[jboss-svn-commits] JBL Code SVN: r13542 - in labs/jbosstm/trunk/ArjunaJTS: jacorb and 5 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Jul 16 04:42:30 EDT 2007


Author: jhalliday
Date: 2007-07-16 04:42:30 -0400 (Mon, 16 Jul 2007)
New Revision: 13542

Added:
   labs/jbosstm/trunk/ArjunaJTS/jacorb/etc/
   labs/jbosstm/trunk/ArjunaJTS/jacorb/etc/jacorb.properties
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/IIOPTransportCurrent.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/TransportCurrent.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosBridgeAdmin.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosPropertyService.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/dds_dcps.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/lib/backport-util-concurrent.jar
   labs/jbosstm/trunk/ArjunaJTS/jacorb/lib/picocontainer-1.2.jar
Removed:
   labs/jbosstm/trunk/ArjunaJTS/jacorb/lib/concurrent-1.3.2.jar
   labs/jbosstm/trunk/ArjunaJTS/jacorb/lib/picocontainer-1.2-021105.jar
Modified:
   labs/jbosstm/trunk/ArjunaJTS/INSTALL
   labs/jbosstm/trunk/ArjunaJTS/jacorb/LICENSE
   labs/jbosstm/trunk/ArjunaJTS/jacorb/README
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/DomainManagement.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/SASPolicy.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/SSLPolicy.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/Tracing.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/channel.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/imr.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/notification.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/ATLAS.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/BiDirPolicy.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CONV_FRAME.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CSI.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CSIIOP.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/Corba.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosCollection.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosCompoundExternalization.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosCompoundLifeCycle.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosConcurrencyControl.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosContainment.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosEventChannelAdmin.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosEventComm.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosExternalization.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosGraphs.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosLifeCycle.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosLifeCycleContainment.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosLifeCycleReference.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNaming.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNaming.old.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNotification.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNotifyChannelAdmin.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNotifyComm.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNotifyFilter.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosObjectIdentity.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosPersistence.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosReference.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosRelationships.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosStream.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTSInteroperation.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTSPortability.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTime.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTrading.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTradingDynamic.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTradingRepos.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTransactions.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTypedEventChannelAdmin.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTypedEventComm.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTypedNotifyChannelAdmin.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTypedNotifyComm.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/Dynamic.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/DynamicAny.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/ETF.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/GIOP.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/GSSUP.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/IIOP.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/IOP.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/IOP_N.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/InterfaceRepository.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/LifeCycleService.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/Messaging.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/NRService.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/PortableInterceptor.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/PortableServer.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/RTCORBA.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SECIOP.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SSLIOP.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/Security.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SecurityAdmin.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SecurityLevel1.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SecurityLevel2.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SecurityReplaceable.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SystemException.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/TimeBase.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/orb.idl
   labs/jbosstm/trunk/ArjunaJTS/jacorb/lib/idl.jar
   labs/jbosstm/trunk/ArjunaJTS/jacorb/lib/jacorb.jar
   labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/RecoverIOR.java
Log:
Upgraded to JacORB 2.3.0-patch4 to match JBossAS 4.2 and 5.0.
The ORB API has changed, requiring modifications to RecoverIOR.java.
Changed README to reflect new method for integration with the AS.


Modified: labs/jbosstm/trunk/ArjunaJTS/INSTALL
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/INSTALL	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/INSTALL	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,54 +1,69 @@
-Installing JBossJTS into JBoss 4.0.3SP1, 4.0.4GA and 4.0.5GA
+
+Note to users of JBoss 4.0.3SP1, 4.0.4GA and 4.0.5GA:
+
+This version of JBossTS no longer supports these older
+JBossAS releases. You probably need JBossTS 4.2.3 instead.
+
+
+Installing JBossTS 4.4 into JBossAS 4.2
 ------------------------------------------------------------
 
-The installation of JBossJTS into JBoss AS is currently a manual process.
-We hope to release an installer in the near future that will automate this
-process.
+Starting with JBossAS 4.2, the application server ships with
+JBossTS JTA as a default component. You do not need to take
+any action if you want JTA support only.
 
-The following steps are required
 
+To change the JTA to the full JTS in JBossAS 4.2, follow these steps:
+
  - download the tar or zip version of the application server
  - extract the distribution into an installation directory
 
- - copy the following jars from the JBossJTS installation into the
-   server/XXX/lib directory of the application server installation
-   - lib/jbossjts.jar
-   - lib/jbossjts-jacorb.jar
-   - lib/jbossjts-integration.jar
-   - lib/ext/jbossts-common.jar
- - copy the following configuration file from the JBossJTS installation into
-   the server/XXX/conf directory of the application server installation
-   - etc/jbossjts-properties.xml
- - edit the server/default/conf/jbossjts-properties.xml file and remove the
+ - Remove from JBossAS:
+    server/XXX/lib/jbossjta.jar
+    server/XXX/lib/jbossjta-integration.jar
+    server/XXX/lib/jbossts-common.jar
+
+ - Copy the following from JBossTS into server/XXX/lib:
+    jbossjts.jar
+    jbossjts-integration.jar
+    jbossjts-jacorb.jar
+    jbossts-common.jar
+
+ - Remove:
+    server/XXX/conf/jbossjta-properties.xml
+ - Replace it with
+    jbossjts-properties.xml
+
+ - edit the server/XXX/conf/jbossjts-properties.xml file and remove the
    recovery extension property containing the value
       "com.arjuna.ats.internal.jta.recovery.jts.XARecoveryModule"
-   also remove the recovery activator property named
-      "com.arjuna.ats.arjuna.recovery.recoveryActivator_1"
- - edit the server/all/conf/jbossjts-properties.xml file and remove the
+
+ - edit the server/XXX/conf/jbossjts-properties.xml file and remove the
    recovery extension property containing the value
    "com.arjuna.ats.internal.jta.recovery.arjunacore.XARecoveryModule"
 
- - Edit the server/all/conf/jboss-service.xml file and replace the
-   jboss:service=TransactionManager mbean declaration with the following
+ - Edit the server/XXX/conf/jboss-service.xml file and modify the
+   jboss:service=TransactionManager mbean declaration:
 
-   <mbean code="com.arjuna.ats.jbossatx.jts.TransactionManagerService"
+   <!-- for JTA (comment this out) -->
+   <mbean code="com.arjuna.ats.jbossatx.jta.TransactionManagerService"
       name="jboss:service=TransactionManager">
-      <depends>jboss:service=CorbaORB</depends>
       <attribute name="TransactionTimeout">300</attribute>
+      <attribute name="ObjectStoreDir">${jboss.server.data.dir}/tx-object-store</attribute>
    </mbean>
 
- - Edit the server/default/conf/jboss-service.xml file and replace the
-   jboss:service=TransactionManager mbean declaration with the following
-
-   <mbean code="com.arjuna.ats.jbossatx.jta.TransactionManagerService"
+   <!-- for JTS -->
+   <mbean code="com.arjuna.ats.jbossatx.jts.TransactionManagerService"
       name="jboss:service=TransactionManager">
+      <depends>jboss:service=CorbaORB</depends>
       <attribute name="TransactionTimeout">300</attribute>
+      <attribute name="ObjectStoreDir">${jboss.server.data.dir}/tx-object-store</attribute>
    </mbean>
 
- - Edit the server/all/conf/jacorb.properies as follows.
+ - Edit the server/XXX/conf/jacorb.properies as follows.
   - change the jacorb.poa.thread_pool_max property to 32
 
- - Edit the server/all/deploy/iiop-service.xml and modify the
+ - Edit the server/XXX/deploy/iiop-service.xml and modify the
    PortableInterceptorInitializers attribute as follows.
   - remove the following lines
          <!-- comment out to disable null transaction propagation over IIOP -->
@@ -59,25 +74,19 @@
          <!-- JBoss TS interceptor -->
          <initializer>com.arjuna.ats.jts.orbspecific.jacorb.interceptors.interposition.InterpositionORBInitializerImpl</initializer>
 
-Replace jacorb.jar in client and server/all/lib with the jacorb.jar located in the jacorb directory.
-
 For each deployment of JacORB, you will need to ensure that the jacorb.implname in the jacorb.properties
 file is unique.
 
-Application Server Library Modifications
-----------------------------------------
+If running an external recovery manager, edit jbossjts-properties.xml to remove
+the recovery activator property named "com.arjuna.ats.arjuna.recovery.recoveryActivator_1".
+This may be necessary in cluster setups where the ObjectStore is shared, as
+there should be only one recovery manager per ObjectStore.
 
-The JBoss 4.0.3SP1, 4.0.4GA and 4.0.5GA application servers require some
-modified librarires before JBossJTA can be used as a replacement.  These
-are detailed in the appropriate subdirectory of the jboss directory within
-this installation.
+Finally, note that starting with JBossAS 4.2, the application server binds to the
+localhost address by default. This is inappropriate for distributed transactions,
+so please ensure the server is bound to a alternative address.
 
-No modifications are required if you are running a cumulative patch for
-JBoss 4.0.4GA.
 
-The application server will now be configured to use the JBossJTS transaction
-manager instead of the JBoss Transaction Manager.
-
 Web Services Transactions
 -------------------------
 
@@ -118,7 +127,7 @@
 
 (i) The XTS trailmap demo application generates warning messages on the
 application server console if it is run in JBoss 4.0.4GA or 4.0.5GA.  These
-warnings do not affect the funtionality of the demo application.
+warnings do not affect the functionality of the demo application.
 
 The warning is:
   [JSR109ServerMetaDataBuilder] Cannot obtain SEI mapping for:

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/LICENSE
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/LICENSE	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/LICENSE	2007-07-16 08:42:30 UTC (rev 13542)
@@ -2,10 +2,9 @@
                         JacORB Licensing
                         ----------------
 
-                   JacORB 2.2, May 2004
+                   JacORB 2.2.3, January 2006
 
-(C) Gerald Brose, Freie Universitaet Berlin/XTRADYNE Technologies AG,
-Germany, 1997-2004
+(C) The JacORB project, 1997-2006
 
 JacORB is free software may be used in accordance with the terms of
 the GNU LIBRARY GENERAL PUBLIC LICENSE as reproduced below.  JacORB is
@@ -26,19 +25,16 @@
 framework (http://www.antlr.org), which is in the public domain and
 may be freely redistribued.
 
-This product includes the "concurrent" class library developed by Doug
-Lea, version 1.3.2
-(http://gee.cs.oswego.edu/dl/classes/EDU/oswego/cs/dl/util/concurrent/index.html). "All
-classes are released to the public domain and may be used for any
-purpose whatsoever without permission or acknowledgment. Portions of
-the CopyOnWriteArrayList and ConcurrentReaderHashMap classes are
-adapted from Sun JDK source code. These are copyright of Sun
-Microsystems, Inc, and are used with their kind permission."
+This product includes the "backport-util-concurrent" class library maintained by
+Dawid Kurzyniec (http://www.mathcs.emory.edu/dcl/util/backport-util-concurrent/), according to the license
+reproduced below.
 
 This product includes software copyrighted by TanukiSoftware
 (http://wrapper.tanukisoftware.org), according to the Tanuki license
 reproduced below. 
 
+This product includes software copyrighted by the PicoContainer Organization
+(http://www.picocontainer.org), according to the license reproduced below.
 
 =====================================================================
 
@@ -573,7 +569,55 @@
  
 =================================================================
 
+The software comprising backport-util-concurrent is based in large
+part on the code from JSR166, and the package dl.util.concurrent.
+The software has been released to the public domain, as explained at:
+http://creativecommons.org/licenses/publicdomain, excepting portions
+of the class 
+edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList, 
+which were adapted from class java.util.ArrayList, written by Sun 
+Microsystems, Inc, which are used with kind permission, and subject 
+to the following:
 
+Copyright 2002-2004 Sun Microsystems, Inc. All rights reserved. Use is
+subject to the following license terms.
+
+  "Sun hereby grants you a non-exclusive, worldwide, non-transferrable
+  license to use and distribute the Java Software technologies as part
+  of a larger work in source and binary forms, with or without
+  modification, provided that the following conditions are met:
+
+   -Neither the name of or trademarks of Sun may be used to endorse or
+    promote products derived from the Java Software technology without
+    specific prior written permission.
+
+   -Redistributions of source or binary code must be accompanied by the
+    following notice and disclaimers:
+
+    Portions copyright Sun Microsystems, Inc. Used with kind permission.
+
+    This software is provided AS IS, without a warranty of any kind.  ALL
+    EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND
+    WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF
+    MERCHANTABILITY, FITNESS FOR A PARTICULAR PUPOSE OR
+    NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN
+    MICROSYSTEMS, INC. AND ITS LICENSORS SHALL NOT BE LIABLE
+    FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF
+    USING, MODIFYING OR DISTRIBUTING THE SOFTWARE OR ITS
+    DERIVATIVES. IN NO EVENT WILL SUN MICROSYSTEMS, INC. OR
+    ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR
+    DATA, OR FOR DIRECT, INDIRECT,CONSQUENTIAL, INCIDENTAL
+    OR PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF
+    THE THEORY OR LIABILITY, ARISING OUT OF THE USE OF OR
+    INABILITY TO USE SOFTWARE, EVEN IF SUN MICROSYSTEMS, INC.
+    HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+    You acknowledge that Software is not designed, licensed or intended for
+    use in the design, construction, operation or maintenance of any nuclear
+    facility."
+
+=================================================================
+
 Copyright (c) 1999, 2004 Tanuki Software
 
 Permission is hereby granted, free of charge, to any person
@@ -614,3 +658,37 @@
 
 The above copyright notice and this permission notice shall be
 included in all copies or substantial portions of the Software.
+ 
+=================================================================
+
+
+Copyright (c) 2003-2004, PicoContainer Organization
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions are met:
+
+  Redistributions of source code must retain the above copyright notice, this 
+  list of conditions and the following disclaimer. 
+
+  Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation 
+  and/or other materials provided with the distribution. 
+
+  Neither the name of the PicoContainer Organization nor the names of its 
+  contributors may be used to endorse or promote products derived from this 
+  software without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGE.
+
+

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/README
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/README	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/README	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,4 +1,13 @@
-This directory contains an extract of the JacORB 2.2.2 distribution.
+This directory contains an extract of the JacORB 2.3.0 distribution with certain JBoss patches applied.
 
+Specifically, it is JacORB 2.3.0-patch4 build from 
+http://repository.jboss.org/jacorb/2.3.0jboss.patch4-brew/
+
+Source code for the patches is in 
+http://repository.jboss.org/jacorb/2.3.0jboss.patch4-brew/src/
+
+Note the licence file incorrectly states 'JacORB 2.2.3'
+this error is present in the original JacORB distribution
+
 These files are used for building orb specific code and running the
 product standalone.

Added: labs/jbosstm/trunk/ArjunaJTS/jacorb/etc/jacorb.properties
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/etc/jacorb.properties	                        (rev 0)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/etc/jacorb.properties	2007-07-16 08:42:30 UTC (rev 13542)
@@ -0,0 +1,810 @@
+##
+##  JacORB configuration options
+##
+
+########################################
+#                                      #
+#   Initial references configuration   #
+#                                      #
+########################################
+
+#
+# URLs where IORs are stored (used in orb.resolve_initial_service())
+# DO EDIT these! (Only those that you are planning to use,
+# of course ;-).
+#
+# The ORBInitRef references are created on ORB startup time. In the
+# cases of the services themselves, this may lead to exceptions being
+# displayed (because the services aren't up yet). These exceptions
+# are handled properly and cause no harm!
+
+#ORBInitRef.NameService=corbaloc::160.45.110.41:38693/StandardNS/NameServer-POA/_root
+#ORBInitRef.NameService=file:/c:/NS_Ref
+ORBInitRef.NameService=http://www.x.y.z/~user/NS_Ref
+#ORBInitRef.TradingService=http://www.x.y.z/~user/TraderRef
+ORBInitRef.InterfaceRepository=file:/c:/IR_Ref
+
+########################################
+#                                      #
+#      Export of corbaloc IORs         #
+#                                      #
+########################################
+
+# allow for more readable corbaloc URLs by mapping the
+# actual object key to an arbitrary string. The mapping
+# below would permit clients of a name service to
+# access it using corbaloc::ipaddress:portnum/NameService
+# Note: it is NOT necessary to define this property for
+# the name service here because this is done already in the
+# code of the ns implementation.
+# This mapping can be altered programatically by the proprietary
+# function ORB::addObjectKey(NameService, file:/home/rnc/NameSingleton.ior)
+#
+# The property also accepts the following mappings:
+# IOR, resource, jndi, URL (e.g. file, http)
+# examples:
+# jacorb.orb.objectKeyMap.NameService=StandardNS/NameServer-POA/_root
+# jacorb.orb.objectKeyMap.NameService=file:/home/rnc/NameSingleton.ior
+
+##################################
+#                                #
+#   ORB version number output    #
+#                                #
+##################################
+
+# if on, the ORB's version number and a copyright statement is printed
+# any time the ORB is initialized
+jacorb.orb.print_version=off
+
+# the logger used to print out the version number
+# should always be set at least to INFO level otherwise
+# nothing will be printed out
+jacorb.orb.print_version.log.verbosity = 3
+
+##################################
+#                                #
+#  Default Logging configuration #
+#                                #
+##################################
+
+# Name of the factory class that plugs in a given log kit
+# The default value is JacORB's own factory for the Apache
+# LogKit. Only edit (or uncomment) if you want a different
+# log kit.
+#jacorb.log.loggerFactory=org.jacorb.util.LogKitLoggerFactory
+
+# log levels:
+#
+# 0 = fatal errors only = "almost off" (FATAL ERRORS)
+# 1 = non-fatal errors and exceptions (ERROR)
+# 2 = important messages (WARN)
+# 3 = informational messages and exceptions (INFO)
+# 4 = debug-level output (DEBUG) (may confuse the unaware user :-)
+# NOTE: the name of this property has changed from jacorb.verbosity!!
+jacorb.log.default.verbosity=1
+
+# where does output go? Terminal is default
+#jacorb.logfile=LOGFILEPATH
+
+# logfilename used by the singleton ORB
+# a timestamp and the suffix .log will be appended
+#jacorb.logfile.singleton=orbsingleton
+
+# If logging to file whether to append to existing file or overwrite
+jacorb.logfile.append=off
+
+# If jacorb.logfile.append is on, set rolling log size in kilobytes.
+# A value of 0 implies no rolling log
+jacorb.logfile.maxLogSize=0
+
+# LogPattern
+# This configure the logging pattern. For the format see
+# http://excalibur.apache.org/apidocs/org/apache/log/format/PatternFormatter.html
+jacorb.log.default.log_pattern=[%.20{category}] %.7{priority} : %{message}\\n%{throwable}
+
+# hexdump outgoing messages
+jacorb.debug.dump_outgoing_messages=off
+
+# hexdump incoming messages
+jacorb.debug.dump_incoming_messages=off
+
+jacorb.util.tpool.log.verbosity=0
+
+##################################################
+#                                                #
+#    WARNING: The following properties should    #
+#    only be edited by the expert user. They     #
+#    can be left untouched in most cases!        #
+#                                                #
+##################################################
+
+
+
+################################
+#                              #
+#   Basic ORB Configuration    #
+#                              #
+################################
+
+# the GIOP minor version number to use for newly created IORs
+jacorb.giop_minor_version=2
+
+# number of retries if connection cannot directly be established
+jacorb.retries=5
+
+# how many msecs. do we wait between retries
+jacorb.retry_interval=500
+
+# log2 of maximum buffer size managed by the internal
+# buffer manager.
+#
+# This is NOT the maximum buffer size that
+# can be used, but just the largest size of buffers that
+# will be kept and managed. This value will be added to
+# an internal constant of 5, so the real value in bytes
+# is 2**(5+maxManagedBufSize-1). You only need to increase this
+# value if you are dealing with LOTS of LARGE data structures.
+# You may decrease it to make the buffer manager release large
+# buffers immediately rather than keeping them for later
+# reuse.
+jacorb.maxManagedBufSize=18
+
+# If this value is 0 an extra unlimited size buffer cache is created
+# for the CDROutputStreams. If this value is > 0 then the cache will
+# be purged every x msecs. If this value is -1 no caching of these
+# buffers will take place. This will reduce memory footprint at the
+# cost of decreased performance handling large data structures.
+# This value defaults to 0 if not set.
+#jacorb.bufferManagerMaxFlush=-1
+
+# Normally, a jacorb server will close the TCP/IP connection right
+# after sending a CloseConnection message. However, it may
+# occasionally happen that the client sends a message into the closed
+# connection because it hasn't handled the CloseConnection yet. To
+# avoid this situation, closing of the TCP/IP connection can be delayed.
+#jacorb.connection.delay_close=on
+#jacorb.connection.timeout_after_closeconnection=20000
+
+# Initial timeout for establishing a connection.
+jacorb.connection.client.connect_timeout=90000
+
+# Wait the specified number of msecs for a reply to a request. If
+# exceeded, a org.omg.CORBA.TIMEOUT exception will be thrown
+#jacorb.connection.client.pending_reply_timeout=0
+
+# client-side connection idle timeout, set to a non-zero value to close the
+# connection after so many msecs. Only connections that don't have pending
+# messages are closed, unless
+# jacorb.connection.client.timeout_ignores_pending_messages is turned on.
+#jacorb.connection.client.idle_timeout=0
+
+# shall the orb ignore pending messages when a connection idle timeout is
+# detected? If "on", the connection is closed regardless of any pending
+# messages, and all pending messages are cancelled (resulting in a
+# COMM_FAILURE, unless jacorb.connection.client.retry_on_failure is turned
+# on). Default is "off"
+#jacorb.connection.client.timeout_ignores_pending_messages=off
+
+# whenever a network failure is detected, the orb can either
+# (infinitely) retry all pending requests, or propagate a COMM_FAILURE
+# back into the client code. Default is "off", i.e. throw a
+# COMM_FAILURE. Note that this should only be used with idempotent operations
+# because the client side orb has no way of knowing the processing state of
+# the lost request on the server.
+#jacorb.connection.client.retry_on_failure=off
+
+# max time (msecs) a server keeps a connection open if nothing happens
+#jacorb.connection.server.timeout=10000
+
+# because JacORB uses blocking network IO, it assigns a thread to each
+# connection to listen and read messages. Threads are taken from a thread pool
+# that can be configured with these following properties. max_receptor_threads
+# is equal to the number of connections that can be serviced
+# simultaneously. When all threads are in use, new connections can still be
+# opened or accepted, but will not be listened on.
+#jacorb.connection.client.max_idle_receptor_threads=5
+#jacorb.connection.client.max_receptor_threads=1000
+#jacorb.connection.server.max_idle_receptor_threads=5
+#jacorb.connection.server.max_receptor_threads=1000
+
+# Max no of accepted connections on the server. Only effective in conjunction
+# with the next four properties. Please see section 15.2 "Connection
+# Management" in the ProgrammingGuide
+#jacorb.connection.max_server_connections=
+
+# The class name of the SelectionStrategy class
+#jacorb.connection.selection_strategy_class=
+
+# The class name of the StatisticsProvider class
+#jacorb.connection.statistics_provider_class=
+
+# The number of msecs that are waited until the next attempt to find
+# an idle connection is made (i.e. do not continuously spin)
+#jacorb.connection.wait_for_idle_interval=500
+
+# Sets keep-alive on server sockets. If the OS keepalive detects a TCP/IP
+# connection to be broken, the effect is the same as if the TCP/IP connection
+# has been closed gracefully.
+#jacorb.connection.server.keepalive=off
+
+# Sets keep-alive on client sockets. If the OS keepalive detects a TCP/IP
+# connection to be broken, the effect is the same as if the TCP/IP connection
+# has been closed gracefully. All pending replies will receive a
+# COMM_FAILURE.
+#jacorb.connection.client.keepalive=off
+
+#jacorb.reference_caching=off
+
+# Sets a timeout on the (SSL) server socket. This is a workaround for JDK 1.3
+# on linux where a thread blocked on accept() isn't notified when closing that
+# socket. See Java bug #4344135. NOTE: This is only useful in conjunction with
+# the SI&C SSL socket factories.
+#jacorb.listener.server_socket_timeout=0
+
+#
+# The following property specifies the class which is used for
+# reference caching. WeakHashtable uses WeakReferences, so entries
+# get gc'ed if only the Hashtable has a reference to them. This
+# is useful if you have many references to short-living non-persistent
+# CORBA objects. It is only available for java 1.2 and above.
+#
+# On the other hand the standard Hashtable keeps the references until
+# they are explicitely deleted by calling _release(). This is useful
+# for persistent and long-living CORBA objects.
+#
+#jacorb.hashtable_class=org.jacorb.util.WeakHashtable
+#
+jacorb.hashtable_class=java.util.Hashtable
+
+# use GIOP 1.2 byte order markers (since CORBA 2.4-5)
+jacorb.use_bom=off
+
+# add additional IIOP 1.0 profiles even if we are using IIOP 1.2
+jacorb.giop.add_1_0_profiles=off
+
+# Use DNS names in IORs
+jacorb.dns.enable=off
+
+# Compact Typecodes (0 - off, 1 - partial (not member_names), 2 - all)
+jacorb.compactTypecodes=0
+
+# Cache typecode on read
+jacorb.cacheTypecodes=off
+
+# Cache poa names
+jacorb.cachePoaNames=off
+
+# Control if errors caused by an ORBInitializer (thrown exceptions or failure
+# to build class) will make ORB.init() fail or not. On failure, a
+# org.omg.CORBA.INITIALIZE exception will be thrown.
+#jacorb.orb_initializer.fail_on_error=off
+
+# A listener to receive a callback when the acceptor thread caught an
+# exception. The default JacORB implementation will shutdown the ORB on all
+# Errors and SSLExceptions (e.g. but not on IOExceptions)
+jacorb.acceptor_exception_listener=org.jacorb.orb.listener.DefaultAcceptorExceptionListener
+
+# If set to on this results in extra information being added to the
+# thread name i.e. connection endpoints and date/time thread started
+# processing - Server_TCP_IP_Transport only.
+jacorb.enhanced_thread_name=off
+
+# If this is set to a class implementing org.jacorb.orb.IORMutator
+# then this will be used to mutate incoming/outgoing Objects
+#jacorb.iormutator=
+
+# If true enable codesets. If false, this will ignore all codesetComponentInfo profiles
+# within an IOR and also disable explicit marshalling with codesets (re Strings).
+# jacorb.codeset=off
+
+# Overrides the detection from the local environment for the codeset used to
+# transmit characters. Note that this property is only effective once per JVM.
+# jacorb.native_char_codeset=ISO8859_1
+
+# Overrides the detection from the local environment for the codeset used to
+# transmit wide characters. ote that this property is only effective once per JVM.
+# jacorb.native_wchar_codeset=UTF16
+
+
+###########################################
+#                                         #
+#         Interoperability                #
+#                                         #
+###########################################
+
+# Turn off indirection encoding for repeated typecodes. This fixes
+# interoperability with certain broken ORB's eg. Orbix2000
+jacorb.interop.indirection_encoding_disable=off
+
+# Iona Comet CORBA/COM bridge can incorrectly encode buffer lengths.
+# Enabling this property adds additional length checking and adjustment
+# for interoperability with Comet.
+jacorb.interop.comet=off
+
+# Some ORBs (e.g. VisiBroker, ORBacus) do not set a byte value of 1
+# as a CDR encoded boolean true value. Enabling this property interprets
+# any non zero CDR encoded boolean value as true.
+jacorb.interop.lax_boolean_encoding=off
+
+# Control whether the method create_abstract_interface_tc performs
+# a validity check on the name parameter or not. Turning this check
+# off circumvents a bug in Sun's implementation of javax.rmi.CORBA.ValueHander,
+# which occasionally passes an invalid name (an empty string) to
+# ORBSingleton.create_abstract_interface_tc. If you are using RMI valuetypes,
+# you should turn this property off.
+jacorb.interop.strict_check_on_tc_creation=on
+
+# Custom-marshalled RMI valuetypes should be encoded as chunks, but some
+# ORBs are not able to decode chunked values. Disable this property for
+# interoperability with the ORB in Sun's JDK 1.4.2.
+jacorb.interop.chunk_custom_rmi_valuetypes=on
+
+# RMI/IIOP data encoded as chunks should contain the length
+# of the chunk. the sun orb does not send the length
+# always.
+# enable this property for interoperability with the Sun ORB.
+# http://lists.spline.inf.fu-berlin.de/mailman/htdig/jacorb-developer/2006-May/008251.html
+jacorb.interop.sun=off
+
+###########################################
+#                                         #
+#         Socket Factories                #
+#                                         #
+###########################################
+
+# A factory design pattern is used for the creation of sockets and server
+# sockets.
+# The jacorb.net.socket_factory property can be used to configure
+# a socket factory that must implement the operations defined in the
+# interface org.jacorb.orb.factory.SocketFactory.
+# The jacorb.net.server_socket_factory property can be used to configure a
+# server socket factory that must implement the operations defined in the
+# interface org.jacorb.orb.factory.ServerSocketFactory.
+#
+#jacorb.net.socket_factory=org.jacorb.orb.factory.DefaultSocketFactory
+#jacorb.net.server_socket_factory=org.jacorb.orb.factory.DefaultServerSocketFactory
+#jacorb.net.socket_factory=org.jacorb.orb.factory.PortRangeSocketFactory
+#jacorb.net.server_socket_factory=org.jacorb.orb.factory.PortRangeServerSocketFactory
+#
+# Additional socket factores are supported that allow for the configuration
+# of maximum and minimum port numbers that can be used. This can be used to
+# enable firewall traversal via a fixed port range. To use these socket factories
+# configure one or both of the following property pairs. The first property pair
+# configures the client socket factory and the second pair the server socket
+# factory.
+#
+#jacorb.net.socket_factory.port.min
+#jacorb.net.socket_factory.port.max
+#jacorb.net.server_socket_factory.port.min
+#jacorb.net.server_socket_factory.port.max
+
+# Listeners
+# The TCP listener listens for TCP socket connections and should be implemented
+# as defined by org.jacorb.orb.listener.TCPConnectionListener
+jacorb.net.tcp_listener=
+
+###########################################
+#                                         #
+#         BiDirectional GIOP              #
+#                                         #
+###########################################
+
+# uncomment this initializer if you want to use BiDirectional GIOP
+
+#org.omg.PortableInterceptor.ORBInitializerClass.bidir_init=org.jacorb.orb.giop.BiDirConnectionInitializer
+
+
+###########################################
+#                                         #
+#       Proxy address in IOR              #
+#                                         #
+###########################################
+
+#
+# Some times it is necessary to present an endpoint alias in an IOR
+# to allow clients outside a firewall to get a connection to a server
+# that is behind a NAT'ing firewall.
+#
+# WARNING: this is just "dumb" replacing, so you
+# have to take care of your configuration!
+#
+
+# The general form of this address is <protocol key>://<address>
+# The protocol key in the address must match the protocol(s) used by
+# the server. See the section on configuring Transport Factories for
+# information on loading specific protocols.
+#jacorb.ior_proxy_address=iiop://1.2.3.4:4711
+
+# Deprecated IIOP-specific form:
+# with these two properties it is possible to
+# tell the ORB what IP/port IORs should contain,
+# if the ServerSockets IP/port can't be used
+# (e.g. for traffic through a firewall).
+#
+# WARNING: this is just "dumb" replacing, so you
+# have to take care of your configuration!
+#
+
+#jacorb.ior_proxy_host=1.2.3.4
+#jacorb.ior_proxy_port=4711
+
+###########################################
+#                                         #
+#   The Object Adapter Internet Address   #
+#                                         #
+###########################################
+
+# IP address on multi-homed host (this gets encoded in
+# object references). NOTE: Adresses like 127.0.0.X
+# will only be accessible from the same machine!
+#OAIAddr=1.2.3.4
+#OAPort=4711
+
+# A new protocol-independent configuration is available
+# for use to configure an explicit endpoint using IIOP or
+# other protocols.
+#OAAddress=iiop://1.2.3.4:4711
+
+############################
+#                          #
+#   Default Interceptors   #
+#   Please leave them in!  #
+#                          #
+############################
+org.omg.PortableInterceptor.ORBInitializerClass.standard_init=org.jacorb.orb.standardInterceptors.IORInterceptorInitializer
+
+
+
+###############################################
+#                                             #
+#   Implementation Repository Configuration   #
+#                                             #
+###############################################
+# Switch off to avoid contacting the ImR on every server start-up
+jacorb.use_imr=off
+
+# Switch off if you don't want to write the ImR address into server IORs
+# (ignored if jacorb.use_imr=off)
+jacorb.use_imr_endpoint=on
+
+# if set to "on", servers that don't already have an entry on their
+# first call to the imr, will get automatically registered. Otherwise,
+# an UnknownServer exception is thrown.
+jacorb.imr.allow_auto_register=off
+
+# if set to "on", the imr will try to "ping" every object reference,
+# that it is going to return. If the reference is not alive, TRANSIENT
+# is thrown.
+jacorb.imr.check_object_liveness=off
+
+ORBInitRef.ImplementationRepository=http://www.x.y.z/~user/ImR_Ref
+
+jacorb.imr.table_file=Z:\table.dat
+jacorb.imr.backup_file=z:\backup.dat
+jacorb.imr.ior_file=/home/bwana/brose/public_html/ImR_Ref
+# Time (msecs) that the implementation will wait for a started server to register.
+jacorb.imr.timeout=
+
+# Host for ImR endpoint
+jacorb.imr.endpoint_host=
+# Port number for IMR endpoint
+jacorb.imr.endpoint_port_number=
+
+# how many millisecs should the imr wait, until a connection from an
+# application client is terminated. Default is 2000.
+jacorb.imr.connection_timeout=2000
+
+# the implementation name, should be set to a different
+# name in the code of persistent servers
+# jacorb.implname=StandardImplName
+jacorb.implname=JBoss
+
+#
+# This is supposed to be a generic startup string for everything
+# that calls Runtime.exec(). Might be replaced by jaco[.bat].
+#
+jacorb.java_exec=java -Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB -Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton
+
+# with these two properties it is possible to
+# tell the ORB what IP / hostname  and port the IMR IOR and IMRified server IORs should
+# contain,  if the ServerSockets IP/port can't be used
+# (e.g. for traffic through a firewall).
+#
+# WARNING: this is just "dumb" replacement, so you
+# have to take care of your configuration!
+#
+#jacorb.imr.ior_proxy_host=1.2.3.4
+#jacorb.imr.ior_proxy_port=4711
+
+# protocol-independent form for assigning imr proxy endpoint
+#jacorb.imr.ior_proxy_address=iiop://1.2.3.4:4711
+
+#########################
+#                       #
+#   SSL Configuration   #
+#                       #
+#########################
+
+#
+# The port number used by SSL, will be dynmically assigned
+# by default
+#
+
+#OASSLPort=4711
+
+# This interceptor must be set if programs need access to
+# certificates using the CORBA Security API, SSL works also
+# without this interceptor
+
+#org.omg.PortableInterceptor.ORBInitializerClass.ForwardInit=org.jacorb.security.ssl.SecurityServiceInitializer
+
+# qualified classname of access decision object
+jacorb.security.access_decision=org.jacorb.security.level2.AccessDecisionImpl
+
+# list of qualified classnames of principal authenticator objects,
+# separated by commas (no whitespaces!). The first entry (that can
+# be successfully created) will be available through the
+# principal_authenticator property.
+jacorb.security.principal_authenticator=org.jacorb.security.level2.PrincipalAuthenticatorImpl
+
+# the qualified classname of the ssl socket factory class
+jacorb.ssl.socket_factory=org.jacorb.security.ssl.sun_jsse.SSLSocketFactory
+
+# the qualified classname of the ssl server socket factory class
+jacorb.ssl.server_socket_factory=org.jacorb.security.ssl.sun_jsse.SSLServerSocketFactory
+
+# IIOP/SSL parameters (numbers are hex values, without the leading "0x"):
+# NoProtection = 1
+# EstablishTrustInClient = 40
+# EstablishTrustInTarget = 20
+# mutual authentication = 60
+# please see the programming guide for more explanation
+
+jacorb.security.support_ssl=off
+
+jacorb.security.ssl.client.supported_options=0
+jacorb.security.ssl.client.required_options=0
+
+jacorb.security.ssl.server.supported_options=0
+jacorb.security.ssl.server.required_options=0
+
+#
+# If set, the following two values will be placed in the IOR, if
+# "corbaloc:ssliop" ssliop.
+#
+# If not set, only EstablishTrustInTarget is used for both supported
+# and required options. EstablishTrustInClient is not set, and the
+# rest of the Association Options aren't currently used anyway.
+#jacorb.security.ssl.corbaloc_ssliop.supported_options=0
+#jacorb.security.ssl.corbaloc_ssliop.required_options=0
+
+# The name and location of the keystore. This may be absolute or
+# relative to the home directory, or a file retrievable through the
+# classloader.
+#
+# NOTE (for Sun JSSE users): The "javax.net.ssl.trustStore[Password]"
+# properties don't seem to take effect, so you may want to add trusted
+# certificates to "normal" keystores. In this case, please set the
+# property "jacorb.security.jsse.trustees_from_ks"is to "on", so trusted
+# certificates are taken from the keystore instead of a dedicated
+# truststore.
+jacorb.security.keystore=
+jacorb.security.keystore_password=
+
+#
+# Sun JSSE specific settings
+#
+# Use the keystore to take trusted certs from.
+jacorb.security.jsse.trustees_from_ks=off
+
+# A comma-separated (no whitespaces!) list of cipher suite names. See
+# the JSSE docs on how to obtain the correct cipher suite strings
+jacorb.security.ssl.server.cipher_suites=
+jacorb.security.ssl.client.cipher_suites=
+
+# A comma seperated list of the names of the protocols to be set enabled on
+# the SSL socket.  See the JSSE documentation for
+# javax.net.ssl.SSLSocket#setEnabledProtocols()
+# NOTE: Does only apply to jdk1.4 and above
+#jacorb.security.ssl.client.protocols=
+#jacorb.security.ssl.server.protocols=
+
+# A user defined javax.net.ssl.TrustManager implemementation class name.
+# Will be used to intialise the SSLContext. See JSSE docs for javax.net.ssl.SSLContext#init().
+# Must be capable of instantiation via a no arg constructor.
+#jacorb.security.ssl.client.trust_manager=my.trust.Manager
+#jacorb.security.ssl.server.trust_manager=my.trust.Manager
+
+# Class name for a class that implements JacORB JSRandom interface. This
+# will be used to get a SecureRandom.
+jacorb.security.randomClassPlugin=
+
+# Listeners
+# The SSL listener listens for SSL sessions and should be implemented as defined
+# by org.jacorb.orb.listener.SSLSessionListener
+jacorb.security.ssl.ssl_listener=
+
+#########################
+#                       #
+#   POA Configuration   #
+#                       #
+#########################
+
+# displays a GUI monitoring tool for servers
+jacorb.poa.monitoring=off
+
+# POA log levels:
+# 0 = fatal errors only = "almost off" (FATAL ERRORS)
+# 1 = non-fatal errors and exceptions (ERROR)
+# 2 = important messages (WARN)
+# 3 = informational messages and exceptions (INFO)
+# 4 = debug-level output (DEBUG) (may confuse the unaware user :-)
+jacorb.poa.log.verbosity=3
+
+# thread pool configuration for request processing
+jacorb.poa.thread_pool_max=32
+jacorb.poa.thread_pool_min=5
+
+# If set then use shared thread pool amongst all the POAs.  Only used with
+# ORB_CTRL_MODEL.
+# jacorb.poa.thread_pool_shared = off
+
+# if set, request processing threads in thePOA
+# will run at this priority. If not set or invalid,
+# MAX_PRIORITY will be used.
+#jacorb.poa.thread_priority=
+
+# Properties controlling the POA's request queue.  If queue_wait is off,
+# then if there are more than queue_max requests in the queue, the
+# client gets TRANSIENT exceptions for any requests.  If queue_wait is on,
+# then the call blocks at the server side until no more than queue_min
+# requests are left in the queue.  The new request is then delivered as usual.
+jacorb.poa.queue_wait=off
+jacorb.poa.queue_max=100
+jacorb.poa.queue_min=10
+
+# Set this to on for server-side checking of expired ReplyEndTimePolicy.
+# (This also applies to RelativeRoundtripTimeoutPolicy.)  When this is on,
+# the clocks of the server and client machine need to be synchronized.
+#jacorb.poa.check_reply_end_time=off
+
+
+###################################
+#                                 #
+#  Transport Layer Configuration  #
+#                                 #
+###################################
+
+# Names of the factories classes for all installed transport plug-ins
+# (comma-separated list).
+
+#jacorb.transport.factories=org.jacorb.orb.iiop.IIOPFactories
+
+# ProfileId tags of all installed transports that should actually
+# listen on the server side.  This is a comma-separated list of numbers,
+# each number must correspond to one ProfileId tag from a factory in
+# jacorb.transport.factories.  In IORs produced by the server, the transport
+# profiles will appear in the order indicated by this list.
+
+#jacorb.transport.server.listeners=0
+
+# Name of a class that selects the transport profile to use on the
+# client side.
+
+#jacorb.transport.client.selector=org.jacorb.orb.DefaultProfileSelector
+
+
+##################################
+#                                #
+#   Name Service Configuration   #
+#                                #
+##################################
+
+# log levels:
+# 0 = fatal errors only = "almost off" (FATAL ERRORS)
+# 1 = non-fatal errors and exceptions (ERROR)
+# 2 = important messages (WARN)
+# 3 = informational messages and exceptions (INFO)
+# 4 = debug-level output (DEBUG) (may confuse the unaware user :-)
+
+jacorb.naming.log.verbosity=3
+
+#
+# name of the logger factory. Implement your own subclass of
+# org.jacorb.util.LoggerFactory and enter class name here to
+# customize logging behavior. Built-in default is org.jacorb.util.LogKitLoggerFactory
+#jacorb.log.loggerFactory=
+
+# Whether non active references are purged from name service
+# when list operation is invoked.
+
+jacorb.naming.purge=on
+
+# Whether resolve should return references without trying to
+# ping them to see if they're still alive first.
+
+jacorb.naming.noping=on
+
+# The file where the name server drops its IOR
+jacorb.naming.ior_filename=c:/NS_Ref
+
+
+########################################################
+#                                                      #
+#   Notification Service configuration, please see     #
+#   the JacORB ProgrammingGuide for a explanation      #
+#                                                      #
+########################################################
+
+jacorb.notification.filter.thread_pool_size = 2
+
+jacorb.notification.proxyconsumer.thread_pool_size = 2
+
+jacorb.notification.proxysupplier.thread_pool_size = 4
+
+jacorb.notification.supplier.poll_intervall = 1000
+
+jacorb.notification.max_batch_size = 1
+
+jacorb.notification.max_events_per_consumer = 100
+
+jacorb.notification.order_policy = PriorityOrder
+
+jacorb.notification.discard_policy = PriorityOrder
+
+jacorb.notification.consumer.backout_interval = 5000
+
+jacorb.notification.consumer.error_threshold = 3
+
+# valid values: ThreadPool, ThreadPerProxy
+jacorb.notification.proxysupplier.threadpolicy = ThreadPool
+
+jacorb.notification.default_filter_factory = builtin
+
+# jacorb.notification.supplier.max_number = 10
+
+# jacorb.notification.start_time_supported = 10
+
+jacorb.notification.stop_time_supported = on
+
+jacorb.notification.proxy.destroy_causes_disconnect = on
+
+# Notification Service log levels:
+org.jacorb.notification.log.verbosity = 3
+
+########################################
+#                                      #
+#   SAS configuration                  #
+#                                      #
+########################################
+
+jacorb.SAS.log.verbosity=INFO
+jacorb.SAS.CSS.log.verbosity=INFO
+jacorb.SAS.TSS.log.verbosity=INFO
+
+# This option defines the specific SAS context generator/validator
+# Currently supported contexts include:
+#    NullContext       - Sends a NULL SAS Context
+#    GssUpContext      - Uses GSSUP security
+#    KerberosContext   - uses Kerberos security
+# At least one context must be selected for SAS support
+#jacorb.security.sas.contextClass=org.jacorb.security.sas.NullContext
+#jacorb.security.sas.contextClass=org.jacorb.security.sas.GssUpContext
+#jacorb.security.sas.contextClass=org.jacorb.security.sas.KerberosContext
+
+# This initializer installs the SAS interceptors
+# Comment out this line if you do not want SAS support
+#org.omg.PortableInterceptor.ORBInitializerClass.SAS=org.jacorb.security.sas.SASInitializer
+
+# This option is used for GSSUP security and sets up the GSS Provider
+# Comment out this line if you are not using GSS UP authentication
+#org.omg.PortableInterceptor.ORBInitializerClass.GSSUPProvider=org.jacorb.security.sas.GSSUPProviderInitializer
+
+########################################
+#                                      #
+#   Custom configuration               #
+#                                      #
+########################################
+
+
+# any other custom properties can be added here.

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/DomainManagement.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/DomainManagement.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/DomainManagement.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,512 +1,512 @@
-/* DomainManagement.idl
-   declares Domain, which manages domain members and domain policies
-	    some policies used to manage domains
-   $Id: DomainManagement.idl,v 1.2 2001/04/03 16:02:48 jacorb Exp $
-*/
-
-
-#include <orb.idl> 
-module org {
-  module jacorb {
-    module orb {
-        module domain { // domain management
-
-            /***** types *****/
-
-            interface Domain;                      // forward declarations
-            interface Membership;                  
-            interface GraphNode;  
-            interface DomainNamingContext;
-            interface DomainFactory;              
-            interface PolicyFactory;              
-            interface MetaPolicy;                
-            interface ObjectDomainMapper;
-
-            typedef sequence <Domain> DomainList;
-            typedef sequence <Object> ObjectList;
-            typedef sequence <CORBA::PolicyType> PolicyTypeList;
-
-
-            // for listeners that want to be informed of changes
-            // in domain membership. Some policies might want to
-            // know so that they can update displayed information
-            // in specialized editors
-
-            interface MembershipListener
-            {
-                oneway void memberRemoved(in Object exMember);
-                oneway void memberAdded(in Object newbie);               
-            };
-
-
-            /***** Domain *****/
-
-            // a domain object manages two sets:
-            // 1) set of object members
-            // 2) set of domain policies
-
-            exception PolicyTypeAlreadyDefined { CORBA::PolicyType type; };
-  
-            interface Domain : CORBA::DomainManager, GraphNode, Membership, 
-                DomainNamingContext, DomainFactory, PolicyFactory, 
-                ObjectDomainMapper
-            {
-
-                // the name of the domain
-                attribute string name;
-
-                // Policy operations
-                
-                // checks whether this domain has a policy of type "type"
-                boolean hasPolicyOfType(in CORBA::PolicyType type);
-
-                // sets the policy of the specified type
-                // Pre : NOT hasPolicyOfType( policy.policy_type() )
-                // Post:     hasPolicyOfType( policy.policy_type() )
-                void set_domain_policy(in CORBA::Policy policy) 
-                    raises (PolicyTypeAlreadyDefined);
-
-                // potentially overwrites a policy, use with care, 
-                // if unsecure, use set_domain_policy instead
-                void overwrite_domain_policy(in CORBA::Policy policy);
-
-                // removes a policy from the domain
-                // Post:  NOT hasPolicyOfType( type )
-                void deletePolicyOfType(in CORBA::PolicyType type);
-
-                // get all policies of the domain
-                CORBA::PolicyList getPolicies(); 
-                unsigned long     getPolicyCount();
-
-                // operations for managing set of object members
-
-                void       insertMember(in Object obj);
-                void       deleteMember(in Object obj);
-                boolean       hasMember(in Object obj);
-                // list all object members
-                ObjectList    getMembers(); 
-                unsigned long getMemberCount();
-
-                // add and remove listeners
-                void addMembershipListener( in MembershipListener listener );
-                void removeMembershipListener( in MembershipListener listener );
-
-            }; // Domain
-
-            interface ORBDomain : Domain
-            {
-                // Pre :  The domain aDomain is in the same process capsule as the ORBDomain
-                // Post:  isLocalTo(aDomain)
-                void insertLocalDomain(in Domain aDomain);
-
-                boolean isLocalTo(in Domain aDomain);
-
-                // Post: NOT isLocalTo(aDomain)
-                void removeLocalDomain(in Domain aDomain);
-
-                void updateODMCache(in Object obj, in DomainList group);
-                void invalidateODMCache(in Object obj);
-                // adds  the domain aDomain to the  domains of obj
-                // in the cache
-                
-                void addToODMCache(in Object obj, in Domain aDomain);
-                // removes the domain  aDomain from the domains of
-                // obj in the cache
-                void removeFromODMCache(in Object obj, in Domain aDomain);
-                
-            };
-
-            // ObjectNaming: provides an object in a domain with a name
-            // the name is a key locally in the domain scope
-
-            typedef string Name;
-            typedef sequence <Name> NameList;
-            exception NameAlreadyDefined { Name name; };
-            exception InvalidName {        Name name; };
-
-            interface DomainNamingContext
-            {
-                /// object names
-                // the prefix used for auto naming
-                attribute string NameAutoPrefix;
-                
-                // inserts an object as member into this domain, names it
-                void insertMemberWithName(in Name objName, in Object obj)
-                    raises (NameAlreadyDefined);
-                
-                // renames an object identified by its old name
-                void renameMember(in string oldName, in string newName)
-                    raises (InvalidName, NameAlreadyDefined);
-                
-                // object -> name
-                Name getNameOf(in Object obj);
-                
-                // name -> object
-                // returns  null if there  is no object  with name
-                // objName in this domain
-                Object resolveName(in Name objName);      
-                
-                /// domain path names
-                
-                attribute string separator;	// default is "/"
-                
-                // finds a domain child identified by childName
-                // returns null if there is no such child
-                Domain findChild(in Name childName);
-                
-                // renames a child domain
-                void renameChildDomain(in Name oldName, in Name newName) 
-                    raises (InvalidName, NameAlreadyDefined);
-                
-                // resolves a domain pathname, recursive version of findChild
-                Domain resolveDomainPathName(in Name pathname) raises (InvalidName);
-                
-                NameList getPathNames(); 
-                //  returns a list  of domain  path names  of this
-                // domain may be  more than one, because there may
-                // be multiple paths to the root domain
-            };
-
-            interface Membership 
-            {
-                // obj -> list of domains
-                DomainList getDomains(in Object obj);
-    
-                // obj -> Policy
-                CORBA::Policy getPolicy( in Object obj, 
-                                         in CORBA::PolicyType type);
-
-            }; // Membership
-   
-
-
-            interface DomainFactory 
-            {
-                // Creates  a Domain object  with "initialMembers"
-                // as initial members and "initialPolicies" as the
-                // policies to begin  with. Both can be null which
-                // then means empty.
-                Domain createDomain
-                    (
-                     in ObjectList        initialMembers, 
-                     in CORBA::PolicyList initialPolicies,
-                     in string            name
-                     );
-                
-                //  creates  an   empty  domain  with  no  initial
-                //  members,  no initial  policies  and the  empty
-                //  string  as name  this  is  just a  convenience
-                // operation
-                Domain createEmptyDomain();
-                
-                // Pre: aDomain.getChildCount() == 0
-                // destroys the domain aDomain, further use is prohibited
-                void destroy(in Domain aDomain);
-            };
- 
-           
-            /********* graph node **********************/
-            //  a  graph  node  supports  operation to  walk  a  graph
-            // hierarchy up- and down
-
-             interface GraphNode 
-             {
-
-                 exception ClosesCycle {};
-                 
-                 //  returns True  iff this  domain manager  has no
-                 // parent domain services
-                 boolean isRoot();    
-                 
-                 // only for testing, normally not here
-                 Domain getRootDomain();    
-                 
-                 // boolean    hasIndirectMember(in Object obj);
-                 // ObjectList getIndirectMembers();         
-                 // list all indirect object members
-                 
-                 
-                 //  extending  policy  operations:  retrieves  the
-                 // effecive policy for this domain may be computed
-                 // dynamically depending on parent domain policies
-                 CORBA::Policy getEffectiveDomainPolicy(in CORBA::PolicyType type);
-                 
-                 // child domains
-     
-                 /* inserts a domain into this domain as a (direct)
-                    child  domain 
-                    Pre:  NOT child.isReachable(this)
-                    (to   prevent  cycles)   the   precondition  of
-                    Domain.addParent  also  needs  to be  satisfied
-                    
-                    Post:          this.hasChild(child)         AND
-                    child.hasParent(this) */
-                 void insertChild(in Domain child)
-                     raises (ClosesCycle, NameAlreadyDefined );
-                 
-                 // returns  true iff domain "aDomain"  is a direct
-                 // child domain of this domain
-                 boolean hasChild(in Domain aDomain);
-                 
-                 // returns  true iff there exists  a directed path
-                 //  from   this  domain  downwards   to  the  node
-                 // "aDomain" (used to prevent cicles)
-                 boolean isReachable(in Domain aDomain);
-                 
-                 // returns  the (direct) child  domains registered
-                 // at this domain
-                 DomainList getChilds();
-                 
-                 // returns the number of childs
-                 unsigned long getChildCount();
-                 // deletes a child domain 
-                 // Post:     NOT this.hasChild(domain_manager) 
-                 //       AND NOT domain_manager.hasParent(this)
-                 void deleteChild(in Domain child);
-                 
-                 // operations to walk and manage the domain hierarchy upwards
-                 
-                 // Pre :
-                 // Post: this.hasParent(parentDS) AND parentDS.hasChild(this)
-                 //       AND NOT this.isRoot() 
-                 //       AND parentDS.getRootDomainService() == this.getRootDomainService()
-                 //       (this is now a child domain of the parent domain parentDS and
-                 //        they have the same root domain service)
-                 void insertParent(in Domain parentDomain)  raises (ClosesCycle, NameAlreadyDefined);
-                 
-                 // Post: NOT this.hasParent(parentDS) AND 
-                 // NOT parentDS.hasChild(this)
-                 void deleteParent(in Domain parentDomain);
-                 
-                 boolean       hasParent(in Domain parentDomain);
-                 DomainList    getParents();
-                 unsigned long getParentCount();                 
-
-             };
-
-            /************************* invariant ************************************
-
-                  all domain  managers dm  and all domain  services ds
-                  must fullfill the  invariants 1) dm.hasParent(ds) ==
-                  ds.hasChild(dm), in other words dm and ds must agree
-                  if there is a parent-child relationship between them
-
-                  2)  Every  two  domain  (managers) d1  and  d2  must
-                      follow: 
-
-                      a) NOT  (d1.hasChildOfAnyLevel(d2)    AND
-                      d2.hasChildOfAnyLevel(d1)  
-                      (there are  no cycles in the domain graph)      #
-
-                      b)         ((d1.hasChildOfAnyLevel(d2)        OR
-                      d2.hasChildOfAnyLevel(d1)  ) =>  d1.getRoot() ==
-                      d2.getRoot() (if there  exist a path between two
-                      nodes, they must have the same unique root) */
-
-            /***** ObjectDomainMapper (ODM) ****/
-  
-            // manages mappings of the form 
-            //
-            //          object reference -> [dm(1), dm(2), ..., dm(n)]
-            //               where dm(i), i from 1 to n, are domain managers
-
-            interface ObjectDomainMapper 
-            {
-                // Post: hasMapping(obj) AND  dms == getMapping(obj) 
-                //       AND for all dm e dms: areMapped(obj, dm)
-                void insertMapping(in Object obj, in DomainList dms);
-                
-                // Post: NOT hasMapping(object)
-                void deleteMapping(in Object obj);
-                
-                // Pre : hasMapping(obj)
-                // returns the domain manager list associated with object obj
-                DomainList getMapping(in Object obj);
-                
-                // is there a mapping defined for obj ? (could also be
-                // the empty list)
-                boolean hasMapping (in Object obj);
-                
-                // is obj mapped to dm ?
-                boolean areMapped(in Object obj, in Domain dm);
-                
-                // Post: hasMapping(obj) AND areMapped(obj, dm)
-                void addToMapping(in Object obj, in Domain dm);
-                
-                // Post: NOT areMapped(obj, dm)
-                    void removeFromMapping(in Object obj, in Domain dm);
-    
-            };
-            
-            // **************  policies  *******************
-
-            // policy types
-            const CORBA::PolicyType MANAGEMENT_POLICY_ID          = 110;
-            const CORBA::PolicyType PROPERTY_POLICY_ID            = 112;
-            const CORBA::PolicyType META_PROPERTY_POLICY_ID       = 113;
-            const CORBA::PolicyType CONFLICT_RESOLUTION_POLICY_ID = 114;
-            const CORBA::PolicyType INITIAL_MAP_POLICY_ID         = 115;
-
-            const CORBA::PolicyType TEST_POLICY_ID                = 120;  
-
-
-            interface ManagementPolicy : CORBA::Policy
-            {
-                //  a human  readable and  very short  (1-2 words)
-                // description of this policy, may be displayed in
-                // list or tree views
-                attribute string short_description;
-                
-                // a human readable description and explanation of
-                //  this  policy, may  be  displayed in  graphical
-                // (help or properties) dialogs
-                attribute string long_description;      
-                
-            };
-
-            // a meta policy manages other policies
-            interface MetaPolicy : ManagementPolicy
-            {
-                // a list  of policy types for which  this policy is a
-                // meta policy,  that means a meta policy  can be meta
-                // for any number of policy types
-                // Type zero stands for all policy types.
-                readonly attribute PolicyTypeList managedTypes;
-            };
-
-
-            interface ConflictResolutionPolicy : MetaPolicy
-            {
-                // predefined strategies:
-                const short FIRST       = 1;
-                const short PARENT_RULES= 2;
-                const short CHILD_RULES = 3;
-                // to be continued...
-                
-                // returns the strategy of the used conflict resolution policy
-                readonly attribute short strategy;
-                
-                //  Pre:   all  the   domain  managers  in   the  list
-                //  overlappingDMs  overlap in  their  policy of  type
-                //  overlapType   
-                // Post: returns a policy of type overlapType
-                CORBA::Policy resolveConflict(in DomainList overlappingDMs,
-                                              in CORBA::PolicyType overlapType);
-            };
-            
-            // decides to which domain managers a new object reference gets mapped
-            interface InitialMapPolicy : ManagementPolicy
-            {
-                // predefinded strategies:
-                const short DEFAULT_DOMAIN = 1;
-                const short TYPE_DOMAINS   = 2;
-                // to be continued...
-                
-                // returns the strategy of the used initial map policy
-                readonly attribute short strategy;
-                
-                // returns a list of domain managers, to which the newly created object
-                    // reference "newReference" shall be associated with in respect to
-                // a given root
-                // Pre : newReference isn't mapped to any domain manager
-                //       AND rootDomain.isRoot()
-                // Post: for all dm e returned list: 
-                //                (dm == rootDomain  OR root.hasChildOfAnyLevel(dm)
-                //           
-                DomainList OnReferenceCreation(in Object newReference,
-                                               in Domain rootDomain);
-            };
-
-            interface InitialMapToDefaultDomainPolicy : InitialMapPolicy
-            {
-                Domain getDefaultDomain();
-                void   setDefaultDomain(in Domain defaultDomain);
-            };
-
-
-            // types for PropertyPolicy
-            typedef string PropertyName;
-            typedef string PropertyValue;
-
-            typedef sequence <PropertyName> PropertyNameList;
-            exception PropertyAlreadyDefined {};
-
-            //  A  property  policy   stands  for  a  whole  class  of
-            // policies.  Therefore its type  can be set.  It  holds a
-            // list of properties. A property consists of a name and a
-            // value.
-
-            interface PropertyPolicy: ManagementPolicy
-            {
-                // the name of the property policy itself
-                attribute string name;
-                
-                // sets the type of this policy
-                void setPolicyType(in CORBA::PolicyType type);
-
-                // adds a new property. 
-                void put(in PropertyName name, in PropertyValue value) 
-                    raises (PropertyAlreadyDefined);
-                
-                // return  a list of  all valid property  names. These
-                //  names can be  used to  get a  value of  a specific
-                // property
-                PropertyNameList getPropertyNames();
-                
-                // resolves the value  of a named property, returns ""
-                // if property is undef
-                PropertyValue getValueOfProperty(in PropertyName name);
-      
-                //  changes  the   property  value.  The  property  is
-                //  identified by  its property  name If  the property
-                // doesn't exist prior to operation call, the property
-                // is inserted
-                void changeValueOfProperty( in PropertyName name, 
-                                            in PropertyValue newValue);
-
-                // returns true iff name is defined in property list
-                boolean containsProperty(in PropertyName name);
-
-                // removes a property
-                // Post: NOT containsProperty(name)
-                void removeProperty(in PropertyName name);
-                
-                // returns the number of valid properties
-                long getPropertyCount();
-            };
-
-
-
-            // extension of a property policy by a meta policy
-            interface MetaPropertyPolicy : MetaPolicy, PropertyPolicy 
-            {
-                // sets the types for  which this property policy is a
-                // meta policy
-                void setManagedTypes(in PolicyTypeList types);
-            };
-
-
- 
-            interface PolicyFactory // : CORBA::PolicyFactory
-            {
-                CORBA::Policy create_policy(in CORBA::PolicyType type,
-                                            in any initValue)
-                    raises (CORBA::PolicyError);
-                
-                InitialMapPolicy  createInitialMapPolicy(in short whichOne);
-                ConflictResolutionPolicy createConflictResolutionPolicy(in short whichOne);
-                PropertyPolicy      createPropertyPolicy();
-                MetaPropertyPolicy  createMetaPropertyPolicy();                
-            };
-
-            
-            // a simple test policy
-            interface TestPolicy : CORBA::Policy {
-                attribute string description;
-                string testFunction();
-                string toString();
-            };
-        };
-    };
-};
-};
+/* DomainManagement.idl
+   declares Domain, which manages domain members and domain policies
+	    some policies used to manage domains
+   $Id: DomainManagement.idl,v 1.2 2001/04/03 16:02:48 jacorb Exp $
+*/
+
+
+#include <orb.idl> 
+module org {
+  module jacorb {
+    module orb {
+        module domain { // domain management
+
+            /***** types *****/
+
+            interface Domain;                      // forward declarations
+            interface Membership;                  
+            interface GraphNode;  
+            interface DomainNamingContext;
+            interface DomainFactory;              
+            interface PolicyFactory;              
+            interface MetaPolicy;                
+            interface ObjectDomainMapper;
+
+            typedef sequence <Domain> DomainList;
+            typedef sequence <Object> ObjectList;
+            typedef sequence <CORBA::PolicyType> PolicyTypeList;
+
+
+            // for listeners that want to be informed of changes
+            // in domain membership. Some policies might want to
+            // know so that they can update displayed information
+            // in specialized editors
+
+            interface MembershipListener
+            {
+                oneway void memberRemoved(in Object exMember);
+                oneway void memberAdded(in Object newbie);               
+            };
+
+
+            /***** Domain *****/
+
+            // a domain object manages two sets:
+            // 1) set of object members
+            // 2) set of domain policies
+
+            exception PolicyTypeAlreadyDefined { CORBA::PolicyType type; };
+  
+            interface Domain : CORBA::DomainManager, GraphNode, Membership, 
+                DomainNamingContext, DomainFactory, PolicyFactory, 
+                ObjectDomainMapper
+            {
+
+                // the name of the domain
+                attribute string name;
+
+                // Policy operations
+                
+                // checks whether this domain has a policy of type "type"
+                boolean hasPolicyOfType(in CORBA::PolicyType type);
+
+                // sets the policy of the specified type
+                // Pre : NOT hasPolicyOfType( policy.policy_type() )
+                // Post:     hasPolicyOfType( policy.policy_type() )
+                void set_domain_policy(in CORBA::Policy policy) 
+                    raises (PolicyTypeAlreadyDefined);
+
+                // potentially overwrites a policy, use with care, 
+                // if unsecure, use set_domain_policy instead
+                void overwrite_domain_policy(in CORBA::Policy policy);
+
+                // removes a policy from the domain
+                // Post:  NOT hasPolicyOfType( type )
+                void deletePolicyOfType(in CORBA::PolicyType type);
+
+                // get all policies of the domain
+                CORBA::PolicyList getPolicies(); 
+                unsigned long     getPolicyCount();
+
+                // operations for managing set of object members
+
+                void       insertMember(in Object obj);
+                void       deleteMember(in Object obj);
+                boolean       hasMember(in Object obj);
+                // list all object members
+                ObjectList    getMembers(); 
+                unsigned long getMemberCount();
+
+                // add and remove listeners
+                void addMembershipListener( in MembershipListener listener );
+                void removeMembershipListener( in MembershipListener listener );
+
+            }; // Domain
+
+            interface ORBDomain : Domain
+            {
+                // Pre :  The domain aDomain is in the same process capsule as the ORBDomain
+                // Post:  isLocalTo(aDomain)
+                void insertLocalDomain(in Domain aDomain);
+
+                boolean isLocalTo(in Domain aDomain);
+
+                // Post: NOT isLocalTo(aDomain)
+                void removeLocalDomain(in Domain aDomain);
+
+                void updateODMCache(in Object obj, in DomainList group);
+                void invalidateODMCache(in Object obj);
+                // adds  the domain aDomain to the  domains of obj
+                // in the cache
+                
+                void addToODMCache(in Object obj, in Domain aDomain);
+                // removes the domain  aDomain from the domains of
+                // obj in the cache
+                void removeFromODMCache(in Object obj, in Domain aDomain);
+                
+            };
+
+            // ObjectNaming: provides an object in a domain with a name
+            // the name is a key locally in the domain scope
+
+            typedef string Name;
+            typedef sequence <Name> NameList;
+            exception NameAlreadyDefined { Name name; };
+            exception InvalidName {        Name name; };
+
+            interface DomainNamingContext
+            {
+                /// object names
+                // the prefix used for auto naming
+                attribute string NameAutoPrefix;
+                
+                // inserts an object as member into this domain, names it
+                void insertMemberWithName(in Name objName, in Object obj)
+                    raises (NameAlreadyDefined);
+                
+                // renames an object identified by its old name
+                void renameMember(in string oldName, in string newName)
+                    raises (InvalidName, NameAlreadyDefined);
+                
+                // object -> name
+                Name getNameOf(in Object obj);
+                
+                // name -> object
+                // returns  null if there  is no object  with name
+                // objName in this domain
+                Object resolveName(in Name objName);      
+                
+                /// domain path names
+                
+                attribute string separator;	// default is "/"
+                
+                // finds a domain child identified by childName
+                // returns null if there is no such child
+                Domain findChild(in Name childName);
+                
+                // renames a child domain
+                void renameChildDomain(in Name oldName, in Name newName) 
+                    raises (InvalidName, NameAlreadyDefined);
+                
+                // resolves a domain pathname, recursive version of findChild
+                Domain resolveDomainPathName(in Name pathname) raises (InvalidName);
+                
+                NameList getPathNames(); 
+                //  returns a list  of domain  path names  of this
+                // domain may be  more than one, because there may
+                // be multiple paths to the root domain
+            };
+
+            interface Membership 
+            {
+                // obj -> list of domains
+                DomainList getDomains(in Object obj);
+    
+                // obj -> Policy
+                CORBA::Policy getPolicy( in Object obj, 
+                                         in CORBA::PolicyType type);
+
+            }; // Membership
+   
+
+
+            interface DomainFactory 
+            {
+                // Creates  a Domain object  with "initialMembers"
+                // as initial members and "initialPolicies" as the
+                // policies to begin  with. Both can be null which
+                // then means empty.
+                Domain createDomain
+                    (
+                     in ObjectList        initialMembers, 
+                     in CORBA::PolicyList initialPolicies,
+                     in string            name
+                     );
+                
+                //  creates  an   empty  domain  with  no  initial
+                //  members,  no initial  policies  and the  empty
+                //  string  as name  this  is  just a  convenience
+                // operation
+                Domain createEmptyDomain();
+                
+                // Pre: aDomain.getChildCount() == 0
+                // destroys the domain aDomain, further use is prohibited
+                void destroy(in Domain aDomain);
+            };
+ 
+           
+            /********* graph node **********************/
+            //  a  graph  node  supports  operation to  walk  a  graph
+            // hierarchy up- and down
+
+             interface GraphNode 
+             {
+
+                 exception ClosesCycle {};
+                 
+                 //  returns True  iff this  domain manager  has no
+                 // parent domain services
+                 boolean isRoot();    
+                 
+                 // only for testing, normally not here
+                 Domain getRootDomain();    
+                 
+                 // boolean    hasIndirectMember(in Object obj);
+                 // ObjectList getIndirectMembers();         
+                 // list all indirect object members
+                 
+                 
+                 //  extending  policy  operations:  retrieves  the
+                 // effecive policy for this domain may be computed
+                 // dynamically depending on parent domain policies
+                 CORBA::Policy getEffectiveDomainPolicy(in CORBA::PolicyType type);
+                 
+                 // child domains
+     
+                 /* inserts a domain into this domain as a (direct)
+                    child  domain 
+                    Pre:  NOT child.isReachable(this)
+                    (to   prevent  cycles)   the   precondition  of
+                    Domain.addParent  also  needs  to be  satisfied
+                    
+                    Post:          this.hasChild(child)         AND
+                    child.hasParent(this) */
+                 void insertChild(in Domain child)
+                     raises (ClosesCycle, NameAlreadyDefined );
+                 
+                 // returns  true iff domain "aDomain"  is a direct
+                 // child domain of this domain
+                 boolean hasChild(in Domain aDomain);
+                 
+                 // returns  true iff there exists  a directed path
+                 //  from   this  domain  downwards   to  the  node
+                 // "aDomain" (used to prevent cicles)
+                 boolean isReachable(in Domain aDomain);
+                 
+                 // returns  the (direct) child  domains registered
+                 // at this domain
+                 DomainList getChilds();
+                 
+                 // returns the number of childs
+                 unsigned long getChildCount();
+                 // deletes a child domain 
+                 // Post:     NOT this.hasChild(domain_manager) 
+                 //       AND NOT domain_manager.hasParent(this)
+                 void deleteChild(in Domain child);
+                 
+                 // operations to walk and manage the domain hierarchy upwards
+                 
+                 // Pre :
+                 // Post: this.hasParent(parentDS) AND parentDS.hasChild(this)
+                 //       AND NOT this.isRoot() 
+                 //       AND parentDS.getRootDomainService() == this.getRootDomainService()
+                 //       (this is now a child domain of the parent domain parentDS and
+                 //        they have the same root domain service)
+                 void insertParent(in Domain parentDomain)  raises (ClosesCycle, NameAlreadyDefined);
+                 
+                 // Post: NOT this.hasParent(parentDS) AND 
+                 // NOT parentDS.hasChild(this)
+                 void deleteParent(in Domain parentDomain);
+                 
+                 boolean       hasParent(in Domain parentDomain);
+                 DomainList    getParents();
+                 unsigned long getParentCount();                 
+
+             };
+
+            /************************* invariant ************************************
+
+                  all domain  managers dm  and all domain  services ds
+                  must fullfill the  invariants 1) dm.hasParent(ds) ==
+                  ds.hasChild(dm), in other words dm and ds must agree
+                  if there is a parent-child relationship between them
+
+                  2)  Every  two  domain  (managers) d1  and  d2  must
+                      follow: 
+
+                      a) NOT  (d1.hasChildOfAnyLevel(d2)    AND
+                      d2.hasChildOfAnyLevel(d1)  
+                      (there are  no cycles in the domain graph)      #
+
+                      b)         ((d1.hasChildOfAnyLevel(d2)        OR
+                      d2.hasChildOfAnyLevel(d1)  ) =>  d1.getRoot() ==
+                      d2.getRoot() (if there  exist a path between two
+                      nodes, they must have the same unique root) */
+
+            /***** ObjectDomainMapper (ODM) ****/
+  
+            // manages mappings of the form 
+            //
+            //          object reference -> [dm(1), dm(2), ..., dm(n)]
+            //               where dm(i), i from 1 to n, are domain managers
+
+            interface ObjectDomainMapper 
+            {
+                // Post: hasMapping(obj) AND  dms == getMapping(obj) 
+                //       AND for all dm e dms: areMapped(obj, dm)
+                void insertMapping(in Object obj, in DomainList dms);
+                
+                // Post: NOT hasMapping(object)
+                void deleteMapping(in Object obj);
+                
+                // Pre : hasMapping(obj)
+                // returns the domain manager list associated with object obj
+                DomainList getMapping(in Object obj);
+                
+                // is there a mapping defined for obj ? (could also be
+                // the empty list)
+                boolean hasMapping (in Object obj);
+                
+                // is obj mapped to dm ?
+                boolean areMapped(in Object obj, in Domain dm);
+                
+                // Post: hasMapping(obj) AND areMapped(obj, dm)
+                void addToMapping(in Object obj, in Domain dm);
+                
+                // Post: NOT areMapped(obj, dm)
+                    void removeFromMapping(in Object obj, in Domain dm);
+    
+            };
+            
+            // **************  policies  *******************
+
+            // policy types
+            const CORBA::PolicyType MANAGEMENT_POLICY_ID          = 110;
+            const CORBA::PolicyType PROPERTY_POLICY_ID            = 112;
+            const CORBA::PolicyType META_PROPERTY_POLICY_ID       = 113;
+            const CORBA::PolicyType CONFLICT_RESOLUTION_POLICY_ID = 114;
+            const CORBA::PolicyType INITIAL_MAP_POLICY_ID         = 115;
+
+            const CORBA::PolicyType TEST_POLICY_ID                = 120;  
+
+
+            interface ManagementPolicy : CORBA::Policy
+            {
+                //  a human  readable and  very short  (1-2 words)
+                // description of this policy, may be displayed in
+                // list or tree views
+                attribute string short_description;
+                
+                // a human readable description and explanation of
+                //  this  policy, may  be  displayed in  graphical
+                // (help or properties) dialogs
+                attribute string long_description;      
+                
+            };
+
+            // a meta policy manages other policies
+            interface MetaPolicy : ManagementPolicy
+            {
+                // a list  of policy types for which  this policy is a
+                // meta policy,  that means a meta policy  can be meta
+                // for any number of policy types
+                // Type zero stands for all policy types.
+                readonly attribute PolicyTypeList managedTypes;
+            };
+
+
+            interface ConflictResolutionPolicy : MetaPolicy
+            {
+                // predefined strategies:
+                const short FIRST       = 1;
+                const short PARENT_RULES= 2;
+                const short CHILD_RULES = 3;
+                // to be continued...
+                
+                // returns the strategy of the used conflict resolution policy
+                readonly attribute short strategy;
+                
+                //  Pre:   all  the   domain  managers  in   the  list
+                //  overlappingDMs  overlap in  their  policy of  type
+                //  overlapType   
+                // Post: returns a policy of type overlapType
+                CORBA::Policy resolveConflict(in DomainList overlappingDMs,
+                                              in CORBA::PolicyType overlapType);
+            };
+            
+            // decides to which domain managers a new object reference gets mapped
+            interface InitialMapPolicy : ManagementPolicy
+            {
+                // predefinded strategies:
+                const short DEFAULT_DOMAIN = 1;
+                const short TYPE_DOMAINS   = 2;
+                // to be continued...
+                
+                // returns the strategy of the used initial map policy
+                readonly attribute short strategy;
+                
+                // returns a list of domain managers, to which the newly created object
+                    // reference "newReference" shall be associated with in respect to
+                // a given root
+                // Pre : newReference isn't mapped to any domain manager
+                //       AND rootDomain.isRoot()
+                // Post: for all dm e returned list: 
+                //                (dm == rootDomain  OR root.hasChildOfAnyLevel(dm)
+                //           
+                DomainList OnReferenceCreation(in Object newReference,
+                                               in Domain rootDomain);
+            };
+
+            interface InitialMapToDefaultDomainPolicy : InitialMapPolicy
+            {
+                Domain getDefaultDomain();
+                void   setDefaultDomain(in Domain defaultDomain);
+            };
+
+
+            // types for PropertyPolicy
+            typedef string PropertyName;
+            typedef string PropertyValue;
+
+            typedef sequence <PropertyName> PropertyNameList;
+            exception PropertyAlreadyDefined {};
+
+            //  A  property  policy   stands  for  a  whole  class  of
+            // policies.  Therefore its type  can be set.  It  holds a
+            // list of properties. A property consists of a name and a
+            // value.
+
+            interface PropertyPolicy: ManagementPolicy
+            {
+                // the name of the property policy itself
+                attribute string name;
+                
+                // sets the type of this policy
+                void setPolicyType(in CORBA::PolicyType type);
+
+                // adds a new property. 
+                void put(in PropertyName name, in PropertyValue value) 
+                    raises (PropertyAlreadyDefined);
+                
+                // return  a list of  all valid property  names. These
+                //  names can be  used to  get a  value of  a specific
+                // property
+                PropertyNameList getPropertyNames();
+                
+                // resolves the value  of a named property, returns ""
+                // if property is undef
+                PropertyValue getValueOfProperty(in PropertyName name);
+      
+                //  changes  the   property  value.  The  property  is
+                //  identified by  its property  name If  the property
+                // doesn't exist prior to operation call, the property
+                // is inserted
+                void changeValueOfProperty( in PropertyName name, 
+                                            in PropertyValue newValue);
+
+                // returns true iff name is defined in property list
+                boolean containsProperty(in PropertyName name);
+
+                // removes a property
+                // Post: NOT containsProperty(name)
+                void removeProperty(in PropertyName name);
+                
+                // returns the number of valid properties
+                long getPropertyCount();
+            };
+
+
+
+            // extension of a property policy by a meta policy
+            interface MetaPropertyPolicy : MetaPolicy, PropertyPolicy 
+            {
+                // sets the types for  which this property policy is a
+                // meta policy
+                void setManagedTypes(in PolicyTypeList types);
+            };
+
+
+ 
+            interface PolicyFactory // : CORBA::PolicyFactory
+            {
+                CORBA::Policy create_policy(in CORBA::PolicyType type,
+                                            in any initValue)
+                    raises (CORBA::PolicyError);
+                
+                InitialMapPolicy  createInitialMapPolicy(in short whichOne);
+                ConflictResolutionPolicy createConflictResolutionPolicy(in short whichOne);
+                PropertyPolicy      createPropertyPolicy();
+                MetaPropertyPolicy  createMetaPropertyPolicy();                
+            };
+
+            
+            // a simple test policy
+            interface TestPolicy : CORBA::Policy {
+                attribute string description;
+                string testFunction();
+                string toString();
+            };
+        };
+    };
+};
+};

Added: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/IIOPTransportCurrent.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/IIOPTransportCurrent.idl	                        (rev 0)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/IIOPTransportCurrent.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -0,0 +1,24 @@
+#pragma prefix "jacorb.org"
+
+#include "TransportCurrent.idl"
+
+module org
+{
+  module jacorb
+  {
+    module transport
+    {
+      module iiop
+      {
+        local interface Current: transport::Current
+        {
+          long   remote_port () raises (NoContext);
+          string remote_host () raises (NoContext);
+          long   local_port () raises (NoContext);
+          string local_host () raises (NoContext);
+        };
+      };
+    };
+  };
+};
+

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/SASPolicy.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/SASPolicy.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/SASPolicy.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,42 +1,42 @@
-/* This file contains SAS policy
- * $Id: SASPolicy.idl,v 1.2 2005/03/04 20:39:23 david.robison Exp $	
- */ 
-
-#ifndef __SASPolicy_IDL
-#define __SASPolicy_IDL
-
-#include <orb.idl>
-
-module org {
-module jacorb{
-
-// Self contained module for SAS policy
-
-module sasPolicy {
-
-  struct SASPolicyValues {
-    short targetRequires;
-    short targetSupports;
-    boolean stateful;
-  };
-
-  const CORBA::PolicyType SAS_POLICY_TYPE = 102;
-
-  local interface SASPolicy : CORBA::Policy {
-    readonly attribute SASPolicyValues value;
-  };
-
-  struct ATLASPolicyValues {
-    string atlasURL;
-    string atlasCache;
-  };
-
-  const CORBA::PolicyType ATLAS_POLICY_TYPE = 103;
-
-  local interface ATLASPolicy : CORBA::Policy {
-    readonly attribute ATLASPolicyValues value;
-  };
-};
-
-};
-};
+/* This file contains SAS policy
+ * $Id: SASPolicy.idl,v 1.2 2005/03/04 20:39:23 david.robison Exp $	
+ */ 
+
+#ifndef __SASPolicy_IDL
+#define __SASPolicy_IDL
+
+#include <orb.idl>
+
+module org {
+module jacorb{
+
+// Self contained module for SAS policy
+
+module sasPolicy {
+
+  struct SASPolicyValues {
+    short targetRequires;
+    short targetSupports;
+    boolean stateful;
+  };
+
+  const CORBA::PolicyType SAS_POLICY_TYPE = 102;
+
+  local interface SASPolicy : CORBA::Policy {
+    readonly attribute SASPolicyValues value;
+  };
+
+  struct ATLASPolicyValues {
+    string atlasURL;
+    string atlasCache;
+  };
+
+  const CORBA::PolicyType ATLAS_POLICY_TYPE = 103;
+
+  local interface ATLASPolicy : CORBA::Policy {
+    readonly attribute ATLASPolicyValues value;
+  };
+};
+
+};
+};

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/SSLPolicy.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/SSLPolicy.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/SSLPolicy.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,31 +1,31 @@
-/* 
- * SSLPolicy definition
- *
- * $Id: SSLPolicy.idl,v 1.1 2004/10/21 14:39:43 francisco Exp $ 
- */ 
-
-#ifndef __SSL_IDL
-#define __SSL_IDL
-
-#include <orb.idl>
-            
-module org {
-module jacorb {
-module ssl {
-
-    const CORBA::PolicyType SSL_POLICY_TYPE = 101;
-
-    enum SSLPolicyValue
-    {
-        SSL_NOT_REQUIRED,
-        SSL_REQUIRED
-    };
-
-    local interface SSLPolicy : CORBA::Policy 
-    {
-        readonly attribute SSLPolicyValue value;
-    };
-
-};
-};
-};
+/* 
+ * SSLPolicy definition
+ *
+ * $Id: SSLPolicy.idl,v 1.1 2004/10/21 14:39:43 francisco Exp $ 
+ */ 
+
+#ifndef __SSL_IDL
+#define __SSL_IDL
+
+#include <orb.idl>
+            
+module org {
+module jacorb {
+module ssl {
+
+    const CORBA::PolicyType SSL_POLICY_TYPE = 101;
+
+    enum SSLPolicyValue
+    {
+        SSL_NOT_REQUIRED,
+        SSL_REQUIRED
+    };
+
+    local interface SSLPolicy : CORBA::Policy 
+    {
+        readonly attribute SSLPolicyValue value;
+    };
+
+};
+};
+};

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/Tracing.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/Tracing.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/Tracing.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,59 +1,59 @@
-module org {
-    module jacorb {
-        module util {
-            module tracing {
-                const long TracingContextID = 0x7f00ff00;
-
-                typedef long PointId;
-                typedef long long RequestId;
-                typedef long long MSec;
-            
-                struct Request{
-                    PointId originator;
-                    RequestId rid;
-                    //rid is 64 bit long
-                    //MSB|      32 bit        |   16 bit   |  16 bit  |LSB
-                    //   |  target.hashCode() | originator | GIOP rid |
-                };
-         
-                struct TraceData {
-                    sequence <TraceData> subtrace;
-
-                    // id of the position that logs this
-                    PointId tracer_id;
-
-                    string operation;
-
-                    MSec client_time;
-                    MSec trace_system_time;   
-                };
-
-                interface TracingService {                    
-                    PointId get_id();                
-                
-                    exception NoSuchRequestId {};
-                
-                    /* retrive trace data for a call */
-                
-                    TraceData getTrace( in Request source ) 
-                        raises (NoSuchRequestId);
-                
-                    /* log trace data for a call trace */
-                
-                    void logTraceAtPoint( in Request origin,
-                                          in string operation,
-                                          in MSec client_time,
-                                          in MSec server_time )
-                        raises (NoSuchRequestId);
-
-                    /* registers a trace as a subtrace in another */
-
-                    void registerSubTrace( in Request original, // original call
-                                           in Request nested ) // nested call
-                        raises (NoSuchRequestId);
-                };
-
-            };
-        };
-    };
-};
+module org {
+    module jacorb {
+        module util {
+            module tracing {
+                const long TracingContextID = 0x7f00ff00;
+
+                typedef long PointId;
+                typedef long long RequestId;
+                typedef long long MSec;
+            
+                struct Request{
+                    PointId originator;
+                    RequestId rid;
+                    //rid is 64 bit long
+                    //MSB|      32 bit        |   16 bit   |  16 bit  |LSB
+                    //   |  target.hashCode() | originator | GIOP rid |
+                };
+         
+                struct TraceData {
+                    sequence <TraceData> subtrace;
+
+                    // id of the position that logs this
+                    PointId tracer_id;
+
+                    string operation;
+
+                    MSec client_time;
+                    MSec trace_system_time;   
+                };
+
+                interface TracingService {                    
+                    PointId get_id();                
+                
+                    exception NoSuchRequestId {};
+                
+                    /* retrive trace data for a call */
+                
+                    TraceData getTrace( in Request source ) 
+                        raises (NoSuchRequestId);
+                
+                    /* log trace data for a call trace */
+                
+                    void logTraceAtPoint( in Request origin,
+                                          in string operation,
+                                          in MSec client_time,
+                                          in MSec server_time )
+                        raises (NoSuchRequestId);
+
+                    /* registers a trace as a subtrace in another */
+
+                    void registerSubTrace( in Request original, // original call
+                                           in Request nested ) // nested call
+                        raises (NoSuchRequestId);
+                };
+
+            };
+        };
+    };
+};

Added: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/TransportCurrent.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/TransportCurrent.idl	                        (rev 0)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/TransportCurrent.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -0,0 +1,51 @@
+#pragma prefix "jacorb.org"
+
+#include <TimeBase.idl>
+
+module org
+{
+
+  module jacorb
+  {
+
+    module transport
+    {
+      /// A type used to represent counters
+      typedef unsigned long long CounterT;
+
+      // Used to signal that a call was made outside the
+      // correct invocation context.
+
+      exception NoContext
+      {
+      };
+
+      // The main interface, providing access to the Transport-specific
+      // information (traits), available to the current thread of
+      // execution.
+
+      local interface Current
+      {
+          /// Transport ID, unique within the process.
+        long id() raises (NoContext);
+
+          /// Bytes sent/received through the transport.
+          CounterT bytes_sent() raises (NoContext);
+          CounterT bytes_received() raises (NoContext);
+
+          /// Messages (requests and replies) sent/received using the current
+          /// protocol.
+          CounterT messages_sent() raises (NoContext);
+          CounterT messages_received() raises (NoContext);
+
+          /// The absolute time (miliseconds) since the transport has been
+          /// open.
+          TimeBase::TimeT open_since() raises (NoContext);
+      };
+
+    };
+
+  };
+
+};
+

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/channel.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/channel.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/channel.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,16 +1,16 @@
-#include <CosEventChannelAdmin.idl>
-
-module org {
-module jacorb
-{
-    module events
-    {
-	interface JacORBEventChannel: 
-	    ::CosEventChannelAdmin::EventChannel, 
-	    CosEventChannelAdmin::ConsumerAdmin, 
-	    CosEventChannelAdmin::SupplierAdmin
-	    {};
-    };
-};
-};
-
+#include <CosEventChannelAdmin.idl>
+
+module org {
+module jacorb
+{
+    module events
+    {
+	interface JacORBEventChannel: 
+	    ::CosEventChannelAdmin::EventChannel, 
+	    CosEventChannelAdmin::ConsumerAdmin, 
+	    CosEventChannelAdmin::SupplierAdmin
+	    {};
+    };
+};
+};
+

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/imr.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/imr.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/imr.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,162 +1,162 @@
-module org {
-module jacorb
-{
-  module imr
-    {
-      //typedef string Istring;
-      typedef string LogicalServerName;
-      typedef string StartupCommand;	
-      typedef string POAName;
-      typedef string HostName;
-      typedef string IORString;
-      typedef unsigned long PortNumber;
-
-      typedef sequence<LogicalServerName> ServerNameSeq;
-      typedef sequence<POAName> POANameSeq;
-
-
-      struct ImRInfo{
-	HostName host;
-	PortNumber port;
-      };
-
-      struct POAInfo{
-	POAName name;
-	HostName host;
-	PortNumber port;
-	LogicalServerName server;
-	boolean active;
-      };
-      typedef sequence<POAInfo> POAInfoSeq;
-
-      struct ServerInfo{
-	LogicalServerName name;
-	StartupCommand command;
-	POAInfoSeq poas;
-	HostName host;
-	boolean active;
-	boolean holding;
-      };
-      typedef sequence<ServerInfo> ServerInfoSeq;
-
-      exception UnknownServerName{
-	LogicalServerName name;
-      };
-
-      exception ServerStartupFailed{
-	string reason;
-      };
-
-      interface ServerStartupDaemon{
-
-	// for load balancing
-	long get_system_load();
-
-	void start_server (in StartupCommand command)
-	  raises (ServerStartupFailed);
-
-      };//ServerStartupDaemon
-
-      struct HostInfo{
-	HostName name;
-	ServerStartupDaemon ssd_ref;
-	IORString ior_string;
-      };
-
-      typedef sequence<HostInfo> HostInfoSeq;
-
-      interface Registration{
-	exception IllegalHostName{
-	  HostName name;
-	};
-
-	exception InvalidSSDRef{};
-
-	exception IllegalPOAName{
-	  POAName name;
-	};
-
-	exception DuplicatePOAName{
-	  POAName name;
-	};
-
-	// Accessed only by SSD's
-	void register_host (in HostInfo info)
-	  raises (IllegalHostName, InvalidSSDRef);
-
-	// tells the imr that the server has gone down
-	void set_server_down (in LogicalServerName name)
-	  raises (UnknownServerName);
-
-	void register_poa	(in POAName name, in LogicalServerName server,
-				 in HostName host, in PortNumber port)
-	  raises (IllegalPOAName, DuplicatePOAName, UnknownServerName);
-
-	ImRInfo get_imr_info ();
-
-      }; // Registration
-	
-
-      interface Admin{
-	exception IllegalServerName{
-	  LogicalServerName name;
-	};
-
-	exception DuplicateServerName{
-	  LogicalServerName name;
-	};
-		
-	exception FileOpFailed{
-	};
-
-	exception UnknownHostName{
-	  HostName name;
-	};
-
-	HostInfoSeq list_hosts();
-
-	ServerInfoSeq list_servers ();
-				
-	ServerInfo get_server_info (in LogicalServerName name)
-	  raises (UnknownServerName);
-
-	void shutdown(in boolean wait);
-
-	void save_server_table ()
-	  raises (FileOpFailed);
-
-	// A server that is registered, is assumed to be in state 'active'.
-	void register_server   (in LogicalServerName name, 
-				in StartupCommand command,
-				in HostName host) 
-	  raises (IllegalServerName, DuplicateServerName);
-
-	// unregisters a server and all its associated POA's
-	void unregister_server (in LogicalServerName name)
-	  raises (UnknownServerName);
-
-	// set new host / command for a server
-	void edit_server   (in LogicalServerName name, 
-			    in StartupCommand command,
-			    in HostName host) 
-	  raises (UnknownServerName);	
-
-	void hold_server (in LogicalServerName name)
-	  raises (UnknownServerName);
-
-	void release_server (in LogicalServerName name)
-	  raises (UnknownServerName);
-
-	void start_server (in LogicalServerName name)
-	  raises (UnknownServerName, ServerStartupFailed);
-
-	void unregister_host (in HostName name)
-	  raises (UnknownHostName);
-      };
-
-      interface ImplementationRepository : Registration, Admin{
-      };
-
-    };
-};		
-};
+module org {
+module jacorb
+{
+  module imr
+    {
+      //typedef string Istring;
+      typedef string LogicalServerName;
+      typedef string StartupCommand;	
+      typedef string POAName;
+      typedef string HostName;
+      typedef string IORString;
+      typedef unsigned long PortNumber;
+
+      typedef sequence<LogicalServerName> ServerNameSeq;
+      typedef sequence<POAName> POANameSeq;
+
+
+      struct ImRInfo{
+	HostName host;
+	PortNumber port;
+      };
+
+      struct POAInfo{
+	POAName name;
+	HostName host;
+	PortNumber port;
+	LogicalServerName server;
+	boolean active;
+      };
+      typedef sequence<POAInfo> POAInfoSeq;
+
+      struct ServerInfo{
+	LogicalServerName name;
+	StartupCommand command;
+	POAInfoSeq poas;
+	HostName host;
+	boolean active;
+	boolean holding;
+      };
+      typedef sequence<ServerInfo> ServerInfoSeq;
+
+      exception UnknownServerName{
+	LogicalServerName name;
+      };
+
+      exception ServerStartupFailed{
+	string reason;
+      };
+
+      interface ServerStartupDaemon{
+
+	// for load balancing
+	long get_system_load();
+
+	void start_server (in StartupCommand command)
+	  raises (ServerStartupFailed);
+
+      };//ServerStartupDaemon
+
+      struct HostInfo{
+	HostName name;
+	ServerStartupDaemon ssd_ref;
+	IORString ior_string;
+      };
+
+      typedef sequence<HostInfo> HostInfoSeq;
+
+      interface Registration{
+	exception IllegalHostName{
+	  HostName name;
+	};
+
+	exception InvalidSSDRef{};
+
+	exception IllegalPOAName{
+	  POAName name;
+	};
+
+	exception DuplicatePOAName{
+	  POAName name;
+	};
+
+	// Accessed only by SSD's
+	void register_host (in HostInfo info)
+	  raises (IllegalHostName, InvalidSSDRef);
+
+	// tells the imr that the server has gone down
+	void set_server_down (in LogicalServerName name)
+	  raises (UnknownServerName);
+
+	void register_poa	(in POAName name, in LogicalServerName server,
+				 in HostName host, in PortNumber port)
+	  raises (IllegalPOAName, DuplicatePOAName, UnknownServerName);
+
+	ImRInfo get_imr_info ();
+
+      }; // Registration
+	
+
+      interface Admin{
+	exception IllegalServerName{
+	  LogicalServerName name;
+	};
+
+	exception DuplicateServerName{
+	  LogicalServerName name;
+	};
+		
+	exception FileOpFailed{
+	};
+
+	exception UnknownHostName{
+	  HostName name;
+	};
+
+	HostInfoSeq list_hosts();
+
+	ServerInfoSeq list_servers ();
+				
+	ServerInfo get_server_info (in LogicalServerName name)
+	  raises (UnknownServerName);
+
+	void shutdown(in boolean wait);
+
+	void save_server_table ()
+	  raises (FileOpFailed);
+
+	// A server that is registered, is assumed to be in state 'active'.
+	void register_server   (in LogicalServerName name, 
+				in StartupCommand command,
+				in HostName host) 
+	  raises (IllegalServerName, DuplicateServerName);
+
+	// unregisters a server and all its associated POA's
+	void unregister_server (in LogicalServerName name)
+	  raises (UnknownServerName);
+
+	// set new host / command for a server
+	void edit_server   (in LogicalServerName name, 
+			    in StartupCommand command,
+			    in HostName host) 
+	  raises (UnknownServerName);	
+
+	void hold_server (in LogicalServerName name)
+	  raises (UnknownServerName);
+
+	void release_server (in LogicalServerName name)
+	  raises (UnknownServerName);
+
+	void start_server (in LogicalServerName name)
+	  raises (UnknownServerName, ServerStartupFailed);
+
+	void unregister_host (in HostName name)
+	  raises (UnknownHostName);
+      };
+
+      interface ImplementationRepository : Registration, Admin{
+      };
+
+    };
+};		
+};

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/notification.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/notification.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/jacorb/notification.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,13 +1,13 @@
-#include <CosNotifyChannelAdmin.idl>
-
-module org {
-  module jacorb {
-    module notification {
-      interface JacORBEventChannelFactory:
-		::CosNotifyChannelAdmin::EventChannelFactory
-      {
-		void destroy();
-      };
-    };
-  };
-};
+#include <CosNotifyChannelAdmin.idl>
+
+module org {
+  module jacorb {
+    module notification {
+      interface JacORBEventChannelFactory:
+		::CosNotifyChannelAdmin::EventChannelFactory
+      {
+		void destroy();
+      };
+    };
+  };
+};

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/ATLAS.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/ATLAS.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/ATLAS.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,83 +1,83 @@
-
-#ifndef _ATLAS_IDL_
-#define _ATLAS_IDL_
-
-#include <TimeBase.idl>
-#include <CosNaming.idl>
-#include <CSI.idl>
-#include <CSIIOP.idl>
-
-#pragma prefix "omg.org"
-
-module ATLAS {
-
-typedef sequence<TimeBase::UtcT,1> ExpiryTime;
-    
-typedef sequence<CSI::IdentityToken,1> IdTokenOption;
-    
-struct AuthTokenData {
-    IdTokenOption           ident_token;
-    CSI::AuthorizationToken auth_token;
-    ExpiryTime              expiry_time;
-};
-
-exception IllegalTokenRequest {
-    unsigned long the_errnum;
-    string        the_reason;
-};
-
-exception TokenOkay {};
-
-interface AuthTokenDispenser {
-
-    AuthTokenData get_my_authorization_token()
-        raises (
-            IllegalTokenRequest
-    );
-
-    AuthTokenData translate_authorization_token(
-        in CSI::IdentityToken      the_subject,
-        in CSI::AuthorizationToken the_token
-    ) raises (
-        IllegalTokenRequest,
-        TokenOkay
-    );
-};
-
-struct CosNamingLocator {
-    CosNaming::NamingContext name_service;
-    CosNaming::Name          the_name;
-};
-    
-    
-//
-// This type specifies a string encoded in UTF-8 form [IETF RFC 2044].
-//
-typedef sequence<octet> UTF8String;
-    
-typedef CosNaming::NamingContextExt::URLString URLocator;
-    
-typedef unsigned long ATLASLocatorType;
-    
-const ATLASLocatorType ATLASCosNaming = 1;
-const ATLASLocatorType ATLASURL       = 2;
-const ATLASLocatorType ATLASObject    = 3;
-    
-union ATLASLocator switch (ATLASLocatorType) {
-    case ATLASCosNaming: CosNamingLocator   naming_locator;
-    case ATLASURL:       URLocator          the_url;
-    case ATLASObject:    AuthTokenDispenser the_dispenser;
-};
-    
-typedef sequence<octet> ATLASCacheId;
-
-struct ATLASProfile {
-    ATLASLocator the_locator;
-    ATLASCacheId the_cache_id;
-};
-    
-const CSIIOP::ServiceConfigurationSyntax SCS_ATLAS = 3;
-
-};
-
-#endif // _ATLAS_IDL_
+
+#ifndef _ATLAS_IDL_
+#define _ATLAS_IDL_
+
+#include <TimeBase.idl>
+#include <CosNaming.idl>
+#include <CSI.idl>
+#include <CSIIOP.idl>
+
+#pragma prefix "omg.org"
+
+module ATLAS {
+
+typedef sequence<TimeBase::UtcT,1> ExpiryTime;
+    
+typedef sequence<CSI::IdentityToken,1> IdTokenOption;
+    
+struct AuthTokenData {
+    IdTokenOption           ident_token;
+    CSI::AuthorizationToken auth_token;
+    ExpiryTime              expiry_time;
+};
+
+exception IllegalTokenRequest {
+    unsigned long the_errnum;
+    string        the_reason;
+};
+
+exception TokenOkay {};
+
+interface AuthTokenDispenser {
+
+    AuthTokenData get_my_authorization_token()
+        raises (
+            IllegalTokenRequest
+    );
+
+    AuthTokenData translate_authorization_token(
+        in CSI::IdentityToken      the_subject,
+        in CSI::AuthorizationToken the_token
+    ) raises (
+        IllegalTokenRequest,
+        TokenOkay
+    );
+};
+
+struct CosNamingLocator {
+    CosNaming::NamingContext name_service;
+    CosNaming::Name          the_name;
+};
+    
+    
+//
+// This type specifies a string encoded in UTF-8 form [IETF RFC 2044].
+//
+typedef sequence<octet> UTF8String;
+    
+typedef CosNaming::NamingContextExt::URLString URLocator;
+    
+typedef unsigned long ATLASLocatorType;
+    
+const ATLASLocatorType ATLASCosNaming = 1;
+const ATLASLocatorType ATLASURL       = 2;
+const ATLASLocatorType ATLASObject    = 3;
+    
+union ATLASLocator switch (ATLASLocatorType) {
+    case ATLASCosNaming: CosNamingLocator   naming_locator;
+    case ATLASURL:       URLocator          the_url;
+    case ATLASObject:    AuthTokenDispenser the_dispenser;
+};
+    
+typedef sequence<octet> ATLASCacheId;
+
+struct ATLASProfile {
+    ATLASLocator the_locator;
+    ATLASCacheId the_cache_id;
+};
+    
+const CSIIOP::ServiceConfigurationSyntax SCS_ATLAS = 3;
+
+};
+
+#endif // _ATLAS_IDL_

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/BiDirPolicy.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/BiDirPolicy.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/BiDirPolicy.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,26 +1,26 @@
-/* This file contains OMG IDL from  CORBA V2.3.1
- * $Id: BiDirPolicy.idl,v 1.1.1.1 2001/03/17 18:08:09 brose Exp $	
- */ 
-
-#ifndef __BiDirPolicy_IDL
-#define __BiDirPolicy_IDL
-
-#include <orb.idl>
-
-#pragma prefix "omg.org"
-
-// Self contained module for Bi-directional GIOP policy
-
-module BiDirPolicy {
-
-  typedef unsigned short BidirectionalPolicyValue;
-
-  const BidirectionalPolicyValue NORMAL = 0;
-  const BidirectionalPolicyValue BOTH = 1;
-
-  const CORBA::PolicyType BIDIRECTIONAL_POLICY_TYPE = 37;
-
-  interface BidirectionalPolicy : CORBA::Policy {
-    readonly attribute BidirectionalPolicyValue value;
-  };
-};
+/* This file contains OMG IDL from  CORBA V2.3.1
+ * $Id: BiDirPolicy.idl,v 1.1.1.1 2001/03/17 18:08:09 brose Exp $	
+ */ 
+
+#ifndef __BiDirPolicy_IDL
+#define __BiDirPolicy_IDL
+
+#include <orb.idl>
+
+#pragma prefix "omg.org"
+
+// Self contained module for Bi-directional GIOP policy
+
+module BiDirPolicy {
+
+  typedef unsigned short BidirectionalPolicyValue;
+
+  const BidirectionalPolicyValue NORMAL = 0;
+  const BidirectionalPolicyValue BOTH = 1;
+
+  const CORBA::PolicyType BIDIRECTIONAL_POLICY_TYPE = 37;
+
+  interface BidirectionalPolicy : CORBA::Policy {
+    readonly attribute BidirectionalPolicyValue value;
+  };
+};

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CONV_FRAME.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CONV_FRAME.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CONV_FRAME.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,36 +1,36 @@
-/* This file contains OMG IDL from  CORBA V2.0, July 1995.
-*/
-
-
-#ifndef __CONV_FRAME_IDL
-#define __CONV_FRAME_IDL
-
-#pragma prefix "omg.org"
-
-module CONV_FRAME 
-{
-        // CodeSet Component of IOR Multi-Component Profile:
-
-	typedef unsigned long CodeSetId;
-
-	struct CodeSetComponent 
-	{
-		CodeSetId			native_code_set;
-		sequence<CodeSetId>		conversion_code_sets;
-	};
-
-	struct CodeSetComponentInfo 
-	{
-		CodeSetComponent ForCharData;
-		CodeSetComponent ForWcharData;
-	};
-
-	// GIOP Code Set Service Context:
-
-	struct CodeSetContext {
-		CodeSetId char_data;
-		CodeSetId wchar_data;
-	};
-};
-
-#endif
+/* This file contains OMG IDL from  CORBA V2.0, July 1995.
+*/
+
+
+#ifndef __CONV_FRAME_IDL
+#define __CONV_FRAME_IDL
+
+#pragma prefix "omg.org"
+
+module CONV_FRAME 
+{
+        // CodeSet Component of IOR Multi-Component Profile:
+
+	typedef unsigned long CodeSetId;
+
+	struct CodeSetComponent 
+	{
+		CodeSetId			native_code_set;
+		sequence<CodeSetId>		conversion_code_sets;
+	};
+
+	struct CodeSetComponentInfo 
+	{
+		CodeSetComponent ForCharData;
+		CodeSetComponent ForWcharData;
+	};
+
+	// GIOP Code Set Service Context:
+
+	struct CodeSetContext {
+		CodeSetId char_data;
+		CodeSetId wchar_data;
+	};
+};
+
+#endif

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CSI.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CSI.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CSI.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,202 +1,202 @@
-#ifndef _CSI_IDL_
-#define _CSI_IDL_
-
-#pragma prefix "omg.org"
-
-module CSI {
-
-    // The OMG VMCID; same value as CORBA::OMGVMCID. Do not change ever.
-
-    const unsigned long OMGVMCID = 0x4F4D0;
-
-    // An X509CertificateChain contains an ASN.1 BER encoded SEQUENCE 
-    // [1..MAX] OF X.509 certificates encapsulated in a sequence of octets. The
-    // subject's certificate shall come first in the list. Each following 
-    // certificate shall directly certify the one preceding it. The ASN.1
-    // representation of Certificate is as defined in [IETF RFC 2459].
-
-    typedef sequence <octet> X509CertificateChain; 
-
-    // an X.501 type name or Distinguished Name encapsulated in a sequence of
-    // octets containing the ASN.1 encoding.
-
-    typedef sequence <octet> X501DistinguishedName;
-
-    // UTF-8 Encoding of String
-
-    typedef sequence <octet> UTF8String;
-
-    // ASN.1 Encoding of an OBJECT IDENTIFIER
-
-    typedef sequence <octet> OID;
-
-    typedef sequence <OID> OIDList;
-
-    // A sequence of octets containing a GSStoken. Initial context tokens are
-    // ASN.1 encoded as defined in [IETF RFC 2743] Section 3.1, 
-    // "Mechanism-Independent token Format", pp. 81-82. Initial context tokens
-    // contain an ASN.1 tag followed by a token length, a mechanism identifier,
-    // and a mechanism-specific token (i.e. a GSSUP::InitialContextToken). The
-    // encoding of all other GSS tokens (e.g. error tokens and final context
-    // tokens) is mechanism dependent.
-
-    typedef sequence <octet> GSSToken;
-
-    // An encoding of a GSS Mechanism-Independent Exported Name Object as
-    // defined in [IETF RFC 2743] Section 3.2, "GSS Mechanism-Independent
-    // Exported Name Object Format," p. 84.
-
-    typedef sequence <octet> GSS_NT_ExportedName;
-
-    typedef sequence <GSS_NT_ExportedName> GSS_NT_ExportedNameList;
-
-    // The MsgType enumeration defines the complete set of service context
-    // message types used by the CSI context management protocols, including
-    // those message types pertaining only to the stateful application of the 
-    // protocols (to insure proper alignment of the identifiers between
-    // stateless and stateful implementations). Specifically, the 
-    // MTMessageInContext is not sent by stateless clients (although it may
-    // be received by stateless targets).
-
-    typedef short MsgType;
-      
-    const MsgType MTEstablishContext = 0;
-    const MsgType MTCompleteEstablishContext = 1;      
-    const MsgType MTContextError = 4; 
-    const MsgType MTMessageInContext = 5;
-
-    // The ContextId type is used carry session identifiers. A stateless 
-    // application of the service context protocol is indicated by a session
-    // identifier value of 0.
-
-    typedef unsigned long long ContextId;
-
-    // The AuthorizationElementType defines the contents and encoding of
-    // the_element field of the AuthorizationElement.
-
-    // The high order 20-bits of each AuthorizationElementType constant
-    // shall contain the Vendor Minor Codeset ID (VMCID) of the
-    // organization that defined the element type. The low order 12 bits
-    // shall contain the organization-scoped element type identifier. The
-    // high-order 20 bits of all element types defined by the OMG shall
-    // contain the VMCID allocated to the OMG (that is, 0x4F4D0).
-      
-    typedef unsigned long AuthorizationElementType;
-
-    // An AuthorizationElementType of X509AttributeCertChain indicates that 
-    // the_element field of the AuthorizationElement contains an ASN.1 BER
-    // SEQUENCE composed of an (X.509) AttributeCertificate followed by a
-    // SEQUENCE OF (X.509) Certificate. The two-part SEQUENCE is encapsulated
-    // in an octet stream. The chain of identity certificates is provided
-    // to certify the attribute certificate. Each certificate in the chain 
-    // shall directly certify the one preceding it. The first certificate
-    // in the chain shall certify the attribute certificate. The ASN.1
-    // representation of (X.509) Certificate is as defined in [IETF RFC 2459].
-    // The ASN.1 representation of (X.509) AtributeCertificate is as defined
-    // in [IETF ID PKIXAC].  
-
-    const AuthorizationElementType X509AttributeCertChain = OMGVMCID | 1;
-
-    typedef sequence <octet> AuthorizationElementContents;
-
-    // The AuthorizationElement contains one element of an authorization token.
-    // Each element of an authorization token is logically a PAC.
-
-    struct AuthorizationElement {
-	AuthorizationElementType   the_type;
-	AuthorizationElementContents   the_element;
-    };
-
-    // The AuthorizationToken is made up of a sequence of 
-    // AuthorizationElements
-
-    typedef sequence <AuthorizationElement> AuthorizationToken;
-      
-    typedef unsigned long IdentityTokenType;
-
-    // Additional standard identity token types shall only be defined by the
-    // OMG. All IdentityTokenType constants shall be a power of 2.
-
-    const IdentityTokenType ITTAbsent = 0;      
-    const IdentityTokenType ITTAnonymous = 1;
-    const IdentityTokenType ITTPrincipalName = 2;
-    const IdentityTokenType ITTX509CertChain = 4;
-    const IdentityTokenType ITTDistinguishedName = 8;
-
-    typedef sequence <octet> IdentityExtension;
-      
-    union IdentityToken switch ( IdentityTokenType ) {
-	case ITTAbsent: boolean absent;
-	case ITTAnonymous: boolean anonymous;
-        case ITTPrincipalName: GSS_NT_ExportedName principal_name;
-	case ITTX509CertChain: X509CertificateChain certificate_chain;
-	case ITTDistinguishedName: X501DistinguishedName dn;
-	default: IdentityExtension id;
-    };
-
-    struct EstablishContext {
-	ContextId client_context_id;
-	AuthorizationToken authorization_token;
-	IdentityToken identity_token;
-	GSSToken client_authentication_token;
-    };
-      
-    struct CompleteEstablishContext {
-	ContextId client_context_id;
-	boolean context_stateful;
-	GSSToken final_context_token;
-    };
-
-    struct ContextError {
-	ContextId client_context_id;
-	long major_status;
-	long minor_status;
-	GSSToken error_token;
-    };
-
-    // Not sent by stateless clients. If received by a stateless server, a
-    // ContextError message should be returned, indicating the session does
-    // not exist.
-      
-    struct MessageInContext {
-	ContextId client_context_id;
-	boolean discard_context;
-    };
-      
-    union SASContextBody switch ( MsgType ) {
-	case MTEstablishContext: EstablishContext establish_msg;
-	case MTCompleteEstablishContext: CompleteEstablishContext complete_msg;
-	case MTContextError: ContextError error_msg;
-	case MTMessageInContext: MessageInContext in_context_msg;
-    };
-
-    // The following type represents the string representation of an ASN.1
-    // OBJECT IDENTIFIER (OID). OIDs are represented by the string "oid:"
-    // followed by the integer base 10 representation of the OID separated
-    // by dots. For example, the OID corresponding to the OMG is represented
-    // as: "oid:2.23.130"     
-
-    typedef string StringOID;
-
-    // The GSS Object Identifier for the KRB5 mechanism is:
-    // { iso(1) member-body(2) United States(840) mit(113554) infosys(1)
-    // gssapi(2) krb5(2) }
-
-    const StringOID KRB5MechOID = "oid:1.2.840.113554.1.2.2";
-
-    // The GSS Object Identifier for name objects of the Mechanism-idependent
-    // Exported Name Object type is:
-    // { iso(1) org(3) dod(6) internet(1) security(5) nametypes(6)
-    // gss-api-exported-name(4) }
-
-    const StringOID GSS_NT_Export_Name_OID = "oid:1.3.6.1.5.6.4";
-
-    // The GSS Object Identifier for the scoped-username name form is:
-    // { iso-itu-t (2) international-organization (23) omg (130) security (1)
-    // naming (2) scoped-username(1) }
-
-    const StringOID GSS_NT_Scoped_Username_OID = "oid:2.23.130.1.2.1";
-
-}; // CSI
-
-#endif
+#ifndef _CSI_IDL_
+#define _CSI_IDL_
+
+#pragma prefix "omg.org"
+
+module CSI {
+
+    // The OMG VMCID; same value as CORBA::OMGVMCID. Do not change ever.
+
+    const unsigned long OMGVMCID = 0x4F4D0;
+
+    // An X509CertificateChain contains an ASN.1 BER encoded SEQUENCE 
+    // [1..MAX] OF X.509 certificates encapsulated in a sequence of octets. The
+    // subject's certificate shall come first in the list. Each following 
+    // certificate shall directly certify the one preceding it. The ASN.1
+    // representation of Certificate is as defined in [IETF RFC 2459].
+
+    typedef sequence <octet> X509CertificateChain; 
+
+    // an X.501 type name or Distinguished Name encapsulated in a sequence of
+    // octets containing the ASN.1 encoding.
+
+    typedef sequence <octet> X501DistinguishedName;
+
+    // UTF-8 Encoding of String
+
+    typedef sequence <octet> UTF8String;
+
+    // ASN.1 Encoding of an OBJECT IDENTIFIER
+
+    typedef sequence <octet> OID;
+
+    typedef sequence <OID> OIDList;
+
+    // A sequence of octets containing a GSStoken. Initial context tokens are
+    // ASN.1 encoded as defined in [IETF RFC 2743] Section 3.1, 
+    // "Mechanism-Independent token Format", pp. 81-82. Initial context tokens
+    // contain an ASN.1 tag followed by a token length, a mechanism identifier,
+    // and a mechanism-specific token (i.e. a GSSUP::InitialContextToken). The
+    // encoding of all other GSS tokens (e.g. error tokens and final context
+    // tokens) is mechanism dependent.
+
+    typedef sequence <octet> GSSToken;
+
+    // An encoding of a GSS Mechanism-Independent Exported Name Object as
+    // defined in [IETF RFC 2743] Section 3.2, "GSS Mechanism-Independent
+    // Exported Name Object Format," p. 84.
+
+    typedef sequence <octet> GSS_NT_ExportedName;
+
+    typedef sequence <GSS_NT_ExportedName> GSS_NT_ExportedNameList;
+
+    // The MsgType enumeration defines the complete set of service context
+    // message types used by the CSI context management protocols, including
+    // those message types pertaining only to the stateful application of the 
+    // protocols (to insure proper alignment of the identifiers between
+    // stateless and stateful implementations). Specifically, the 
+    // MTMessageInContext is not sent by stateless clients (although it may
+    // be received by stateless targets).
+
+    typedef short MsgType;
+      
+    const MsgType MTEstablishContext = 0;
+    const MsgType MTCompleteEstablishContext = 1;      
+    const MsgType MTContextError = 4; 
+    const MsgType MTMessageInContext = 5;
+
+    // The ContextId type is used carry session identifiers. A stateless 
+    // application of the service context protocol is indicated by a session
+    // identifier value of 0.
+
+    typedef unsigned long long ContextId;
+
+    // The AuthorizationElementType defines the contents and encoding of
+    // the_element field of the AuthorizationElement.
+
+    // The high order 20-bits of each AuthorizationElementType constant
+    // shall contain the Vendor Minor Codeset ID (VMCID) of the
+    // organization that defined the element type. The low order 12 bits
+    // shall contain the organization-scoped element type identifier. The
+    // high-order 20 bits of all element types defined by the OMG shall
+    // contain the VMCID allocated to the OMG (that is, 0x4F4D0).
+      
+    typedef unsigned long AuthorizationElementType;
+
+    // An AuthorizationElementType of X509AttributeCertChain indicates that 
+    // the_element field of the AuthorizationElement contains an ASN.1 BER
+    // SEQUENCE composed of an (X.509) AttributeCertificate followed by a
+    // SEQUENCE OF (X.509) Certificate. The two-part SEQUENCE is encapsulated
+    // in an octet stream. The chain of identity certificates is provided
+    // to certify the attribute certificate. Each certificate in the chain 
+    // shall directly certify the one preceding it. The first certificate
+    // in the chain shall certify the attribute certificate. The ASN.1
+    // representation of (X.509) Certificate is as defined in [IETF RFC 2459].
+    // The ASN.1 representation of (X.509) AtributeCertificate is as defined
+    // in [IETF ID PKIXAC].  
+
+    const AuthorizationElementType X509AttributeCertChain = OMGVMCID | 1;
+
+    typedef sequence <octet> AuthorizationElementContents;
+
+    // The AuthorizationElement contains one element of an authorization token.
+    // Each element of an authorization token is logically a PAC.
+
+    struct AuthorizationElement {
+	AuthorizationElementType   the_type;
+	AuthorizationElementContents   the_element;
+    };
+
+    // The AuthorizationToken is made up of a sequence of 
+    // AuthorizationElements
+
+    typedef sequence <AuthorizationElement> AuthorizationToken;
+      
+    typedef unsigned long IdentityTokenType;
+
+    // Additional standard identity token types shall only be defined by the
+    // OMG. All IdentityTokenType constants shall be a power of 2.
+
+    const IdentityTokenType ITTAbsent = 0;      
+    const IdentityTokenType ITTAnonymous = 1;
+    const IdentityTokenType ITTPrincipalName = 2;
+    const IdentityTokenType ITTX509CertChain = 4;
+    const IdentityTokenType ITTDistinguishedName = 8;
+
+    typedef sequence <octet> IdentityExtension;
+      
+    union IdentityToken switch ( IdentityTokenType ) {
+	case ITTAbsent: boolean absent;
+	case ITTAnonymous: boolean anonymous;
+        case ITTPrincipalName: GSS_NT_ExportedName principal_name;
+	case ITTX509CertChain: X509CertificateChain certificate_chain;
+	case ITTDistinguishedName: X501DistinguishedName dn;
+	default: IdentityExtension id;
+    };
+
+    struct EstablishContext {
+	ContextId client_context_id;
+	AuthorizationToken authorization_token;
+	IdentityToken identity_token;
+	GSSToken client_authentication_token;
+    };
+      
+    struct CompleteEstablishContext {
+	ContextId client_context_id;
+	boolean context_stateful;
+	GSSToken final_context_token;
+    };
+
+    struct ContextError {
+	ContextId client_context_id;
+	long major_status;
+	long minor_status;
+	GSSToken error_token;
+    };
+
+    // Not sent by stateless clients. If received by a stateless server, a
+    // ContextError message should be returned, indicating the session does
+    // not exist.
+      
+    struct MessageInContext {
+	ContextId client_context_id;
+	boolean discard_context;
+    };
+      
+    union SASContextBody switch ( MsgType ) {
+	case MTEstablishContext: EstablishContext establish_msg;
+	case MTCompleteEstablishContext: CompleteEstablishContext complete_msg;
+	case MTContextError: ContextError error_msg;
+	case MTMessageInContext: MessageInContext in_context_msg;
+    };
+
+    // The following type represents the string representation of an ASN.1
+    // OBJECT IDENTIFIER (OID). OIDs are represented by the string "oid:"
+    // followed by the integer base 10 representation of the OID separated
+    // by dots. For example, the OID corresponding to the OMG is represented
+    // as: "oid:2.23.130"     
+
+    typedef string StringOID;
+
+    // The GSS Object Identifier for the KRB5 mechanism is:
+    // { iso(1) member-body(2) United States(840) mit(113554) infosys(1)
+    // gssapi(2) krb5(2) }
+
+    const StringOID KRB5MechOID = "oid:1.2.840.113554.1.2.2";
+
+    // The GSS Object Identifier for name objects of the Mechanism-idependent
+    // Exported Name Object type is:
+    // { iso(1) org(3) dod(6) internet(1) security(5) nametypes(6)
+    // gss-api-exported-name(4) }
+
+    const StringOID GSS_NT_Export_Name_OID = "oid:1.3.6.1.5.6.4";
+
+    // The GSS Object Identifier for the scoped-username name form is:
+    // { iso-itu-t (2) international-organization (23) omg (130) security (1)
+    // naming (2) scoped-username(1) }
+
+    const StringOID GSS_NT_Scoped_Username_OID = "oid:2.23.130.1.2.1";
+
+}; // CSI
+
+#endif

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CSIIOP.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CSIIOP.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CSIIOP.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,135 +1,135 @@
-#ifndef _CSIIOP_IDL_
-#define _CSIIOP_IDL_
-#include <IOP.idl>
-#include <CSI.idl>
-    
-#pragma prefix "omg.org"
-    
-module CSIIOP {
-
-    const IOP::ComponentId TAG_NULL_TAG = 34; 
-    const IOP::ComponentId TAG_CSI_SEC_MECH_LIST = 33;
-
-    // Association options
-    
-    typedef unsigned short AssociationOptions;
-   
-    const AssociationOptions NoProtection = 1;
-    const AssociationOptions Integrity = 2;     
-    const AssociationOptions Confidentiality = 4; 
-    const AssociationOptions DetectReplay = 8;     
-    const AssociationOptions DetectMisordering = 16;
-    const AssociationOptions EstablishTrustInTarget = 32; 
-    const AssociationOptions EstablishTrustInClient = 64;
-    const AssociationOptions NoDelegation = 128;
-    const AssociationOptions SimpleDelegation = 256; 
-    const AssociationOptions CompositeDelegation = 512;
-    const AssociationOptions IdentityAssertion = 1024;
-    const AssociationOptions DelegationByClient = 2048;
-    
-    // The high order 20-bits of each ServiceConfigurationSyntax constant
-    // shall contain the Vendor Minor Codeset ID (VMCID) of the
-    // organization that defined the syntax. The low order 12 bits shall
-    // contain the organization-scoped syntax identifier. The high-order 20
-    // bits of all syntaxes defined by the OMG shall contain the VMCID
-    // allocated to the OMG (that is, 0x4F4D0).
-
-    typedef unsigned long ServiceConfigurationSyntax;
-
-    const ServiceConfigurationSyntax SCS_GeneralNames = CSI::OMGVMCID | 0;
-    const ServiceConfigurationSyntax SCS_GSSExportedName = CSI::OMGVMCID | 1;
-      
-    typedef sequence <octet> ServiceSpecificName;
-
-    // The name field of the ServiceConfiguration structure identifies a
-    // privilege authority in the format identified in the syntax field. If the
-    // syntax is SCS_GeneralNames, the name field contains an ASN.1 (BER)
-    // SEQUENCE [1..MAX] OF GeneralName, as defined by the type GeneralNames in
-    // [IETF RFC 2459]. If the syntax is SCS_GSSExportedName, the name field 
-    // contains a GSS exported name encoded according to the rules in 
-    // [IETF RFC 2743] Section 3.2, "Mechanism-Independent Exported Name
-    // Object Format," p. 84.
-
-    struct ServiceConfiguration {
-	ServiceConfigurationSyntax syntax;
-        ServiceSpecificName name;
-    };
-
-    typedef sequence <ServiceConfiguration> ServiceConfigurationList;
-
-    // The body of the TAG_NULL_TAG component is a sequence of octets of
-    // length 0.
-
-    // type used to define AS layer functionality within a compound mechanism
-    // definition
-      
-    struct AS_ContextSec {
-        AssociationOptions target_supports;
-        AssociationOptions target_requires;
-        CSI::OID client_authentication_mech;
-	CSI::GSS_NT_ExportedName target_name;
-    };
-
-    // type used to define SAS layer functionality within a compound mechanism
-    // definition
- 
-    struct SAS_ContextSec {
-	AssociationOptions target_supports;
-	AssociationOptions target_requires;
-	ServiceConfigurationList  privilege_authorities;
-	CSI::OIDList supported_naming_mechanisms;
-	CSI::IdentityTokenType supported_identity_types;
-    };
-
-    // type used in the body of a TAG_CSI_SEC_MECH_LIST component to
-    // describe a compound mechanism
-      
-    struct CompoundSecMech {
-	AssociationOptions target_requires;
-	IOP::TaggedComponent transport_mech;
-	AS_ContextSec as_context_mech;
-	SAS_ContextSec sas_context_mech;
-    };
-
-    typedef sequence <CompoundSecMech> CompoundSecMechanisms;
-
-    // type corresponding to the body of a TAG_CSI_SEC_MECH_LIST 
-    // component
-      
-    struct CompoundSecMechList {
-	boolean stateful;
-	CompoundSecMechanisms  mechanism_list;
-    };
-
-    struct TransportAddress {
-	string host_name;
-	unsigned short port;
-    };
-
-    typedef sequence <TransportAddress> TransportAddressList;
-
-    // Tagged component for configuring SECIOP as a CSIv2 transport mechanism
-
-    const IOP::ComponentId TAG_SECIOP_SEC_TRANS = 35;
-
-    struct SECIOP_SEC_TRANS {
-	AssociationOptions target_supports;
-	AssociationOptions target_requires;
-	CSI::OID mech_oid;
-	CSI::GSS_NT_ExportedName target_name;
-	TransportAddressList addresses;
-    };
-
-    // tagged component for configuring TLS/SSL as a CSIv2 transport mechanism
-
-    const IOP::ComponentId TAG_TLS_SEC_TRANS = 36;
-
-    struct TLS_SEC_TRANS {
-	AssociationOptions target_supports;
-	AssociationOptions target_requires;
-	TransportAddressList addresses;
-    };
-
-}; //CSIIOP
-
-#endif
+#ifndef _CSIIOP_IDL_
+#define _CSIIOP_IDL_
+#include <IOP.idl>
+#include <CSI.idl>
+    
+#pragma prefix "omg.org"
+    
+module CSIIOP {
+
+    const IOP::ComponentId TAG_NULL_TAG = 34; 
+    const IOP::ComponentId TAG_CSI_SEC_MECH_LIST = 33;
+
+    // Association options
+    
+    typedef unsigned short AssociationOptions;
+   
+    const AssociationOptions NoProtection = 1;
+    const AssociationOptions Integrity = 2;     
+    const AssociationOptions Confidentiality = 4; 
+    const AssociationOptions DetectReplay = 8;     
+    const AssociationOptions DetectMisordering = 16;
+    const AssociationOptions EstablishTrustInTarget = 32; 
+    const AssociationOptions EstablishTrustInClient = 64;
+    const AssociationOptions NoDelegation = 128;
+    const AssociationOptions SimpleDelegation = 256; 
+    const AssociationOptions CompositeDelegation = 512;
+    const AssociationOptions IdentityAssertion = 1024;
+    const AssociationOptions DelegationByClient = 2048;
+    
+    // The high order 20-bits of each ServiceConfigurationSyntax constant
+    // shall contain the Vendor Minor Codeset ID (VMCID) of the
+    // organization that defined the syntax. The low order 12 bits shall
+    // contain the organization-scoped syntax identifier. The high-order 20
+    // bits of all syntaxes defined by the OMG shall contain the VMCID
+    // allocated to the OMG (that is, 0x4F4D0).
+
+    typedef unsigned long ServiceConfigurationSyntax;
+
+    const ServiceConfigurationSyntax SCS_GeneralNames = CSI::OMGVMCID | 0;
+    const ServiceConfigurationSyntax SCS_GSSExportedName = CSI::OMGVMCID | 1;
+      
+    typedef sequence <octet> ServiceSpecificName;
+
+    // The name field of the ServiceConfiguration structure identifies a
+    // privilege authority in the format identified in the syntax field. If the
+    // syntax is SCS_GeneralNames, the name field contains an ASN.1 (BER)
+    // SEQUENCE [1..MAX] OF GeneralName, as defined by the type GeneralNames in
+    // [IETF RFC 2459]. If the syntax is SCS_GSSExportedName, the name field 
+    // contains a GSS exported name encoded according to the rules in 
+    // [IETF RFC 2743] Section 3.2, "Mechanism-Independent Exported Name
+    // Object Format," p. 84.
+
+    struct ServiceConfiguration {
+	ServiceConfigurationSyntax syntax;
+        ServiceSpecificName name;
+    };
+
+    typedef sequence <ServiceConfiguration> ServiceConfigurationList;
+
+    // The body of the TAG_NULL_TAG component is a sequence of octets of
+    // length 0.
+
+    // type used to define AS layer functionality within a compound mechanism
+    // definition
+      
+    struct AS_ContextSec {
+        AssociationOptions target_supports;
+        AssociationOptions target_requires;
+        CSI::OID client_authentication_mech;
+	CSI::GSS_NT_ExportedName target_name;
+    };
+
+    // type used to define SAS layer functionality within a compound mechanism
+    // definition
+ 
+    struct SAS_ContextSec {
+	AssociationOptions target_supports;
+	AssociationOptions target_requires;
+	ServiceConfigurationList  privilege_authorities;
+	CSI::OIDList supported_naming_mechanisms;
+	CSI::IdentityTokenType supported_identity_types;
+    };
+
+    // type used in the body of a TAG_CSI_SEC_MECH_LIST component to
+    // describe a compound mechanism
+      
+    struct CompoundSecMech {
+	AssociationOptions target_requires;
+	IOP::TaggedComponent transport_mech;
+	AS_ContextSec as_context_mech;
+	SAS_ContextSec sas_context_mech;
+    };
+
+    typedef sequence <CompoundSecMech> CompoundSecMechanisms;
+
+    // type corresponding to the body of a TAG_CSI_SEC_MECH_LIST 
+    // component
+      
+    struct CompoundSecMechList {
+	boolean stateful;
+	CompoundSecMechanisms  mechanism_list;
+    };
+
+    struct TransportAddress {
+	string host_name;
+	unsigned short port;
+    };
+
+    typedef sequence <TransportAddress> TransportAddressList;
+
+    // Tagged component for configuring SECIOP as a CSIv2 transport mechanism
+
+    const IOP::ComponentId TAG_SECIOP_SEC_TRANS = 35;
+
+    struct SECIOP_SEC_TRANS {
+	AssociationOptions target_supports;
+	AssociationOptions target_requires;
+	CSI::OID mech_oid;
+	CSI::GSS_NT_ExportedName target_name;
+	TransportAddressList addresses;
+    };
+
+    // tagged component for configuring TLS/SSL as a CSIv2 transport mechanism
+
+    const IOP::ComponentId TAG_TLS_SEC_TRANS = 36;
+
+    struct TLS_SEC_TRANS {
+	AssociationOptions target_supports;
+	AssociationOptions target_requires;
+	TransportAddressList addresses;
+    };
+
+}; //CSIIOP
+
+#endif

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/Corba.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/Corba.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/Corba.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,740 +1,739 @@
-/**
- * Some definitions from the CORBA module which are not covered
- * by the OMG's standard Java mapping files. We need the classes
- * generated from this file, but it is not suitable to be
- * included in user-defined IDL files!
- * 
- * DO NOT INCLUDE THIS FILE, INCLUDE <orb.idl> instead!
- *
- * $Id: Corba.idl,v 1.10 2004/02/11 07:19:50 gerald Exp $
- */
-
-#ifndef _MYORB_IDL
-#define _MYORB_IDL
-
-
-#pragma prefix "omg.org"
-
-module CORBA 
-{
-
-    typedef unsigned long PolicyType;
-
-    interface Policy
-	{
-	    readonly attribute PolicyType policy_type;
-	    Policy copy();
-	    void destroy();
-	};
-
-    typedef sequence <Policy> PolicyList;
-    typedef sequence <PolicyType> PolicyTypeSeq;
-    exception InvalidPolicies { sequence <unsigned short> indices; };
-
-    local interface DomainManager
-    {
-	Policy get_domain_policy(in PolicyType policy_type);
-    };
-
-
-    interface InterfaceDef; // forward
-
-    interface ConstructionPolicy: Policy
-    {
-	void make_domain_manager(in InterfaceDef object_type,
-				 in boolean constr_policy);
-    };
-
-    typedef sequence <DomainManager> DomainManagersList;
-	
-
-    typedef short PolicyErrorCode;
-    const PolicyErrorCode BAD_POLICY = 0;
-    const PolicyErrorCode UNSUPPORTED_POLICY = 1;
-    const PolicyErrorCode BAD_POLICY_TYPE = 2;
-    const PolicyErrorCode BAD_POLICY_VALUE = 3;
-    const PolicyErrorCode UNSUPPORTED_POLICY_VALUE = 4;
-
-    exception PolicyError
-    {
-	PolicyErrorCode reason;
-    };
-
-    enum SetOverrideType {SET_OVERRIDE, ADD_OVERRIDE};
-
-    local interface PolicyManager 
-    {
-        PolicyList get_policy_overrides(in PolicyTypeSeq ts);
-
-        void set_policy_overrides(in PolicyList policies,
-                                  in SetOverrideType set_add
-                                  ) raises (InvalidPolicies);
-    };
-
-    local interface Current {}; // dummy
-
-    local interface PolicyCurrent : PolicyManager, Current {
-    };
-
-
-    //    exception UserException {};
-    //pseudo interface ExceptionList {};
-
-    typedef string Identifier;
-
-    // for PortableInterceptors
-    typedef sequence<string> StringSeq;
-    typedef sequence<wstring> WStringSeq;
-    typedef sequence<octet> OctetSeq;
-
-
-    // Chapter 10, Interface Repository
-
-    interface TypeCode; // forward declaration
-
-    //#include <InterfaceRepository.idl>
-
-    interface AliasDef;
-    interface ArrayDef;
-    interface AttributeDef;
-    interface ConstantDef;
-    interface Contained;
-    interface Container;
-    interface EnumDef;
-    interface ExceptionDef;
-    interface FixedDef;
-    interface IDLType;
-    interface InterfaceDef;
-    interface IRObject;
-    interface ModuleDef;
-    interface NativeDef;
-    interface OperationDef;
-    interface PrimitiveDef; 
-    interface Repository;
-    interface SequenceDef;
-    interface StringDef;
-    interface StructDef;
-    interface TypeCode;
-    interface TypedefDef;
-    interface UnionDef;
-    interface ValueDef;
-    interface ValueBoxDef;
-    interface ValueMemberDef;
-    interface WstringDef;
-
-    typedef string ScopedName;
-    typedef string RepositoryId;
-
-    enum DefinitionKind {
-        dk_none,        dk_all,
-        dk_Attribute,   dk_Constant,    dk_Exception,   dk_Interface,
-        dk_Module,      dk_Operation,   dk_Typedef,
-        dk_Alias,       dk_Struct,      dk_Union,       dk_Enum,
-        dk_Primitive,   dk_String,      dk_Sequence,    dk_Array,
-        dk_Repository,
-        dk_Wstring,     dk_Fixed,
-        dk_Value,       dk_ValueBox,    dk_ValueMember,
-        dk_Native
-    };
-    
-    interface IRObject {
-        // read interface
-        readonly attribute  DefinitionKind  def_kind;
-        // write interface
-        void                destroy ();
-    };
-    
-    typedef string VersionSpec;
-
-    interface Contained : IRObject {
-
-        // read/write interface
-        attribute           RepositoryId    id;
-        attribute           Identifier      name;
-        attribute           VersionSpec     version;
-        // read interface
-        readonly attribute  Container       defined_in;
-        readonly attribute  ScopedName      absolute_name;
-        readonly attribute  Repository      containing_repository;
-
-        struct Description {
-            DefinitionKind  kind;
-            any             value; 
-        }; 
-
-        Description         describe ();
-
-        // write interface
-        void                move (  in Container    new_container,
-                                    in Identifier   new_name,
-                                    in VersionSpec  new_version
-                                    );
-    };
-
-    typedef sequence <InterfaceDef> InterfaceDefSeq;
-    typedef sequence <ValueDef> ValueDefSeq;
-    typedef sequence <Contained> ContainedSeq;
-    
-    struct StructMember {
-        Identifier          name;
-        TypeCode            type;
-        IDLType             type_def;
-    };
-    typedef sequence <StructMember> StructMemberSeq;
-
-    struct Initializer {
-        StructMemberSeq     members;
-        Identifier          name;
-    };
-
-    typedef sequence <Initializer> InitializerSeq;
-
-    struct UnionMember {
-        Identifier          name;
-        any                 label;
-        TypeCode            type;
-        IDLType             type_def;
-    };
-
-    typedef sequence <UnionMember> UnionMemberSeq;
-    typedef sequence <Identifier> EnumMemberSeq;
-
-    interface Container : IRObject {
-        // read interface
-        Contained lookup (
-                          in ScopedName                   search_name);
-        ContainedSeq contents (
-                               in DefinitionKind               limit_type,
-                               in boolean                      exclude_inherited
-                               );
-        ContainedSeq lookup_name (
-                                  in Identifier                   search_name, 
-                                  in long                         levels_to_search, 
-                                  in DefinitionKind               limit_type,
-                                  in boolean                      exclude_inherited
-                                  );
-        struct Description {
-            Contained                       contained_object; 
-            DefinitionKind                  kind;
-            any                             value; 
-        };
-
-        typedef sequence<Description> DescriptionSeq;
-
-        DescriptionSeq describe_contents (
-                                          in DefinitionKind               limit_type,
-                                          in boolean                      exclude_inherited,
-                                          in long                         max_returned_objs
-                                          );
-        // write interface
-        ModuleDef create_module (
-                                 in RepositoryId                 id,
-                                 in Identifier                   name,
-                                 in VersionSpec                  version
-                                 );
-        ConstantDef create_constant (
-                                     in RepositoryId                 id,
-                                     in Identifier                   name,
-                                     in VersionSpec                  version,
-                                     in IDLType                      type,
-                                     in any                          value
-                                     );
-        StructDef create_struct (
-                                 in RepositoryId                 id,
-                                 in Identifier                   name,
-                                 in VersionSpec                  version,
-                                 in StructMemberSeq              members
-                                 );
-        UnionDef create_union (
-                               in RepositoryId                 id,
-                               in Identifier                   name,
-                               in VersionSpec                  version,
-                               in IDLType                      discriminator_type,
-                               in UnionMemberSeq               members
-                               );
-        EnumDef create_enum (
-                             in RepositoryId                 id,
-                             in Identifier                   name,
-                             in VersionSpec                  version,
-                             in EnumMemberSeq                members
-                             );
-        AliasDef create_alias (
-                               in RepositoryId                 id,
-                               in Identifier                   name,
-                               in VersionSpec                  version,
-                               in IDLType                      original_type
-                               );
-        InterfaceDef create_interface (
-                                       in RepositoryId                 id,
-                                       in Identifier                   name,
-                                       in VersionSpec                  version,
-                                       in InterfaceDefSeq              base_interfaces,
-                                       in boolean                      is_abstract
-                                       );
-        ValueDef create_value(
-                              in RepositoryId                 id,
-                              in Identifier                   name,
-                              in VersionSpec                  version,
-                              in boolean                      is_custom,
-                              in boolean                      is_abstract,
-                              in ValueDef                     base_value,
-                              in boolean                      is_truncatable,
-                              in ValueDefSeq                  abstract_base_values,
-                              in InterfaceDefSeq              supported_interfaces,
-                              in InitializerSeq               initializers
-                              );
-        ValueBoxDef create_value_box(
-                                     in RepositoryId                 id,
-                                     in Identifier                   name,
-                                     in VersionSpec                  version,
-                                     in IDLType                      original_type_def
-                                     );
-        ExceptionDef create_exception(
-                                      in RepositoryId                 id,
-                                      in Identifier                   name,
-                                      in VersionSpec                  version,
-                                      in StructMemberSeq              members
-                                      );
-        NativeDef create_native(
-                                in RepositoryId                 id,
-                                in Identifier                   name,
-                                in VersionSpec                  version
-                                );
-    };
-    interface IDLType : IRObject {
-        readonly attribute TypeCode     type;
-    };
-
-    enum PrimitiveKind {
-        pk_null,    pk_void,      pk_short,     pk_long,   pk_ushort, pk_ulong,
-        pk_float,   pk_double,    pk_boolean,   pk_char,   pk_octet,
-        pk_any,     pk_TypeCode,  pk_Principal, pk_string, pk_objref,
-        pk_longlong,pk_ulonglong, pk_longdouble, 
-        pk_wchar,   pk_wstring,   pk_value_base
-    };
-    
-    interface Repository : Container {
-        // read interface
-        Contained   lookup_id               (in RepositoryId    search_id);
-        TypeCode    get_canonical_typecode  (in TypeCode        tc); 
-        PrimitiveDef get_primitive          (in PrimitiveKind   kind);
-        // write interface
-        StringDef   create_string           (in unsigned long   bound);
-        WstringDef  create_wstring          (in unsigned long   bound);
-        SequenceDef create_sequence         (in unsigned long   bound,
-                                             in IDLType         element_type
-                                             );
-        ArrayDef create_array               (in unsigned long   length,
-                                             in IDLType         element_type
-                                             );
-        FixedDef create_fixed               (in unsigned short  digits,
-                                             in short           scale
-                                             );
-    };
-
-
-
-    interface ModuleDef : Container, Contained {
-    };
-    
-    struct ModuleDescription {
-        Identifier                      name; 
-        RepositoryId                    id; 
-        RepositoryId                    defined_in;
-        VersionSpec                     version;
-    };
-
-    interface ConstantDef : Contained {
-        readonly attribute TypeCode     type;
-        attribute IDLType               type_def;
-        attribute any                   value;
-    };
-    struct ConstantDescription {
-        Identifier                      name; 
-        RepositoryId                    id; 
-        RepositoryId                    defined_in; 
-        VersionSpec                     version;
-        TypeCode                        type; 
-        any                             value; 
-    };
-    
-    interface TypedefDef : Contained, IDLType {
-    };
-    
-    struct TypeDescription {
-        Identifier                      name; 
-        RepositoryId                    id; 
-        RepositoryId                    defined_in; 
-        VersionSpec                     version;
-        TypeCode                        type; 
-    };
-    
-    interface StructDef : TypedefDef, Container {
-        attribute StructMemberSeq       members;
-    };
-    
-    interface UnionDef : TypedefDef, Container {
-        readonly attribute TypeCode     discriminator_type;
-        attribute IDLType               discriminator_type_def;
-        attribute UnionMemberSeq        members;
-    };
-
-    interface EnumDef : TypedefDef {
-        attribute EnumMemberSeq         members;
-    };
-    interface AliasDef : TypedefDef {
-        attribute IDLType               original_type_def;
-    };
-    interface NativeDef : TypedefDef {
-    };
-    interface PrimitiveDef: IDLType {
-        readonly attribute PrimitiveKind kind;
-    };
-    interface StringDef : IDLType {
-        attribute unsigned long         bound;
-    };
-    interface WstringDef : IDLType {
-        attribute unsigned long         bound;
-    };
-    interface FixedDef : IDLType {
-        attribute unsigned short        digits;
-        attribute short                 scale;
-    };
-    interface SequenceDef : IDLType {
-        attribute unsigned long         bound;
-        readonly attribute TypeCode     element_type;
-        attribute IDLType               element_type_def;
-    };
-    interface ArrayDef : IDLType {
-        attribute unsigned long         length;
-        readonly attribute TypeCode     element_type;
-        attribute IDLType               element_type_def;
-    };
-    interface ExceptionDef : Contained, Container {
-        readonly attribute TypeCode     type;
-        attribute StructMemberSeq       members;
-    };
-    struct ExceptionDescription {
-        Identifier                      name; 
-        RepositoryId                    id; 
-        RepositoryId                    defined_in; 
-        VersionSpec                     version;
-        TypeCode                        type; 
-    };
-    enum AttributeMode {ATTR_NORMAL, ATTR_READONLY};
-    interface AttributeDef : Contained {
-        readonly attribute TypeCode     type;
-        attribute IDLType               type_def;
-        attribute AttributeMode         mode;
-    };
-    struct AttributeDescription {
-        Identifier                      name; 
-        RepositoryId                    id; 
-        RepositoryId                    defined_in; 
-        VersionSpec                     version;
-        TypeCode                        type;
-        AttributeMode                   mode; 
-    };
-    enum OperationMode {OP_NORMAL, OP_ONEWAY};
-    enum ParameterMode {PARAM_IN, PARAM_OUT, PARAM_INOUT};
-    struct ParameterDescription {
-        Identifier                      name; 
-        TypeCode                        type; 
-        IDLType                         type_def;
-        ParameterMode                   mode;
-    };
-    typedef sequence <ParameterDescription> ParDescriptionSeq;
-    typedef Identifier                      ContextIdentifier;
-    typedef sequence <ContextIdentifier>    ContextIdSeq;
-    typedef sequence <ExceptionDef>         ExceptionDefSeq;
-    typedef sequence <ExceptionDescription> ExcDescriptionSeq;
-    
-    interface OperationDef : Contained {
-        readonly attribute TypeCode     result;
-        attribute IDLType               result_def;
-        attribute ParDescriptionSeq     params;
-        attribute OperationMode         mode; 
-        attribute ContextIdSeq          contexts;
-        attribute ExceptionDefSeq       exceptions;
-    };
-    
-    struct OperationDescription {
-        Identifier                      name; 
-        RepositoryId                    id; 
-        RepositoryId                    defined_in; 
-        VersionSpec                     version;
-        TypeCode                        result; 
-        OperationMode                   mode; 
-        ContextIdSeq                    contexts; 
-        ParDescriptionSeq               parameters;
-        ExcDescriptionSeq               exceptions;
-    };
-    typedef sequence <RepositoryId>         RepositoryIdSeq;
-    typedef sequence <OperationDescription> OpDescriptionSeq;
-    typedef sequence <AttributeDescription> AttrDescriptionSeq;
-    
-    interface InterfaceDef : Container, Contained, IDLType {
-
-        // read/write interface
-        attribute InterfaceDefSeq       base_interfaces;
-        attribute boolean               is_abstract;
-
-        // read interface
-        boolean is_a (in RepositoryId   interface_id
-                      );
-
-        struct FullInterfaceDescription {
-            Identifier                  name;
-            RepositoryId                id;
-            RepositoryId                defined_in;
-            VersionSpec                 version;
-            OpDescriptionSeq            operations;
-            AttrDescriptionSeq          attributes;
-            RepositoryIdSeq             base_interfaces;
-            TypeCode                    type;
-            boolean                     is_abstract;
-        };
-
-        FullInterfaceDescription describe_interface();
-
-        // write interface
-
-        AttributeDef create_attribute (
-                                       in RepositoryId             id,
-                                       in Identifier               name,
-                                       in VersionSpec              version,
-                                       in IDLType                  type,
-                                       in AttributeMode            mode
-                                       );
-        OperationDef create_operation ( 
-                                       in RepositoryId             id,
-                                       in Identifier               name,
-                                       in VersionSpec              version,
-                                       in IDLType                  result,
-                                       in OperationMode            mode, 
-                                       in ParDescriptionSeq        params,
-                                       in ExceptionDefSeq          exceptions,
-                                       in ContextIdSeq             contexts
-                                       );
-    };
-
-    struct InterfaceDescription {
-        Identifier                      name; 
-        RepositoryId                    id; 
-        RepositoryId                    defined_in; 
-        VersionSpec                     version;
-        RepositoryIdSeq                 base_interfaces;
-        boolean                         is_abstract;
-    };
-
-    typedef short Visibility;
-    const Visibility PRIVATE_MEMBER = 0;
-    const Visibility PUBLIC_MEMBER  = 1;
-    
-    struct ValueMember {
-        Identifier                      name;
-        RepositoryId                    id;
-        RepositoryId                    defined_in;
-        VersionSpec                     version;
-        TypeCode                        type;
-        IDLType                         type_def;
-        Visibility                      access; 
-    };
-
-    typedef sequence <ValueMember> ValueMemberSeq;
-
-    interface ValueMemberDef : Contained {
-        readonly attribute              TypeCode type;
-        attribute IDLType               type_def;
-        attribute Visibility            access;
-    };
-
-    interface ValueDef : Container, Contained, IDLType {
-        // read/write interface
-        attribute InterfaceDefSeq       supported_interfaces;
-        attribute InitializerSeq        initializers;
-        attribute ValueDef              base_value;
-        attribute ValueDefSeq           abstract_base_values;
-        attribute boolean               is_abstract;
-        attribute boolean               is_custom;
-        attribute boolean               is_truncatable;
-        // read interface
-        boolean is_a(in RepositoryId    id);
-
-        struct FullValueDescription {
-            Identifier                  name;
-            RepositoryId                id;
-            boolean                     is_abstract;
-            boolean                     is_custom;
-            RepositoryId                defined_in;
-            VersionSpec                 version;
-            OpDescriptionSeq            operations;
-            AttrDescriptionSeq          attributes;
-            ValueMemberSeq              members;
-            InitializerSeq              initializers;
-            RepositoryIdSeq             supported_interfaces;
-            RepositoryIdSeq             abstract_base_values;
-            boolean                     is_truncatable;
-            RepositoryId                base_value;
-            TypeCode                    type;
-        };
-
-        FullValueDescription describe_value();
-
-        ValueMemberDef create_value_member(
-                                           in RepositoryId             id,
-                                           in Identifier               name,
-                                           in VersionSpec              version,
-                                           in IDLType                  type,
-                                           in Visibility               access
-                                           );
-        AttributeDef create_attribute(
-                                      in RepositoryId             id,
-                                      in Identifier               name,
-                                      in VersionSpec              version,
-                                      in IDLType                  type,
-                                      in AttributeMode            mode
-                                      );
-        OperationDef create_operation (
-                                       in RepositoryId             id,
-                                       in Identifier               name,
-                                       in VersionSpec              version,
-                                       in IDLType                  result,
-                                       in OperationMode            mode,
-                                       in ParDescriptionSeq        params,
-                                       in ExceptionDefSeq          exceptions,
-                                       in ContextIdSeq             contexts
-                                       );
-    };
-
-    struct ValueDescription {
-        Identifier                      name;
-        RepositoryId                    id;
-        boolean                         is_abstract;
-        boolean                         is_custom;
-        RepositoryId                    defined_in;
-        VersionSpec                     version;
-        RepositoryIdSeq                 supported_interfaces;
-        RepositoryIdSeq                 abstract_base_values;
-        boolean                         is_truncatable;
-        RepositoryId                    base_value; 
-    };
-
-    interface ValueBoxDef : TypedefDef {
-        attribute IDLType original_type_def;
-    };
-
-    enum TCKind {                               // PIDL
-        tk_null,    tk_void, 
-        tk_short,   tk_long,        tk_ushort,  tk_ulong, 
-        tk_float,   tk_double,      tk_boolean, tk_char, 
-        tk_octet,   tk_any,         tk_TypeCode,tk_Principal, tk_objref, 
-        tk_struct,  tk_union,       tk_enum,    tk_string, 
-        tk_sequence,tk_array,       tk_alias,   tk_except,
-        tk_longlong,tk_ulonglong,   tk_longdouble,
-        tk_wchar,   tk_wstring,     tk_fixed,
-        tk_value,   tk_value_box,
-        tk_native,
-        tk_abstract_interface,
-        tk_local_interface
-    };
-    typedef short ValueModifier;                        // PIDL
-    const ValueModifier VM_NONE         = 0;
-    const ValueModifier VM_CUSTOM       = 1;
-    const ValueModifier VM_ABSTRACT     = 2;
-    const ValueModifier VM_TRUNCATABLE  = 3;
-
-    interface TypeCode {                            // PIDL
-        exception   Bounds {};
-        exception   BadKind {};
-        // for all TypeCode kinds
-        boolean     equal       (in TypeCode tc);
-        boolean     equivalent  (in TypeCode tc); 
-        TypeCode    get_compact_typecode(); 
-        TCKind      kind ();
-        // for tk_objref, tk_struct,    tk_union,  tk_enum, tk_alias, 
-        //     tk_value,  tk_value_box, tk_native, tk_abstract_interface
-        // and tk_except
-        RepositoryId    id () raises (BadKind);
-        // for tk_objref, tk_struct,    tk_union,  tk_enum, tk_alias, 
-        //     tk_value,  tk_value_box, tk_native, tk_abstract_interface
-        // and tk_except
-        Identifier name () raises (BadKind);
-        // for tk_struct, tk_union, tk_enum, tk_value, 
-        // and tk_except
-        unsigned long   member_count () raises (BadKind);
-        Identifier      member_name (in unsigned long index) 
-            raises (BadKind, Bounds);
-        // for tk_struct, tk_union, tk_value, and tk_except
-        TypeCode        member_type (in unsigned long index) 
-            raises (BadKind, Bounds);
-        // for tk_union
-        any             member_label (in unsigned long index) 
-            raises (BadKind, Bounds);
-        TypeCode        discriminator_type ()   raises (BadKind);
-        long            default_index ()        raises (BadKind); 
-        // for tk_string, tk_sequence, and tk_array
-        unsigned long   length ()               raises (BadKind);
-        // for tk_sequence, tk_array, tk_value_box, and tk_alias
-        TypeCode        content_type ()         raises (BadKind);
-        // for tk_fixed
-        unsigned short  fixed_digits()          raises (BadKind);
-        short           fixed_scale()           raises (BadKind);
-        // for tk_value
-        Visibility      member_visibility(in unsigned long index)
-            raises(BadKind, Bounds);
-        ValueModifier   type_modifier()         raises(BadKind);
-        TypeCode        concrete_base_type()    raises(BadKind);
-    };
-
-
-
-    /* this is the original PIDL from the lang. mapping, 
-       but we do not use it! Instead...
-
-    pseudo interface Principal
-    { 
-	attribute sequence<octet> name;
-    };
-    */
-
-    /* ... we use this little hack. It saves us fiddling with 
-       the generated code that uses  Principals. Actually, we 
-       should not be doing this....
-    */
-
-    typedef sequence<octet> Principal;
-
-    
-    //need to have this because the OMG supplied helper classes for
-    //these exceptions always throw NO_IMPLEMENT
-    interface ORB 
-    {
-       exception InvalidName {}; 
-       exception InconsistentTypeCode {};
-    };
-
-    typedef sequence<any> AnySeq;
-    typedef sequence<boolean> BooleanSeq;
-    typedef sequence<char> CharSeq;
-    typedef sequence<double> DoubleSeq;
-    typedef sequence<float> FloatSeq;
-    typedef sequence<long> LongSeq;
-    typedef sequence<long long> LongLongSeq;
-    typedef sequence<short> ShortSeq;
-    typedef sequence<unsigned long> ULongSeq;
-    typedef sequence<unsigned long long> ULongLongSeq;
-    typedef sequence<unsigned short> UShortSeq;
-    typedef sequence<wchar> WCharSeq;
-
-
-   valuetype WStringValue {
-      public wstring value;
-   };
-
-
-
-};
-
-
-#endif /* _MYORB_IDL */
+/**
+ * Some definitions from the CORBA module which are not covered
+ * by the OMG's standard Java mapping files. We need the classes
+ * generated from this file, but it is not suitable to be
+ * included in user-defined IDL files!
+ *
+ * DO NOT INCLUDE THIS FILE, INCLUDE <orb.idl> instead!
+ *
+ * $Id: Corba.idl,v 1.11 2006/05/15 14:35:52 alphonse.bendt Exp $
+ */
+
+#ifndef _MYORB_IDL
+#define _MYORB_IDL
+
+
+#pragma prefix "omg.org"
+
+module CORBA
+{
+
+    typedef unsigned long PolicyType;
+
+    interface Policy
+    {
+        readonly attribute PolicyType policy_type;
+        Policy copy();
+        void destroy();
+    };
+
+    typedef sequence <Policy> PolicyList;
+    typedef sequence <PolicyType> PolicyTypeSeq;
+    exception InvalidPolicies { sequence <unsigned short> indices; };
+
+    local interface DomainManager
+    {
+    Policy get_domain_policy(in PolicyType policy_type);
+    };
+
+
+    interface InterfaceDef; // forward
+
+    interface ConstructionPolicy: Policy
+    {
+    void make_domain_manager(in InterfaceDef object_type,
+                 in boolean constr_policy);
+    };
+
+    typedef sequence <DomainManager> DomainManagersList;
+
+
+    typedef short PolicyErrorCode;
+    const PolicyErrorCode BAD_POLICY = 0;
+    const PolicyErrorCode UNSUPPORTED_POLICY = 1;
+    const PolicyErrorCode BAD_POLICY_TYPE = 2;
+    const PolicyErrorCode BAD_POLICY_VALUE = 3;
+    const PolicyErrorCode UNSUPPORTED_POLICY_VALUE = 4;
+
+    exception PolicyError
+    {
+    PolicyErrorCode reason;
+    };
+
+    enum SetOverrideType {SET_OVERRIDE, ADD_OVERRIDE};
+
+    local interface PolicyManager
+    {
+        PolicyList get_policy_overrides(in PolicyTypeSeq ts);
+
+        void set_policy_overrides(in PolicyList policies,
+                                  in SetOverrideType set_add
+                                  ) raises (InvalidPolicies);
+    };
+
+    local interface Current {}; // dummy
+
+    local interface PolicyCurrent : PolicyManager, Current {
+    };
+
+
+    //    exception UserException {};
+    //pseudo interface ExceptionList {};
+
+    typedef string Identifier;
+
+    // for PortableInterceptors
+    typedef sequence<string> StringSeq;
+    typedef sequence<wstring> WStringSeq;
+    typedef sequence<octet> OctetSeq;
+
+
+    // Chapter 10, Interface Repository
+
+    interface TypeCode; // forward declaration
+
+    //#include <InterfaceRepository.idl>
+
+    interface AliasDef;
+    interface ArrayDef;
+    interface AttributeDef;
+    interface ConstantDef;
+    interface Contained;
+    interface Container;
+    interface EnumDef;
+    interface ExceptionDef;
+    interface FixedDef;
+    interface IDLType;
+    interface InterfaceDef;
+    interface IRObject;
+    interface ModuleDef;
+    interface NativeDef;
+    interface OperationDef;
+    interface PrimitiveDef;
+    interface Repository;
+    interface SequenceDef;
+    interface StringDef;
+    interface StructDef;
+    interface TypeCode;
+    interface TypedefDef;
+    interface UnionDef;
+    interface ValueDef;
+    interface ValueBoxDef;
+    interface ValueMemberDef;
+    interface WstringDef;
+
+    typedef string ScopedName;
+    typedef string RepositoryId;
+
+    enum DefinitionKind {
+        dk_none,        dk_all,
+        dk_Attribute,   dk_Constant,    dk_Exception,   dk_Interface,
+        dk_Module,      dk_Operation,   dk_Typedef,
+        dk_Alias,       dk_Struct,      dk_Union,       dk_Enum,
+        dk_Primitive,   dk_String,      dk_Sequence,    dk_Array,
+        dk_Repository,
+        dk_Wstring,     dk_Fixed,
+        dk_Value,       dk_ValueBox,    dk_ValueMember,
+        dk_Native
+    };
+
+    interface IRObject {
+        // read interface
+        readonly attribute  DefinitionKind  def_kind;
+        // write interface
+        void                destroy ();
+    };
+
+    typedef string VersionSpec;
+
+    interface Contained : IRObject {
+
+        // read/write interface
+        attribute           RepositoryId    id;
+        attribute           Identifier      name;
+        attribute           VersionSpec     version;
+        // read interface
+        readonly attribute  Container       defined_in;
+        readonly attribute  ScopedName      absolute_name;
+        readonly attribute  Repository      containing_repository;
+
+        struct Description {
+            DefinitionKind  kind;
+            any             value;
+        };
+
+        Description         describe ();
+
+        // write interface
+        void                move (  in Container    new_container,
+                                    in Identifier   new_name,
+                                    in VersionSpec  new_version
+                                    );
+    };
+
+    typedef sequence <InterfaceDef> InterfaceDefSeq;
+    typedef sequence <ValueDef> ValueDefSeq;
+    typedef sequence <Contained> ContainedSeq;
+
+    struct StructMember {
+        Identifier          name;
+        TypeCode            type;
+        IDLType             type_def;
+    };
+    typedef sequence <StructMember> StructMemberSeq;
+
+    struct Initializer {
+        StructMemberSeq     members;
+        Identifier          name;
+    };
+
+    typedef sequence <Initializer> InitializerSeq;
+
+    struct UnionMember {
+        Identifier          name;
+        any                 label;
+        TypeCode            type;
+        IDLType             type_def;
+    };
+
+    typedef sequence <UnionMember> UnionMemberSeq;
+    typedef sequence <Identifier> EnumMemberSeq;
+
+    interface Container : IRObject {
+        // read interface
+        Contained lookup (
+                          in ScopedName                   search_name);
+        ContainedSeq contents (
+                               in DefinitionKind               limit_type,
+                               in boolean                      exclude_inherited
+                               );
+        ContainedSeq lookup_name (
+                                  in Identifier                   search_name,
+                                  in long                         levels_to_search,
+                                  in DefinitionKind               limit_type,
+                                  in boolean                      exclude_inherited
+                                  );
+        struct Description {
+            Contained                       contained_object;
+            DefinitionKind                  kind;
+            any                             value;
+        };
+
+        typedef sequence<Description> DescriptionSeq;
+
+        DescriptionSeq describe_contents (
+                                          in DefinitionKind               limit_type,
+                                          in boolean                      exclude_inherited,
+                                          in long                         max_returned_objs
+                                          );
+        // write interface
+        ModuleDef create_module (
+                                 in RepositoryId                 id,
+                                 in Identifier                   name,
+                                 in VersionSpec                  version
+                                 );
+        ConstantDef create_constant (
+                                     in RepositoryId                 id,
+                                     in Identifier                   name,
+                                     in VersionSpec                  version,
+                                     in IDLType                      type,
+                                     in any                          value
+                                     );
+        StructDef create_struct (
+                                 in RepositoryId                 id,
+                                 in Identifier                   name,
+                                 in VersionSpec                  version,
+                                 in StructMemberSeq              members
+                                 );
+        UnionDef create_union (
+                               in RepositoryId                 id,
+                               in Identifier                   name,
+                               in VersionSpec                  version,
+                               in IDLType                      discriminator_type,
+                               in UnionMemberSeq               members
+                               );
+        EnumDef create_enum (
+                             in RepositoryId                 id,
+                             in Identifier                   name,
+                             in VersionSpec                  version,
+                             in EnumMemberSeq                members
+                             );
+        AliasDef create_alias (
+                               in RepositoryId                 id,
+                               in Identifier                   name,
+                               in VersionSpec                  version,
+                               in IDLType                      original_type
+                               );
+        InterfaceDef create_interface (
+                                       in RepositoryId                 id,
+                                       in Identifier                   name,
+                                       in VersionSpec                  version,
+                                       in InterfaceDefSeq              base_interfaces,
+                                       in boolean                      is_abstract
+                                       );
+        ValueDef create_value(
+                              in RepositoryId                 id,
+                              in Identifier                   name,
+                              in VersionSpec                  version,
+                              in boolean                      is_custom,
+                              in boolean                      is_abstract,
+                              in ValueDef                     base_value,
+                              in boolean                      is_truncatable,
+                              in ValueDefSeq                  abstract_base_values,
+                              in InterfaceDefSeq              supported_interfaces,
+                              in InitializerSeq               initializers
+                              );
+        ValueBoxDef create_value_box(
+                                     in RepositoryId                 id,
+                                     in Identifier                   name,
+                                     in VersionSpec                  version,
+                                     in IDLType                      original_type_def
+                                     );
+        ExceptionDef create_exception(
+                                      in RepositoryId                 id,
+                                      in Identifier                   name,
+                                      in VersionSpec                  version,
+                                      in StructMemberSeq              members
+                                      );
+        NativeDef create_native(
+                                in RepositoryId                 id,
+                                in Identifier                   name,
+                                in VersionSpec                  version
+                                );
+    };
+    interface IDLType : IRObject {
+        readonly attribute TypeCode     type;
+    };
+
+    enum PrimitiveKind {
+        pk_null,    pk_void,      pk_short,     pk_long,   pk_ushort, pk_ulong,
+        pk_float,   pk_double,    pk_boolean,   pk_char,   pk_octet,
+        pk_any,     pk_TypeCode,  pk_Principal, pk_string, pk_objref,
+        pk_longlong,pk_ulonglong, pk_longdouble,
+        pk_wchar,   pk_wstring,   pk_value_base
+    };
+
+    interface Repository : Container {
+        // read interface
+        Contained   lookup_id               (in RepositoryId    search_id);
+        TypeCode    get_canonical_typecode  (in TypeCode        tc);
+        PrimitiveDef get_primitive          (in PrimitiveKind   kind);
+        // write interface
+        StringDef   create_string           (in unsigned long   bound);
+        WstringDef  create_wstring          (in unsigned long   bound);
+        SequenceDef create_sequence         (in unsigned long   bound,
+                                             in IDLType         element_type
+                                             );
+        ArrayDef create_array               (in unsigned long   length,
+                                             in IDLType         element_type
+                                             );
+        FixedDef create_fixed               (in unsigned short  digits,
+                                             in short           scale
+                                             );
+    };
+
+
+
+    interface ModuleDef : Container, Contained {
+    };
+
+    struct ModuleDescription {
+        Identifier                      name;
+        RepositoryId                    id;
+        RepositoryId                    defined_in;
+        VersionSpec                     version;
+    };
+
+    interface ConstantDef : Contained {
+        readonly attribute TypeCode     type;
+        attribute IDLType               type_def;
+        attribute any                   value;
+    };
+    struct ConstantDescription {
+        Identifier                      name;
+        RepositoryId                    id;
+        RepositoryId                    defined_in;
+        VersionSpec                     version;
+        TypeCode                        type;
+        any                             value;
+    };
+
+    interface TypedefDef : Contained, IDLType {
+    };
+
+    struct TypeDescription {
+        Identifier                      name;
+        RepositoryId                    id;
+        RepositoryId                    defined_in;
+        VersionSpec                     version;
+        TypeCode                        type;
+    };
+
+    interface StructDef : TypedefDef, Container {
+        attribute StructMemberSeq       members;
+    };
+
+    interface UnionDef : TypedefDef, Container {
+        readonly attribute TypeCode     discriminator_type;
+        attribute IDLType               discriminator_type_def;
+        attribute UnionMemberSeq        members;
+    };
+
+    interface EnumDef : TypedefDef {
+        attribute EnumMemberSeq         members;
+    };
+    interface AliasDef : TypedefDef {
+        attribute IDLType               original_type_def;
+    };
+    interface NativeDef : TypedefDef {
+    };
+    interface PrimitiveDef: IDLType {
+        readonly attribute PrimitiveKind kind;
+    };
+    interface StringDef : IDLType {
+        attribute unsigned long         bound;
+    };
+    interface WstringDef : IDLType {
+        attribute unsigned long         bound;
+    };
+    interface FixedDef : IDLType {
+        attribute unsigned short        digits;
+        attribute short                 scale;
+    };
+    interface SequenceDef : IDLType {
+        attribute unsigned long         bound;
+        readonly attribute TypeCode     element_type;
+        attribute IDLType               element_type_def;
+    };
+    interface ArrayDef : IDLType {
+        attribute unsigned long         length;
+        readonly attribute TypeCode     element_type;
+        attribute IDLType               element_type_def;
+    };
+    interface ExceptionDef : Contained, Container {
+        readonly attribute TypeCode     type;
+        attribute StructMemberSeq       members;
+    };
+    struct ExceptionDescription {
+        Identifier                      name;
+        RepositoryId                    id;
+        RepositoryId                    defined_in;
+        VersionSpec                     version;
+        TypeCode                        type;
+    };
+    enum AttributeMode {ATTR_NORMAL, ATTR_READONLY};
+    interface AttributeDef : Contained {
+        readonly attribute TypeCode     type;
+        attribute IDLType               type_def;
+        attribute AttributeMode         mode;
+    };
+    struct AttributeDescription {
+        Identifier                      name;
+        RepositoryId                    id;
+        RepositoryId                    defined_in;
+        VersionSpec                     version;
+        TypeCode                        type;
+        AttributeMode                   mode;
+    };
+    enum OperationMode {OP_NORMAL, OP_ONEWAY};
+    enum ParameterMode {PARAM_IN, PARAM_OUT, PARAM_INOUT};
+    struct ParameterDescription {
+        Identifier                      name;
+        TypeCode                        type;
+        IDLType                         type_def;
+        ParameterMode                   mode;
+    };
+    typedef sequence <ParameterDescription> ParDescriptionSeq;
+    typedef Identifier                      ContextIdentifier;
+    typedef sequence <ContextIdentifier>    ContextIdSeq;
+    typedef sequence <ExceptionDef>         ExceptionDefSeq;
+    typedef sequence <ExceptionDescription> ExcDescriptionSeq;
+
+    interface OperationDef : Contained {
+        readonly attribute TypeCode     result;
+        attribute IDLType               result_def;
+        attribute ParDescriptionSeq     params;
+        attribute OperationMode         mode;
+        attribute ContextIdSeq          contexts;
+        attribute ExceptionDefSeq       exceptions;
+    };
+
+    struct OperationDescription {
+        Identifier                      name;
+        RepositoryId                    id;
+        RepositoryId                    defined_in;
+        VersionSpec                     version;
+        TypeCode                        result;
+        OperationMode                   mode;
+        ContextIdSeq                    contexts;
+        ParDescriptionSeq               parameters;
+        ExcDescriptionSeq               exceptions;
+    };
+    typedef sequence <RepositoryId>         RepositoryIdSeq;
+    typedef sequence <OperationDescription> OpDescriptionSeq;
+    typedef sequence <AttributeDescription> AttrDescriptionSeq;
+
+    interface InterfaceDef : Container, Contained, IDLType {
+
+        // read/write interface
+        attribute InterfaceDefSeq       base_interfaces;
+        attribute boolean               is_abstract;
+
+        // read interface
+        boolean is_a (in RepositoryId   interface_id
+                      );
+
+        struct FullInterfaceDescription {
+            Identifier                  name;
+            RepositoryId                id;
+            RepositoryId                defined_in;
+            VersionSpec                 version;
+            OpDescriptionSeq            operations;
+            AttrDescriptionSeq          attributes;
+            RepositoryIdSeq             base_interfaces;
+            TypeCode                    type;
+            boolean                     is_abstract;
+        };
+
+        FullInterfaceDescription describe_interface();
+
+        // write interface
+
+        AttributeDef create_attribute (
+                                       in RepositoryId             id,
+                                       in Identifier               name,
+                                       in VersionSpec              version,
+                                       in IDLType                  type,
+                                       in AttributeMode            mode
+                                       );
+        OperationDef create_operation (
+                                       in RepositoryId             id,
+                                       in Identifier               name,
+                                       in VersionSpec              version,
+                                       in IDLType                  result,
+                                       in OperationMode            mode,
+                                       in ParDescriptionSeq        params,
+                                       in ExceptionDefSeq          exceptions,
+                                       in ContextIdSeq             contexts
+                                       );
+    };
+
+    struct InterfaceDescription {
+        Identifier                      name;
+        RepositoryId                    id;
+        RepositoryId                    defined_in;
+        VersionSpec                     version;
+        RepositoryIdSeq                 base_interfaces;
+        boolean                         is_abstract;
+    };
+
+    typedef short Visibility;
+    const Visibility PRIVATE_MEMBER = 0;
+    const Visibility PUBLIC_MEMBER  = 1;
+
+    struct ValueMember {
+        Identifier                      name;
+        RepositoryId                    id;
+        RepositoryId                    defined_in;
+        VersionSpec                     version;
+        TypeCode                        type;
+        IDLType                         type_def;
+        Visibility                      access;
+    };
+
+    typedef sequence <ValueMember> ValueMemberSeq;
+
+    interface ValueMemberDef : Contained {
+        readonly attribute              TypeCode type;
+        attribute IDLType               type_def;
+        attribute Visibility            access;
+    };
+
+    interface ValueDef : Container, Contained, IDLType {
+        // read/write interface
+        attribute InterfaceDefSeq       supported_interfaces;
+        attribute InitializerSeq        initializers;
+        attribute ValueDef              base_value;
+        attribute ValueDefSeq           abstract_base_values;
+        attribute boolean               is_abstract;
+        attribute boolean               is_custom;
+        attribute boolean               is_truncatable;
+        // read interface
+        boolean is_a(in RepositoryId    id);
+
+        struct FullValueDescription {
+            Identifier                  name;
+            RepositoryId                id;
+            boolean                     is_abstract;
+            boolean                     is_custom;
+            RepositoryId                defined_in;
+            VersionSpec                 version;
+            OpDescriptionSeq            operations;
+            AttrDescriptionSeq          attributes;
+            ValueMemberSeq              members;
+            InitializerSeq              initializers;
+            RepositoryIdSeq             supported_interfaces;
+            RepositoryIdSeq             abstract_base_values;
+            boolean                     is_truncatable;
+            RepositoryId                base_value;
+            TypeCode                    type;
+        };
+
+        FullValueDescription describe_value();
+
+        ValueMemberDef create_value_member(
+                                           in RepositoryId             id,
+                                           in Identifier               name,
+                                           in VersionSpec              version,
+                                           in IDLType                  type,
+                                           in Visibility               access
+                                           );
+        AttributeDef create_attribute(
+                                      in RepositoryId             id,
+                                      in Identifier               name,
+                                      in VersionSpec              version,
+                                      in IDLType                  type,
+                                      in AttributeMode            mode
+                                      );
+        OperationDef create_operation (
+                                       in RepositoryId             id,
+                                       in Identifier               name,
+                                       in VersionSpec              version,
+                                       in IDLType                  result,
+                                       in OperationMode            mode,
+                                       in ParDescriptionSeq        params,
+                                       in ExceptionDefSeq          exceptions,
+                                       in ContextIdSeq             contexts
+                                       );
+    };
+
+    struct ValueDescription {
+        Identifier                      name;
+        RepositoryId                    id;
+        boolean                         is_abstract;
+        boolean                         is_custom;
+        RepositoryId                    defined_in;
+        VersionSpec                     version;
+        RepositoryIdSeq                 supported_interfaces;
+        RepositoryIdSeq                 abstract_base_values;
+        boolean                         is_truncatable;
+        RepositoryId                    base_value;
+    };
+
+    interface ValueBoxDef : TypedefDef {
+        attribute IDLType original_type_def;
+    };
+
+    enum TCKind {                               // PIDL
+        tk_null,    tk_void,
+        tk_short,   tk_long,        tk_ushort,  tk_ulong,
+        tk_float,   tk_double,      tk_boolean, tk_char,
+        tk_octet,   tk_any,         tk_TypeCode,tk_Principal, tk_objref,
+        tk_struct,  tk_union,       tk_enum,    tk_string,
+        tk_sequence,tk_array,       tk_alias,   tk_except,
+        tk_longlong,tk_ulonglong,   tk_longdouble,
+        tk_wchar,   tk_wstring,     tk_fixed,
+        tk_value,   tk_value_box,
+        tk_native,
+        tk_abstract_interface,
+        tk_local_interface
+    };
+    typedef short ValueModifier;                        // PIDL
+    const ValueModifier VM_NONE         = 0;
+    const ValueModifier VM_CUSTOM       = 1;
+    const ValueModifier VM_ABSTRACT     = 2;
+    const ValueModifier VM_TRUNCATABLE  = 3;
+
+    interface TypeCode {                            // PIDL
+        exception   Bounds {};
+        exception   BadKind {};
+        // for all TypeCode kinds
+        boolean     equal       (in TypeCode tc);
+        boolean     equivalent  (in TypeCode tc);
+        TypeCode    get_compact_typecode();
+        TCKind      kind ();
+        // for tk_objref, tk_struct,    tk_union,  tk_enum, tk_alias,
+        //     tk_value,  tk_value_box, tk_native, tk_abstract_interface
+        // and tk_except
+        RepositoryId    id () raises (BadKind);
+        // for tk_objref, tk_struct,    tk_union,  tk_enum, tk_alias,
+        //     tk_value,  tk_value_box, tk_native, tk_abstract_interface
+        // and tk_except
+        Identifier name () raises (BadKind);
+        // for tk_struct, tk_union, tk_enum, tk_value,
+        // and tk_except
+        unsigned long   member_count () raises (BadKind);
+        Identifier      member_name (in unsigned long index)
+            raises (BadKind, Bounds);
+        // for tk_struct, tk_union, tk_value, and tk_except
+        TypeCode        member_type (in unsigned long index)
+            raises (BadKind, Bounds);
+        // for tk_union
+        any             member_label (in unsigned long index)
+            raises (BadKind, Bounds);
+        TypeCode        discriminator_type ()   raises (BadKind);
+        long            default_index ()        raises (BadKind);
+        // for tk_string, tk_sequence, and tk_array
+        unsigned long   length ()               raises (BadKind);
+        // for tk_sequence, tk_array, tk_value_box, and tk_alias
+        TypeCode        content_type ()         raises (BadKind);
+        // for tk_fixed
+        unsigned short  fixed_digits()          raises (BadKind);
+        short           fixed_scale()           raises (BadKind);
+        // for tk_value
+        Visibility      member_visibility(in unsigned long index)
+            raises(BadKind, Bounds);
+        ValueModifier   type_modifier()         raises(BadKind);
+        TypeCode        concrete_base_type()    raises(BadKind);
+    };
+
+
+
+    /* this is the original PIDL from the lang. mapping,
+       but we do not use it! Instead...
+
+    pseudo interface Principal
+    {
+    attribute sequence<octet> name;
+    };
+    */
+
+    /* ... we use this little hack. It saves us fiddling with
+       the generated code that uses  Principals. Actually, we
+       should not be doing this....
+    */
+
+    typedef sequence<octet> Principal;
+
+
+    //need to have this because the OMG supplied helper classes for
+    //these exceptions always throw NO_IMPLEMENT
+    interface ORB
+    {
+       exception InvalidName {};
+       exception InconsistentTypeCode {};
+    };
+
+    typedef sequence<any> AnySeq;
+    typedef sequence<boolean> BooleanSeq;
+    typedef sequence<char> CharSeq;
+    typedef sequence<double> DoubleSeq;
+    typedef sequence<float> FloatSeq;
+    typedef sequence<long> LongSeq;
+    typedef sequence<long long> LongLongSeq;
+    typedef sequence<short> ShortSeq;
+    typedef sequence<unsigned long> ULongSeq;
+    typedef sequence<unsigned long long> ULongLongSeq;
+    typedef sequence<unsigned short> UShortSeq;
+    typedef sequence<wchar> WCharSeq;
+
+
+   // Taken from 04-03-12 CORBA 3.0.3
+   valuetype StringValue string;
+   valuetype WStringValue wstring;
+
+   exception WrongTransaction {};
+};
+
+
+#endif /* _MYORB_IDL */

Added: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosBridgeAdmin.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosBridgeAdmin.idl	                        (rev 0)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosBridgeAdmin.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -0,0 +1,231 @@
+//Notification/JMS Interworking Specification, v1.0 - OMG IDL Summary File
+//Object Management Group, Inc.
+//Copyright (C) 2001, Alcatel
+//Copyright (C) 2001, Fujitsu Limited
+//Copyright (C) 2001, IONA
+//Copyright (C) 2001, Prismtech
+//The companies listed above have granted to the Object Management Group, Inc. 
+//(OMG) a nonexclusive, royalty-free, paid up, worldwide license to copy and 
+//distribute this document and to modify this document and distribute copies of 
+//the modified version. Each of the copyright holders listed above has agreed 
+//that no person shall be deemed to have infringed the copyright in the included 
+//material of any such copyright holder by reason of having used the 
+//specification set forth herein or having conformed any computer software to 
+//the specification. 
+//
+//This file contains OMG IDL from the Naming Service Specification, v1.2.
+//OMG regularly publishes a summary file that contains all the "code" parts of 
+//an OMG formal document. Every formal document line that is IDL, PIDL, or 
+//language code is included in the summary file. The reason for such a listing 
+//is to give readers an electronic version of the "code" so that they can 
+//extract pieces of it. Readers might want to test an example, include it in 
+//their own code, or use it for documentation purposes. Having the code lines 
+//available electronically means there is less likelihood of a transcription 
+//error. 
+
+#ifndef _COS_BRIDGE_ADMIN_
+#define _COS_BRIDGE_ADMIN_
+// #include <orbdefs.idl> TODO does not exist in JacORB
+#include <CosNotifyChannelAdmin.idl>
+#pragma prefix "omg.org"
+
+module CosBridgeAdmin
+{
+   enum ExternalEndpointRole
+   {
+      SOURCE,
+      SINK
+   };
+
+   enum JMSDestinationType
+   {
+      QUEUE,
+      TOPIC
+   };
+
+   enum MessageType
+   {
+      JMS_MESSAGE,
+      STRUCTURED_EVENT,
+      SEQUENCE_EVENT
+   };
+
+   struct JMSDestination
+   {
+      JMSDestinationType destination_type;
+      string destination_name;
+      string factory_name;
+   };
+
+   enum FlowStyle
+   {
+      PUSH,
+      PULL
+   };
+
+   union ExternalEndpointConnector switch (MessageType)
+   {
+      case JMS_MESSAGE: JMSDestination destination;
+      default: CosNotifyChannelAdmin::ChannelID channel_id;
+   };
+
+   struct ExternalEndpoint
+   {
+      ExternalEndpointRole role;
+      ExternalEndpointConnector connector;
+      FlowStyle style;
+      MessageType type;
+   };
+
+   enum ExternalEndpointErrorCode
+   {
+      INVALID_CHANNELID,
+      INVALID_JMSDESTINATION,
+      MISMATCH_ENDPOINTROLE_NOTIFSTYLE
+   }; 
+
+   struct ExternalEndpointError
+   {
+      ExternalEndpointRole role;
+      ExternalEndpointErrorCode code;
+   };
+
+   typedef sequence<ExternalEndpointError> ExternalEndpointErrorSeq;
+
+   exception InvalidExternalEndPoints 
+   {
+      ExternalEndpointErrorSeq error;
+   };
+
+   typedef long BridgeID;
+   typedef sequence<BridgeID> BridgeIDSeq;
+
+   exception BridgeAlreadyStarted {};
+   exception BridgeInactive {};
+   exception BridgeNotFound {};
+
+   interface BridgeFactory;
+
+   interface Bridge
+   {
+      readonly attribute ExternalEndpoint end_point_receiver;
+      readonly attribute ExternalEndpoint end_point_sender;
+
+      void start_bridge() raises (BridgeAlreadyStarted, InvalidExternalEndPoints);
+      void stop_bridge () raises (BridgeInactive);
+    //  status get_status(); TODO seems to be imported from orbdefs.idl
+      void destroy ();
+   };
+
+   interface BridgeFactory
+   {
+      Bridge create_bridge (in ExternalEndpoint source, in ExternalEndpoint sink, out BridgeID id)
+         raises (InvalidExternalEndPoints );
+      Bridge get_bridge_with_id (in BridgeID id)
+         raises (BridgeNotFound);
+      BridgeIDSeq get_all_bridges();
+  };
+};
+
+#endif
+
+
+module BridgeTransactionMgmt
+{
+	   exception UnsupportedTransaction {};
+	   exception TransactionAlreadyActive {};
+	   exception TransactionActive {} ;
+
+	   interface TransactionManagement
+   {
+      void enable_transaction (in unsigned long events, in unsigned long timeout)
+   raises (UnsupportedTransaction, TransactionAlreadyActive);
+      void disable_transaction() raises (TransactionActive);
+   };
+}; // BridgeTransactionMgmt
+
+//File: CosNotifyCommAck.idl
+//Part of the extended Notification Service
+#ifndef _COS_NOTIFY_COMM_ACK_IDL_
+#define _COS_NOTIFY_COMM_ACK_IDL_
+#include <CosNotifyComm.idl>
+#pragma prefix "omg.org"
+
+module CosNotifyCommAck {
+const string SequenceNumber = "SequenceNumber";
+// SequenceNumber takes a value of type long.
+// Structured events must include a SequenceNumber field to be acknowledged 
+
+typedef sequence<long> SequenceNumbers;
+
+const string DeliveryReliability = "DeliveryReliability";
+const short None = 0;
+const short Acknowledgment = 1;
+// DeliveryReliability takes value of None or Acknowledgement as Notification Qos
+
+const string RetryInterval = "RetryInterval";
+// RetryInterval takes on a value of TimeBase::TimeT as Notification Qos
+
+const string Retries = "Retries";
+// Retries takes on a value of type long as Notification Qos Parameter
+
+interface StructuredPushSupplierAck : CosNotifyComm::StructuredPushSupplier {
+	void acknowledge(in SequenceNumbers sequence_numbers);
+};
+
+interface StructuredPullSupplierAck : CosNotifyComm::StructuredPullSupplier {
+void acknowledge(in SequenceNumbers sequence_numbers);
+};
+
+interface SequencePushSupplierAck : CosNotifyComm::SequencePushSupplier {
+         void acknowledge(in SequenceNumbers sequence_numbers);
+};
+
+interface SequencePullSupplierAck : CosNotifyComm::SequencePullSupplier {
+   		void acknowledge(in SequenceNumbers sequence_numbers);
+};
+};
+#endif
+
+//File: CosNotifyChannelAdminAck.idl
+//Part of the extended Notification Service
+#ifndef _COS_NOTIFY_CHANNEL_ADMIN_ACK_IDL_
+#define _COS_NOTIFY_CHANNEL_ADMIN_ACK_IDL_
+#include <CosNotifyChannelAdmin.idl>
+#pragma prefix "omg.org"
+
+module CosNotifyChannelAdminAck {
+
+typedef sequence<long> SequenceNumbers;
+
+interface StructuredProxyPushSupplierAck : 
+       CosNotifyChannelAdmin::StructuredProxyPushSupplier {
+	void acknowledge(in SequenceNumbers sequence_numbers);
+};
+
+interface StructuredProxyPullSupplierAck : 
+       CosNotifyChannelAdmin::StructuredProxyPullSupplier {
+	void acknowledge(in SequenceNumbers sequence_numbers);
+};
+
+interface SequenceProxyPushSupplierAck :    
+		CosNotifyChannelAdmin::SequenceProxyPushSupplier {
+	void acknowledge(in SequenceNumbers sequence_numbers);
+};
+
+interface SequenceProxyPullSupplierAck : 
+		CosNotifyChannelAdmin::SequenceProxyPullSupplier {
+	void acknowledge(in SequenceNumbers sequence_numbers);
+};
+};
+#endif
+
+
+
+
+
+
+
+
+
+

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosCollection.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosCollection.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosCollection.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,1077 +1,1077 @@
-//File: CosCollection.idl
-//This is the single module for the Collection Service
-
-#ifndef _COS_COLLECTION_IDL_
-#define _COS_COLLECTION_IDL_
-#pragma prefix "omg.org"
-
-#include <orb.idl>
-
-module CosCollection 
-{ 
-    interface Collection;
-
-    //  T y p e   d e f i n i t i o n s
-
-    typedef sequence<any> AnySequence;
-    typedef string Istring;
-    struct NVPair {
-	Istring name; 
-	any value;
-    };
-    typedef sequence<NVPair> ParameterList; 
-
-    //  E x c e p t i o n s
-    exception  EmptyCollection{};
-    exception  PositionInvalid{};
-
-    enum IteratorInvalidReason {is_invalid, 
-				is_not_for_collection,  
-				is_const};
-
-    exception IteratorInvalid {IteratorInvalidReason why;};
-    exception IteratorInBetween{};
-    enum ElementInvalidReason {	element_type_invalid, 
-				positioning_property_invalid, 
-				element_exists};
-
-    exception ElementInvalid {ElementInvalidReason why;};
-    exception KeyInvalid {};
-    exception ParameterInvalid {unsigned long which; Istring why;}; 
-
-
-    // O p e r a t i o n s
-    interface Operations {
-
-	//  e l e m e n t   t y p e   s p e c i f i c   
-	//    i n f o r m a t i o n
-	readonly attribute CORBA::TypeCode element_type;
-	boolean check_element_type (in any element);
-	boolean equal (in any element1, in any element2);
-	long compare (in any element1, in any element2);
-	unsigned long hash (in any element, in unsigned long value);
-
-	//  k e y   r e t r i e v a l
-	any key (in any element);
-		
-	//  k e y   t y p e   s p e c i f i c   
-	//    i n f o r m a t i o n
-	readonly attribute CORBA::TypeCode key_type;
-	boolean check_key_type (in any key);
-	boolean key_equal (in any key1, in any key2);
-	long key_compare (in any key1, in any key2);
-	unsigned long key_hash (in any thisKey, 
-				in unsigned long value);
-		
-	//  d e s t r o y i n g
-	void destroy();
-		
-    };
-
-    interface Command {
-	boolean do_on (in any element);
-    };
-
-    interface Comparator { 
-	long compare (in any element1, in any element2);
-    };
-
-
-
-    // Iterators
-
-    // I t e r a t o r
-    interface Iterator { 
-
-	//  m o v i n g   i t e r a t o r s
-	boolean set_to_first_element ();
-	boolean set_to_next_element() raises (IteratorInvalid);
-	boolean set_to_next_nth_element (in unsigned long n)
-	    raises  (IteratorInvalid); 
-
-	//  r e t r i e v i n g   e l e m e n t s
-	boolean retrieve_element (out any element)
-	    raises (IteratorInvalid,  IteratorInBetween);
-	boolean retrieve_element_set_to_next (	
-					      out any element, 
-					      out boolean  more)
-	    raises (IteratorInvalid, IteratorInBetween);
-	boolean retrieve_next_n_elements (	
-					  in unsigned long n, 
-					  out AnySequence result, 
-					  out boolean more)
-	    raises (IteratorInvalid,  IteratorInBetween); 
-	boolean not_equal_retrieve_element_set_to_next (
-							in  Iterator test,  
-							out any element)
-	    raises (IteratorInvalid, IteratorInBetween); 
-
-	//   r e m o v i n g   e l e m e n t s
-	void remove_element() 
-	    raises (IteratorInvalid, IteratorInBetween);
-	boolean remove_element_set_to_next()
-	    raises (IteratorInvalid,  IteratorInBetween); 
-	boolean remove_next_n_elements (
-					in  unsigned long n, 
-					out unsigned long actual_number)
-	    raises (IteratorInvalid, IteratorInBetween); 
-	boolean not_equal_remove_element_set_to_next (in Iterator test)
-	    raises (IteratorInvalid, IteratorInBetween); 
-		
-	//  r e p l a c i n g   e l e m e n t s
-	void replace_element (in any element)
-	    raises (IteratorInvalid, IteratorInBetween, ElementInvalid);
-	boolean replace_element_set_to_next (in any element)
-	    raises(IteratorInvalid, IteratorInBetween, ElementInvalid);
-	boolean replace_next_n_elements (
-					 in  AnySequence   elements, 
-					 out unsigned long actual_number)
-	    raises (IteratorInvalid, IteratorInBetween, ElementInvalid); 
-	boolean not_equal_replace_element_set_to_next (
-						       in Iterator test, 
-						       in any element)
-	    raises(IteratorInvalid, IteratorInBetween, ElementInvalid); 
-		
-	//   a d d i n g   e l e m e n t s
-	boolean add_element_set_iterator (in any element)raises  
-	    (ElementInvalid); 
-	boolean add_n_elements_set_iterator (
-					     in  AnySequence elements, 
-					     out unsigned long actual_number)
-	    raises (ElementInvalid);
-		
-	//  s e t t i n g   i t e r a t o r   s t a t e
-	void invalidate (); 
-		
-	//  t e s t i n g   i t e r a t o r s
-	boolean is_valid ();
-	boolean is_in_between ();
-	boolean is_for(in Collection collector);
-	boolean is_const ();
-	boolean is_equal (in Iterator test) raises (IteratorInvalid); 
-		
-	//  c l o n i n g ,   a s s i g n i n g ,    
-	//    d e s t r o y i n g  i t e r a t o r s
-	Iterator clone ();
-	void assign (in Iterator from_where) raises (IteratorInvalid);
-	void destroy (); 
-		
-    };
-
-
-    // O r d e r e d I t e r a t o r
-    interface OrderedIterator: Iterator {
-
-	//   m o v i n g   i t e r a t o r s
-	boolean set_to_last_element ();
-	boolean set_to_previous_element() raises (IteratorInvalid);
-	boolean set_to_nth_previous_element(in unsigned long n)
-	    raises  (IteratorInvalid);
-	void set_to_position (in unsigned long position) 
-	    raises (PositionInvalid);
-		
-	//  c o m p u t i n g   i t e r a t o r   p o s i t i o n
-	unsigned long position () raises (IteratorInvalid); 
-		
-	//  r e t r i e v i n g   e l e m e n t s
-	boolean retrieve_element_set_to_previous(
-						 out any element, 
-						 out boolean more)
-	    raises (IteratorInvalid, IteratorInBetween);
-	boolean retrieve_previous_n_elements (
-					      in  unsigned long n, 
-					      out AnySequence result, 
-					      out boolean more)
-	    raises (IteratorInvalid,  IteratorInBetween); 
-	boolean not_equal_retrieve_element_set_to_previous (
-							    in Iterator  test, 
-							    out any element)
-	    raises (IteratorInvalid, IteratorInBetween); 
-
-	//   r e m o v i n g   e l e m e n t s
-	boolean remove_element_set_to_previous()
-	    raises (IteratorInvalid,  IteratorInBetween); 
-	boolean remove_previous_n_elements (
-					    in  unsigned long n, 
-					    out unsigned long actual_number)
-	    raises (IteratorInvalid, IteratorInBetween);
-	boolean not_equal_remove_element_set_to_previous(
-							 in Iterator test)
-	    raises (IteratorInvalid, IteratorInBetween); 
-
-	//  r e p l a c i n g   e l e m e n t s
-	boolean replace_element_set_to_previous(in any element)
-	    raises (IteratorInvalid, IteratorInBetween, ElementInvalid);
-	boolean replace_previous_n_elements(
-					    in  AnySequence   elements, 
-					    out unsigned long actual_number)
-	    raises (IteratorInvalid, IteratorInBetween, ElementInvalid); 
-	boolean not_equal_replace_element_set_to_previous (
-							   in Iterator  test, 
-							   in any       element)
-	    raises (IteratorInvalid, IteratorInBetween, ElementInvalid); 
-		
-	//  t e s t i n g   i t e r a t o r s
-	boolean is_first ();
-	boolean is_last ();
-	boolean is_for_same (in Iterator test);
-	boolean is_reverse ();
-
-    };
-
-
-    // S e q u e n t i a l I t e r a t o r
-    interface SequentialIterator : OrderedIterator { 
-
-	// adding elements
-	boolean add_element_as_next_set_iterator (in any element)
-	    raises(IteratorInvalid, ElementInvalid);
-	void add_n_elements_as_next_set_iterator(
-						 in AnySequence elements)
-	    raises(IteratorInvalid, ElementInvalid); 
-	boolean add_element_as_previous_set_iterator(in any element)
-	    raises(IteratorInvalid, ElementInvalid);
-	void add_n_elements_as_previous_set_iterator(
-						     in AnySequence  elements)
-	    raises(IteratorInvalid, ElementInvalid);
-
-    };
-
-
-    // K e y I t e r a t o r
-    interface KeyIterator : Iterator { 
-	//  m o v i n g   t h e   i t e r a t o r s
-	boolean set_to_element_with_key (in any key) 
-	    raises(KeyInvalid);
-	boolean set_to_next_element_with_key (in any key)
-	    raises(IteratorInvalid, KeyInvalid);
-	boolean set_to_next_element_with_different_key()
-	    raises (IteratorInBetween, IteratorInvalid); 
-		
-	//  r e t r i e v i n g   t h e   k e y s
-	boolean retrieve_key (out any key)
-	    raises (IteratorInBetween,  IteratorInvalid);
-	boolean retrieve_next_n_keys (out AnySequence keys)
-	    raises (IteratorInBetween, IteratorInvalid); 
-		
-    };
-
-
-    // E q u a l i t y I t e r a t o r
-    interface EqualityIterator : Iterator { 
-
-	//  m o v i n g   t h e   i t e r a t o r s
-	boolean set_to_element_with_value(in any element) 
-	    raises(ElementInvalid);
-	boolean set_to_next_element_with_value(in any element)
-	    raises (IteratorInvalid, ElementInvalid);
-	boolean set_to_next_element_with_different_value()
-	    raises (IteratorInBetween, IteratorInvalid);
-
-    };
-
-
-
-    // E q u a l i t y K e y I t e r a t o r
-    interface EqualityKeyIterator : EqualityIterator, KeyIterator {};
-
-    // S o r t e d I t e r a t o r
-    interface SortedIterator : OrderedIterator {};
-
-
-    //  e n u m e r a t i o n   t y p e   f o r   s p e c i f y i n g   r a n g e s
-    enum LowerBoundStyle {equal_lo, greater, greater_or_equal};
-    enum UpperBoundStyle {equal_up, less, less_or_equal};
-
-    // K e y S o r t e d I t e r a t o r
-    interface KeySortedIterator : KeyIterator, SortedIterator {
-
-	//  m o v i n g   t h e   i t e r a t o r s
-	boolean set_to_first_element_with_key (
-					       in any             key, 
-					       in LowerBoundStyle style)
-	    raises(KeyInvalid);
-	boolean set_to_last_element_with_key (
-					      in any              key, 
-					      in UpperBoundStyle  style)
-	    raises (KeyInvalid); 
-	boolean set_to_previous_element_with_key (in any key)
-	    raises(IteratorInvalid, KeyInvalid);
-	boolean set_to_previous_element_with_different_key()
-	    raises (IteratorInBetween, IteratorInvalid); 
-		
-	//  r e t r i e v i n g   k e y s
-	boolean retrieve_previous_n_keys(out AnySequence keys)
-	    raises (IteratorInBetween, IteratorInvalid);
-
-    };
-
-
-    // E q u a l i t y S o r t e d I t e r a t o r
-    interface EqualitySortedIterator : 
-	EqualityIterator, SortedIterator  {
-
-	//  m o v i n g   t h e   i t e r a t o r
-	boolean set_to_first_element_with_value (
-						 in any             element, 
-						 in LowerBoundStyle style)
-	    raises (ElementInvalid);
-	boolean set_to_last_element_with_value (
-						in any             element, 
-						in UpperBoundStyle style)
-	    raises (ElementInvalid); 
-	boolean set_to_previous_element_with_value (in any elementally)
-	    raises (IteratorInvalid, ElementInvalid);
-	boolean set_to_previous_element_with_different_value()
-	    raises (IteratorInBetween, IteratorInvalid);
-
-    };
-
-
-    // E q u a l i t y K e y S o r t e d I t e r a t o r
-    interface EqualityKeySortedIterator : 
-	EqualitySortedIterator,  KeySortedIterator {};
-
-    // E q u a l i t y S e q u e n t i a l I t e r a t o r
-    interface EqualitySequentialIterator : 
-	EqualityIterator,  SequentialIterator {
-
-	//  l o c a t i n g   e l e m e n t s
-	boolean set_to_first_element_with_value (in any element)
-	    raises (ElementInvalid);
-	boolean set_to_last_element_with_value (in any element)
-	    raises (ElementInvalid);
-	boolean set_to_previous_element_with_value (in any element)
-	    raises (ElementInvalid);
-
-    };
-
-
-    interface Collection {
-	//   e l e m e n t   t y p e   i n f o r m a t i o n
-	readonly attribute CORBA::TypeCode element_type;
-		
-	// a d d i n g   e l e m e n t s
-	boolean add_element (in any element) 
-	    raises (ElementInvalid);
-	boolean add_element_set_iterator (
-					  in any      element, 
-					  in Iterator where) 
-	    raises (IteratorInvalid, ElementInvalid); 
-	void add_all_from (in Collection collector) 
-	    raises (ElementInvalid);
-		
-	//   r e m o v i n g   e l e m e n t s
-	void remove_element_at (in Iterator where) 
-	    raises (IteratorInvalid,  IteratorInBetween); 
-	unsigned long remove_all ();
-		
-	//  r e p l a c i n g   e l e m e n t s
-	void replace_element_at (
-				 in Iterator where, 
-				 in any      element)
-	    raises(IteratorInvalid, IteratorInBetween, ElementInvalid); 
-		
-	// r e t r i e v i n g   e l e m e n t s
-	boolean retrieve_element_at (
-				     in  Iterator where, 
-				     out any element)
-	    raises (IteratorInvalid, IteratorInBetween); 
-		
-	// i t e r a t i n g   o v e r   t h e   c o l l e c t i o n
-	boolean all_elements_do (in Command what) ;
-		
-	//   i n q u i r i n g   c o l l e c t i o n   
-	//       i n f o r m a t i o n 
-	unsigned long number_of_elements ();
-	boolean is_empty ();
-		
-	//  d e s t r o y i n g   c o l l e c t i o n
-	void destroy(); 
-		
-	//  c r e a t i n g   i t e r a t o r s
-	Iterator create_iterator (in boolean read_only); 
-
-    }; 
-	
-    //  O r d e r e d C o l l e c t i o n
-    interface OrderedCollection: Collection {
-
-	//  r e m o v i n g   e l e m e n t s
-	void remove_element_at_position (in unsigned long position)
-	    raises  (PositionInvalid);
-	void remove_first_element () raises (EmptyCollection);
-	void remove_last_element () raises (EmptyCollection); 
-		
-	//  r e t r i e v i n g   e l e m e n t s
-	boolean retrieve_element_at_position (
-					      in  unsigned long position, 
-					      out any           element)
-	    raises (PositionInvalid);
-	boolean retrieve_first_element (out any element) 
-	    raises  (EmptyCollection);
-	boolean retrieve_last_element (out any element) 
-	    raises  (EmptyCollection);
-		
-	//  c r e a t i n g   i t e r a t o r s
-	OrderedIterator create_ordered_iterator(
-						in boolean read_only, 
-						in boolean reverse_iteration);
-		
-    }; 
-	
-	
-    // S e q u e n t i a l C o l l e c t i o n
-    interface SequentialCollection: OrderedCollection {
-
-	//   a d d i n g   e l e m e n t s   
-	void add_element_as_first (in any element) 
-	    raises (ElementInvalid);
-		
-	void add_element_as_first_set_iterator (
-						in any       element, 
-						in Iterator  where)
-	    raises (ElementInvalid, IteratorInvalid); 
-	void add_element_as_last (in any element) 
-	    raises (ElementInvalid);
-	void add_element_as_last_set_iterator (
-					       in any       element, 
-					       in Iterator  where)
-	    raises (ElementInvalid, IteratorInvalid); 
-	void add_element_as_next (
-				  in any      element, 
-				  in Iterator where)
-	    raises  (ElementInvalid, IteratorInvalid); 
-	void add_element_as_previous (
-				      in any      element, 
-				      in Iterator where)
-	    raises (ElementInvalid,IteratorInvalid); 
-	void add_element_at_position (
-				      in unsigned long position, 
-				      in any           element)
-	    raises(PositionInvalid, ElementInvalid); 
-	void add_element_at_position_set_iterator (
-						   in unsigned long  position, 
-						   in any            element, 
-						   in Iterator       where) 
-	    raises  (PositionInvalid, ElementInvalid, IteratorInvalid); 
-		
-	//  r e p l a c i n g   e l e m e n t s
-	void replace_element_at_position (
-					  in unsigned long position, 
-					  in any           element)
-	    raises (PositionInvalid, ElementInvalid);
-	void replace_first_element (in any element)
-	    raises (ElementInvalid,  EmptyCollection);
-	void replace_last_element (in any element) 
-	    raises (ElementInvalid,  EmptyCollection); 
-		
-	//  r e o r d e r i n g   e l e m e n t s
-	void sort (in Comparator comparison); void reverse(); 
-		
-    };
-	
-	
-    // S o r t e C o l l e c t i o n
-    interface SortedCollection: OrderedCollection{};
-	
-    // E q u a l i t y C o l l e c t i o n
-    interface EqualityCollection: Collection {
-
-	//  t e s t i n g   e l e m e n t   c o n t a i n m e n t
-	boolean contains_element (in any element) 
-	    raises(ElementInvalid);
-	boolean contains_all_from (in Collection collector)  
-	    raises(ElementInvalid); 
-		
-	//  a d d i n g   e l e m e n t s
-	boolean locate_or_add_element (in any element) 
-	    raises (ElementInvalid); 
-	boolean locate_or_add_element_set_iterator (
-						    in any      element, 
-						    in Iterator where)
-	    raises (ElementInvalid, IteratorInvalid); 
-		
-	//  l o c a t i n g   e l e m e n t s
-	boolean locate_element (
-				in any      element, 
-				in Iterator where) 
-	    raises (ElementInvalid, IteratorInvalid);
-	boolean locate_next_element (
-				     in any      element, 
-				     in Iterator where)
-	    raises (ElementInvalid, IteratorInvalid);
-	boolean locate_next_different_element (in Iterator where)
-	    raises  (IteratorInvalid, IteratorInBetween);
-		
-	//  r e m o v i n g   e l e m e n t s
-	boolean remove_element (in any element) 
-	    raises (ElementInvalid);
-	unsigned long remove_all_occurrences (in any element)
-	    raises (ElementInvalid); 
-		
-	//  i n q u i r i n g   c o l l e c t i o n   
-	//      i n f o r m a t i o n
-	unsigned long number_of_different_elements ();
-	unsigned long number_of_occurrences (in any element) 
-	    raises(ElementInvalid);
-		
-    };
-
-    // K e y C o l l e c t i o n
-    interface KeyCollection: Collection { 
-
-	//  K e y   t y p e   i n f o r m a t i o n
-	readonly attribute CORBA::TypeCode key_type; 
-		
-	//  t e s t i n g   c o n t a i n m e n t
-	boolean contains_element_with_key (in any key) 
-	    raises(KeyInvalid);
-	boolean contains_all_keys_from (in KeyCollection collector)
-	    raises(KeyInvalid);
-		
-	//  a d d i n g   e l e m e n t s
-	boolean locate_or_add_element_with_key (in any element)
-	    raises(ElementInvalid);
-	boolean locate_or_add_element_with_key_set_iterator (
-							     in any      element, 
-							     in Iterator where)
-	    raises (ElementInvalid,  IteratorInvalid);
-		
-	//  a d d i n g   o r   r e p l a c i n g   e l e m e n t s
-	boolean add_or_replace_element_with_key (in any element)
-	    raises(ElementInvalid); 
-	boolean add_or_replace_element_with_key_set_iterator (
-							      in any      element, 
-							      in Iterator where)
-	    raises (ElementInvalid,  IteratorInvalid); 
-		
-	//  r e m o v i n g   e l e m e n t s
-	boolean remove_element_with_key(in any key) 
-	    raises(KeyInvalid);
-	unsigned long remove_all_elements_with_key (in any key) 
-	    raises(KeyInvalid); 
-		
-	//  r e p l a c i n g   e l e m e n t s
-	boolean replace_element_with_key (in any element) 
-	    raises(ElementInvalid);
-	boolean replace_element_with_key_set_iterator (
-						       in any      element, 
-						       in Iterator where)
-	    raises (ElementInvalid, IteratorInvalid);
-		
-	//  r e t r i e v i n g   e l e m e n t s
-	boolean retrieve_element_with_key (
-					   in  any key, 
-					   out any element)
-	    raises (KeyInvalid); 
-		
-	//  c o m p u t i n g   t h e   k e y s
-	void key (in any element, out any key) 
-	    raises (ElementInvalid);
-	void keys (in AnySequence elements, out AnySequence keys)
-	    raises (ElementInvalid);
-		
-	//  l o c a t i n g   e l e m e n t s
-	boolean locate_element_with_key (
-					 in any      key, 
-					 in Iterator where)
-	    raises (KeyInvalid, IteratorInvalid);
-	boolean locate_next_element_with_key (
-					      in any      key, 
-					      in Iterator where)
-	    raises (KeyInvalid, IteratorInvalid);
-	boolean locate_next_element_with_different_key (
-							in Iterator where)
-	    raises (IteratorInBetween, IteratorInvalid);
-		
-	//  i n q u i r i n g   c o l l e c t i o n   
-	//      i n f o r m a t i o n
-	unsigned long number_of_different_keys ();
-	unsigned long number_of_elements_with_key (in any key) 
-	    raises(KeyInvalid);
-		
-    };
-
-
-    // E q u a l i t y K e y C o l l e c t i o n
-    interface EqualityKeyCollection : 
-	EqualityCollection, KeyCollection{};
-
-    // K e y S o r t e d C o l l e c t i o n
-    interface KeySortedCollection : 
-	KeyCollection, SortedCollection { 
-
-	//  l o c a t i n g   e l e m e n t s
-	boolean locate_first_element_with_key (
-					       in any      key, 
-					       in Iterator where)
-	    raises (KeyInvalid, IteratorInvalid); 
-	boolean locate_last_element_with_key(
-					     in any      key, 
-					     in Iterator where)
-	    raises (KeyInvalid, IteratorInvalid);
-	boolean locate_previous_element_with_key (
-						  in any      key, 
-						  in Iterator where)
-	    raises (KeyInvalid, IteratorInvalid); 
-	boolean locate_previous_element_with_different_key(
-							   in Iterator  where)
-	    raises (IteratorInBetween, IteratorInvalid);
-
-    };
-	
-	
-    // E q u a l i t y S o r t e d C o l l e c t i o n
-    interface EqualitySortedCollection : 
-	EqualityCollection,  SortedCollection {
-	
-	//  l o c a t i n g   e l e m e n t s
-	boolean locate_first_element (
-				      in any      element, 
-				      in Iterator where)
-	    raises (ElementInvalid, IteratorInvalid);
-	boolean locate_last_element (
-				     in any      element, 
-				     in Iterator where)
-	    raises (ElementInvalid, IteratorInvalid);
-	boolean locate_previous_element (
-					 in any      element, 
-					 in Iterator where)
-	    raises  (ElementInvalid, IteratorInvalid);
-	boolean locate_previous_different_element (in Iterator where)
-	    raises  (IteratorInvalid);
-
-    }; 
-	
-	
-    // E q u a l i t y K e y S o r t e d C o l l e c t i o n
-    interface EqualityKeySortedCollection : 
-	EqualityCollection, KeyCollection,  SortedCollection {};
-
-
-    // E q u a l i t y S e q u e n t i a l C o l l e c t i o n
-    interface EqualitySequentialCollection : 
-	EqualityCollection,  SequentialCollection  {
-
-	//  l o c a t i n g   e l e m e n t s
-	boolean locate_first_element_with_value (
-						 in any      element, 
-						 in Iterator where)
-	    raises (ElementInvalid, IteratorInvalid);
-	boolean locate_last_element_with_value (
-						in any      element, 
-						in Iterator where)
-	    raises (ElementInvalid, IteratorInvalid);
-	boolean locate_previous_element_with_value (
-						    in any      element, 
-						    in Iterator where)
-	    raises (ElementInvalid, IteratorInvalid);
-		
-    };
-	
-	
-    // THE CONCRETE COLLECTION INTERFACES
-	
-	
-    // K e y S e t
-    interface KeySet: KeyCollection {};
-	
-    // K e y B a g
-    interface KeyBag: KeyCollection {};
-	
-    // M a p
-    interface Map : EqualityKeyCollection { 
-	
-	//  s e t   t h e o r e t i c a l   o p e r a t i o n s
-	void difference_with (in Map collector) 
-	    raises (ElementInvalid);
-	void add_difference (
-			     in Map collector1, 
-			     in Map collector2) 
-	    raises  (ElementInvalid);
-	void intersection_with (in Map collector) 
-	    raises (ElementInvalid);
-	void add_intersection (
-			       in Map collector1, 
-			       in Map collector2)
-	    raises  (ElementInvalid);
-	void union_with (in Map collector) 
-	    raises (ElementInvalid);
-	void add_union (
-			in Map collector1, 
-			in Map collector2) 
-	    raises (ElementInvalid);
-		
-	//   t e s t i n g   e q u a l i t y
-	boolean equal (in Map collector) 
-	    raises (ElementInvalid);
-	boolean not_equal (in Map collector) 
-	    raises(ElementInvalid);
-		
-    };
-	
-	
-    // R e l a t i o n
-    interface Relation : EqualityKeyCollection { 
-	
-	//  e q u a l ,   n o t _ e q u a l ,   a n d   t h e   
-	//  s e t - t h e o r e t i c a l   o p e r a t i o n s   a s   
-	//  d e f i n e d   f o r   M a p  
-    }; 
-
-
-    // S e t
-    interface Set : EqualityCollection { 
-	
-	//  e q u a l ,   n o t _ e q u a l ,   a n d   t h e   s e t   
-	//  t h e o r e t i c a l   o p e r a t i o n s   a s   
-	//  d e f i n e d   f o r   M a p
-    }; 
-	
-	
-    // B a g
-    interface Bag : EqualityCollection { 
-	
-	//  e q u a l ,   n o t _ e q u a l ,   a n d   t h e   s e t   
-	//  t h e o r e t i c a l   o p e r a t i o n s   a s   d e f i n e d   
-	//  d e f i n e d   f o r   M a p
-	
-    };
-	
-	
-    // K e y S o r t e d S e t
-    interface KeySortedSet : KeySortedCollection {
-	long compare (	in KeySortedSet collector, 
-			in Comparator comparison); 
-    };
-	
-	
-    // K e y S o r t e d B a g
-    interface KeySortedBag : KeySortedCollection {
-	long compare (	in KeySortedBag collector, 
-			in Comparator comparison); 
-    };
-
-
-    // S o r t e d M a p
-    interface SortedMap : EqualityKeySortedCollection { 
-	
-	//  e q u a l ,   n o t _ e q u a l ,   a n d   t h e   s e t   
-	// t h e o r e t i c a l   o p e r a t i o n s
-	long compare (	in SortedMap collector, 
-			in Comparator comparison);
-    };
-	
-	
-    // S o r t e d R e l a t i o n
-    interface SortedRelation : EqualityKeySortedCollection {
-	
-	//  e q u a l ,   n o t _ e q u a l ,   a n d   t h e   s e t
-	//  t h e o r e t i c a l   o p e r a t i o n s
-	long compare (	in SortedRelation collector, 
-			in Comparator  comparison);
-    };
-	
-	
-    // S o r t e d S e t
-    interface SortedSet : EqualitySortedCollection {
-	
-	// e q u a l ,   n o t _ e q u a l ,   a n d   t h e   s e t   
-	// t h e o r e t i c a l   o p e r a t i o n s
-	long compare (	in SortedSet collector, 
-			in Comparator comparison);
-    };
-	
-	
-    // S o r t e d B a g
-    interface SortedBag: EqualitySortedCollection { 
-	
-	//  e q u a l ,   n o t _ e q u a l ,   a n d   t h e   s e t
-	// t h e o r e t i c a l   o p e r a t i o n s
-	long compare (	in SortedBag collector, 
-			in Comparator comparison);
-    };
-	
-	
-    // S e q u e n c e
-    interface CSequence : SequentialCollection { 
-	//  C o m p a r i s o n
-	long compare (	in CSequence collector, 
-			in Comparator comparison);
-    };
-
-
-    // E q u a l i t y S e q u e n c e
-    interface EqualitySequence : EqualitySequentialCollection { 
-	
-	//  t e s t   o n   e q u a l i t y
-	boolean equal     (in EqualitySequence collector);
-	boolean not_equal (in EqualitySequence collector); 
-	//   c o m p a r i s o n
-	long compare (     in EqualitySequence collector, 
-			   in Comparator       comparison);
-    };
-	
-	
-    // H e a p
-    interface Heap : Collection {};
-
-
-    //  R e s t r i c t e d   A c c e s s   C o l l e c t i o n s 
-
-    interface RestrictedAccessCollection {
-
-	//  g e t t i n g   i n f o r m a t i o n   o n   
-	//      c o l l e c t i o n   s t a t e   
-	boolean unfilled ();
-	unsigned long size ();
-		
-	//  r e m o v i n g   e l e m e n t s
-	void purge ();
-    };
-
-
-    // Q u e u e
-    interface Queue : RestrictedAccessCollection {
-	
-	//  a d d i n g   e l e m e n t s
-	void enqueue (in any element) raises (ElementInvalid);
-		
-	//   r e m o v i n g   e l e m e n t s
-	void dequeue () raises (EmptyCollection);
-	boolean element_dequeue (out any element) 
-	    raises (EmptyCollection);
-    }; 
-	
-	
-    // D e q u e
-    interface Deque : RestrictedAccessCollection {
-	
-	//  a d d i n g   e l e m e n t s
-	void enqueue_as_first (in any element) 
-	    raises (ElementInvalid);
-	void enqueue_as_last (in any element) 
-	    raises(ElementInvalid);
-	
-	//  r e m o v i n g   e l e m e n t s
-	void dequeue_first () raises (EmptyCollection);
-	boolean element_dequeue_first (out any element) 
-	    raises (EmptyCollection);
-	void dequeue_last () raises (EmptyCollection);
-	boolean element_dequeue_last (out any element) 
-	    raises (EmptyCollection);
-	
-    };
-
-
-    // S t a c k
-    interface Stack: RestrictedAccessCollection {
-
-	//  a d d i n g   e l e m e n t s
-	void push (in any element) raises (ElementInvalid);
-		
-	//  r e m o v i n g   a n d   r e t r i e v i n g   
-	//      e l e m e n t s
-	void pop () raises (EmptyCollection);
-	boolean element_pop (out any element) 
-	    raises (EmptyCollection);
-	boolean top (out any element) 
-	    raises (EmptyCollection);
-    };
-
-
-    // P r i o r i t y Q u e u e
-    interface PriorityQueue: RestrictedAccessCollection {
-	//  a d d i n g   e l e m e n t s
-	void enqueue (in any element) raises (ElementInvalid);
-	
-	//  r e m o v i n g   e l e m e n t s
-	void dequeue () raises (EmptyCollection);
-	boolean element_dequeue (out any element) 
-	    raises (EmptyCollection);
-    };
-
-
-    // COLLECTION FACTORIES
-
-    // C o l l e c t i o n F a c t o r y
-    interface CollectionFactory { 
-	Collection generic_create (in ParameterList parameters)
-	    raises (ParameterInvalid); 
-    };
-
-
-    // C o l l e c t i o n F a c t o r i e s
-    interface CollectionFactories : CollectionFactory { 
-	boolean add_factory (
-			     in Istring            collection_interface, 
-			     in Istring            impl_category, 
-			     in Istring            impl_interface, 
-			     in CollectionFactory  _factory);
-	boolean remove_factory (
-				in Istring collection_interface, 
-				in Istring impl_category, 
-				in Istring impl_interface); 
-	Collection create (in ParameterList parameters) 
-	    raises (ParameterInvalid);
-    }; 
-
-
-    // R A C o l l e c t i o n F a ct o r y
-    interface RACollectionFactory { 
-	RestrictedAccessCollection generic_create (
-						   in ParameterList  parameters)
-	    raises (ParameterInvalid); 
-    };
-
-
-    // R A C o l l e c t i o n F a c t o r i e s
-    interface RACollectionFactories : RACollectionFactory {
-	boolean add_factory (
-			     in Istring              collection_interface, 
-			     in Istring              impl_category, 
-			     in Istring              impl_interface, 
-			     in RACollectionFactory  _factory); 
-	boolean remove_factory (
-				in Istring collection_interface, 
-				in Istring impl_category, 
-				in Istring impl_interface); 
-	Collection create ( in ParameterList parameters) 
-	    raises (ParameterInvalid);
-    }; 
-
-
-    // K e y S e t F a c t o r y
-    interface KeySetFactory : CollectionFactory { 
-	KeySet create (	in Operations    ops, 
-			in unsigned long expected_size);
-    };
-
-    // K e y B a g F a c t o r y
-    interface KeyBagFactory : CollectionFactory {
-	KeyBag create ( in Operations    ops, 
-			in unsigned long expected_size);
-    };
-
-
-    // M a p F a c t o r y
-    interface MapFactory : CollectionFactory { 
-	Map create (in Operations    ops, 
-		    in unsigned long expected_size);
-    };
-
-
-    // R e l a t i o n F a c t o r y
-    interface RelationFactory : CollectionFactory { 
-	Relation create (	in Operations    ops, 
-				in unsigned long expected_size);
-    };
-
-
-    // S e t F a c t o r y
-    interface SetFactory : CollectionFactory {
-	Set create (in Operations ops, 
-		    in unsigned long expected_size);
-    };
-
-
-    // B a g F a c t o r y
-    interface BagFactory {
-	Bag create (in Operations ops, 
-		    in unsigned long expected_size);
-    };
-
-
-    // K e y S o r t e d S e t F a c t o r y
-    interface KeySortedSetFactory { 
-	KeySortedSet create (in Operations    ops, 
-			     in unsigned long expected_size);
-    };
-
-
-    // K e y S o r t e d B a g F a c t o r y
-    interface KeySortedBagFactory : CollectionFactory {
-	KeySortedBag create (in Operations    ops, 
-			     in unsigned long expected_size);
-    }; 
-
-
-    // S o r t e d M a p F a c t o r y
-    interface SortedMapFactory : CollectionFactory {
-	SortedMap create (in Operations    ops, 
-			  in unsigned long expected_size);
-    };
-
-
-    // S o r t e d R e l a t i o n F a c t o r y
-    interface SortedRelationFactory : CollectionFactory {
-	SortedRelation create (	in Operations    ops, 
-				in unsigned long expected_size);
-    };
-
-
-    // S o r t e d S e t F a c t o r y
-    interface SortedSetFactory : CollectionFactory {
-	SortedSet create (	in Operations    ops, 
-				in unsigned long expected_size);
-    }; 
-
-
-    // S o r t e d B a g F a c t o r y
-    interface SortedBagFactory { 
-	SortedBag create (	in Operations    ops, 
-				in unsigned long expected_size);
-    };
-
-
-    // S e q u e n c e F a c t o r y
-    interface SequenceFactory : CollectionFactory {
-	CSequence create (	in Operations    ops, 
-				in unsigned long expected_size);
-    };
-
-
-    // E q u a l i t y S e q u e n c e F a c t o r y
-    interface EqualitySequenceFactory : CollectionFactory { 
-	EqualitySequence create (in Operations    ops, 
-				 in unsigned long expected_size);
-    };
-
-
-    // H e a p F a c t o r y
-    interface HeapFactory : CollectionFactory {
-	Heap create (in Operations    ops, 
-		     in unsigned long expected_size);
-    };
-
-
-    // Q u e u e F a c t o r y
-    interface QueueFactory : RACollectionFactory {
-	Queue create (	in Operations ops, 
-			in unsigned long expected_size);
-    };
-
-
-    // S t a c k F a c t o r y
-    interface StackFactory : RACollectionFactory {
-	Stack create (	in Operations    ops, 
-			in unsigned long expected_size);
-    };
-
-
-    // D e q u e F a c t o r y
-    interface DequeFactory : RACollectionFactory { 
-	Deque create (	in Operations    ops, 
-			in unsigned long expected_size);
-    };
-
-
-    // P r i o r i t y Q u e u e F a c t o r y
-    interface PriorityQueueFactory : RACollectionFactory {
-	PriorityQueue create (	in Operations    ops, 
-				in unsigned long expected_size);
-    };
-
-};
-#endif /* ifndef _COS_COLLECTION_IDL_ */!
+//File: CosCollection.idl
+//This is the single module for the Collection Service
+
+#ifndef _COS_COLLECTION_IDL_
+#define _COS_COLLECTION_IDL_
+#pragma prefix "omg.org"
+
+#include <orb.idl>
+
+module CosCollection 
+{ 
+    interface Collection;
+
+    //  T y p e   d e f i n i t i o n s
+
+    typedef sequence<any> AnySequence;
+    typedef string Istring;
+    struct NVPair {
+	Istring name; 
+	any value;
+    };
+    typedef sequence<NVPair> ParameterList; 
+
+    //  E x c e p t i o n s
+    exception  EmptyCollection{};
+    exception  PositionInvalid{};
+
+    enum IteratorInvalidReason {is_invalid, 
+				is_not_for_collection,  
+				is_const};
+
+    exception IteratorInvalid {IteratorInvalidReason why;};
+    exception IteratorInBetween{};
+    enum ElementInvalidReason {	element_type_invalid, 
+				positioning_property_invalid, 
+				element_exists};
+
+    exception ElementInvalid {ElementInvalidReason why;};
+    exception KeyInvalid {};
+    exception ParameterInvalid {unsigned long which; Istring why;}; 
+
+
+    // O p e r a t i o n s
+    interface Operations {
+
+	//  e l e m e n t   t y p e   s p e c i f i c   
+	//    i n f o r m a t i o n
+	readonly attribute CORBA::TypeCode element_type;
+	boolean check_element_type (in any element);
+	boolean equal (in any element1, in any element2);
+	long compare (in any element1, in any element2);
+	unsigned long hash (in any element, in unsigned long value);
+
+	//  k e y   r e t r i e v a l
+	any key (in any element);
+		
+	//  k e y   t y p e   s p e c i f i c   
+	//    i n f o r m a t i o n
+	readonly attribute CORBA::TypeCode key_type;
+	boolean check_key_type (in any key);
+	boolean key_equal (in any key1, in any key2);
+	long key_compare (in any key1, in any key2);
+	unsigned long key_hash (in any thisKey, 
+				in unsigned long value);
+		
+	//  d e s t r o y i n g
+	void destroy();
+		
+    };
+
+    interface Command {
+	boolean do_on (in any element);
+    };
+
+    interface Comparator { 
+	long compare (in any element1, in any element2);
+    };
+
+
+
+    // Iterators
+
+    // I t e r a t o r
+    interface Iterator { 
+
+	//  m o v i n g   i t e r a t o r s
+	boolean set_to_first_element ();
+	boolean set_to_next_element() raises (IteratorInvalid);
+	boolean set_to_next_nth_element (in unsigned long n)
+	    raises  (IteratorInvalid); 
+
+	//  r e t r i e v i n g   e l e m e n t s
+	boolean retrieve_element (out any element)
+	    raises (IteratorInvalid,  IteratorInBetween);
+	boolean retrieve_element_set_to_next (	
+					      out any element, 
+					      out boolean  more)
+	    raises (IteratorInvalid, IteratorInBetween);
+	boolean retrieve_next_n_elements (	
+					  in unsigned long n, 
+					  out AnySequence result, 
+					  out boolean more)
+	    raises (IteratorInvalid,  IteratorInBetween); 
+	boolean not_equal_retrieve_element_set_to_next (
+							in  Iterator test,  
+							out any element)
+	    raises (IteratorInvalid, IteratorInBetween); 
+
+	//   r e m o v i n g   e l e m e n t s
+	void remove_element() 
+	    raises (IteratorInvalid, IteratorInBetween);
+	boolean remove_element_set_to_next()
+	    raises (IteratorInvalid,  IteratorInBetween); 
+	boolean remove_next_n_elements (
+					in  unsigned long n, 
+					out unsigned long actual_number)
+	    raises (IteratorInvalid, IteratorInBetween); 
+	boolean not_equal_remove_element_set_to_next (in Iterator test)
+	    raises (IteratorInvalid, IteratorInBetween); 
+		
+	//  r e p l a c i n g   e l e m e n t s
+	void replace_element (in any element)
+	    raises (IteratorInvalid, IteratorInBetween, ElementInvalid);
+	boolean replace_element_set_to_next (in any element)
+	    raises(IteratorInvalid, IteratorInBetween, ElementInvalid);
+	boolean replace_next_n_elements (
+					 in  AnySequence   elements, 
+					 out unsigned long actual_number)
+	    raises (IteratorInvalid, IteratorInBetween, ElementInvalid); 
+	boolean not_equal_replace_element_set_to_next (
+						       in Iterator test, 
+						       in any element)
+	    raises(IteratorInvalid, IteratorInBetween, ElementInvalid); 
+		
+	//   a d d i n g   e l e m e n t s
+	boolean add_element_set_iterator (in any element)raises  
+	    (ElementInvalid); 
+	boolean add_n_elements_set_iterator (
+					     in  AnySequence elements, 
+					     out unsigned long actual_number)
+	    raises (ElementInvalid);
+		
+	//  s e t t i n g   i t e r a t o r   s t a t e
+	void invalidate (); 
+		
+	//  t e s t i n g   i t e r a t o r s
+	boolean is_valid ();
+	boolean is_in_between ();
+	boolean is_for(in Collection collector);
+	boolean is_const ();
+	boolean is_equal (in Iterator test) raises (IteratorInvalid); 
+		
+	//  c l o n i n g ,   a s s i g n i n g ,    
+	//    d e s t r o y i n g  i t e r a t o r s
+	Iterator clone ();
+	void assign (in Iterator from_where) raises (IteratorInvalid);
+	void destroy (); 
+		
+    };
+
+
+    // O r d e r e d I t e r a t o r
+    interface OrderedIterator: Iterator {
+
+	//   m o v i n g   i t e r a t o r s
+	boolean set_to_last_element ();
+	boolean set_to_previous_element() raises (IteratorInvalid);
+	boolean set_to_nth_previous_element(in unsigned long n)
+	    raises  (IteratorInvalid);
+	void set_to_position (in unsigned long position) 
+	    raises (PositionInvalid);
+		
+	//  c o m p u t i n g   i t e r a t o r   p o s i t i o n
+	unsigned long position () raises (IteratorInvalid); 
+		
+	//  r e t r i e v i n g   e l e m e n t s
+	boolean retrieve_element_set_to_previous(
+						 out any element, 
+						 out boolean more)
+	    raises (IteratorInvalid, IteratorInBetween);
+	boolean retrieve_previous_n_elements (
+					      in  unsigned long n, 
+					      out AnySequence result, 
+					      out boolean more)
+	    raises (IteratorInvalid,  IteratorInBetween); 
+	boolean not_equal_retrieve_element_set_to_previous (
+							    in Iterator  test, 
+							    out any element)
+	    raises (IteratorInvalid, IteratorInBetween); 
+
+	//   r e m o v i n g   e l e m e n t s
+	boolean remove_element_set_to_previous()
+	    raises (IteratorInvalid,  IteratorInBetween); 
+	boolean remove_previous_n_elements (
+					    in  unsigned long n, 
+					    out unsigned long actual_number)
+	    raises (IteratorInvalid, IteratorInBetween);
+	boolean not_equal_remove_element_set_to_previous(
+							 in Iterator test)
+	    raises (IteratorInvalid, IteratorInBetween); 
+
+	//  r e p l a c i n g   e l e m e n t s
+	boolean replace_element_set_to_previous(in any element)
+	    raises (IteratorInvalid, IteratorInBetween, ElementInvalid);
+	boolean replace_previous_n_elements(
+					    in  AnySequence   elements, 
+					    out unsigned long actual_number)
+	    raises (IteratorInvalid, IteratorInBetween, ElementInvalid); 
+	boolean not_equal_replace_element_set_to_previous (
+							   in Iterator  test, 
+							   in any       element)
+	    raises (IteratorInvalid, IteratorInBetween, ElementInvalid); 
+		
+	//  t e s t i n g   i t e r a t o r s
+	boolean is_first ();
+	boolean is_last ();
+	boolean is_for_same (in Iterator test);
+	boolean is_reverse ();
+
+    };
+
+
+    // S e q u e n t i a l I t e r a t o r
+    interface SequentialIterator : OrderedIterator { 
+
+	// adding elements
+	boolean add_element_as_next_set_iterator (in any element)
+	    raises(IteratorInvalid, ElementInvalid);
+	void add_n_elements_as_next_set_iterator(
+						 in AnySequence elements)
+	    raises(IteratorInvalid, ElementInvalid); 
+	boolean add_element_as_previous_set_iterator(in any element)
+	    raises(IteratorInvalid, ElementInvalid);
+	void add_n_elements_as_previous_set_iterator(
+						     in AnySequence  elements)
+	    raises(IteratorInvalid, ElementInvalid);
+
+    };
+
+
+    // K e y I t e r a t o r
+    interface KeyIterator : Iterator { 
+	//  m o v i n g   t h e   i t e r a t o r s
+	boolean set_to_element_with_key (in any key) 
+	    raises(KeyInvalid);
+	boolean set_to_next_element_with_key (in any key)
+	    raises(IteratorInvalid, KeyInvalid);
+	boolean set_to_next_element_with_different_key()
+	    raises (IteratorInBetween, IteratorInvalid); 
+		
+	//  r e t r i e v i n g   t h e   k e y s
+	boolean retrieve_key (out any key)
+	    raises (IteratorInBetween,  IteratorInvalid);
+	boolean retrieve_next_n_keys (out AnySequence keys)
+	    raises (IteratorInBetween, IteratorInvalid); 
+		
+    };
+
+
+    // E q u a l i t y I t e r a t o r
+    interface EqualityIterator : Iterator { 
+
+	//  m o v i n g   t h e   i t e r a t o r s
+	boolean set_to_element_with_value(in any element) 
+	    raises(ElementInvalid);
+	boolean set_to_next_element_with_value(in any element)
+	    raises (IteratorInvalid, ElementInvalid);
+	boolean set_to_next_element_with_different_value()
+	    raises (IteratorInBetween, IteratorInvalid);
+
+    };
+
+
+
+    // E q u a l i t y K e y I t e r a t o r
+    interface EqualityKeyIterator : EqualityIterator, KeyIterator {};
+
+    // S o r t e d I t e r a t o r
+    interface SortedIterator : OrderedIterator {};
+
+
+    //  e n u m e r a t i o n   t y p e   f o r   s p e c i f y i n g   r a n g e s
+    enum LowerBoundStyle {equal_lo, greater, greater_or_equal};
+    enum UpperBoundStyle {equal_up, less, less_or_equal};
+
+    // K e y S o r t e d I t e r a t o r
+    interface KeySortedIterator : KeyIterator, SortedIterator {
+
+	//  m o v i n g   t h e   i t e r a t o r s
+	boolean set_to_first_element_with_key (
+					       in any             key, 
+					       in LowerBoundStyle style)
+	    raises(KeyInvalid);
+	boolean set_to_last_element_with_key (
+					      in any              key, 
+					      in UpperBoundStyle  style)
+	    raises (KeyInvalid); 
+	boolean set_to_previous_element_with_key (in any key)
+	    raises(IteratorInvalid, KeyInvalid);
+	boolean set_to_previous_element_with_different_key()
+	    raises (IteratorInBetween, IteratorInvalid); 
+		
+	//  r e t r i e v i n g   k e y s
+	boolean retrieve_previous_n_keys(out AnySequence keys)
+	    raises (IteratorInBetween, IteratorInvalid);
+
+    };
+
+
+    // E q u a l i t y S o r t e d I t e r a t o r
+    interface EqualitySortedIterator : 
+	EqualityIterator, SortedIterator  {
+
+	//  m o v i n g   t h e   i t e r a t o r
+	boolean set_to_first_element_with_value (
+						 in any             element, 
+						 in LowerBoundStyle style)
+	    raises (ElementInvalid);
+	boolean set_to_last_element_with_value (
+						in any             element, 
+						in UpperBoundStyle style)
+	    raises (ElementInvalid); 
+	boolean set_to_previous_element_with_value (in any elementally)
+	    raises (IteratorInvalid, ElementInvalid);
+	boolean set_to_previous_element_with_different_value()
+	    raises (IteratorInBetween, IteratorInvalid);
+
+    };
+
+
+    // E q u a l i t y K e y S o r t e d I t e r a t o r
+    interface EqualityKeySortedIterator : 
+	EqualitySortedIterator,  KeySortedIterator {};
+
+    // E q u a l i t y S e q u e n t i a l I t e r a t o r
+    interface EqualitySequentialIterator : 
+	EqualityIterator,  SequentialIterator {
+
+	//  l o c a t i n g   e l e m e n t s
+	boolean set_to_first_element_with_value (in any element)
+	    raises (ElementInvalid);
+	boolean set_to_last_element_with_value (in any element)
+	    raises (ElementInvalid);
+	boolean set_to_previous_element_with_value (in any element)
+	    raises (ElementInvalid);
+
+    };
+
+
+    interface Collection {
+	//   e l e m e n t   t y p e   i n f o r m a t i o n
+	readonly attribute CORBA::TypeCode element_type;
+		
+	// a d d i n g   e l e m e n t s
+	boolean add_element (in any element) 
+	    raises (ElementInvalid);
+	boolean add_element_set_iterator (
+					  in any      element, 
+					  in Iterator where) 
+	    raises (IteratorInvalid, ElementInvalid); 
+	void add_all_from (in Collection collector) 
+	    raises (ElementInvalid);
+		
+	//   r e m o v i n g   e l e m e n t s
+	void remove_element_at (in Iterator where) 
+	    raises (IteratorInvalid,  IteratorInBetween); 
+	unsigned long remove_all ();
+		
+	//  r e p l a c i n g   e l e m e n t s
+	void replace_element_at (
+				 in Iterator where, 
+				 in any      element)
+	    raises(IteratorInvalid, IteratorInBetween, ElementInvalid); 
+		
+	// r e t r i e v i n g   e l e m e n t s
+	boolean retrieve_element_at (
+				     in  Iterator where, 
+				     out any element)
+	    raises (IteratorInvalid, IteratorInBetween); 
+		
+	// i t e r a t i n g   o v e r   t h e   c o l l e c t i o n
+	boolean all_elements_do (in Command what) ;
+		
+	//   i n q u i r i n g   c o l l e c t i o n   
+	//       i n f o r m a t i o n 
+	unsigned long number_of_elements ();
+	boolean is_empty ();
+		
+	//  d e s t r o y i n g   c o l l e c t i o n
+	void destroy(); 
+		
+	//  c r e a t i n g   i t e r a t o r s
+	Iterator create_iterator (in boolean read_only); 
+
+    }; 
+	
+    //  O r d e r e d C o l l e c t i o n
+    interface OrderedCollection: Collection {
+
+	//  r e m o v i n g   e l e m e n t s
+	void remove_element_at_position (in unsigned long position)
+	    raises  (PositionInvalid);
+	void remove_first_element () raises (EmptyCollection);
+	void remove_last_element () raises (EmptyCollection); 
+		
+	//  r e t r i e v i n g   e l e m e n t s
+	boolean retrieve_element_at_position (
+					      in  unsigned long position, 
+					      out any           element)
+	    raises (PositionInvalid);
+	boolean retrieve_first_element (out any element) 
+	    raises  (EmptyCollection);
+	boolean retrieve_last_element (out any element) 
+	    raises  (EmptyCollection);
+		
+	//  c r e a t i n g   i t e r a t o r s
+	OrderedIterator create_ordered_iterator(
+						in boolean read_only, 
+						in boolean reverse_iteration);
+		
+    }; 
+	
+	
+    // S e q u e n t i a l C o l l e c t i o n
+    interface SequentialCollection: OrderedCollection {
+
+	//   a d d i n g   e l e m e n t s   
+	void add_element_as_first (in any element) 
+	    raises (ElementInvalid);
+		
+	void add_element_as_first_set_iterator (
+						in any       element, 
+						in Iterator  where)
+	    raises (ElementInvalid, IteratorInvalid); 
+	void add_element_as_last (in any element) 
+	    raises (ElementInvalid);
+	void add_element_as_last_set_iterator (
+					       in any       element, 
+					       in Iterator  where)
+	    raises (ElementInvalid, IteratorInvalid); 
+	void add_element_as_next (
+				  in any      element, 
+				  in Iterator where)
+	    raises  (ElementInvalid, IteratorInvalid); 
+	void add_element_as_previous (
+				      in any      element, 
+				      in Iterator where)
+	    raises (ElementInvalid,IteratorInvalid); 
+	void add_element_at_position (
+				      in unsigned long position, 
+				      in any           element)
+	    raises(PositionInvalid, ElementInvalid); 
+	void add_element_at_position_set_iterator (
+						   in unsigned long  position, 
+						   in any            element, 
+						   in Iterator       where) 
+	    raises  (PositionInvalid, ElementInvalid, IteratorInvalid); 
+		
+	//  r e p l a c i n g   e l e m e n t s
+	void replace_element_at_position (
+					  in unsigned long position, 
+					  in any           element)
+	    raises (PositionInvalid, ElementInvalid);
+	void replace_first_element (in any element)
+	    raises (ElementInvalid,  EmptyCollection);
+	void replace_last_element (in any element) 
+	    raises (ElementInvalid,  EmptyCollection); 
+		
+	//  r e o r d e r i n g   e l e m e n t s
+	void sort (in Comparator comparison); void reverse(); 
+		
+    };
+	
+	
+    // S o r t e C o l l e c t i o n
+    interface SortedCollection: OrderedCollection{};
+	
+    // E q u a l i t y C o l l e c t i o n
+    interface EqualityCollection: Collection {
+
+	//  t e s t i n g   e l e m e n t   c o n t a i n m e n t
+	boolean contains_element (in any element) 
+	    raises(ElementInvalid);
+	boolean contains_all_from (in Collection collector)  
+	    raises(ElementInvalid); 
+		
+	//  a d d i n g   e l e m e n t s
+	boolean locate_or_add_element (in any element) 
+	    raises (ElementInvalid); 
+	boolean locate_or_add_element_set_iterator (
+						    in any      element, 
+						    in Iterator where)
+	    raises (ElementInvalid, IteratorInvalid); 
+		
+	//  l o c a t i n g   e l e m e n t s
+	boolean locate_element (
+				in any      element, 
+				in Iterator where) 
+	    raises (ElementInvalid, IteratorInvalid);
+	boolean locate_next_element (
+				     in any      element, 
+				     in Iterator where)
+	    raises (ElementInvalid, IteratorInvalid);
+	boolean locate_next_different_element (in Iterator where)
+	    raises  (IteratorInvalid, IteratorInBetween);
+		
+	//  r e m o v i n g   e l e m e n t s
+	boolean remove_element (in any element) 
+	    raises (ElementInvalid);
+	unsigned long remove_all_occurrences (in any element)
+	    raises (ElementInvalid); 
+		
+	//  i n q u i r i n g   c o l l e c t i o n   
+	//      i n f o r m a t i o n
+	unsigned long number_of_different_elements ();
+	unsigned long number_of_occurrences (in any element) 
+	    raises(ElementInvalid);
+		
+    };
+
+    // K e y C o l l e c t i o n
+    interface KeyCollection: Collection { 
+
+	//  K e y   t y p e   i n f o r m a t i o n
+	readonly attribute CORBA::TypeCode key_type; 
+		
+	//  t e s t i n g   c o n t a i n m e n t
+	boolean contains_element_with_key (in any key) 
+	    raises(KeyInvalid);
+	boolean contains_all_keys_from (in KeyCollection collector)
+	    raises(KeyInvalid);
+		
+	//  a d d i n g   e l e m e n t s
+	boolean locate_or_add_element_with_key (in any element)
+	    raises(ElementInvalid);
+	boolean locate_or_add_element_with_key_set_iterator (
+							     in any      element, 
+							     in Iterator where)
+	    raises (ElementInvalid,  IteratorInvalid);
+		
+	//  a d d i n g   o r   r e p l a c i n g   e l e m e n t s
+	boolean add_or_replace_element_with_key (in any element)
+	    raises(ElementInvalid); 
+	boolean add_or_replace_element_with_key_set_iterator (
+							      in any      element, 
+							      in Iterator where)
+	    raises (ElementInvalid,  IteratorInvalid); 
+		
+	//  r e m o v i n g   e l e m e n t s
+	boolean remove_element_with_key(in any key) 
+	    raises(KeyInvalid);
+	unsigned long remove_all_elements_with_key (in any key) 
+	    raises(KeyInvalid); 
+		
+	//  r e p l a c i n g   e l e m e n t s
+	boolean replace_element_with_key (in any element) 
+	    raises(ElementInvalid);
+	boolean replace_element_with_key_set_iterator (
+						       in any      element, 
+						       in Iterator where)
+	    raises (ElementInvalid, IteratorInvalid);
+		
+	//  r e t r i e v i n g   e l e m e n t s
+	boolean retrieve_element_with_key (
+					   in  any key, 
+					   out any element)
+	    raises (KeyInvalid); 
+		
+	//  c o m p u t i n g   t h e   k e y s
+	void key (in any element, out any key) 
+	    raises (ElementInvalid);
+	void keys (in AnySequence elements, out AnySequence keys)
+	    raises (ElementInvalid);
+		
+	//  l o c a t i n g   e l e m e n t s
+	boolean locate_element_with_key (
+					 in any      key, 
+					 in Iterator where)
+	    raises (KeyInvalid, IteratorInvalid);
+	boolean locate_next_element_with_key (
+					      in any      key, 
+					      in Iterator where)
+	    raises (KeyInvalid, IteratorInvalid);
+	boolean locate_next_element_with_different_key (
+							in Iterator where)
+	    raises (IteratorInBetween, IteratorInvalid);
+		
+	//  i n q u i r i n g   c o l l e c t i o n   
+	//      i n f o r m a t i o n
+	unsigned long number_of_different_keys ();
+	unsigned long number_of_elements_with_key (in any key) 
+	    raises(KeyInvalid);
+		
+    };
+
+
+    // E q u a l i t y K e y C o l l e c t i o n
+    interface EqualityKeyCollection : 
+	EqualityCollection, KeyCollection{};
+
+    // K e y S o r t e d C o l l e c t i o n
+    interface KeySortedCollection : 
+	KeyCollection, SortedCollection { 
+
+	//  l o c a t i n g   e l e m e n t s
+	boolean locate_first_element_with_key (
+					       in any      key, 
+					       in Iterator where)
+	    raises (KeyInvalid, IteratorInvalid); 
+	boolean locate_last_element_with_key(
+					     in any      key, 
+					     in Iterator where)
+	    raises (KeyInvalid, IteratorInvalid);
+	boolean locate_previous_element_with_key (
+						  in any      key, 
+						  in Iterator where)
+	    raises (KeyInvalid, IteratorInvalid); 
+	boolean locate_previous_element_with_different_key(
+							   in Iterator  where)
+	    raises (IteratorInBetween, IteratorInvalid);
+
+    };
+	
+	
+    // E q u a l i t y S o r t e d C o l l e c t i o n
+    interface EqualitySortedCollection : 
+	EqualityCollection,  SortedCollection {
+	
+	//  l o c a t i n g   e l e m e n t s
+	boolean locate_first_element (
+				      in any      element, 
+				      in Iterator where)
+	    raises (ElementInvalid, IteratorInvalid);
+	boolean locate_last_element (
+				     in any      element, 
+				     in Iterator where)
+	    raises (ElementInvalid, IteratorInvalid);
+	boolean locate_previous_element (
+					 in any      element, 
+					 in Iterator where)
+	    raises  (ElementInvalid, IteratorInvalid);
+	boolean locate_previous_different_element (in Iterator where)
+	    raises  (IteratorInvalid);
+
+    }; 
+	
+	
+    // E q u a l i t y K e y S o r t e d C o l l e c t i o n
+    interface EqualityKeySortedCollection : 
+	EqualityCollection, KeyCollection,  SortedCollection {};
+
+
+    // E q u a l i t y S e q u e n t i a l C o l l e c t i o n
+    interface EqualitySequentialCollection : 
+	EqualityCollection,  SequentialCollection  {
+
+	//  l o c a t i n g   e l e m e n t s
+	boolean locate_first_element_with_value (
+						 in any      element, 
+						 in Iterator where)
+	    raises (ElementInvalid, IteratorInvalid);
+	boolean locate_last_element_with_value (
+						in any      element, 
+						in Iterator where)
+	    raises (ElementInvalid, IteratorInvalid);
+	boolean locate_previous_element_with_value (
+						    in any      element, 
+						    in Iterator where)
+	    raises (ElementInvalid, IteratorInvalid);
+		
+    };
+	
+	
+    // THE CONCRETE COLLECTION INTERFACES
+	
+	
+    // K e y S e t
+    interface KeySet: KeyCollection {};
+	
+    // K e y B a g
+    interface KeyBag: KeyCollection {};
+	
+    // M a p
+    interface Map : EqualityKeyCollection { 
+	
+	//  s e t   t h e o r e t i c a l   o p e r a t i o n s
+	void difference_with (in Map collector) 
+	    raises (ElementInvalid);
+	void add_difference (
+			     in Map collector1, 
+			     in Map collector2) 
+	    raises  (ElementInvalid);
+	void intersection_with (in Map collector) 
+	    raises (ElementInvalid);
+	void add_intersection (
+			       in Map collector1, 
+			       in Map collector2)
+	    raises  (ElementInvalid);
+	void union_with (in Map collector) 
+	    raises (ElementInvalid);
+	void add_union (
+			in Map collector1, 
+			in Map collector2) 
+	    raises (ElementInvalid);
+		
+	//   t e s t i n g   e q u a l i t y
+	boolean equal (in Map collector) 
+	    raises (ElementInvalid);
+	boolean not_equal (in Map collector) 
+	    raises(ElementInvalid);
+		
+    };
+	
+	
+    // R e l a t i o n
+    interface Relation : EqualityKeyCollection { 
+	
+	//  e q u a l ,   n o t _ e q u a l ,   a n d   t h e   
+	//  s e t - t h e o r e t i c a l   o p e r a t i o n s   a s   
+	//  d e f i n e d   f o r   M a p  
+    }; 
+
+
+    // S e t
+    interface Set : EqualityCollection { 
+	
+	//  e q u a l ,   n o t _ e q u a l ,   a n d   t h e   s e t   
+	//  t h e o r e t i c a l   o p e r a t i o n s   a s   
+	//  d e f i n e d   f o r   M a p
+    }; 
+	
+	
+    // B a g
+    interface Bag : EqualityCollection { 
+	
+	//  e q u a l ,   n o t _ e q u a l ,   a n d   t h e   s e t   
+	//  t h e o r e t i c a l   o p e r a t i o n s   a s   d e f i n e d   
+	//  d e f i n e d   f o r   M a p
+	
+    };
+	
+	
+    // K e y S o r t e d S e t
+    interface KeySortedSet : KeySortedCollection {
+	long compare (	in KeySortedSet collector, 
+			in Comparator comparison); 
+    };
+	
+	
+    // K e y S o r t e d B a g
+    interface KeySortedBag : KeySortedCollection {
+	long compare (	in KeySortedBag collector, 
+			in Comparator comparison); 
+    };
+
+
+    // S o r t e d M a p
+    interface SortedMap : EqualityKeySortedCollection { 
+	
+	//  e q u a l ,   n o t _ e q u a l ,   a n d   t h e   s e t   
+	// t h e o r e t i c a l   o p e r a t i o n s
+	long compare (	in SortedMap collector, 
+			in Comparator comparison);
+    };
+	
+	
+    // S o r t e d R e l a t i o n
+    interface SortedRelation : EqualityKeySortedCollection {
+	
+	//  e q u a l ,   n o t _ e q u a l ,   a n d   t h e   s e t
+	//  t h e o r e t i c a l   o p e r a t i o n s
+	long compare (	in SortedRelation collector, 
+			in Comparator  comparison);
+    };
+	
+	
+    // S o r t e d S e t
+    interface SortedSet : EqualitySortedCollection {
+	
+	// e q u a l ,   n o t _ e q u a l ,   a n d   t h e   s e t   
+	// t h e o r e t i c a l   o p e r a t i o n s
+	long compare (	in SortedSet collector, 
+			in Comparator comparison);
+    };
+	
+	
+    // S o r t e d B a g
+    interface SortedBag: EqualitySortedCollection { 
+	
+	//  e q u a l ,   n o t _ e q u a l ,   a n d   t h e   s e t
+	// t h e o r e t i c a l   o p e r a t i o n s
+	long compare (	in SortedBag collector, 
+			in Comparator comparison);
+    };
+	
+	
+    // S e q u e n c e
+    interface CSequence : SequentialCollection { 
+	//  C o m p a r i s o n
+	long compare (	in CSequence collector, 
+			in Comparator comparison);
+    };
+
+
+    // E q u a l i t y S e q u e n c e
+    interface EqualitySequence : EqualitySequentialCollection { 
+	
+	//  t e s t   o n   e q u a l i t y
+	boolean equal     (in EqualitySequence collector);
+	boolean not_equal (in EqualitySequence collector); 
+	//   c o m p a r i s o n
+	long compare (     in EqualitySequence collector, 
+			   in Comparator       comparison);
+    };
+	
+	
+    // H e a p
+    interface Heap : Collection {};
+
+
+    //  R e s t r i c t e d   A c c e s s   C o l l e c t i o n s 
+
+    interface RestrictedAccessCollection {
+
+	//  g e t t i n g   i n f o r m a t i o n   o n   
+	//      c o l l e c t i o n   s t a t e   
+	boolean unfilled ();
+	unsigned long size ();
+		
+	//  r e m o v i n g   e l e m e n t s
+	void purge ();
+    };
+
+
+    // Q u e u e
+    interface Queue : RestrictedAccessCollection {
+	
+	//  a d d i n g   e l e m e n t s
+	void enqueue (in any element) raises (ElementInvalid);
+		
+	//   r e m o v i n g   e l e m e n t s
+	void dequeue () raises (EmptyCollection);
+	boolean element_dequeue (out any element) 
+	    raises (EmptyCollection);
+    }; 
+	
+	
+    // D e q u e
+    interface Deque : RestrictedAccessCollection {
+	
+	//  a d d i n g   e l e m e n t s
+	void enqueue_as_first (in any element) 
+	    raises (ElementInvalid);
+	void enqueue_as_last (in any element) 
+	    raises(ElementInvalid);
+	
+	//  r e m o v i n g   e l e m e n t s
+	void dequeue_first () raises (EmptyCollection);
+	boolean element_dequeue_first (out any element) 
+	    raises (EmptyCollection);
+	void dequeue_last () raises (EmptyCollection);
+	boolean element_dequeue_last (out any element) 
+	    raises (EmptyCollection);
+	
+    };
+
+
+    // S t a c k
+    interface Stack: RestrictedAccessCollection {
+
+	//  a d d i n g   e l e m e n t s
+	void push (in any element) raises (ElementInvalid);
+		
+	//  r e m o v i n g   a n d   r e t r i e v i n g   
+	//      e l e m e n t s
+	void pop () raises (EmptyCollection);
+	boolean element_pop (out any element) 
+	    raises (EmptyCollection);
+	boolean top (out any element) 
+	    raises (EmptyCollection);
+    };
+
+
+    // P r i o r i t y Q u e u e
+    interface PriorityQueue: RestrictedAccessCollection {
+	//  a d d i n g   e l e m e n t s
+	void enqueue (in any element) raises (ElementInvalid);
+	
+	//  r e m o v i n g   e l e m e n t s
+	void dequeue () raises (EmptyCollection);
+	boolean element_dequeue (out any element) 
+	    raises (EmptyCollection);
+    };
+
+
+    // COLLECTION FACTORIES
+
+    // C o l l e c t i o n F a c t o r y
+    interface CollectionFactory { 
+	Collection generic_create (in ParameterList parameters)
+	    raises (ParameterInvalid); 
+    };
+
+
+    // C o l l e c t i o n F a c t o r i e s
+    interface CollectionFactories : CollectionFactory { 
+	boolean add_factory (
+			     in Istring            collection_interface, 
+			     in Istring            impl_category, 
+			     in Istring            impl_interface, 
+			     in CollectionFactory  _factory);
+	boolean remove_factory (
+				in Istring collection_interface, 
+				in Istring impl_category, 
+				in Istring impl_interface); 
+	Collection create (in ParameterList parameters) 
+	    raises (ParameterInvalid);
+    }; 
+
+
+    // R A C o l l e c t i o n F a ct o r y
+    interface RACollectionFactory { 
+	RestrictedAccessCollection generic_create (
+						   in ParameterList  parameters)
+	    raises (ParameterInvalid); 
+    };
+
+
+    // R A C o l l e c t i o n F a c t o r i e s
+    interface RACollectionFactories : RACollectionFactory {
+	boolean add_factory (
+			     in Istring              collection_interface, 
+			     in Istring              impl_category, 
+			     in Istring              impl_interface, 
+			     in RACollectionFactory  _factory); 
+	boolean remove_factory (
+				in Istring collection_interface, 
+				in Istring impl_category, 
+				in Istring impl_interface); 
+	Collection create ( in ParameterList parameters) 
+	    raises (ParameterInvalid);
+    }; 
+
+
+    // K e y S e t F a c t o r y
+    interface KeySetFactory : CollectionFactory { 
+	KeySet create (	in Operations    ops, 
+			in unsigned long expected_size);
+    };
+
+    // K e y B a g F a c t o r y
+    interface KeyBagFactory : CollectionFactory {
+	KeyBag create ( in Operations    ops, 
+			in unsigned long expected_size);
+    };
+
+
+    // M a p F a c t o r y
+    interface MapFactory : CollectionFactory { 
+	Map create (in Operations    ops, 
+		    in unsigned long expected_size);
+    };
+
+
+    // R e l a t i o n F a c t o r y
+    interface RelationFactory : CollectionFactory { 
+	Relation create (	in Operations    ops, 
+				in unsigned long expected_size);
+    };
+
+
+    // S e t F a c t o r y
+    interface SetFactory : CollectionFactory {
+	Set create (in Operations ops, 
+		    in unsigned long expected_size);
+    };
+
+
+    // B a g F a c t o r y
+    interface BagFactory {
+	Bag create (in Operations ops, 
+		    in unsigned long expected_size);
+    };
+
+
+    // K e y S o r t e d S e t F a c t o r y
+    interface KeySortedSetFactory { 
+	KeySortedSet create (in Operations    ops, 
+			     in unsigned long expected_size);
+    };
+
+
+    // K e y S o r t e d B a g F a c t o r y
+    interface KeySortedBagFactory : CollectionFactory {
+	KeySortedBag create (in Operations    ops, 
+			     in unsigned long expected_size);
+    }; 
+
+
+    // S o r t e d M a p F a c t o r y
+    interface SortedMapFactory : CollectionFactory {
+	SortedMap create (in Operations    ops, 
+			  in unsigned long expected_size);
+    };
+
+
+    // S o r t e d R e l a t i o n F a c t o r y
+    interface SortedRelationFactory : CollectionFactory {
+	SortedRelation create (	in Operations    ops, 
+				in unsigned long expected_size);
+    };
+
+
+    // S o r t e d S e t F a c t o r y
+    interface SortedSetFactory : CollectionFactory {
+	SortedSet create (	in Operations    ops, 
+				in unsigned long expected_size);
+    }; 
+
+
+    // S o r t e d B a g F a c t o r y
+    interface SortedBagFactory { 
+	SortedBag create (	in Operations    ops, 
+				in unsigned long expected_size);
+    };
+
+
+    // S e q u e n c e F a c t o r y
+    interface SequenceFactory : CollectionFactory {
+	CSequence create (	in Operations    ops, 
+				in unsigned long expected_size);
+    };
+
+
+    // E q u a l i t y S e q u e n c e F a c t o r y
+    interface EqualitySequenceFactory : CollectionFactory { 
+	EqualitySequence create (in Operations    ops, 
+				 in unsigned long expected_size);
+    };
+
+
+    // H e a p F a c t o r y
+    interface HeapFactory : CollectionFactory {
+	Heap create (in Operations    ops, 
+		     in unsigned long expected_size);
+    };
+
+
+    // Q u e u e F a c t o r y
+    interface QueueFactory : RACollectionFactory {
+	Queue create (	in Operations ops, 
+			in unsigned long expected_size);
+    };
+
+
+    // S t a c k F a c t o r y
+    interface StackFactory : RACollectionFactory {
+	Stack create (	in Operations    ops, 
+			in unsigned long expected_size);
+    };
+
+
+    // D e q u e F a c t o r y
+    interface DequeFactory : RACollectionFactory { 
+	Deque create (	in Operations    ops, 
+			in unsigned long expected_size);
+    };
+
+
+    // P r i o r i t y Q u e u e F a c t o r y
+    interface PriorityQueueFactory : RACollectionFactory {
+	PriorityQueue create (	in Operations    ops, 
+				in unsigned long expected_size);
+    };
+
+};
+#endif /* ifndef _COS_COLLECTION_IDL_ */!

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosCompoundExternalization.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosCompoundExternalization.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosCompoundExternalization.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,75 +1,75 @@
-// CosCompoundExternalization Module, p 8-20 CORBAservices,
-// Externalization Service V1.0, 3/94
-
-#ifndef __CosCompoundExternalization_IDL
-#define __CosCompoundExternalization_IDL
-
-#pragma prefix "omg.org"
-
-#include <CosGraphs.idl>
-#include <CosLifeCycle.idl>
-
-//
-//#include <CosStream.idl>
-//
-// including CosStream would lead to a cycle of inlcudes,
-// thus we have to define the necessary names as empty interfaces
-// here
-
-module CosStream
-{
-  interface Node{};
-  interface Streamable{};
-  interface StreamIO{};
-};
-
-module CosCompoundExternalization 
-{
-        interface Node;
-        interface Role;
-        interface Relationship;
-        interface PropagationCriteriaFactory;
-        
-        struct RelationshipHandle {
-                        Relationship theRelationship;
-                        CosObjectIdentity::ObjectIdentifier constantRandomId;
-        };
-
-        interface Node : CosGraphs::Node, CosStream::Streamable
-	  {
-                        void externalize_node (in CosStream::StreamIO sio);
-                        void internalize_node (in CosStream::StreamIO sio,
-                                                in CosLifeCycle::FactoryFinder there,
-                                                out CosGraphs::Node::Roles rolesOfNode)
-                                raises (CosLifeCycle::NoFactory);
-        };
-
-        interface Role : CosGraphs::Role {
-                        void externalize_role (in CosStream::StreamIO sio); 
-                        void internalize_role (in CosStream::StreamIO sio); 
-                        CosGraphs::PropagationValue externalize_propagation (
-                                                in RelationshipHandle rel,
-                                                in CosRelationships::RoleName toRoleName,
-                                                out boolean sameForAll);
-                };
-
-        interface Relationship : 
-                                CosRelationships::Relationship {
-                  void externalize_relationship (
-			in CosStream::StreamIO sio);
-			void internalize_relationship(
-				in CosStream::StreamIO sio,
-				in CosGraphs::NamedRoles newRoles);
-                        CosGraphs::PropagationValue externalize_propagation (
-				in CosRelationships::RoleName fromRoleName,
-				in CosRelationships::RoleName toRoleName,
-				out boolean sameForAll);
-        };
-
-        interface PropagationCriteriaFactory {
-                        CosGraphs::TraversalCriteria create_for_externalize( );
-        };
-
-};
-
-#endif
+// CosCompoundExternalization Module, p 8-20 CORBAservices,
+// Externalization Service V1.0, 3/94
+
+#ifndef __CosCompoundExternalization_IDL
+#define __CosCompoundExternalization_IDL
+
+#pragma prefix "omg.org"
+
+#include <CosGraphs.idl>
+#include <CosLifeCycle.idl>
+
+//
+//#include <CosStream.idl>
+//
+// including CosStream would lead to a cycle of inlcudes,
+// thus we have to define the necessary names as empty interfaces
+// here
+
+module CosStream
+{
+  interface Node{};
+  interface Streamable{};
+  interface StreamIO{};
+};
+
+module CosCompoundExternalization 
+{
+        interface Node;
+        interface Role;
+        interface Relationship;
+        interface PropagationCriteriaFactory;
+        
+        struct RelationshipHandle {
+                        Relationship theRelationship;
+                        CosObjectIdentity::ObjectIdentifier constantRandomId;
+        };
+
+        interface Node : CosGraphs::Node, CosStream::Streamable
+	  {
+                        void externalize_node (in CosStream::StreamIO sio);
+                        void internalize_node (in CosStream::StreamIO sio,
+                                                in CosLifeCycle::FactoryFinder there,
+                                                out CosGraphs::Node::Roles rolesOfNode)
+                                raises (CosLifeCycle::NoFactory);
+        };
+
+        interface Role : CosGraphs::Role {
+                        void externalize_role (in CosStream::StreamIO sio); 
+                        void internalize_role (in CosStream::StreamIO sio); 
+                        CosGraphs::PropagationValue externalize_propagation (
+                                                in RelationshipHandle rel,
+                                                in CosRelationships::RoleName toRoleName,
+                                                out boolean sameForAll);
+                };
+
+        interface Relationship : 
+                                CosRelationships::Relationship {
+                  void externalize_relationship (
+			in CosStream::StreamIO sio);
+			void internalize_relationship(
+				in CosStream::StreamIO sio,
+				in CosGraphs::NamedRoles newRoles);
+                        CosGraphs::PropagationValue externalize_propagation (
+				in CosRelationships::RoleName fromRoleName,
+				in CosRelationships::RoleName toRoleName,
+				out boolean sameForAll);
+        };
+
+        interface PropagationCriteriaFactory {
+                        CosGraphs::TraversalCriteria create_for_externalize( );
+        };
+
+};
+
+#endif

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosCompoundLifeCycle.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosCompoundLifeCycle.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosCompoundLifeCycle.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,122 +1,122 @@
-// CosCompoundLifeCycle Module, p 6-30 CORBAservices,
-// Life Cycle Service V1.0, 3/94
-
-#include <CosLifeCycle.idl>
-#include <CosRelationships.idl>
-#include <CosGraphs.idl>
-
-#pragma prefix "omg.org"
-
-module CosCompoundLifeCycle 
-{
-        interface OperationsFactory; 
-        interface Operations;
-        interface Node;
-        interface Role;
-        interface Relationship;
-        interface PropagationCriteriaFactory;
-        
-        enum Operation {copy, move, remove};
-
-        struct RelationshipHandle {
-                        Relationship the_relationship;
-                        CosObjectIdentity::ObjectIdentifier constant_random_id;
-        };
-
-        interface OperationsFactory {
-                        Operations create_compound_operations();
-        };
-
-        interface Operations {
-                        Node copy (
-                                                in Node starting_node,
-                                                in CosLifeCycle::FactoryFinder there,
-                                                in CosLifeCycle::Criteria the_criteria)
-                                raises (CosLifeCycle::NoFactory,
-                                                CosLifeCycle::NotCopyable,
-                                                CosLifeCycle::InvalidCriteria,
-                                                CosLifeCycle::CannotMeetCriteria);
-                        void move (
-                                                in Node starting_node,
-                                                in CosLifeCycle::FactoryFinder there,
-                                                in CosLifeCycle::Criteria the_criteria)
-                                raises (CosLifeCycle::NoFactory,
-                                                CosLifeCycle::NotMovable,
-                                                CosLifeCycle::InvalidCriteria,
-                                                CosLifeCycle::CannotMeetCriteria);
-                        void remove (in Node starting_node)
-                                raises (CosLifeCycle::NotRemovable);
-                        void destroy();
-                };
-
-        interface Node : CosGraphs::Node {
-                        exception NotLifeCycleObject {};
-                        void copy_node ( in CosLifeCycle::FactoryFinder there,
-                                                in CosLifeCycle::Criteria the_criteria,
-                                                out Node new_node,
-                                                out CosGraphs::Node::Roles roles_of_new_node)
-                                raises (CosLifeCycle::NoFactory,
-                                                CosLifeCycle::NotCopyable,
-                                                CosLifeCycle::InvalidCriteria,
-                                                CosLifeCycle::CannotMeetCriteria);
-                        void move_node (in CosLifeCycle::FactoryFinder there, 
-                                                in CosLifeCycle::Criteria the_criteria)
-                                raises (CosLifeCycle::NoFactory,
-                                                CosLifeCycle::NotMovable,
-                                                CosLifeCycle::InvalidCriteria,
-                                                CosLifeCycle::CannotMeetCriteria);
-                        void remove_node ()
-                                raises (CosLifeCycle::NotRemovable);
-                        CosLifeCycle::LifeCycleObject get_life_cycle_object()
-                                raises (NotLifeCycleObject);
-                };
-
-        interface Role : CosGraphs::Role {
-                        Role copy_role (in CosLifeCycle::FactoryFinder there, 
-                                                in CosLifeCycle::Criteria the_criteria)
-                                raises (CosLifeCycle::NoFactory,
-                                                CosLifeCycle::NotCopyable,
-                                                CosLifeCycle::InvalidCriteria,
-                                                CosLifeCycle::CannotMeetCriteria);
-                        void move_role (in CosLifeCycle::FactoryFinder there, 
-                                                in CosLifeCycle::Criteria the_criteria)
-                                raises (CosLifeCycle::NoFactory,
-                                                CosLifeCycle::NotMovable,
-                                                CosLifeCycle::InvalidCriteria,
-                                                CosLifeCycle::CannotMeetCriteria);
-                        CosGraphs::PropagationValue life_cycle_propagation (
-                                                in Operation op,
-                                                in RelationshipHandle rel,
-                                                in CosRelationships::RoleName to_role_name,
-                                                out boolean same_for_all);
-                };
-
-        interface Relationship : 
-                                CosRelationships::Relationship {
-                        Relationship copy_relationship (
-                                                in CosLifeCycle::FactoryFinder there,
-                                                in CosLifeCycle::Criteria the_criteria,
-                                                in CosGraphs::NamedRoles new_roles)
-                                raises (CosLifeCycle::NoFactory,
-                                                CosLifeCycle::NotCopyable,
-                                                CosLifeCycle::InvalidCriteria,
-                                                CosLifeCycle::CannotMeetCriteria);
-                        void move_relationship (
-                                                in CosLifeCycle::FactoryFinder there,
-                                                in CosLifeCycle::Criteria the_criteria)
-                                raises (CosLifeCycle::NoFactory,
-                                                CosLifeCycle::NotMovable,
-                                                CosLifeCycle::InvalidCriteria,
-                                                CosLifeCycle::CannotMeetCriteria);
-                        CosGraphs::PropagationValue life_cycle_propagation (
-                                                in Operation op,
-                                                in CosRelationships::RoleName from_role_name,
-                                                in CosRelationships::RoleName to_role_name,
-                                                out boolean same_for_all);
-        };
-
-        interface PropagationCriteriaFactory {
-                        CosGraphs::TraversalCriteria create(in Operation op);
-        };
-
-};
+// CosCompoundLifeCycle Module, p 6-30 CORBAservices,
+// Life Cycle Service V1.0, 3/94
+
+#include <CosLifeCycle.idl>
+#include <CosRelationships.idl>
+#include <CosGraphs.idl>
+
+#pragma prefix "omg.org"
+
+module CosCompoundLifeCycle 
+{
+        interface OperationsFactory; 
+        interface Operations;
+        interface Node;
+        interface Role;
+        interface Relationship;
+        interface PropagationCriteriaFactory;
+        
+        enum Operation {copy, move, remove};
+
+        struct RelationshipHandle {
+                        Relationship the_relationship;
+                        CosObjectIdentity::ObjectIdentifier constant_random_id;
+        };
+
+        interface OperationsFactory {
+                        Operations create_compound_operations();
+        };
+
+        interface Operations {
+                        Node copy (
+                                                in Node starting_node,
+                                                in CosLifeCycle::FactoryFinder there,
+                                                in CosLifeCycle::Criteria the_criteria)
+                                raises (CosLifeCycle::NoFactory,
+                                                CosLifeCycle::NotCopyable,
+                                                CosLifeCycle::InvalidCriteria,
+                                                CosLifeCycle::CannotMeetCriteria);
+                        void move (
+                                                in Node starting_node,
+                                                in CosLifeCycle::FactoryFinder there,
+                                                in CosLifeCycle::Criteria the_criteria)
+                                raises (CosLifeCycle::NoFactory,
+                                                CosLifeCycle::NotMovable,
+                                                CosLifeCycle::InvalidCriteria,
+                                                CosLifeCycle::CannotMeetCriteria);
+                        void remove (in Node starting_node)
+                                raises (CosLifeCycle::NotRemovable);
+                        void destroy();
+                };
+
+        interface Node : CosGraphs::Node {
+                        exception NotLifeCycleObject {};
+                        void copy_node ( in CosLifeCycle::FactoryFinder there,
+                                                in CosLifeCycle::Criteria the_criteria,
+                                                out Node new_node,
+                                                out CosGraphs::Node::Roles roles_of_new_node)
+                                raises (CosLifeCycle::NoFactory,
+                                                CosLifeCycle::NotCopyable,
+                                                CosLifeCycle::InvalidCriteria,
+                                                CosLifeCycle::CannotMeetCriteria);
+                        void move_node (in CosLifeCycle::FactoryFinder there, 
+                                                in CosLifeCycle::Criteria the_criteria)
+                                raises (CosLifeCycle::NoFactory,
+                                                CosLifeCycle::NotMovable,
+                                                CosLifeCycle::InvalidCriteria,
+                                                CosLifeCycle::CannotMeetCriteria);
+                        void remove_node ()
+                                raises (CosLifeCycle::NotRemovable);
+                        CosLifeCycle::LifeCycleObject get_life_cycle_object()
+                                raises (NotLifeCycleObject);
+                };
+
+        interface Role : CosGraphs::Role {
+                        Role copy_role (in CosLifeCycle::FactoryFinder there, 
+                                                in CosLifeCycle::Criteria the_criteria)
+                                raises (CosLifeCycle::NoFactory,
+                                                CosLifeCycle::NotCopyable,
+                                                CosLifeCycle::InvalidCriteria,
+                                                CosLifeCycle::CannotMeetCriteria);
+                        void move_role (in CosLifeCycle::FactoryFinder there, 
+                                                in CosLifeCycle::Criteria the_criteria)
+                                raises (CosLifeCycle::NoFactory,
+                                                CosLifeCycle::NotMovable,
+                                                CosLifeCycle::InvalidCriteria,
+                                                CosLifeCycle::CannotMeetCriteria);
+                        CosGraphs::PropagationValue life_cycle_propagation (
+                                                in Operation op,
+                                                in RelationshipHandle rel,
+                                                in CosRelationships::RoleName to_role_name,
+                                                out boolean same_for_all);
+                };
+
+        interface Relationship : 
+                                CosRelationships::Relationship {
+                        Relationship copy_relationship (
+                                                in CosLifeCycle::FactoryFinder there,
+                                                in CosLifeCycle::Criteria the_criteria,
+                                                in CosGraphs::NamedRoles new_roles)
+                                raises (CosLifeCycle::NoFactory,
+                                                CosLifeCycle::NotCopyable,
+                                                CosLifeCycle::InvalidCriteria,
+                                                CosLifeCycle::CannotMeetCriteria);
+                        void move_relationship (
+                                                in CosLifeCycle::FactoryFinder there,
+                                                in CosLifeCycle::Criteria the_criteria)
+                                raises (CosLifeCycle::NoFactory,
+                                                CosLifeCycle::NotMovable,
+                                                CosLifeCycle::InvalidCriteria,
+                                                CosLifeCycle::CannotMeetCriteria);
+                        CosGraphs::PropagationValue life_cycle_propagation (
+                                                in Operation op,
+                                                in CosRelationships::RoleName from_role_name,
+                                                in CosRelationships::RoleName to_role_name,
+                                                out boolean same_for_all);
+        };
+
+        interface PropagationCriteriaFactory {
+                        CosGraphs::TraversalCriteria create(in Operation op);
+        };
+
+};

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosConcurrencyControl.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosConcurrencyControl.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosConcurrencyControl.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,66 +1,66 @@
-
-// CosConcurrency Control Module, p 7-8 CORBAservices, 
-// Concurrency Control Service V1.0, 3/94
-
-#include <CosTransactions.idl>
-
-#pragma prefix "omg.org"
-
-module CosConcurrencyControl {
-
-    enum lock_mode {
-        read,
-        write,
-        upgrade,
-        intention_read,
-        intention_write
-    };
-
-    exception LockNotHeld{};
-
-    interface LockCoordinator
-    {
-                void drop_locks();
-    };
-
-    interface LockSet
-    {
-        void lock(in lock_mode mode);
-        boolean try_lock(in lock_mode mode);
-
-        void unlock(in lock_mode mode)
-            raises(LockNotHeld);
-        void change_mode(in lock_mode held_mode,
-                         in lock_mode new_mode)
-           raises(LockNotHeld);
-        LockCoordinator get_coordinator(
-            in CosTransactions::Coordinator which);
-    };
-
-    interface TransactionalLockSet
-    {
-        void lock(in CosTransactions::Coordinator current,
-                  in lock_mode mode);
-        boolean try_lock(in CosTransactions::Coordinator current,
-                         in lock_mode mode);
-        void unlock(in CosTransactions::Coordinator current,
-                    in lock_mode mode)
-           raises(LockNotHeld);
-        void change_mode(in CosTransactions::Coordinator current,
-                         in lock_mode held_mode,
-                         in lock_mode new_mode)
-           raises(LockNotHeld);
-        LockCoordinator get_coordinator(
-            in CosTransactions::Coordinator which);
-    };
-
-    interface LockSetFactory
-    {
-        LockSet create();
-        LockSet create_related(in LockSet which);
-        TransactionalLockSet create_transactional();
-        TransactionalLockSet create_transactional_related(in
-            TransactionalLockSet which);
-    };
-};
-
+
+// CosConcurrency Control Module, p 7-8 CORBAservices, 
+// Concurrency Control Service V1.0, 3/94
+
+#include <CosTransactions.idl>
+
+#pragma prefix "omg.org"
+
+module CosConcurrencyControl {
+
+    enum lock_mode {
+        read,
+        write,
+        upgrade,
+        intention_read,
+        intention_write
+    };
+
+    exception LockNotHeld{};
+
+    interface LockCoordinator
+    {
+                void drop_locks();
+    };
+
+    interface LockSet
+    {
+        void lock(in lock_mode mode);
+        boolean try_lock(in lock_mode mode);
+
+        void unlock(in lock_mode mode)
+            raises(LockNotHeld);
+        void change_mode(in lock_mode held_mode,
+                         in lock_mode new_mode)
+           raises(LockNotHeld);
+        LockCoordinator get_coordinator(
+            in CosTransactions::Coordinator which);
+    };
+
+    interface TransactionalLockSet
+    {
+        void lock(in CosTransactions::Coordinator current,
+                  in lock_mode mode);
+        boolean try_lock(in CosTransactions::Coordinator current,
+                         in lock_mode mode);
+        void unlock(in CosTransactions::Coordinator current,
+                    in lock_mode mode)
+           raises(LockNotHeld);
+        void change_mode(in CosTransactions::Coordinator current,
+                         in lock_mode held_mode,
+                         in lock_mode new_mode)
+           raises(LockNotHeld);
+        LockCoordinator get_coordinator(
+            in CosTransactions::Coordinator which);
+    };
+
+    interface LockSetFactory
+    {
+        LockSet create();
+        LockSet create_related(in LockSet which);
+        TransactionalLockSet create_transactional();
+        TransactionalLockSet create_transactional_related(in
+            TransactionalLockSet which);
+    };
+};
+

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosContainment.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosContainment.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosContainment.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,17 +1,17 @@
-// CosContainment Module, p 9- 48 CORBAservices, Relationship
-// Service V1.0, 3/94
-
-#include <CosGraphs.idl>
-
-#pragma prefix "omg.org"
-
-module CosContainment {
-
-        interface Relationship :
-                        CosRelationships::Relationship {};
-
-        interface ContainsRole : CosGraphs::Role {};
-
-        interface ContainedInRole : CosGraphs::Role {};
-
-};
+// CosContainment Module, p 9- 48 CORBAservices, Relationship
+// Service V1.0, 3/94
+
+#include <CosGraphs.idl>
+
+#pragma prefix "omg.org"
+
+module CosContainment {
+
+        interface Relationship :
+                        CosRelationships::Relationship {};
+
+        interface ContainsRole : CosGraphs::Role {};
+
+        interface ContainedInRole : CosGraphs::Role {};
+
+};

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosEventChannelAdmin.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosEventChannelAdmin.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosEventChannelAdmin.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,56 +1,56 @@
-//File: CosEventChannelAdmin.idl
-//Part of the Event Service
-
-#ifndef _COS_EVENT_CHANNEL_ADMIN_IDL_
-#define _COS_EVENT_CHANNEL_ADMIN_IDL_
-
-#include <CosEventComm.idl>
-
-#pragma prefix "omg.org"
-
-module CosEventChannelAdmin {
-
-   exception AlreadyConnected {};
-   exception TypeError {};
-
-   interface ProxyPushConsumer: CosEventComm::PushConsumer {
-      void connect_push_supplier(
-            in CosEventComm::PushSupplier push_supplier)
-         raises(AlreadyConnected);
-   };
-
-   interface ProxyPullSupplier: CosEventComm::PullSupplier {
-      void connect_pull_consumer(
-            in CosEventComm::PullConsumer pull_consumer)
-         raises(AlreadyConnected);
-   };
-
-   interface ProxyPullConsumer: CosEventComm::PullConsumer {
-      void connect_pull_supplier(
-            in CosEventComm::PullSupplier pull_supplier)
-         raises(AlreadyConnected,TypeError);
-   };
-
-   interface ProxyPushSupplier: CosEventComm::PushSupplier {
-      void connect_push_consumer(
-            in CosEventComm::PushConsumer push_consumer)
-         raises(AlreadyConnected, TypeError);
-   };
-
-   interface ConsumerAdmin {
-      ProxyPushSupplier obtain_push_supplier();
-      ProxyPullSupplier obtain_pull_supplier();
-   };
-
-   interface SupplierAdmin {
-      ProxyPushConsumer obtain_push_consumer();
-      ProxyPullConsumer obtain_pull_consumer();
-   };
-
-   interface EventChannel {
-      ConsumerAdmin for_consumers();
-      SupplierAdmin for_suppliers();
-      void destroy();
-   };
-};
-#endif /* ifndef _COS_EVENT_CHANNEL_ADMIN_IDL_ */
+//File: CosEventChannelAdmin.idl
+//Part of the Event Service
+
+#ifndef _COS_EVENT_CHANNEL_ADMIN_IDL_
+#define _COS_EVENT_CHANNEL_ADMIN_IDL_
+
+#include <CosEventComm.idl>
+
+#pragma prefix "omg.org"
+
+module CosEventChannelAdmin {
+
+   exception AlreadyConnected {};
+   exception TypeError {};
+
+   interface ProxyPushConsumer: CosEventComm::PushConsumer {
+      void connect_push_supplier(
+            in CosEventComm::PushSupplier push_supplier)
+         raises(AlreadyConnected);
+   };
+
+   interface ProxyPullSupplier: CosEventComm::PullSupplier {
+      void connect_pull_consumer(
+            in CosEventComm::PullConsumer pull_consumer)
+         raises(AlreadyConnected);
+   };
+
+   interface ProxyPullConsumer: CosEventComm::PullConsumer {
+      void connect_pull_supplier(
+            in CosEventComm::PullSupplier pull_supplier)
+         raises(AlreadyConnected,TypeError);
+   };
+
+   interface ProxyPushSupplier: CosEventComm::PushSupplier {
+      void connect_push_consumer(
+            in CosEventComm::PushConsumer push_consumer)
+         raises(AlreadyConnected, TypeError);
+   };
+
+   interface ConsumerAdmin {
+      ProxyPushSupplier obtain_push_supplier();
+      ProxyPullSupplier obtain_pull_supplier();
+   };
+
+   interface SupplierAdmin {
+      ProxyPushConsumer obtain_push_consumer();
+      ProxyPullConsumer obtain_pull_consumer();
+   };
+
+   interface EventChannel {
+      ConsumerAdmin for_consumers();
+      SupplierAdmin for_suppliers();
+      void destroy();
+   };
+};
+#endif /* ifndef _COS_EVENT_CHANNEL_ADMIN_IDL_ */

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosEventComm.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosEventComm.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosEventComm.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,33 +1,33 @@
-//File: CosEventComm.idl
-//Part of the Event Service
-
-#ifndef _COS_EVENT_COMM_IDL_
-#define _COS_EVENT_COMM_IDL_
-#pragma prefix "omg.org"
-
-module CosEventComm {
-
-   exception Disconnected{};
-
-   interface PushConsumer {
-      void push (in any data) raises(Disconnected);
-      void disconnect_push_consumer();
-   };
-
-    interface PushSupplier {
-      void disconnect_push_supplier();
-   };
-
-   interface PullSupplier {
-      any pull () raises(Disconnected);
-      any try_pull (out boolean has_event)
-         raises(Disconnected);
-      void disconnect_pull_supplier();
-   };
-
-   interface PullConsumer {
-      void disconnect_pull_consumer();
-   };
-
-};
-#endif /* ifndef _COS_EVENT_COMM_IDL_ */
+//File: CosEventComm.idl
+//Part of the Event Service
+
+#ifndef _COS_EVENT_COMM_IDL_
+#define _COS_EVENT_COMM_IDL_
+#pragma prefix "omg.org"
+
+module CosEventComm {
+
+   exception Disconnected{};
+
+   interface PushConsumer {
+      void push (in any data) raises(Disconnected);
+      void disconnect_push_consumer();
+   };
+
+    interface PushSupplier {
+      void disconnect_push_supplier();
+   };
+
+   interface PullSupplier {
+      any pull () raises(Disconnected);
+      any try_pull (out boolean has_event)
+         raises(Disconnected);
+      void disconnect_pull_supplier();
+   };
+
+   interface PullConsumer {
+      void disconnect_pull_consumer();
+   };
+
+};
+#endif /* ifndef _COS_EVENT_COMM_IDL_ */

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosExternalization.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosExternalization.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosExternalization.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,78 +1,78 @@
-// CosExternalization Module, 8-12 CORBAservices,
-// Externalization Service V1.0, 3/94
-
-#include <CosLifeCycle.idl>
-#include <CosStream.idl>
-
-#pragma prefix "omg.org"
-
-module CosExternalization {
-                exception InvalidFileNameError{};
-                exception ContextAlreadyRegistered{};
-                interface Stream: CosLifeCycle::LifeCycleObject{
-                        void externalize(
-                                        in CosStream::Streamable theObject);
-                        CosStream::Streamable internalize( 
-                                        in CosLifeCycle::FactoryFinder there)
-                                raises( CosLifeCycle::NoFactory,
-                                        CosStream::StreamDataFormatError );
-                        void begin_context()
-                                raises( ContextAlreadyRegistered);
-                        void end_context(); 
-                        void flush();
-                };
-                interface StreamFactory {
-                        Stream create();
-                };
-                interface FileStreamFactory {
-                        Stream create(
-                                        in string theFileName) 
-                                raises( InvalidFileNameError );
-                };
-};
-
-
-
-//  CosExternalizationContainment Module, p 8-26 CORBAservices,
-// Externalization Service V1.0, 3/94
-
-#include <CosContainment.idl>
-#include <CosCompoundExternalization.idl>
-
-module CosExternalizationContainment {
-
-        interface Relationship : 
-                        CosCompoundExternalization::Relationship,
-                        CosContainment::Relationship {};
-
-        interface ContainsRole : 
-                        CosCompoundExternalization::Role,
-                        CosContainment::ContainsRole {};
-
-        interface ContainedInRole : 
-                        CosCompoundExternalization::Role,
-                        CosContainment::ContainedInRole {};
-};
-
-// CosExternalizationReference Module, p 8-28 CORBAservices, 
-// Externalization Service V1.0, 3/94
-
-#include <CosReference.idl>
-#include <CosCompoundExternalization.idl>
-
-module CosExternalizationReference {
-
-        interface Relationship : 
-                        CosCompoundExternalization::Relationship,
-                        CosReference::Relationship {};
-
-        interface ReferencesRole : 
-                        CosCompoundExternalization::Role,
-                        CosReference::ReferencesRole {};
-
-        interface ReferencedByRole : 
-                        CosCompoundExternalization::Role,
-                        CosReference::ReferencedByRole {};
-};
-
-
+// CosExternalization Module, 8-12 CORBAservices,
+// Externalization Service V1.0, 3/94
+
+#include <CosLifeCycle.idl>
+#include <CosStream.idl>
+
+#pragma prefix "omg.org"
+
+module CosExternalization {
+                exception InvalidFileNameError{};
+                exception ContextAlreadyRegistered{};
+                interface Stream: CosLifeCycle::LifeCycleObject{
+                        void externalize(
+                                        in CosStream::Streamable theObject);
+                        CosStream::Streamable internalize( 
+                                        in CosLifeCycle::FactoryFinder there)
+                                raises( CosLifeCycle::NoFactory,
+                                        CosStream::StreamDataFormatError );
+                        void begin_context()
+                                raises( ContextAlreadyRegistered);
+                        void end_context(); 
+                        void flush();
+                };
+                interface StreamFactory {
+                        Stream create();
+                };
+                interface FileStreamFactory {
+                        Stream create(
+                                        in string theFileName) 
+                                raises( InvalidFileNameError );
+                };
+};
+
+
+
+//  CosExternalizationContainment Module, p 8-26 CORBAservices,
+// Externalization Service V1.0, 3/94
+
+#include <CosContainment.idl>
+#include <CosCompoundExternalization.idl>
+
+module CosExternalizationContainment {
+
+        interface Relationship : 
+                        CosCompoundExternalization::Relationship,
+                        CosContainment::Relationship {};
+
+        interface ContainsRole : 
+                        CosCompoundExternalization::Role,
+                        CosContainment::ContainsRole {};
+
+        interface ContainedInRole : 
+                        CosCompoundExternalization::Role,
+                        CosContainment::ContainedInRole {};
+};
+
+// CosExternalizationReference Module, p 8-28 CORBAservices, 
+// Externalization Service V1.0, 3/94
+
+#include <CosReference.idl>
+#include <CosCompoundExternalization.idl>
+
+module CosExternalizationReference {
+
+        interface Relationship : 
+                        CosCompoundExternalization::Relationship,
+                        CosReference::Relationship {};
+
+        interface ReferencesRole : 
+                        CosCompoundExternalization::Role,
+                        CosReference::ReferencesRole {};
+
+        interface ReferencedByRole : 
+                        CosCompoundExternalization::Role,
+                        CosReference::ReferencedByRole {};
+};
+
+

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosGraphs.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosGraphs.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosGraphs.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,130 +1,130 @@
-// CosGraphs Module, p 9-39 CORBAservices, Relationship Service
-// V1.0, 3/94
-
-#ifndef __CosGraphs_IDL
-#define __CosGraphs_IDL
-
-#include <CosRelationships.idl>
-#include <CosObjectIdentity.idl>
-
-#pragma prefix "omg.org"
-
-module CosGraphs 
-{
-	interface TraversalFactory; 
-	interface Traversal;
-	interface TraversalCriteria;
-	interface Node;
-	interface NodeFactory;
-	interface Role; 
-	interface EdgeIterator; 
-			
-	struct NodeHandle {
-		Node the_node;
-		CosObjectIdentity::ObjectIdentifier constant_random_id;
-	};
-	typedef sequence<NodeHandle> NodeHandles;
-			
-	struct NamedRole {
-		Role the_role;  
-		CosRelationships::RoleName the_name;
-	};
-	typedef sequence<NamedRole> NamedRoles;
-
-	struct EndPoint {
-		NodeHandle the_node;
-		NamedRole the_role;
-	};
-	typedef sequence<EndPoint> EndPoints;
-
-	struct Edge {
-		EndPoint from;
-		CosRelationships::RelationshipHandle the_relationship;
-		EndPoints relatives;
-	};
-	typedef sequence<Edge> Edges;
-
-	enum PropagationValue {deep, shallow, none, inhibit};
-	enum Mode {depthFirst, breadthFirst, bestFirst};
-
-	interface TraversalFactory {
-		Traversal create_traversal_on (
-				in NodeHandle root_node,
-				in TraversalCriteria the_criteria,
-				in Mode how);
-	};
-
-	interface Traversal {
-		typedef unsigned long TraversalScopedId;
-		struct ScopedEndPoint {
-			EndPoint point;
-			TraversalScopedId id;
-		};
-		typedef sequence<ScopedEndPoint> ScopedEndPoints;
-		struct ScopedRelationship {
-			CosRelationships::RelationshipHandle
-				scoped_relationship;
-			TraversalScopedId id;
-		};
-		struct ScopedEdge {
-			ScopedEndPoint from;
-			ScopedRelationship the_relationship;
-			ScopedEndPoints relatives;
-		};
-		typedef sequence<ScopedEdge> ScopedEdges;
-		boolean next_one (out ScopedEdge the_edge);
-		boolean next_n (in short how_many,
-				out ScopedEdges the_edges);
-		void destroy ();
-	};
-			
-	interface TraversalCriteria {
-		struct WeightedEdge {
-			Edge the_edge;
-			unsigned long weight;
-			sequence<NodeHandle> next_nodes;
-		};
-		typedef sequence<WeightedEdge> WeightedEdges;
-		void visit_node(in NodeHandle a_node,
-				in Mode search_mode);
-		boolean next_one (out WeightedEdge the_edge);
-		boolean next_n (in short how_many, 
-				out WeightedEdges the_edges);
-		void destroy();
-	};
-			
-	interface Node: CosObjectIdentity::IdentifiableObject {
-		typedef sequence<Role> Roles;
-		exception NoSuchRole {};
-		exception DuplicateRoleType {};
-			
-		readonly attribute CosRelationships::RelatedObject
-			 related_object;
-		readonly attribute Roles roles_of_node;
-		Roles roles_of_type ( 
-				in CORBA::InterfaceDef role_type);
-		void add_role (in Role a_role)
-				raises (DuplicateRoleType);
-		void remove_role (in CORBA::InterfaceDef of_type)
-			raises (NoSuchRole);
-	};
-			
-	interface NodeFactory {
-		Node create_node (in Object related_object);
-	};
-			
-	interface Role : CosRelationships::Role {
-		void get_edges ( in long how_many,
-				out Edges the_edges,
-				out EdgeIterator the_rest);
-	};
-			
-	interface EdgeIterator {
-		boolean next_one (out Edge the_edge);
-		boolean next_n ( in unsigned long how_many,
-				out Edges the_edges);
-		void destroy ();
-	};
-			
-};
-#endif
+// CosGraphs Module, p 9-39 CORBAservices, Relationship Service
+// V1.0, 3/94
+
+#ifndef __CosGraphs_IDL
+#define __CosGraphs_IDL
+
+#include <CosRelationships.idl>
+#include <CosObjectIdentity.idl>
+
+#pragma prefix "omg.org"
+
+module CosGraphs 
+{
+	interface TraversalFactory; 
+	interface Traversal;
+	interface TraversalCriteria;
+	interface Node;
+	interface NodeFactory;
+	interface Role; 
+	interface EdgeIterator; 
+			
+	struct NodeHandle {
+		Node the_node;
+		CosObjectIdentity::ObjectIdentifier constant_random_id;
+	};
+	typedef sequence<NodeHandle> NodeHandles;
+			
+	struct NamedRole {
+		Role the_role;  
+		CosRelationships::RoleName the_name;
+	};
+	typedef sequence<NamedRole> NamedRoles;
+
+	struct EndPoint {
+		NodeHandle the_node;
+		NamedRole the_role;
+	};
+	typedef sequence<EndPoint> EndPoints;
+
+	struct Edge {
+		EndPoint from;
+		CosRelationships::RelationshipHandle the_relationship;
+		EndPoints relatives;
+	};
+	typedef sequence<Edge> Edges;
+
+	enum PropagationValue {deep, shallow, none, inhibit};
+	enum Mode {depthFirst, breadthFirst, bestFirst};
+
+	interface TraversalFactory {
+		Traversal create_traversal_on (
+				in NodeHandle root_node,
+				in TraversalCriteria the_criteria,
+				in Mode how);
+	};
+
+	interface Traversal {
+		typedef unsigned long TraversalScopedId;
+		struct ScopedEndPoint {
+			EndPoint point;
+			TraversalScopedId id;
+		};
+		typedef sequence<ScopedEndPoint> ScopedEndPoints;
+		struct ScopedRelationship {
+			CosRelationships::RelationshipHandle
+				scoped_relationship;
+			TraversalScopedId id;
+		};
+		struct ScopedEdge {
+			ScopedEndPoint from;
+			ScopedRelationship the_relationship;
+			ScopedEndPoints relatives;
+		};
+		typedef sequence<ScopedEdge> ScopedEdges;
+		boolean next_one (out ScopedEdge the_edge);
+		boolean next_n (in short how_many,
+				out ScopedEdges the_edges);
+		void destroy ();
+	};
+			
+	interface TraversalCriteria {
+		struct WeightedEdge {
+			Edge the_edge;
+			unsigned long weight;
+			sequence<NodeHandle> next_nodes;
+		};
+		typedef sequence<WeightedEdge> WeightedEdges;
+		void visit_node(in NodeHandle a_node,
+				in Mode search_mode);
+		boolean next_one (out WeightedEdge the_edge);
+		boolean next_n (in short how_many, 
+				out WeightedEdges the_edges);
+		void destroy();
+	};
+			
+	interface Node: CosObjectIdentity::IdentifiableObject {
+		typedef sequence<Role> Roles;
+		exception NoSuchRole {};
+		exception DuplicateRoleType {};
+			
+		readonly attribute CosRelationships::RelatedObject
+			 related_object;
+		readonly attribute Roles roles_of_node;
+		Roles roles_of_type ( 
+				in CORBA::InterfaceDef role_type);
+		void add_role (in Role a_role)
+				raises (DuplicateRoleType);
+		void remove_role (in CORBA::InterfaceDef of_type)
+			raises (NoSuchRole);
+	};
+			
+	interface NodeFactory {
+		Node create_node (in Object related_object);
+	};
+			
+	interface Role : CosRelationships::Role {
+		void get_edges ( in long how_many,
+				out Edges the_edges,
+				out EdgeIterator the_rest);
+	};
+			
+	interface EdgeIterator {
+		boolean next_one (out Edge the_edge);
+		boolean next_n ( in unsigned long how_many,
+				out Edges the_edges);
+		void destroy ();
+	};
+			
+};
+#endif

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosLifeCycle.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosLifeCycle.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosLifeCycle.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,63 +1,63 @@
-// CosLifeCycle Module, p 6-10 CORBAservices, LifeCycle Service V1.0, 3/94
-
-#ifndef __CosLifeCycle_IDL
-#define __CosLifeCycle_IDL
-
-#include <CosNaming.idl>
-
-#pragma prefix "omg.org"
-
-module CosLifeCycle 
-{
-        typedef CosNaming::Name Key; 
-        typedef Object _Factory;
-        typedef sequence <_Factory> Factories;
-        typedef struct NVP {     
-                CosNaming::Istring  name; 
-                any     value; 
-        } NameValuePair;
-        typedef sequence <NameValuePair> Criteria;
-
-        exception NoFactory {
-                Key search_key;
-        };
-        exception NotCopyable { string reason; };
-        exception NotMovable { string reason; };
-        exception NotRemovable { string reason; };
-        exception InvalidCriteria{ 
-                Criteria invalid_criteria;
-        };
-        exception CannotMeetCriteria {
-                Criteria unmet_criteria;
-        };
-
-
-        interface FactoryFinder {
-                Factories find_factories(in Key factory_key)
-                        raises(NoFactory);
-        };
-
-        interface LifeCycleObject {
-                LifeCycleObject copy(in FactoryFinder there, 
-                                in Criteria the_criteria)
-                        raises(NoFactory, NotCopyable, InvalidCriteria,
-                                 CannotMeetCriteria);
-                void move(in FactoryFinder there, 
-                                in Criteria the_criteria)
-                        raises(NoFactory, NotMovable, InvalidCriteria,
-                                 CannotMeetCriteria);
-                void remove()
-                        raises(NotRemovable);
-        };
-
-        interface GenericFactory {              
-                boolean _supports(in Key k);
-                Object create_object(                   
-                                in Key k, 
-                                in Criteria the_criteria)                          
-                        raises (NoFactory, InvalidCriteria,                                                                             
-                                CannotMeetCriteria);
-        };
-};
-
-#endif
+// CosLifeCycle Module, p 6-10 CORBAservices, LifeCycle Service V1.0, 3/94
+
+#ifndef __CosLifeCycle_IDL
+#define __CosLifeCycle_IDL
+
+#include <CosNaming.idl>
+
+#pragma prefix "omg.org"
+
+module CosLifeCycle 
+{
+        typedef CosNaming::Name Key; 
+        typedef Object _Factory;
+        typedef sequence <_Factory> Factories;
+        typedef struct NVP {     
+                CosNaming::Istring  name; 
+                any     value; 
+        } NameValuePair;
+        typedef sequence <NameValuePair> Criteria;
+
+        exception NoFactory {
+                Key search_key;
+        };
+        exception NotCopyable { string reason; };
+        exception NotMovable { string reason; };
+        exception NotRemovable { string reason; };
+        exception InvalidCriteria{ 
+                Criteria invalid_criteria;
+        };
+        exception CannotMeetCriteria {
+                Criteria unmet_criteria;
+        };
+
+
+        interface FactoryFinder {
+                Factories find_factories(in Key factory_key)
+                        raises(NoFactory);
+        };
+
+        interface LifeCycleObject {
+                LifeCycleObject copy(in FactoryFinder there, 
+                                in Criteria the_criteria)
+                        raises(NoFactory, NotCopyable, InvalidCriteria,
+                                 CannotMeetCriteria);
+                void move(in FactoryFinder there, 
+                                in Criteria the_criteria)
+                        raises(NoFactory, NotMovable, InvalidCriteria,
+                                 CannotMeetCriteria);
+                void remove()
+                        raises(NotRemovable);
+        };
+
+        interface GenericFactory {              
+                boolean _supports(in Key k);
+                Object create_object(                   
+                                in Key k, 
+                                in Criteria the_criteria)                          
+                        raises (NoFactory, InvalidCriteria,                                                                             
+                                CannotMeetCriteria);
+        };
+};
+
+#endif

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosLifeCycleContainment.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosLifeCycleContainment.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosLifeCycleContainment.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,23 +1,23 @@
-//  CosLifeCycleContainment Module, p 6-42 CORBAservices,
-//  Life Cycle Service V1.0, 3/94
-
-#include <CosContainment.idl>
-#include <CosCompoundLifeCycle.idl>
-
-#pragma prefix "omg.org"
-
-module CosLifeCycleContainment {
-
-        interface Relationship : 
-                        CosCompoundLifeCycle::Relationship,
-                        CosContainment::Relationship {};
-
-        interface ContainsRole : 
-                        CosCompoundLifeCycle::Role,
-                        CosContainment::ContainsRole {};
-
-        interface ContainedInRole : 
-                        CosCompoundLifeCycle::Role,
-                        CosContainment::ContainedInRole {};
-};
-
+//  CosLifeCycleContainment Module, p 6-42 CORBAservices,
+//  Life Cycle Service V1.0, 3/94
+
+#include <CosContainment.idl>
+#include <CosCompoundLifeCycle.idl>
+
+#pragma prefix "omg.org"
+
+module CosLifeCycleContainment {
+
+        interface Relationship : 
+                        CosCompoundLifeCycle::Relationship,
+                        CosContainment::Relationship {};
+
+        interface ContainsRole : 
+                        CosCompoundLifeCycle::Role,
+                        CosContainment::ContainsRole {};
+
+        interface ContainedInRole : 
+                        CosCompoundLifeCycle::Role,
+                        CosContainment::ContainedInRole {};
+};
+

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosLifeCycleReference.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosLifeCycleReference.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosLifeCycleReference.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,22 +1,22 @@
-// CosLifeCycleReference Module, p 6-44 CORBAservices,
-// Life Cycle Service V1.0, 3/94
-
-#include <CosReference.idl>
-#include <CosCompoundLifeCycle.idl>
-
-#pragma prefix "omg.org"
-
-module CosLifeCycleReference {
-
-        interface Relationship : 
-                        CosCompoundLifeCycle::Relationship,
-                        CosReference::Relationship {};
-
-        interface ReferencesRole : 
-                        CosCompoundLifeCycle::Role,
-                        CosReference::ReferencesRole {};
-
-        interface ReferencedByRole : 
-                        CosCompoundLifeCycle::Role,
-                        CosReference::ReferencedByRole {};
-};
+// CosLifeCycleReference Module, p 6-44 CORBAservices,
+// Life Cycle Service V1.0, 3/94
+
+#include <CosReference.idl>
+#include <CosCompoundLifeCycle.idl>
+
+#pragma prefix "omg.org"
+
+module CosLifeCycleReference {
+
+        interface Relationship : 
+                        CosCompoundLifeCycle::Relationship,
+                        CosReference::Relationship {};
+
+        interface ReferencesRole : 
+                        CosCompoundLifeCycle::Role,
+                        CosReference::ReferencesRole {};
+
+        interface ReferencedByRole : 
+                        CosCompoundLifeCycle::Role,
+                        CosReference::ReferencedByRole {};
+};

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNaming.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNaming.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNaming.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,114 +1,114 @@
-// File: CosNaming.idl
-
-#ifndef _COSNAMING_IDL_
-#define _COSNAMING_IDL_
-
-#pragma prefix "omg.org"
-
-module CosNaming {
-
-    typedef string Istring;
-    struct NameComponent {
-	Istring id;
-	Istring kind;
-    };
-
-    typedef sequence<NameComponent> Name;
-
-    enum BindingType { nobject, ncontext };
-
-    struct Binding {
-	Name binding_name;
-	BindingType binding_type;
-    };
-
-    // Note: In struct Binding, binding_name is incorrectly defined
-    // as a Name instead of a NameComponent. This definition is
-    // unchanged for compatibility reasons.
-
-    typedef sequence <Binding> BindingList;
-
-    interface BindingIterator;
-
-    interface NamingContext {
-
-	enum NotFoundReason {
-	    missing_node, not_context, not_object
-	};
-	exception NotFound {
-	    NotFoundReason why;
-	    Name rest_of_name;
-	};
-	exception CannotProceed {
-	    NamingContext cxt;
-	    Name rest_of_name;
-	};
-	exception InvalidName{};
-	exception AlreadyBound {};
-	exception NotEmpty{};
-
-	void bind(in Name n, in Object obj)
-	    raises(
-		   NotFound, CannotProceed,
-		   InvalidName, AlreadyBound
-		   );
-	void rebind(in Name n, in Object obj)
-	    raises(NotFound, CannotProceed, InvalidName);
-	void bind_context(in Name n, in NamingContext nc)
-	    raises(
-		   NotFound, CannotProceed,
-		   InvalidName, AlreadyBound
-		   );
-	void rebind_context(in Name n, in NamingContext nc)
-	    raises(NotFound, CannotProceed, InvalidName);
-	Object resolve (in Name n)
-	    raises(NotFound, CannotProceed, InvalidName);
-	void unbind(in Name n)
-	    raises(NotFound, CannotProceed, InvalidName);
-	NamingContext new_context();
-	NamingContext bind_new_context(in Name n)
-	    raises(
-		   NotFound, AlreadyBound,
-		   CannotProceed, InvalidName
-		   );
-	void destroy() raises(NotEmpty);
-	void list(
-		  in unsigned long how_many,
-		  out BindingList bl,
-		  out BindingIterator bi
-		  );
-    };
-
-    interface BindingIterator {
-	boolean next_one(out Binding b);
-	boolean next_n(in unsigned long how_many, out BindingList bl);
-	void destroy();
-    };
-
-    interface NamingContextExt: NamingContext {
-	typedef string StringName;
-	typedef string Address;
-	typedef string URLString;
-
-	StringName to_string(in Name n) raises(InvalidName);
-
-	Name to_name(in StringName sn)
-	    raises(InvalidName);
-
-	exception InvalidAddress {};
-
-	URLString to_url(in Address addr, in StringName sn)
-	    raises(InvalidAddress, InvalidName);
-
-	Object resolve_str(in StringName n)
-	    raises(
-		   NotFound, CannotProceed,
-		   InvalidName
-		   );
-
-    };
-
-};
-#endif // _COSNAMING_IDL_
-
-
+// File: CosNaming.idl
+
+#ifndef _COSNAMING_IDL_
+#define _COSNAMING_IDL_
+
+#pragma prefix "omg.org"
+
+module CosNaming {
+
+    typedef string Istring;
+    struct NameComponent {
+	Istring id;
+	Istring kind;
+    };
+
+    typedef sequence<NameComponent> Name;
+
+    enum BindingType { nobject, ncontext };
+
+    struct Binding {
+	Name binding_name;
+	BindingType binding_type;
+    };
+
+    // Note: In struct Binding, binding_name is incorrectly defined
+    // as a Name instead of a NameComponent. This definition is
+    // unchanged for compatibility reasons.
+
+    typedef sequence <Binding> BindingList;
+
+    interface BindingIterator;
+
+    interface NamingContext {
+
+	enum NotFoundReason {
+	    missing_node, not_context, not_object
+	};
+	exception NotFound {
+	    NotFoundReason why;
+	    Name rest_of_name;
+	};
+	exception CannotProceed {
+	    NamingContext cxt;
+	    Name rest_of_name;
+	};
+	exception InvalidName{};
+	exception AlreadyBound {};
+	exception NotEmpty{};
+
+	void bind(in Name n, in Object obj)
+	    raises(
+		   NotFound, CannotProceed,
+		   InvalidName, AlreadyBound
+		   );
+	void rebind(in Name n, in Object obj)
+	    raises(NotFound, CannotProceed, InvalidName);
+	void bind_context(in Name n, in NamingContext nc)
+	    raises(
+		   NotFound, CannotProceed,
+		   InvalidName, AlreadyBound
+		   );
+	void rebind_context(in Name n, in NamingContext nc)
+	    raises(NotFound, CannotProceed, InvalidName);
+	Object resolve (in Name n)
+	    raises(NotFound, CannotProceed, InvalidName);
+	void unbind(in Name n)
+	    raises(NotFound, CannotProceed, InvalidName);
+	NamingContext new_context();
+	NamingContext bind_new_context(in Name n)
+	    raises(
+		   NotFound, AlreadyBound,
+		   CannotProceed, InvalidName
+		   );
+	void destroy() raises(NotEmpty);
+	void list(
+		  in unsigned long how_many,
+		  out BindingList bl,
+		  out BindingIterator bi
+		  );
+    };
+
+    interface BindingIterator {
+	boolean next_one(out Binding b);
+	boolean next_n(in unsigned long how_many, out BindingList bl);
+	void destroy();
+    };
+
+    interface NamingContextExt: NamingContext {
+	typedef string StringName;
+	typedef string Address;
+	typedef string URLString;
+
+	StringName to_string(in Name n) raises(InvalidName);
+
+	Name to_name(in StringName sn)
+	    raises(InvalidName);
+
+	exception InvalidAddress {};
+
+	URLString to_url(in Address addr, in StringName sn)
+	    raises(InvalidAddress, InvalidName);
+
+	Object resolve_str(in StringName n)
+	    raises(
+		   NotFound, CannotProceed,
+		   InvalidName
+		   );
+
+    };
+
+};
+#endif // _COSNAMING_IDL_
+
+

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNaming.old.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNaming.old.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNaming.old.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,116 +1,116 @@
-// CosNaming Module, p 3-6 CORBAservices, Naming Service V1.0, 3/94
-#ifndef __COS_NAMING
-#define __COS_NAMING
-#endif
-
-#pragma prefix "omg.org"
-
-module CosNaming 
-{
-        typedef string Istring;
-        struct NameComponent {
-                Istring id;
-                Istring kind;
-        };
-
-        typedef sequence <NameComponent> Name;
-
-        enum BindingType {nobject, ncontext};
-
-        struct Binding {
-                Name    binding_name;
-                BindingType binding_type;                                  
-        };
-
-        typedef sequence <Binding> BindingList;                                       
-        interface BindingIterator;
-
-        interface NamingContext {
-
-                enum NotFoundReason { missing_node, not_context, not_object};
-        
-                exception NotFound { 
-                                NotFoundReason why;
-                                Name rest_of_name;
-                };
-
-                exception CannotProceed {
-                                NamingContext cxt;
-                                Name rest_of_name;
-                };
-                                                                                                        
-                exception InvalidName{};                                                                        
-                exception AlreadyBound {};
-                exception NotEmpty{};
-
-                void bind(in Name n, in Object obj)             
-                         raises(NotFound, CannotProceed, InvalidName, AlreadyBound);
-                void rebind(in Name n, in Object obj)   
-                         raises(NotFound, CannotProceed, InvalidName);
-                void bind_context(in Name n, in NamingContext nc)               
-                         raises(NotFound, CannotProceed, InvalidName, AlreadyBound);
-                void rebind_context(in Name n, in NamingContext nc)     
-                         raises(NotFound, CannotProceed, InvalidName);
-                Object resolve (in Name n)
-                         raises(NotFound, CannotProceed, InvalidName);
-                void unbind(in Name n)
-                         raises(NotFound, CannotProceed, InvalidName);
-
-                NamingContext new_context();
-
-                NamingContext bind_new_context(in Name n)
-                         raises(NotFound, AlreadyBound, CannotProceed, InvalidName);
-                void destroy( )
-                         raises(NotEmpty);
-                void list (in unsigned long how_many, 
-                                        out BindingList bl, out BindingIterator bi);
-        };
-
-        interface BindingIterator {
-                boolean next_one(out Binding b);
-                boolean next_n(in unsigned long how_many, 
-                                        out BindingList bl);
-                void destroy();
-        };
-
-// Names Library interface in PIDL,   
-// CORBAservices p 3- 14, Naming Service V1.0 3/94 
-
-	pseudo interface LNameComponent { // PIDL
-		exception NotSet{};
-		string get_id() 
-			raises(NotSet);
-		void set_id(in string i);
-		string get_kind() 
-			raises(NotSet);
-		void set_kind(in string k);
-		void destroy();
-	};
-	
-	pseudo interface LName { // PIDL
-		exception NoComponent{};
-		exception OverFlow{};
-		exception InvalidName{};                                
-		LName insert_component(in unsigned long i, 
-						in LNameComponent n) 
-				raises(NoComponent, OverFlow);
-		LNameComponent get_component(in unsigned long i)
-			 raises(NoComponent);                           
-		LNameComponent delete_component(in unsigned long i)
-			 raises(NoComponent);                           
-		unsigned long num_components();
-		boolean equal(in LName ln);
-		boolean less_than(in LName ln);
-		Name to_idl_form()
-				raises(InvalidName);                             
-		void from_idl_form(in Name n);
-		void destroy();
-	};
-	
-	/*
-	LName create_lname();                      // C/C++
-	LNameComponent create_lname_component();   // C/C++
-	*/
-}; // end CosNaming
-
-#endif
+// CosNaming Module, p 3-6 CORBAservices, Naming Service V1.0, 3/94
+#ifndef __COS_NAMING
+#define __COS_NAMING
+#endif
+
+#pragma prefix "omg.org"
+
+module CosNaming 
+{
+        typedef string Istring;
+        struct NameComponent {
+                Istring id;
+                Istring kind;
+        };
+
+        typedef sequence <NameComponent> Name;
+
+        enum BindingType {nobject, ncontext};
+
+        struct Binding {
+                Name    binding_name;
+                BindingType binding_type;                                  
+        };
+
+        typedef sequence <Binding> BindingList;                                       
+        interface BindingIterator;
+
+        interface NamingContext {
+
+                enum NotFoundReason { missing_node, not_context, not_object};
+        
+                exception NotFound { 
+                                NotFoundReason why;
+                                Name rest_of_name;
+                };
+
+                exception CannotProceed {
+                                NamingContext cxt;
+                                Name rest_of_name;
+                };
+                                                                                                        
+                exception InvalidName{};                                                                        
+                exception AlreadyBound {};
+                exception NotEmpty{};
+
+                void bind(in Name n, in Object obj)             
+                         raises(NotFound, CannotProceed, InvalidName, AlreadyBound);
+                void rebind(in Name n, in Object obj)   
+                         raises(NotFound, CannotProceed, InvalidName);
+                void bind_context(in Name n, in NamingContext nc)               
+                         raises(NotFound, CannotProceed, InvalidName, AlreadyBound);
+                void rebind_context(in Name n, in NamingContext nc)     
+                         raises(NotFound, CannotProceed, InvalidName);
+                Object resolve (in Name n)
+                         raises(NotFound, CannotProceed, InvalidName);
+                void unbind(in Name n)
+                         raises(NotFound, CannotProceed, InvalidName);
+
+                NamingContext new_context();
+
+                NamingContext bind_new_context(in Name n)
+                         raises(NotFound, AlreadyBound, CannotProceed, InvalidName);
+                void destroy( )
+                         raises(NotEmpty);
+                void list (in unsigned long how_many, 
+                                        out BindingList bl, out BindingIterator bi);
+        };
+
+        interface BindingIterator {
+                boolean next_one(out Binding b);
+                boolean next_n(in unsigned long how_many, 
+                                        out BindingList bl);
+                void destroy();
+        };
+
+// Names Library interface in PIDL,   
+// CORBAservices p 3- 14, Naming Service V1.0 3/94 
+
+	pseudo interface LNameComponent { // PIDL
+		exception NotSet{};
+		string get_id() 
+			raises(NotSet);
+		void set_id(in string i);
+		string get_kind() 
+			raises(NotSet);
+		void set_kind(in string k);
+		void destroy();
+	};
+	
+	pseudo interface LName { // PIDL
+		exception NoComponent{};
+		exception OverFlow{};
+		exception InvalidName{};                                
+		LName insert_component(in unsigned long i, 
+						in LNameComponent n) 
+				raises(NoComponent, OverFlow);
+		LNameComponent get_component(in unsigned long i)
+			 raises(NoComponent);                           
+		LNameComponent delete_component(in unsigned long i)
+			 raises(NoComponent);                           
+		unsigned long num_components();
+		boolean equal(in LName ln);
+		boolean less_than(in LName ln);
+		Name to_idl_form()
+				raises(InvalidName);                             
+		void from_idl_form(in Name n);
+		void destroy();
+	};
+	
+	/*
+	LName create_lname();                      // C/C++
+	LNameComponent create_lname_component();   // C/C++
+	*/
+}; // end CosNaming
+
+#endif

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNotification.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNotification.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNotification.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,175 +1,175 @@
-//File: CosNotification.idl
-//Part of the Notification Service
-
-#ifndef _COS_NOTIFICATION_IDL_
-#define _COS_NOTIFICATION_IDL_
-#pragma prefix "omg.org"
-
-module CosNotification {
-
-   typedef string Istring;
-   typedef Istring PropertyName;
-   typedef any PropertyValue;
-
-   struct Property {
-      PropertyName name;
-      PropertyValue value;
-   };
-   typedef sequence<Property> PropertySeq;
-
-   // The following are the same, but serve different purposes.
-   typedef PropertySeq OptionalHeaderFields;
-   typedef PropertySeq FilterableEventBody;
-   typedef PropertySeq QoSProperties;
-   typedef PropertySeq AdminProperties;
-
-   struct _EventType {
-      string domain_name;
-      string type_name;
-   };
-   typedef sequence<_EventType> EventTypeSeq;
-
-   struct PropertyRange {
-      PropertyValue low_val;
-      PropertyValue high_val;
-   };
-
-   struct NamedPropertyRange {
-      PropertyName name;
-      PropertyRange range;
-   };
-   typedef sequence<NamedPropertyRange> NamedPropertyRangeSeq;
-
-   enum QoSError_code {
-      UNSUPPORTED_PROPERTY,
-      UNAVAILABLE_PROPERTY,
-      UNSUPPORTED_VALUE,
-      UNAVAILABLE_VALUE,
-      BAD_PROPERTY,
-      BAD_TYPE,
-      BAD_VALUE
-   };
-
-   struct PropertyError {
-      QoSError_code code;
-      PropertyName name;
-      PropertyRange available_range;
-   };
-   typedef sequence<PropertyError> PropertyErrorSeq;
-
-   exception UnsupportedQoS { PropertyErrorSeq qos_err; };
-   exception UnsupportedAdmin { PropertyErrorSeq admin_err; };
-
-   // Define the Structured Event structure
-   struct FixedEventHeader {
-      _EventType event_type;
-      string event_name;
-   };
-
-   struct EventHeader {
-      FixedEventHeader fixed_header;
-      OptionalHeaderFields variable_header;
-   };
-
-   struct StructuredEvent {
-      EventHeader header;
-      FilterableEventBody filterable_data;
-      any remainder_of_body;
-   }; // StructuredEvent
-   typedef sequence<StructuredEvent> EventBatch;
-
-   // The following constant declarations define the standard
-   // QoS property names and the associated values each property
-   // can take on. The name/value pairs for each standard property
-   // are grouped, beginning with a string constant defined for the
-   // property name, followed by the values the property can take on.
-
-   const string EventReliability = "EventReliability";
-   const short BestEffort = 0;
-   const short Persistent = 1;
-
-   const string ConnectionReliability = "ConnectionReliability";
-   // Can take on the same values as EventReliability
-
-   const string Priority = "Priority";
-   const short LowestPriority = -32767;
-   const short HighestPriority = 32767;
-   const short DefaultPriority = 0;
-
-   const string StartTime = "StartTime";
-   // StartTime takes a value of type TimeBase::UtcT.
-
-   const string StopTime = "StopTime";
-   // StopTime takes a value of type TimeBase::UtcT.
-
-   const string Timeout = "Timeout";
-   // Timeout takes on a value of type TimeBase::TimeT
-
-   const string OrderPolicy = "OrderPolicy";
-   const short AnyOrder = 0;
-   const short FifoOrder = 1;
-   const short PriorityOrder = 2;
-   const short DeadlineOrder = 3;
-
-   const string DiscardPolicy = "DiscardPolicy";
-   // DiscardPolicy takes on the same values as OrderPolicy, plus
-   const short LifoOrder = 4;
-
-   const string MaximumBatchSize = "MaximumBatchSize";
-   // MaximumBatchSize takes on a value of type long
-
-   const string PacingInterval = "PacingInterval";
-   // PacingInterval takes on a value of type TimeBase::TimeT
-
-   const string StartTimeSupported = "StartTimeSupported";
-   // StartTimeSupported takes on a boolean value
-
-   const string StopTimeSupported = "StopTimeSupported";
-   // StopTimeSupported takes on a boolean value
-
-   const string MaxEventsPerConsumer = "MaxEventsPerConsumer";
-   // MaxEventsPerConsumer takes on a value of type long
-
-   interface QoSAdmin {
-
-      QoSProperties get_qos();
-
-      void set_qos ( in QoSProperties qos)
-         raises ( UnsupportedQoS );
-
-      void validate_qos (
-            in QoSProperties required_qos,
-            out NamedPropertyRangeSeq available_qos )
-         raises ( UnsupportedQoS );
-
-   }; // QosAdmin
-
-   // Admin properties are defined in similar manner as QoS
-   // properties. The only difference is that these properties
-   // are related to channel administration policies, as opposed
-   // message quality of service
-
-   const string MaxQueueLength = "MaxQueueLength";
-   // MaxQueueLength takes on a value of type long
-
-   const string MaxConsumers = "MaxConsumers";
-   // MaxConsumers takes on a value of type long
-
-   const string MaxSuppliers = "MaxSuppliers";
-   // MaxSuppliers takes on a value of type long
-
-   const string RejectNewEvents = "RejectNewEvents";
-   // RejectNewEvents takes on a value of type Boolean
-
-   interface AdminPropertiesAdmin {
-
-      AdminProperties get_admin();
-
-      void set_admin (in AdminProperties admin)
-         raises ( UnsupportedAdmin);
-
-   }; // AdminPropertiesAdmin
-
-}; // CosNotification
-
-#endif /* _COS_NOTIFICATION_IDL_ */
+//File: CosNotification.idl
+//Part of the Notification Service
+
+#ifndef _COS_NOTIFICATION_IDL_
+#define _COS_NOTIFICATION_IDL_
+#pragma prefix "omg.org"
+
+module CosNotification {
+
+   typedef string Istring;
+   typedef Istring PropertyName;
+   typedef any PropertyValue;
+
+   struct Property {
+      PropertyName name;
+      PropertyValue value;
+   };
+   typedef sequence<Property> PropertySeq;
+
+   // The following are the same, but serve different purposes.
+   typedef PropertySeq OptionalHeaderFields;
+   typedef PropertySeq FilterableEventBody;
+   typedef PropertySeq QoSProperties;
+   typedef PropertySeq AdminProperties;
+
+   struct _EventType {
+      string domain_name;
+      string type_name;
+   };
+   typedef sequence<_EventType> EventTypeSeq;
+
+   struct PropertyRange {
+      PropertyValue low_val;
+      PropertyValue high_val;
+   };
+
+   struct NamedPropertyRange {
+      PropertyName name;
+      PropertyRange range;
+   };
+   typedef sequence<NamedPropertyRange> NamedPropertyRangeSeq;
+
+   enum QoSError_code {
+      UNSUPPORTED_PROPERTY,
+      UNAVAILABLE_PROPERTY,
+      UNSUPPORTED_VALUE,
+      UNAVAILABLE_VALUE,
+      BAD_PROPERTY,
+      BAD_TYPE,
+      BAD_VALUE
+   };
+
+   struct PropertyError {
+      QoSError_code code;
+      PropertyName name;
+      PropertyRange available_range;
+   };
+   typedef sequence<PropertyError> PropertyErrorSeq;
+
+   exception UnsupportedQoS { PropertyErrorSeq qos_err; };
+   exception UnsupportedAdmin { PropertyErrorSeq admin_err; };
+
+   // Define the Structured Event structure
+   struct FixedEventHeader {
+      _EventType event_type;
+      string event_name;
+   };
+
+   struct EventHeader {
+      FixedEventHeader fixed_header;
+      OptionalHeaderFields variable_header;
+   };
+
+   struct StructuredEvent {
+      EventHeader header;
+      FilterableEventBody filterable_data;
+      any remainder_of_body;
+   }; // StructuredEvent
+   typedef sequence<StructuredEvent> EventBatch;
+
+   // The following constant declarations define the standard
+   // QoS property names and the associated values each property
+   // can take on. The name/value pairs for each standard property
+   // are grouped, beginning with a string constant defined for the
+   // property name, followed by the values the property can take on.
+
+   const string EventReliability = "EventReliability";
+   const short BestEffort = 0;
+   const short Persistent = 1;
+
+   const string ConnectionReliability = "ConnectionReliability";
+   // Can take on the same values as EventReliability
+
+   const string Priority = "Priority";
+   const short LowestPriority = -32767;
+   const short HighestPriority = 32767;
+   const short DefaultPriority = 0;
+
+   const string StartTime = "StartTime";
+   // StartTime takes a value of type TimeBase::UtcT.
+
+   const string StopTime = "StopTime";
+   // StopTime takes a value of type TimeBase::UtcT.
+
+   const string Timeout = "Timeout";
+   // Timeout takes on a value of type TimeBase::TimeT
+
+   const string OrderPolicy = "OrderPolicy";
+   const short AnyOrder = 0;
+   const short FifoOrder = 1;
+   const short PriorityOrder = 2;
+   const short DeadlineOrder = 3;
+
+   const string DiscardPolicy = "DiscardPolicy";
+   // DiscardPolicy takes on the same values as OrderPolicy, plus
+   const short LifoOrder = 4;
+
+   const string MaximumBatchSize = "MaximumBatchSize";
+   // MaximumBatchSize takes on a value of type long
+
+   const string PacingInterval = "PacingInterval";
+   // PacingInterval takes on a value of type TimeBase::TimeT
+
+   const string StartTimeSupported = "StartTimeSupported";
+   // StartTimeSupported takes on a boolean value
+
+   const string StopTimeSupported = "StopTimeSupported";
+   // StopTimeSupported takes on a boolean value
+
+   const string MaxEventsPerConsumer = "MaxEventsPerConsumer";
+   // MaxEventsPerConsumer takes on a value of type long
+
+   interface QoSAdmin {
+
+      QoSProperties get_qos();
+
+      void set_qos ( in QoSProperties qos)
+         raises ( UnsupportedQoS );
+
+      void validate_qos (
+            in QoSProperties required_qos,
+            out NamedPropertyRangeSeq available_qos )
+         raises ( UnsupportedQoS );
+
+   }; // QosAdmin
+
+   // Admin properties are defined in similar manner as QoS
+   // properties. The only difference is that these properties
+   // are related to channel administration policies, as opposed
+   // message quality of service
+
+   const string MaxQueueLength = "MaxQueueLength";
+   // MaxQueueLength takes on a value of type long
+
+   const string MaxConsumers = "MaxConsumers";
+   // MaxConsumers takes on a value of type long
+
+   const string MaxSuppliers = "MaxSuppliers";
+   // MaxSuppliers takes on a value of type long
+
+   const string RejectNewEvents = "RejectNewEvents";
+   // RejectNewEvents takes on a value of type Boolean
+
+   interface AdminPropertiesAdmin {
+
+      AdminProperties get_admin();
+
+      void set_admin (in AdminProperties admin)
+         raises ( UnsupportedAdmin);
+
+   }; // AdminPropertiesAdmin
+
+}; // CosNotification
+
+#endif /* _COS_NOTIFICATION_IDL_ */

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNotifyChannelAdmin.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNotifyChannelAdmin.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNotifyChannelAdmin.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,387 +1,387 @@
-//File: CosNotifyChannelAdmin.idl
-//Part of the Notification Service
-
-#ifndef _COS_NOTIFY_CHANNEL_ADMIN_IDL_
-#define _COS_NOTIFY_CHANNEL_ADMIN_IDL_
-#pragma prefix "omg.org"
-
-#include <CosNotification.idl>
-#include <CosNotifyFilter.idl>
-#include <CosNotifyComm.idl>
-#include <CosEventChannelAdmin.idl>
-
-module CosNotifyChannelAdmin {
-
-   exception ConnectionAlreadyActive {};
-   exception ConnectionAlreadyInactive {};
-   exception NotConnected {};
-
-   // Forward declarations
-   interface ConsumerAdmin;
-   interface SupplierAdmin;
-   interface EventChannel;
-   interface EventChannelFactory;
-
-   enum ProxyType {
-      PUSH_ANY,
-      PULL_ANY,
-      PUSH_STRUCTURED,
-      PULL_STRUCTURED,
-      PUSH_SEQUENCE,
-      PULL_SEQUENCE,
-      PUSH_TYPED,
-      PULL_TYPED
-   };
-
-   enum ObtainInfoMode {
-      ALL_NOW_UPDATES_OFF,
-      ALL_NOW_UPDATES_ON,
-      NONE_NOW_UPDATES_OFF,
-      NONE_NOW_UPDATES_ON
-   };
-
-   interface ProxyConsumer :
-         CosNotification::QoSAdmin,
-         CosNotifyFilter::FilterAdmin {
-
-      readonly attribute ProxyType MyType;
-      readonly attribute SupplierAdmin MyAdmin;
-
-      CosNotification::EventTypeSeq obtain_subscription_types(
-            in ObtainInfoMode mode );
-
-      void validate_event_qos (
-            in CosNotification::QoSProperties required_qos,
-            out CosNotification::NamedPropertyRangeSeq available_qos)
-         raises (CosNotification::UnsupportedQoS);
-
-   }; // ProxyConsumer
-
-   interface ProxySupplier :
-         CosNotification::QoSAdmin,
-         CosNotifyFilter::FilterAdmin {
-
-      readonly attribute ProxyType MyType;
-      readonly attribute ConsumerAdmin MyAdmin;
-
-      attribute CosNotifyFilter::MappingFilter priority_filter;
-      attribute CosNotifyFilter::MappingFilter lifetime_filter;
-
-      CosNotification::EventTypeSeq obtain_offered_types(
-            in ObtainInfoMode mode );
-
-      void validate_event_qos (
-            in CosNotification::QoSProperties required_qos,
-            out CosNotification::NamedPropertyRangeSeq available_qos)
-         raises (CosNotification::UnsupportedQoS);
-
-   }; // ProxySupplier
-
-   interface ProxyPushConsumer :
-         ProxyConsumer,
-         CosNotifyComm::PushConsumer {
-
-      void connect_any_push_supplier (
-            in CosEventComm::PushSupplier push_supplier)
-         raises(CosEventChannelAdmin::AlreadyConnected);
-
-   }; // ProxyPushConsumer
-
-   interface StructuredProxyPushConsumer :
-         ProxyConsumer,
-         CosNotifyComm::StructuredPushConsumer {
-
-      void connect_structured_push_supplier (
-            in CosNotifyComm::StructuredPushSupplier push_supplier)
-         raises(CosEventChannelAdmin::AlreadyConnected);
-
-   }; // StructuredProxyPushConsumer
-
-   interface SequenceProxyPushConsumer :
-         ProxyConsumer,
-         CosNotifyComm::SequencePushConsumer {
-
-      void connect_sequence_push_supplier (
-            in CosNotifyComm::SequencePushSupplier push_supplier)
-         raises(CosEventChannelAdmin::AlreadyConnected);
-
-   }; // SequenceProxyPushConsumer
-
-   interface ProxyPullSupplier :
-         ProxySupplier,
-         CosNotifyComm::PullSupplier {
-
-      void connect_any_pull_consumer (
-            in CosEventComm::PullConsumer pull_consumer)
-         raises(CosEventChannelAdmin::AlreadyConnected);
-
-   }; // ProxyPullSupplier
-
-   interface StructuredProxyPullSupplier :
-         ProxySupplier,
-         CosNotifyComm::StructuredPullSupplier {
-
-      void connect_structured_pull_consumer (
-            in CosNotifyComm::StructuredPullConsumer pull_consumer)
-         raises(CosEventChannelAdmin::AlreadyConnected);
-
-   }; // StructuredProxyPullSupplier
-
-   interface SequenceProxyPullSupplier :
-         ProxySupplier,
-         CosNotifyComm::SequencePullSupplier {
-
-      void connect_sequence_pull_consumer (
-            in CosNotifyComm::SequencePullConsumer pull_consumer)
-         raises(CosEventChannelAdmin::AlreadyConnected);
-
-   }; // SequenceProxyPullSupplier
-
-   interface ProxyPullConsumer :
-         ProxyConsumer,
-         CosNotifyComm::PullConsumer {
-
-      void connect_any_pull_supplier (
-            in CosEventComm::PullSupplier pull_supplier)
-         raises(CosEventChannelAdmin::AlreadyConnected,
-                CosEventChannelAdmin::TypeError );
-
-      void suspend_connection()
-         raises(ConnectionAlreadyInactive, NotConnected);
-
-      void resume_connection()
-         raises(ConnectionAlreadyActive, NotConnected);
-
-   }; // ProxyPullConsumer
-
-   interface StructuredProxyPullConsumer :
-         ProxyConsumer,
-         CosNotifyComm::StructuredPullConsumer {
-
-      void connect_structured_pull_supplier (
-            in CosNotifyComm::StructuredPullSupplier pull_supplier)
-         raises(CosEventChannelAdmin::AlreadyConnected,
-                CosEventChannelAdmin::TypeError );
-
-      void suspend_connection()
-         raises(ConnectionAlreadyInactive, NotConnected);
-
-      void resume_connection()
-         raises(ConnectionAlreadyActive, NotConnected);
-
-   }; // StructuredProxyPullConsumer
-
-   interface SequenceProxyPullConsumer :
-         ProxyConsumer,
-         CosNotifyComm::SequencePullConsumer {
-
-      void connect_sequence_pull_supplier (
-            in CosNotifyComm::SequencePullSupplier pull_supplier)
-         raises(CosEventChannelAdmin::AlreadyConnected,
-                CosEventChannelAdmin::TypeError );
-
-      void suspend_connection()
-         raises(ConnectionAlreadyInactive, NotConnected);
-
-      void resume_connection()
-         raises(ConnectionAlreadyActive, NotConnected);
-
-   }; // SequenceProxyPullConsumer
-
-   interface ProxyPushSupplier :
-         ProxySupplier,
-         CosNotifyComm::PushSupplier {
-
-      void connect_any_push_consumer (
-            in CosEventComm::PushConsumer push_consumer)
-         raises(CosEventChannelAdmin::AlreadyConnected,
-                CosEventChannelAdmin::TypeError );
-
-      void suspend_connection()
-         raises(ConnectionAlreadyInactive, NotConnected);
-
-      void resume_connection()
-         raises(ConnectionAlreadyActive, NotConnected);
-
-   }; // ProxyPushSupplier
-
-   interface StructuredProxyPushSupplier :
-         ProxySupplier,
-         CosNotifyComm::StructuredPushSupplier {
-
-      void connect_structured_push_consumer (
-            in CosNotifyComm::StructuredPushConsumer push_consumer)
-         raises(CosEventChannelAdmin::AlreadyConnected,
-                CosEventChannelAdmin::TypeError );
-
-      void suspend_connection()
-         raises(ConnectionAlreadyInactive, NotConnected);
-
-      void resume_connection()
-         raises(ConnectionAlreadyActive, NotConnected);
-
-   }; // StructuredProxyPushSupplier
-
-   interface SequenceProxyPushSupplier :
-         ProxySupplier,
-         CosNotifyComm::SequencePushSupplier {
-
-      void connect_sequence_push_consumer (
-            in CosNotifyComm::SequencePushConsumer push_consumer)
-         raises(CosEventChannelAdmin::AlreadyConnected,
-                CosEventChannelAdmin::TypeError );
-
-      void suspend_connection()
-         raises(ConnectionAlreadyInactive, NotConnected);
-
-      void resume_connection()
-         raises(ConnectionAlreadyActive, NotConnected);
-
-   }; // SequenceProxyPushSupplier
-
-   typedef long ProxyID;
-   typedef sequence <ProxyID> ProxyIDSeq;
-
-   enum ClientType {
-      ANY_EVENT,
-      STRUCTURED_EVENT,
-      SEQUENCE_EVENT
-   };
-
-   enum InterFilterGroupOperator { AND_OP, OR_OP };
-
-   typedef long AdminID;
-   typedef sequence<AdminID> AdminIDSeq;
-
-   exception AdminNotFound {};
-   exception ProxyNotFound {};
-
-   struct AdminLimit {
-      CosNotification::PropertyName name;
-      CosNotification::PropertyValue value;
-   };
-
-   exception AdminLimitExceeded { AdminLimit admin_property_err; };
-
-   interface ConsumerAdmin :
-         CosNotification::QoSAdmin,
-         CosNotifyComm::NotifySubscribe,
-         CosNotifyFilter::FilterAdmin,
-         CosEventChannelAdmin::ConsumerAdmin {
-
-      readonly attribute AdminID MyID;
-      readonly attribute EventChannel MyChannel;
-
-      readonly attribute InterFilterGroupOperator MyOperator;
-
-      attribute CosNotifyFilter::MappingFilter priority_filter;
-      attribute CosNotifyFilter::MappingFilter lifetime_filter;
-
-      readonly attribute ProxyIDSeq pull_suppliers;
-      readonly attribute ProxyIDSeq push_suppliers;
-
-      ProxySupplier get_proxy_supplier (
-            in ProxyID proxy_id )
-         raises ( ProxyNotFound );
-
-      ProxySupplier obtain_notification_pull_supplier (
-            in ClientType ctype,
-            out ProxyID proxy_id)
-         raises ( AdminLimitExceeded );
-
-      ProxySupplier obtain_notification_push_supplier (
-            in ClientType ctype,
-            out ProxyID proxy_id)
-         raises ( AdminLimitExceeded );
-
-      void destroy();
-
-   }; // ConsumerAdmin
-
-   interface SupplierAdmin :
-         CosNotification::QoSAdmin,
-         CosNotifyComm::NotifyPublish,
-         CosNotifyFilter::FilterAdmin,
-         CosEventChannelAdmin::SupplierAdmin {
-
-      readonly attribute AdminID MyID;
-      readonly attribute EventChannel MyChannel;
-
-      readonly attribute InterFilterGroupOperator MyOperator;
-
-      readonly attribute ProxyIDSeq pull_consumers;
-      readonly attribute ProxyIDSeq push_consumers;
-
-      ProxyConsumer get_proxy_consumer (
-            in ProxyID proxy_id )
-         raises ( ProxyNotFound );
-
-      ProxyConsumer obtain_notification_pull_consumer (
-            in ClientType ctype,
-            out ProxyID proxy_id)
-         raises ( AdminLimitExceeded );
-
-      ProxyConsumer obtain_notification_push_consumer (
-            in ClientType ctype,
-            out ProxyID proxy_id)
-         raises ( AdminLimitExceeded );
-
-      void destroy();
-
-   }; // SupplierAdmin
-
-   interface EventChannel :
-      CosNotification::QoSAdmin,
-      CosNotification::AdminPropertiesAdmin,
-      CosEventChannelAdmin::EventChannel {
-
-      readonly attribute EventChannelFactory MyFactory;
-
-      readonly attribute ConsumerAdmin default_consumer_admin;
-      readonly attribute SupplierAdmin default_supplier_admin;
-
-      readonly attribute CosNotifyFilter::FilterFactory
-                  default_filter_factory;
-
-      ConsumerAdmin new_for_consumers(
-            in InterFilterGroupOperator op,
-            out AdminID id );
-
-      SupplierAdmin new_for_suppliers(
-            in InterFilterGroupOperator op,
-            out AdminID id );
-
-      ConsumerAdmin get_consumeradmin ( in AdminID id )
-         raises (AdminNotFound);
-
-      SupplierAdmin get_supplieradmin ( in AdminID id )
-         raises (AdminNotFound);
-
-      AdminIDSeq get_all_consumeradmins();
-      AdminIDSeq get_all_supplieradmins();
-
-   }; // EventChannel
-
-   typedef long ChannelID;
-   typedef sequence<ChannelID> ChannelIDSeq;
-
-   exception ChannelNotFound {};
-
-   interface EventChannelFactory {
-
-      EventChannel create_channel (
-            in CosNotification::QoSProperties initial_qos,
-            in CosNotification::AdminProperties initial_admin,
-            out ChannelID id)
-         raises(CosNotification::UnsupportedQoS,
-                CosNotification::UnsupportedAdmin );
-
-      ChannelIDSeq get_all_channels();
-
-      EventChannel get_event_channel ( in ChannelID id )
-         raises (ChannelNotFound);
-
-   }; // EventChannelFactory
-}; // CosNotifyChannelAdmin
-
-#endif /* _COS_NOTIFY_CHANNEL_ADMIN_IDL_ */
+//File: CosNotifyChannelAdmin.idl
+//Part of the Notification Service
+
+#ifndef _COS_NOTIFY_CHANNEL_ADMIN_IDL_
+#define _COS_NOTIFY_CHANNEL_ADMIN_IDL_
+#pragma prefix "omg.org"
+
+#include <CosNotification.idl>
+#include <CosNotifyFilter.idl>
+#include <CosNotifyComm.idl>
+#include <CosEventChannelAdmin.idl>
+
+module CosNotifyChannelAdmin {
+
+   exception ConnectionAlreadyActive {};
+   exception ConnectionAlreadyInactive {};
+   exception NotConnected {};
+
+   // Forward declarations
+   interface ConsumerAdmin;
+   interface SupplierAdmin;
+   interface EventChannel;
+   interface EventChannelFactory;
+
+   enum ProxyType {
+      PUSH_ANY,
+      PULL_ANY,
+      PUSH_STRUCTURED,
+      PULL_STRUCTURED,
+      PUSH_SEQUENCE,
+      PULL_SEQUENCE,
+      PUSH_TYPED,
+      PULL_TYPED
+   };
+
+   enum ObtainInfoMode {
+      ALL_NOW_UPDATES_OFF,
+      ALL_NOW_UPDATES_ON,
+      NONE_NOW_UPDATES_OFF,
+      NONE_NOW_UPDATES_ON
+   };
+
+   interface ProxyConsumer :
+         CosNotification::QoSAdmin,
+         CosNotifyFilter::FilterAdmin {
+
+      readonly attribute ProxyType MyType;
+      readonly attribute SupplierAdmin MyAdmin;
+
+      CosNotification::EventTypeSeq obtain_subscription_types(
+            in ObtainInfoMode mode );
+
+      void validate_event_qos (
+            in CosNotification::QoSProperties required_qos,
+            out CosNotification::NamedPropertyRangeSeq available_qos)
+         raises (CosNotification::UnsupportedQoS);
+
+   }; // ProxyConsumer
+
+   interface ProxySupplier :
+         CosNotification::QoSAdmin,
+         CosNotifyFilter::FilterAdmin {
+
+      readonly attribute ProxyType MyType;
+      readonly attribute ConsumerAdmin MyAdmin;
+
+      attribute CosNotifyFilter::MappingFilter priority_filter;
+      attribute CosNotifyFilter::MappingFilter lifetime_filter;
+
+      CosNotification::EventTypeSeq obtain_offered_types(
+            in ObtainInfoMode mode );
+
+      void validate_event_qos (
+            in CosNotification::QoSProperties required_qos,
+            out CosNotification::NamedPropertyRangeSeq available_qos)
+         raises (CosNotification::UnsupportedQoS);
+
+   }; // ProxySupplier
+
+   interface ProxyPushConsumer :
+         ProxyConsumer,
+         CosNotifyComm::PushConsumer {
+
+      void connect_any_push_supplier (
+            in CosEventComm::PushSupplier push_supplier)
+         raises(CosEventChannelAdmin::AlreadyConnected);
+
+   }; // ProxyPushConsumer
+
+   interface StructuredProxyPushConsumer :
+         ProxyConsumer,
+         CosNotifyComm::StructuredPushConsumer {
+
+      void connect_structured_push_supplier (
+            in CosNotifyComm::StructuredPushSupplier push_supplier)
+         raises(CosEventChannelAdmin::AlreadyConnected);
+
+   }; // StructuredProxyPushConsumer
+
+   interface SequenceProxyPushConsumer :
+         ProxyConsumer,
+         CosNotifyComm::SequencePushConsumer {
+
+      void connect_sequence_push_supplier (
+            in CosNotifyComm::SequencePushSupplier push_supplier)
+         raises(CosEventChannelAdmin::AlreadyConnected);
+
+   }; // SequenceProxyPushConsumer
+
+   interface ProxyPullSupplier :
+         ProxySupplier,
+         CosNotifyComm::PullSupplier {
+
+      void connect_any_pull_consumer (
+            in CosEventComm::PullConsumer pull_consumer)
+         raises(CosEventChannelAdmin::AlreadyConnected);
+
+   }; // ProxyPullSupplier
+
+   interface StructuredProxyPullSupplier :
+         ProxySupplier,
+         CosNotifyComm::StructuredPullSupplier {
+
+      void connect_structured_pull_consumer (
+            in CosNotifyComm::StructuredPullConsumer pull_consumer)
+         raises(CosEventChannelAdmin::AlreadyConnected);
+
+   }; // StructuredProxyPullSupplier
+
+   interface SequenceProxyPullSupplier :
+         ProxySupplier,
+         CosNotifyComm::SequencePullSupplier {
+
+      void connect_sequence_pull_consumer (
+            in CosNotifyComm::SequencePullConsumer pull_consumer)
+         raises(CosEventChannelAdmin::AlreadyConnected);
+
+   }; // SequenceProxyPullSupplier
+
+   interface ProxyPullConsumer :
+         ProxyConsumer,
+         CosNotifyComm::PullConsumer {
+
+      void connect_any_pull_supplier (
+            in CosEventComm::PullSupplier pull_supplier)
+         raises(CosEventChannelAdmin::AlreadyConnected,
+                CosEventChannelAdmin::TypeError );
+
+      void suspend_connection()
+         raises(ConnectionAlreadyInactive, NotConnected);
+
+      void resume_connection()
+         raises(ConnectionAlreadyActive, NotConnected);
+
+   }; // ProxyPullConsumer
+
+   interface StructuredProxyPullConsumer :
+         ProxyConsumer,
+         CosNotifyComm::StructuredPullConsumer {
+
+      void connect_structured_pull_supplier (
+            in CosNotifyComm::StructuredPullSupplier pull_supplier)
+         raises(CosEventChannelAdmin::AlreadyConnected,
+                CosEventChannelAdmin::TypeError );
+
+      void suspend_connection()
+         raises(ConnectionAlreadyInactive, NotConnected);
+
+      void resume_connection()
+         raises(ConnectionAlreadyActive, NotConnected);
+
+   }; // StructuredProxyPullConsumer
+
+   interface SequenceProxyPullConsumer :
+         ProxyConsumer,
+         CosNotifyComm::SequencePullConsumer {
+
+      void connect_sequence_pull_supplier (
+            in CosNotifyComm::SequencePullSupplier pull_supplier)
+         raises(CosEventChannelAdmin::AlreadyConnected,
+                CosEventChannelAdmin::TypeError );
+
+      void suspend_connection()
+         raises(ConnectionAlreadyInactive, NotConnected);
+
+      void resume_connection()
+         raises(ConnectionAlreadyActive, NotConnected);
+
+   }; // SequenceProxyPullConsumer
+
+   interface ProxyPushSupplier :
+         ProxySupplier,
+         CosNotifyComm::PushSupplier {
+
+      void connect_any_push_consumer (
+            in CosEventComm::PushConsumer push_consumer)
+         raises(CosEventChannelAdmin::AlreadyConnected,
+                CosEventChannelAdmin::TypeError );
+
+      void suspend_connection()
+         raises(ConnectionAlreadyInactive, NotConnected);
+
+      void resume_connection()
+         raises(ConnectionAlreadyActive, NotConnected);
+
+   }; // ProxyPushSupplier
+
+   interface StructuredProxyPushSupplier :
+         ProxySupplier,
+         CosNotifyComm::StructuredPushSupplier {
+
+      void connect_structured_push_consumer (
+            in CosNotifyComm::StructuredPushConsumer push_consumer)
+         raises(CosEventChannelAdmin::AlreadyConnected,
+                CosEventChannelAdmin::TypeError );
+
+      void suspend_connection()
+         raises(ConnectionAlreadyInactive, NotConnected);
+
+      void resume_connection()
+         raises(ConnectionAlreadyActive, NotConnected);
+
+   }; // StructuredProxyPushSupplier
+
+   interface SequenceProxyPushSupplier :
+         ProxySupplier,
+         CosNotifyComm::SequencePushSupplier {
+
+      void connect_sequence_push_consumer (
+            in CosNotifyComm::SequencePushConsumer push_consumer)
+         raises(CosEventChannelAdmin::AlreadyConnected,
+                CosEventChannelAdmin::TypeError );
+
+      void suspend_connection()
+         raises(ConnectionAlreadyInactive, NotConnected);
+
+      void resume_connection()
+         raises(ConnectionAlreadyActive, NotConnected);
+
+   }; // SequenceProxyPushSupplier
+
+   typedef long ProxyID;
+   typedef sequence <ProxyID> ProxyIDSeq;
+
+   enum ClientType {
+      ANY_EVENT,
+      STRUCTURED_EVENT,
+      SEQUENCE_EVENT
+   };
+
+   enum InterFilterGroupOperator { AND_OP, OR_OP };
+
+   typedef long AdminID;
+   typedef sequence<AdminID> AdminIDSeq;
+
+   exception AdminNotFound {};
+   exception ProxyNotFound {};
+
+   struct AdminLimit {
+      CosNotification::PropertyName name;
+      CosNotification::PropertyValue value;
+   };
+
+   exception AdminLimitExceeded { AdminLimit admin_property_err; };
+
+   interface ConsumerAdmin :
+         CosNotification::QoSAdmin,
+         CosNotifyComm::NotifySubscribe,
+         CosNotifyFilter::FilterAdmin,
+         CosEventChannelAdmin::ConsumerAdmin {
+
+      readonly attribute AdminID MyID;
+      readonly attribute EventChannel MyChannel;
+
+      readonly attribute InterFilterGroupOperator MyOperator;
+
+      attribute CosNotifyFilter::MappingFilter priority_filter;
+      attribute CosNotifyFilter::MappingFilter lifetime_filter;
+
+      readonly attribute ProxyIDSeq pull_suppliers;
+      readonly attribute ProxyIDSeq push_suppliers;
+
+      ProxySupplier get_proxy_supplier (
+            in ProxyID proxy_id )
+         raises ( ProxyNotFound );
+
+      ProxySupplier obtain_notification_pull_supplier (
+            in ClientType ctype,
+            out ProxyID proxy_id)
+         raises ( AdminLimitExceeded );
+
+      ProxySupplier obtain_notification_push_supplier (
+            in ClientType ctype,
+            out ProxyID proxy_id)
+         raises ( AdminLimitExceeded );
+
+      void destroy();
+
+   }; // ConsumerAdmin
+
+   interface SupplierAdmin :
+         CosNotification::QoSAdmin,
+         CosNotifyComm::NotifyPublish,
+         CosNotifyFilter::FilterAdmin,
+         CosEventChannelAdmin::SupplierAdmin {
+
+      readonly attribute AdminID MyID;
+      readonly attribute EventChannel MyChannel;
+
+      readonly attribute InterFilterGroupOperator MyOperator;
+
+      readonly attribute ProxyIDSeq pull_consumers;
+      readonly attribute ProxyIDSeq push_consumers;
+
+      ProxyConsumer get_proxy_consumer (
+            in ProxyID proxy_id )
+         raises ( ProxyNotFound );
+
+      ProxyConsumer obtain_notification_pull_consumer (
+            in ClientType ctype,
+            out ProxyID proxy_id)
+         raises ( AdminLimitExceeded );
+
+      ProxyConsumer obtain_notification_push_consumer (
+            in ClientType ctype,
+            out ProxyID proxy_id)
+         raises ( AdminLimitExceeded );
+
+      void destroy();
+
+   }; // SupplierAdmin
+
+   interface EventChannel :
+      CosNotification::QoSAdmin,
+      CosNotification::AdminPropertiesAdmin,
+      CosEventChannelAdmin::EventChannel {
+
+      readonly attribute EventChannelFactory MyFactory;
+
+      readonly attribute ConsumerAdmin default_consumer_admin;
+      readonly attribute SupplierAdmin default_supplier_admin;
+
+      readonly attribute CosNotifyFilter::FilterFactory
+                  default_filter_factory;
+
+      ConsumerAdmin new_for_consumers(
+            in InterFilterGroupOperator op,
+            out AdminID id );
+
+      SupplierAdmin new_for_suppliers(
+            in InterFilterGroupOperator op,
+            out AdminID id );
+
+      ConsumerAdmin get_consumeradmin ( in AdminID id )
+         raises (AdminNotFound);
+
+      SupplierAdmin get_supplieradmin ( in AdminID id )
+         raises (AdminNotFound);
+
+      AdminIDSeq get_all_consumeradmins();
+      AdminIDSeq get_all_supplieradmins();
+
+   }; // EventChannel
+
+   typedef long ChannelID;
+   typedef sequence<ChannelID> ChannelIDSeq;
+
+   exception ChannelNotFound {};
+
+   interface EventChannelFactory {
+
+      EventChannel create_channel (
+            in CosNotification::QoSProperties initial_qos,
+            in CosNotification::AdminProperties initial_admin,
+            out ChannelID id)
+         raises(CosNotification::UnsupportedQoS,
+                CosNotification::UnsupportedAdmin );
+
+      ChannelIDSeq get_all_channels();
+
+      EventChannel get_event_channel ( in ChannelID id )
+         raises (ChannelNotFound);
+
+   }; // EventChannelFactory
+}; // CosNotifyChannelAdmin
+
+#endif /* _COS_NOTIFY_CHANNEL_ADMIN_IDL_ */

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNotifyComm.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNotifyComm.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNotifyComm.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,127 +1,127 @@
-//File: CosNotifyComm.idl
-//Part of the Notification Service
-
-#ifndef _COS_NOTIFY_COMM_IDL_
-#define _COS_NOTIFY_COMM_IDL_
-#pragma prefix "omg.org"
-
-#include <CosNotification.idl>
-#include <CosEventComm.idl>
-
-module CosNotifyComm {
-
-   exception InvalidEventType { CosNotification::EventType type; };
-
-   interface NotifyPublish {
-
-      void offer_change (
-            in CosNotification::EventTypeSeq added,
-            in CosNotification::EventTypeSeq removed )
-         raises ( InvalidEventType );
-
-   }; // NotifyPublish
-
-   interface NotifySubscribe {
-
-      void subscription_change(
-            in CosNotification::EventTypeSeq added,
-            in CosNotification::EventTypeSeq removed )
-         raises ( InvalidEventType );
-
-   }; // NotifySubscribe
-
-   interface PushConsumer :
-      NotifyPublish,
-      CosEventComm::PushConsumer {
-   }; // PushConsumer
-
-   interface PullConsumer :
-      NotifyPublish,
-      CosEventComm::PullConsumer {
-   }; // PullConsumer
-
-   interface PullSupplier :
-      NotifySubscribe,
-      CosEventComm::PullSupplier {
-   }; // PullSupplier
-
-   interface PushSupplier :
-      NotifySubscribe,
-      CosEventComm::PushSupplier {
-   };
-
-   interface StructuredPushConsumer : NotifyPublish {
-
-      void push_structured_event(
-            in CosNotification::StructuredEvent notification)
-         raises(CosEventComm::Disconnected);
-
-      void disconnect_structured_push_consumer();
-
-   }; // StructuredPushConsumer
-
-   interface StructuredPullConsumer : NotifyPublish {
-      
-      void disconnect_structured_pull_consumer();
-
-   }; // StructuredPullConsumer
-
-   interface StructuredPullSupplier : NotifySubscribe {
-
-      CosNotification::StructuredEvent pull_structured_event()
-         raises(CosEventComm::Disconnected);
-
-      CosNotification::StructuredEvent try_pull_structured_event(
-            out boolean has_event)
-         raises(CosEventComm::Disconnected);
-
-      void disconnect_structured_pull_supplier();
-
-   }; // StructuredPullSupplier
-
-   interface StructuredPushSupplier : NotifySubscribe {
-      
-      void disconnect_structured_push_supplier();
-
-   }; // StructuredPushSupplier
-
-   interface SequencePushConsumer : NotifyPublish {
-
-      void push_structured_events(
-            in CosNotification::EventBatch notifications)
-         raises(CosEventComm::Disconnected);
-
-      void disconnect_sequence_push_consumer();
-
-   }; // SequencePushConsumer
-
-   interface SequencePullConsumer : NotifyPublish {
-      
-      void disconnect_sequence_pull_consumer();
-
-   }; // SequencePullConsumer
-
-   interface SequencePullSupplier : NotifySubscribe {
-
-      CosNotification::EventBatch pull_structured_events(
-            in long max_number )
-         raises(CosEventComm::Disconnected);
-
-      CosNotification::EventBatch try_pull_structured_events(
-            in long max_number,
-            out boolean has_event)
-         raises(CosEventComm::Disconnected);
-
-      void disconnect_sequence_pull_supplier();
-
-   }; // SequencePullSupplier
-
-   interface SequencePushSupplier : NotifySubscribe {
-      
-      void disconnect_sequence_push_supplier();
-
-   }; // SequencePushSupplier
-
-}; // CosNotifyComm
-
-#endif /* _COS_NOTIFY_COMM_IDL_ */
+//File: CosNotifyComm.idl
+//Part of the Notification Service
+
+#ifndef _COS_NOTIFY_COMM_IDL_
+#define _COS_NOTIFY_COMM_IDL_
+#pragma prefix "omg.org"
+
+#include <CosNotification.idl>
+#include <CosEventComm.idl>
+
+module CosNotifyComm {
+
+   exception InvalidEventType { CosNotification::EventType type; };
+
+   interface NotifyPublish {
+
+      void offer_change (
+            in CosNotification::EventTypeSeq added,
+            in CosNotification::EventTypeSeq removed )
+         raises ( InvalidEventType );
+
+   }; // NotifyPublish
+
+   interface NotifySubscribe {
+
+      void subscription_change(
+            in CosNotification::EventTypeSeq added,
+            in CosNotification::EventTypeSeq removed )
+         raises ( InvalidEventType );
+
+   }; // NotifySubscribe
+
+   interface PushConsumer :
+      NotifyPublish,
+      CosEventComm::PushConsumer {
+   }; // PushConsumer
+
+   interface PullConsumer :
+      NotifyPublish,
+      CosEventComm::PullConsumer {
+   }; // PullConsumer
+
+   interface PullSupplier :
+      NotifySubscribe,
+      CosEventComm::PullSupplier {
+   }; // PullSupplier
+
+   interface PushSupplier :
+      NotifySubscribe,
+      CosEventComm::PushSupplier {
+   };
+
+   interface StructuredPushConsumer : NotifyPublish {
+
+      void push_structured_event(
+            in CosNotification::StructuredEvent notification)
+         raises(CosEventComm::Disconnected);
+
+      void disconnect_structured_push_consumer();
+
+   }; // StructuredPushConsumer
+
+   interface StructuredPullConsumer : NotifyPublish {
+      
+      void disconnect_structured_pull_consumer();
+
+   }; // StructuredPullConsumer
+
+   interface StructuredPullSupplier : NotifySubscribe {
+
+      CosNotification::StructuredEvent pull_structured_event()
+         raises(CosEventComm::Disconnected);
+
+      CosNotification::StructuredEvent try_pull_structured_event(
+            out boolean has_event)
+         raises(CosEventComm::Disconnected);
+
+      void disconnect_structured_pull_supplier();
+
+   }; // StructuredPullSupplier
+
+   interface StructuredPushSupplier : NotifySubscribe {
+      
+      void disconnect_structured_push_supplier();
+
+   }; // StructuredPushSupplier
+
+   interface SequencePushConsumer : NotifyPublish {
+
+      void push_structured_events(
+            in CosNotification::EventBatch notifications)
+         raises(CosEventComm::Disconnected);
+
+      void disconnect_sequence_push_consumer();
+
+   }; // SequencePushConsumer
+
+   interface SequencePullConsumer : NotifyPublish {
+      
+      void disconnect_sequence_pull_consumer();
+
+   }; // SequencePullConsumer
+
+   interface SequencePullSupplier : NotifySubscribe {
+
+      CosNotification::EventBatch pull_structured_events(
+            in long max_number )
+         raises(CosEventComm::Disconnected);
+
+      CosNotification::EventBatch try_pull_structured_events(
+            in long max_number,
+            out boolean has_event)
+         raises(CosEventComm::Disconnected);
+
+      void disconnect_sequence_pull_supplier();
+
+   }; // SequencePullSupplier
+
+   interface SequencePushSupplier : NotifySubscribe {
+      
+      void disconnect_sequence_push_supplier();
+
+   }; // SequencePushSupplier
+
+}; // CosNotifyComm
+
+#endif /* _COS_NOTIFY_COMM_IDL_ */

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNotifyFilter.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNotifyFilter.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosNotifyFilter.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,183 +1,183 @@
-//File: CosNotifyFilter.idl
-//Part of the Notification Service
-
-#ifndef _COS_NOTIFY_FILTER_IDL_
-#define _COS_NOTIFY_FILTER_IDL_
-#pragma prefix "omg.org"
-
-#include <CosNotifyComm.idl>
-#include <orb.idl>
-
-module CosNotifyFilter {
-
-   typedef long ConstraintID;
-
-   struct ConstraintExp {
-      CosNotification::EventTypeSeq event_types;
-      string constraint_expr;
-   };
-
-   typedef sequence<ConstraintID> ConstraintIDSeq;
-   typedef sequence<ConstraintExp> ConstraintExpSeq;
-
-   struct ConstraintInfo {
-      ConstraintExp constraint_expression;
-      ConstraintID constraint_id;
-   };
-
-   typedef sequence<ConstraintInfo> ConstraintInfoSeq;
-
-   struct MappingConstraintPair {
-      ConstraintExp constraint_expression;
-      any result_to_set;
-   };
-
-   typedef sequence<MappingConstraintPair> MappingConstraintPairSeq;
-
-   struct MappingConstraintInfo {
-      ConstraintExp constraint_expression;
-      ConstraintID constraint_id;
-      any value;
-   };
-
-   typedef sequence<MappingConstraintInfo> MappingConstraintInfoSeq;
-
-   typedef long CallbackID;
-   typedef sequence<CallbackID> CallbackIDSeq;
-
-   exception UnsupportedFilterableData {};
-   exception InvalidGrammar {};
-   exception InvalidConstraint {ConstraintExp constr;};
-   exception DuplicateConstraintID {ConstraintID id;};
-
-   exception ConstraintNotFound {ConstraintID id;};
-   exception CallbackNotFound {};
-
-   exception InvalidValue {ConstraintExp constr; any value;};
-
-   interface Filter {
-
-      readonly attribute string constraint_grammar;
-
-      ConstraintInfoSeq add_constraints (
-            in ConstraintExpSeq constraint_list)
-         raises (InvalidConstraint);
-
-      void modify_constraints (
-            in ConstraintIDSeq del_list,
-            in ConstraintInfoSeq modify_list)
-         raises (InvalidConstraint, ConstraintNotFound);
-
-      ConstraintInfoSeq get_constraints(
-            in ConstraintIDSeq id_list)
-         raises (ConstraintNotFound);
-
-      ConstraintInfoSeq get_all_constraints();
-
-      void remove_all_constraints();
-
-      void destroy();
-
-      boolean match ( in any filterable_data )
-         raises (UnsupportedFilterableData);
-
-      boolean match_structured (
-            in CosNotification::StructuredEvent filterable_data )
-         raises (UnsupportedFilterableData);
-
-      boolean match_typed (
-            in CosNotification::PropertySeq filterable_data )
-         raises (UnsupportedFilterableData);
-
-      CallbackID attach_callback (
-            in CosNotifyComm::NotifySubscribe callback);
-
-      void detach_callback ( in CallbackID callback)
-         raises ( CallbackNotFound );
-
-      CallbackIDSeq get_callbacks();
-
-   }; // Filter
-
-   interface MappingFilter {
-
-      readonly attribute string constraint_grammar;
-
-      readonly attribute CORBA::TypeCode value_type;
-
-      readonly attribute any default_value;
-
-      MappingConstraintInfoSeq add_mapping_constraints (
-            in MappingConstraintPairSeq pair_list)
-         raises (InvalidConstraint, InvalidValue);
-
-      void modify_mapping_constraints (
-            in ConstraintIDSeq del_list,
-            in MappingConstraintInfoSeq modify_list)
-         raises (InvalidConstraint, InvalidValue,
-                  ConstraintNotFound);
-
-      MappingConstraintInfoSeq get_mapping_constraints (
-            in ConstraintIDSeq id_list)
-         raises (ConstraintNotFound);
-
-      MappingConstraintInfoSeq get_all_mapping_constraints();
-
-      void remove_all_mapping_constraints();
-
-      void destroy();
-
-      boolean match (
-            in any filterable_data,
-            out any result_to_set )
-         raises (UnsupportedFilterableData);
-
-      boolean match_structured (
-            in CosNotification::StructuredEvent filterable_data,
-            out any result_to_set)
-         raises (UnsupportedFilterableData);
-
-      boolean match_typed (
-            in CosNotification::PropertySeq filterable_data,
-            out any result_to_set)
-         raises (UnsupportedFilterableData);
-
-   }; // MappingFilter
-
-   interface FilterFactory {
-
-      Filter create_filter (
-            in string constraint_grammar)
-         raises (InvalidGrammar);
-
-      MappingFilter create_mapping_filter (
-            in string constraint_grammar,
-            in any default_value)
-         raises(InvalidGrammar);
-
-   }; // FilterFactory
-
-   typedef long FilterID;
-   typedef sequence<FilterID> FilterIDSeq;
-
-   exception FilterNotFound {};
-
-   interface FilterAdmin {
-
-      FilterID add_filter ( in Filter new_filter );
-
-      void remove_filter ( in FilterID filter )
-         raises ( FilterNotFound );
-
-      Filter get_filter ( in FilterID filter )
-         raises ( FilterNotFound );
-
-      FilterIDSeq get_all_filters();
-
-      void remove_all_filters();
-
-   }; // FilterAdmin
-
-}; // CosNotifyFilter
-
-#endif /* _COS_NOTIFY_FILTER_IDL_ */
+//File: CosNotifyFilter.idl
+//Part of the Notification Service
+
+#ifndef _COS_NOTIFY_FILTER_IDL_
+#define _COS_NOTIFY_FILTER_IDL_
+#pragma prefix "omg.org"
+
+#include <CosNotifyComm.idl>
+#include <orb.idl>
+
+module CosNotifyFilter {
+
+   typedef long ConstraintID;
+
+   struct ConstraintExp {
+      CosNotification::EventTypeSeq event_types;
+      string constraint_expr;
+   };
+
+   typedef sequence<ConstraintID> ConstraintIDSeq;
+   typedef sequence<ConstraintExp> ConstraintExpSeq;
+
+   struct ConstraintInfo {
+      ConstraintExp constraint_expression;
+      ConstraintID constraint_id;
+   };
+
+   typedef sequence<ConstraintInfo> ConstraintInfoSeq;
+
+   struct MappingConstraintPair {
+      ConstraintExp constraint_expression;
+      any result_to_set;
+   };
+
+   typedef sequence<MappingConstraintPair> MappingConstraintPairSeq;
+
+   struct MappingConstraintInfo {
+      ConstraintExp constraint_expression;
+      ConstraintID constraint_id;
+      any value;
+   };
+
+   typedef sequence<MappingConstraintInfo> MappingConstraintInfoSeq;
+
+   typedef long CallbackID;
+   typedef sequence<CallbackID> CallbackIDSeq;
+
+   exception UnsupportedFilterableData {};
+   exception InvalidGrammar {};
+   exception InvalidConstraint {ConstraintExp constr;};
+   exception DuplicateConstraintID {ConstraintID id;};
+
+   exception ConstraintNotFound {ConstraintID id;};
+   exception CallbackNotFound {};
+
+   exception InvalidValue {ConstraintExp constr; any value;};
+
+   interface Filter {
+
+      readonly attribute string constraint_grammar;
+
+      ConstraintInfoSeq add_constraints (
+            in ConstraintExpSeq constraint_list)
+         raises (InvalidConstraint);
+
+      void modify_constraints (
+            in ConstraintIDSeq del_list,
+            in ConstraintInfoSeq modify_list)
+         raises (InvalidConstraint, ConstraintNotFound);
+
+      ConstraintInfoSeq get_constraints(
+            in ConstraintIDSeq id_list)
+         raises (ConstraintNotFound);
+
+      ConstraintInfoSeq get_all_constraints();
+
+      void remove_all_constraints();
+
+      void destroy();
+
+      boolean match ( in any filterable_data )
+         raises (UnsupportedFilterableData);
+
+      boolean match_structured (
+            in CosNotification::StructuredEvent filterable_data )
+         raises (UnsupportedFilterableData);
+
+      boolean match_typed (
+            in CosNotification::PropertySeq filterable_data )
+         raises (UnsupportedFilterableData);
+
+      CallbackID attach_callback (
+            in CosNotifyComm::NotifySubscribe callback);
+
+      void detach_callback ( in CallbackID callback)
+         raises ( CallbackNotFound );
+
+      CallbackIDSeq get_callbacks();
+
+   }; // Filter
+
+   interface MappingFilter {
+
+      readonly attribute string constraint_grammar;
+
+      readonly attribute CORBA::TypeCode value_type;
+
+      readonly attribute any default_value;
+
+      MappingConstraintInfoSeq add_mapping_constraints (
+            in MappingConstraintPairSeq pair_list)
+         raises (InvalidConstraint, InvalidValue);
+
+      void modify_mapping_constraints (
+            in ConstraintIDSeq del_list,
+            in MappingConstraintInfoSeq modify_list)
+         raises (InvalidConstraint, InvalidValue,
+                  ConstraintNotFound);
+
+      MappingConstraintInfoSeq get_mapping_constraints (
+            in ConstraintIDSeq id_list)
+         raises (ConstraintNotFound);
+
+      MappingConstraintInfoSeq get_all_mapping_constraints();
+
+      void remove_all_mapping_constraints();
+
+      void destroy();
+
+      boolean match (
+            in any filterable_data,
+            out any result_to_set )
+         raises (UnsupportedFilterableData);
+
+      boolean match_structured (
+            in CosNotification::StructuredEvent filterable_data,
+            out any result_to_set)
+         raises (UnsupportedFilterableData);
+
+      boolean match_typed (
+            in CosNotification::PropertySeq filterable_data,
+            out any result_to_set)
+         raises (UnsupportedFilterableData);
+
+   }; // MappingFilter
+
+   interface FilterFactory {
+
+      Filter create_filter (
+            in string constraint_grammar)
+         raises (InvalidGrammar);
+
+      MappingFilter create_mapping_filter (
+            in string constraint_grammar,
+            in any default_value)
+         raises(InvalidGrammar);
+
+   }; // FilterFactory
+
+   typedef long FilterID;
+   typedef sequence<FilterID> FilterIDSeq;
+
+   exception FilterNotFound {};
+
+   interface FilterAdmin {
+
+      FilterID add_filter ( in Filter new_filter );
+
+      void remove_filter ( in FilterID filter )
+         raises ( FilterNotFound );
+
+      Filter get_filter ( in FilterID filter )
+         raises ( FilterNotFound );
+
+      FilterIDSeq get_all_filters();
+
+      void remove_all_filters();
+
+   }; // FilterAdmin
+
+}; // CosNotifyFilter
+
+#endif /* _COS_NOTIFY_FILTER_IDL_ */

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosObjectIdentity.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosObjectIdentity.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosObjectIdentity.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,21 +1,21 @@
-// CosObjectIdentity Module, p 9-19 CORBAservices, Relationship
-// Service V1.0, 3/94
-
-#ifndef __CosObjectIdentity_IDL
-#define __CosObjectIdentity_IDL
-
-#pragma prefix "omg.org"
-
-module CosObjectIdentity 
-{
-        typedef unsigned long ObjectIdentifier;
-
-        interface IdentifiableObject {
-                        readonly attribute ObjectIdentifier constant_random_id;
-                        boolean is_identical (
-                                in IdentifiableObject other_object);
-        };
-
-};
-
-#endif
+// CosObjectIdentity Module, p 9-19 CORBAservices, Relationship
+// Service V1.0, 3/94
+
+#ifndef __CosObjectIdentity_IDL
+#define __CosObjectIdentity_IDL
+
+#pragma prefix "omg.org"
+
+module CosObjectIdentity 
+{
+        typedef unsigned long ObjectIdentifier;
+
+        interface IdentifiableObject {
+                        readonly attribute ObjectIdentifier constant_random_id;
+                        boolean is_identical (
+                                in IdentifiableObject other_object);
+        };
+
+};
+
+#endif

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosPersistence.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosPersistence.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosPersistence.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,266 +1,266 @@
-// CosPersistencePID Module, p 5-20 CORBAservices, 
-// Persistent Object Service V1.0, 3/94
-
-//#ifndef __COSPERSISTENCE
-//#define __COSPERSISTENCE
-
-#include <orb.idl>
-
-#pragma prefix "omg.org"
-
-module CosPersistencePID {
-
-        interface PID {
-                attribute string datastore_type;
-                string get_PIDString();
-        };
-};
-
-// CosPersistencePDS Module, p 5-20 CORBAservices, 
-// Persistent Object Service V1.0, 3/94
-
-// #include <CosPersistencePID.idl>
-
-module CosPersistencePDS {
-
-// interface Object;
-        interface PDS {
-                PDS     connect (in Object obj, 
-                        in CosPersistencePID::PID p);
-                void disconnect (in Object obj, 
-                        in CosPersistencePID::PID p);
-                void store (in Object obj, 
-                        in CosPersistencePID::PID p);
-                void restore (in Object obj, 
-                        in CosPersistencePID::PID p);
-                void delete (in Object obj, 
-                        in CosPersistencePID::PID p);
-        };
-};
-
-
-// CosPersistencePO Module, p 5-12 CORBAservices,
-// Persistent Object Service V1.0, 3/94
-
-// // #include <CosPersistencePDS.idl>
-// CosPersistencePDS.idl 
-// // #includes CosPersistencePID.idl
-
-module CosPersistencePO {
-
-        interface PO {
-                attribute CosPersistencePID::PID p;
-                CosPersistencePDS::PDS connect (
-                        in CosPersistencePID::PID p);
-                void disconnect (in CosPersistencePID::PID p);
-                void store (in CosPersistencePID::PID p);
-                void restore (in CosPersistencePID::PID p);
-                void delete (in CosPersistencePID::PID p);
-        };
-
-        interface SD {
-                void pre_store();
-                void post_restore();
-        };
-};
-
-
-// CosPersistencePOM Module, p 5-15 CORBAservices,
-// Persistent Object Service V1.0, 3/94
-
-// #include <CosPersistencePDS.idl>
-
-// CosPersistencePDS.idl // #includes CosPersistencePID.idl
-
-module CosPersistencePOM {
-
-// interface Object;        
-
-	interface POM {
-                CosPersistencePDS::PDS connect (
-                        in Object obj, 
-                        in CosPersistencePID::PID p);
-                void disconnect (
-                        in Object obj, 
-                        in CosPersistencePID::PID p);
-                void store (
-                        in Object obj, 
-                        in CosPersistencePID::PID p);
-                void restore (
-                        in Object obj, 
-                        in CosPersistencePID::PID p);
-                void delete (
-                        in Object obj, 
-                        in CosPersistencePID::PID p);
- 	       };
-	};
-
-
-// CosPersistencePDS_DA Module, p 5-22 CORBAservices,
-// Persistent Object Service, V1.0, 3/94
-
-// #include <CosPersistencePDS.idl>
-// CosPersistencePDS.idl // #includes CosPersistencePID.idl
-
-module CosPersistencePDS_DA {
-
-        typedef string DAObjectID;
-
-        interface PID_DA : CosPersistencePID::PID {
-                attribute DAObjectID oid;
-        };
-        
-        interface DAObject {
-                boolean dado_same(in DAObject d);
-                DAObjectID dado_oid();
-                PID_DA dado_pid();
-                void dado_remove();
-                void dado_free();
-        };
-
-        interface DAObjectFactory {
-                DAObject create();
-        };
-
-        interface DAObjectFactoryFinder {
-                DAObjectFactory find_factory(in string key);
-        };
-
-        interface PDS_DA : CosPersistencePDS::PDS {
-                DAObject get_data();
-                void set_data(in DAObject new_data);
-                DAObject lookup(in DAObjectID id);
-                PID_DA get_pid();
-                PID_DA get_object_pid(in DAObject dao);
-                DAObjectFactoryFinder data_factories();
-        };
-
-        typedef sequence<string> AttributeNames;
-        interface DynamicAttributeAccess {
-                AttributeNames attribute_names();
-                any attribute_get(in string name);
-                void attribute_set(in string name, in any value);
-        };
-
-        typedef string ClusterID;
-        typedef sequence<ClusterID> ClusterIDs;
-        interface PDS_ClusteredDA : PDS_DA{
-                ClusterID cluster_id();
-                string cluster_kind();
-                ClusterIDs clusters_of();
-                PDS_ClusteredDA create_cluster(in string kind);
-                PDS_ClusteredDA open_cluster(in ClusterID cluster);
-                PDS_ClusteredDA copy_cluster(
-                        in PDS_DA source);
-        };
-};
-
-// CosPersistenceDDO Module, p 5-32 CORBAservices, Persistent Object Service V1.0, 3/94
-
-// #include <CosPersistencePID.idl>
-module CosPersistenceDDO {
-
-        interface DDO {
-                attribute string object_type;
-                attribute CosPersistencePID::PID p;
-                short add_data();
-                short add_data_property (in short data_id);
-                short get_data_count();
-                short get_data_property_count (in short data_id);
-                void get_data_property (in short data_id,
-                        in short property_id,
-                        out string property_name,
-                        out any property_value);
-                void set_data_property (in short data_id,
-                        in short property_id,
-                        in string property_name,
-                        in any property_value);
-                void get_data (in short data_id,
-                        out string data_name,
-                        out any data_value);
-                void set_data (in short data_id,
-                        in string data_name,
-                        in any data_value);
-        };
-};
-
-// CosPersistenceDS_CLI module, p 5-34 CORBAservices,
-// Persistent Object Service V1.0, 3/94
-
-// #include <CosPersistenceDDO.idl>
-// CosPersistenceDDO.idl // #includes CosPersistencePID.idl
-
-module CosPersistenceDS_CLI {
-        interface UserEnvironment {
-                void set_option (in long option,in any value);
-                void get_option (in long option,out any value);
-                void release();
-        };
-
-        interface Connection {
-                void set_option (in long option,in any value);
-                void get_option (in long option,out any value);
-        };
-
-        interface ConnectionFactory {
-                Connection create_object (
-                        in UserEnvironment user_envir);
-        };
-
-        interface Cursor { 
-                void set_position (in long position,in any value);
-                CosPersistenceDDO::DDO fetch_object();
-        };
-
-        interface CursorFactory {
-                Cursor create_object (
-                        in Connection connection);
-        };
-
-        interface PID_CLI : CosPersistencePID::PID {
-                attribute string datastore_id;
-                attribute string id;
-        };
-
-
-
-        interface Datastore_CLI {
-                void connect (in Connection connection,
-                        in string datastore_id,
-                        in string user_name,
-                        in string authentication);
-                void disconnect (in Connection connection);
-                Connection get_connection (
-                        in string datastore_id,
-                        in string user_name);
-                void add_object (in Connection connection,
-                        in CosPersistenceDDO::DDO data_obj);
-                void delete_object (
-                        in Connection connection,
-                        in CosPersistenceDDO::DDO data_obj);
-                void update_object (
-                        in Connection connection,
-                        in CosPersistenceDDO::DDO data_obj);
-                void retrieve_object(
-                        in Connection connection,
-                        in CosPersistenceDDO::DDO data_obj);
-                Cursor select_object(
-                        in Connection connection,
-                        in string key);
-                void transact (in UserEnvironment user_envir,
-                        in short completion_type);
-                void assign_PID (in PID_CLI p);
-                void assign_PID_relative (
-                        in PID_CLI source_pid,
-                        in PID_CLI target_pid);
-                boolean is_identical_PID (
-                        in PID_CLI pid_1,
-                        in PID_CLI pid_2);
-                string get_object_type (in PID_CLI p);
-                void register_mapping_schema (in string schema_file); 
-                Cursor execute (in Connection connection,
-                        in string command); 
-        };
-
-};
-
+// CosPersistencePID Module, p 5-20 CORBAservices, 
+// Persistent Object Service V1.0, 3/94
+
+//#ifndef __COSPERSISTENCE
+//#define __COSPERSISTENCE
+
+#include <orb.idl>
+
+#pragma prefix "omg.org"
+
+module CosPersistencePID {
+
+        interface PID {
+                attribute string datastore_type;
+                string get_PIDString();
+        };
+};
+
+// CosPersistencePDS Module, p 5-20 CORBAservices, 
+// Persistent Object Service V1.0, 3/94
+
+// #include <CosPersistencePID.idl>
+
+module CosPersistencePDS {
+
+// interface Object;
+        interface PDS {
+                PDS     connect (in Object obj, 
+                        in CosPersistencePID::PID p);
+                void disconnect (in Object obj, 
+                        in CosPersistencePID::PID p);
+                void store (in Object obj, 
+                        in CosPersistencePID::PID p);
+                void restore (in Object obj, 
+                        in CosPersistencePID::PID p);
+                void delete (in Object obj, 
+                        in CosPersistencePID::PID p);
+        };
+};
+
+
+// CosPersistencePO Module, p 5-12 CORBAservices,
+// Persistent Object Service V1.0, 3/94
+
+// // #include <CosPersistencePDS.idl>
+// CosPersistencePDS.idl 
+// // #includes CosPersistencePID.idl
+
+module CosPersistencePO {
+
+        interface PO {
+                attribute CosPersistencePID::PID p;
+                CosPersistencePDS::PDS connect (
+                        in CosPersistencePID::PID p);
+                void disconnect (in CosPersistencePID::PID p);
+                void store (in CosPersistencePID::PID p);
+                void restore (in CosPersistencePID::PID p);
+                void delete (in CosPersistencePID::PID p);
+        };
+
+        interface SD {
+                void pre_store();
+                void post_restore();
+        };
+};
+
+
+// CosPersistencePOM Module, p 5-15 CORBAservices,
+// Persistent Object Service V1.0, 3/94
+
+// #include <CosPersistencePDS.idl>
+
+// CosPersistencePDS.idl // #includes CosPersistencePID.idl
+
+module CosPersistencePOM {
+
+// interface Object;        
+
+	interface POM {
+                CosPersistencePDS::PDS connect (
+                        in Object obj, 
+                        in CosPersistencePID::PID p);
+                void disconnect (
+                        in Object obj, 
+                        in CosPersistencePID::PID p);
+                void store (
+                        in Object obj, 
+                        in CosPersistencePID::PID p);
+                void restore (
+                        in Object obj, 
+                        in CosPersistencePID::PID p);
+                void delete (
+                        in Object obj, 
+                        in CosPersistencePID::PID p);
+ 	       };
+	};
+
+
+// CosPersistencePDS_DA Module, p 5-22 CORBAservices,
+// Persistent Object Service, V1.0, 3/94
+
+// #include <CosPersistencePDS.idl>
+// CosPersistencePDS.idl // #includes CosPersistencePID.idl
+
+module CosPersistencePDS_DA {
+
+        typedef string DAObjectID;
+
+        interface PID_DA : CosPersistencePID::PID {
+                attribute DAObjectID oid;
+        };
+        
+        interface DAObject {
+                boolean dado_same(in DAObject d);
+                DAObjectID dado_oid();
+                PID_DA dado_pid();
+                void dado_remove();
+                void dado_free();
+        };
+
+        interface DAObjectFactory {
+                DAObject create();
+        };
+
+        interface DAObjectFactoryFinder {
+                DAObjectFactory find_factory(in string key);
+        };
+
+        interface PDS_DA : CosPersistencePDS::PDS {
+                DAObject get_data();
+                void set_data(in DAObject new_data);
+                DAObject lookup(in DAObjectID id);
+                PID_DA get_pid();
+                PID_DA get_object_pid(in DAObject dao);
+                DAObjectFactoryFinder data_factories();
+        };
+
+        typedef sequence<string> AttributeNames;
+        interface DynamicAttributeAccess {
+                AttributeNames attribute_names();
+                any attribute_get(in string name);
+                void attribute_set(in string name, in any value);
+        };
+
+        typedef string ClusterID;
+        typedef sequence<ClusterID> ClusterIDs;
+        interface PDS_ClusteredDA : PDS_DA{
+                ClusterID cluster_id();
+                string cluster_kind();
+                ClusterIDs clusters_of();
+                PDS_ClusteredDA create_cluster(in string kind);
+                PDS_ClusteredDA open_cluster(in ClusterID cluster);
+                PDS_ClusteredDA copy_cluster(
+                        in PDS_DA source);
+        };
+};
+
+// CosPersistenceDDO Module, p 5-32 CORBAservices, Persistent Object Service V1.0, 3/94
+
+// #include <CosPersistencePID.idl>
+module CosPersistenceDDO {
+
+        interface DDO {
+                attribute string object_type;
+                attribute CosPersistencePID::PID p;
+                short add_data();
+                short add_data_property (in short data_id);
+                short get_data_count();
+                short get_data_property_count (in short data_id);
+                void get_data_property (in short data_id,
+                        in short property_id,
+                        out string property_name,
+                        out any property_value);
+                void set_data_property (in short data_id,
+                        in short property_id,
+                        in string property_name,
+                        in any property_value);
+                void get_data (in short data_id,
+                        out string data_name,
+                        out any data_value);
+                void set_data (in short data_id,
+                        in string data_name,
+                        in any data_value);
+        };
+};
+
+// CosPersistenceDS_CLI module, p 5-34 CORBAservices,
+// Persistent Object Service V1.0, 3/94
+
+// #include <CosPersistenceDDO.idl>
+// CosPersistenceDDO.idl // #includes CosPersistencePID.idl
+
+module CosPersistenceDS_CLI {
+        interface UserEnvironment {
+                void set_option (in long option,in any value);
+                void get_option (in long option,out any value);
+                void release();
+        };
+
+        interface Connection {
+                void set_option (in long option,in any value);
+                void get_option (in long option,out any value);
+        };
+
+        interface ConnectionFactory {
+                Connection create_object (
+                        in UserEnvironment user_envir);
+        };
+
+        interface Cursor { 
+                void set_position (in long position,in any value);
+                CosPersistenceDDO::DDO fetch_object();
+        };
+
+        interface CursorFactory {
+                Cursor create_object (
+                        in Connection connection);
+        };
+
+        interface PID_CLI : CosPersistencePID::PID {
+                attribute string datastore_id;
+                attribute string id;
+        };
+
+
+
+        interface Datastore_CLI {
+                void connect (in Connection connection,
+                        in string datastore_id,
+                        in string user_name,
+                        in string authentication);
+                void disconnect (in Connection connection);
+                Connection get_connection (
+                        in string datastore_id,
+                        in string user_name);
+                void add_object (in Connection connection,
+                        in CosPersistenceDDO::DDO data_obj);
+                void delete_object (
+                        in Connection connection,
+                        in CosPersistenceDDO::DDO data_obj);
+                void update_object (
+                        in Connection connection,
+                        in CosPersistenceDDO::DDO data_obj);
+                void retrieve_object(
+                        in Connection connection,
+                        in CosPersistenceDDO::DDO data_obj);
+                Cursor select_object(
+                        in Connection connection,
+                        in string key);
+                void transact (in UserEnvironment user_envir,
+                        in short completion_type);
+                void assign_PID (in PID_CLI p);
+                void assign_PID_relative (
+                        in PID_CLI source_pid,
+                        in PID_CLI target_pid);
+                boolean is_identical_PID (
+                        in PID_CLI pid_1,
+                        in PID_CLI pid_2);
+                string get_object_type (in PID_CLI p);
+                void register_mapping_schema (in string schema_file); 
+                Cursor execute (in Connection connection,
+                        in string command); 
+        };
+
+};
+

Added: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosPropertyService.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosPropertyService.idl	                        (rev 0)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosPropertyService.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -0,0 +1,246 @@
+//File: CosPropertyService.idl
+//The only module of the Property Service
+
+#ifndef _COS_PROPERTY_SERVICE_IDL_
+#define _COS_PROPERTY_SERVICE_IDL_
+#pragma prefix "omg.org"
+
+#include <orb.idl>
+
+module CosPropertyService
+{
+   /*****************************************************/
+   /*  Data Types                                       */
+   /*****************************************************/
+
+   typedef string PropertyName;
+   struct Property {
+      PropertyName property_name;
+      any property_value;
+   };
+
+   enum PropertyModeType {
+      normal,
+      read_only,
+      fixed_normal,
+      fixed_readonly,
+      undefined
+   };
+
+   struct PropertyDef {
+      PropertyName property_name;
+      any property_value;
+      PropertyModeType property_mode;
+   };
+
+   struct PropertyMode {
+      PropertyName property_name;
+      PropertyModeType property_mode;
+   };
+
+   typedef sequence<PropertyName> PropertyNames;
+   typedef sequence<Property> Properties;
+   typedef sequence<PropertyDef> PropertyDefs;
+   typedef sequence<PropertyMode> PropertyModes;
+   typedef sequence<CORBA::TypeCode> PropertyTypes;
+
+   interface PropertyNamesIterator;
+   interface PropertiesIterator;
+   interface PropertySetFactory;
+   interface PropertySetDef;
+   interface PropertySet;
+
+   /*****************************************************/
+   /*  Exceptions                                       */
+   /*****************************************************/
+   exception ConstraintNotSupported{};
+   exception InvalidPropertyName {};
+   exception ConflictingProperty {};
+   exception PropertyNotFound {};
+   exception UnsupportedTypeCode {};
+   exception UnsupportedProperty {};
+   exception UnsupportedMode {};
+   exception FixedProperty {};
+   exception ReadOnlyProperty {};
+
+   enum ExceptionReason {
+      invalid_property_name,
+      conflicting_property,
+      property_not_found,
+      unsupported_type_code,
+      unsupported_property,
+      unsupported_mode,
+      fixed_property,
+      read_only_property
+   };
+
+   struct PropertyException {
+      ExceptionReason reason;
+      PropertyName failing_property_name;
+   };
+
+   typedef sequence<PropertyException> PropertyExceptions;
+
+   exception MultipleExceptions {
+      PropertyExceptions exceptions;
+   };
+
+   /*****************************************************/
+   /*  Interface Definitions                            */
+   /*****************************************************/
+   interface PropertySetFactory
+   {
+      PropertySet create_propertyset();
+      PropertySet create_constrained_propertyset(
+         in PropertyTypes allowed_property_types,
+         in Properties  allowed_properties)
+         raises(ConstraintNotSupported);
+      PropertySet create_initial_propertyset(
+         in Properties  initial_properties)
+         raises(MultipleExceptions);
+   };
+
+   /*---------------------------------------------------*/
+   interface PropertySetDefFactory
+   {
+      PropertySetDef create_propertysetdef();
+      PropertySetDef create_constrained_propertysetdef(
+         in PropertyTypes allowed_property_types,
+         in PropertyDefs  allowed_property_defs)
+         raises(ConstraintNotSupported);
+      PropertySetDef create_initial_propertysetdef(
+         in PropertyDefs  initial_property_defs)
+         raises(MultipleExceptions);
+   };
+
+   /*---------------------------------------------------*/
+   interface PropertySet
+   {
+      /* Support for defining and modifying properties */
+      void define_property(
+         in PropertyName property_name,
+         in any property_value)
+         raises(  InvalidPropertyName,
+                  ConflictingProperty,
+                  UnsupportedTypeCode,
+                  UnsupportedProperty,
+                  ReadOnlyProperty);
+
+      void define_properties(
+         in Properties nproperties)
+         raises(MultipleExceptions);
+
+      /* Support for Getting Properties and their Names */
+      unsigned long get_number_of_properties();
+
+      void get_all_property_names(
+         in unsigned long how_many,
+         out PropertyNames property_names,
+         out PropertyNamesIterator rest);
+
+      any  get_property_value(
+         in  PropertyName property_name)
+         raises(  PropertyNotFound,
+                  InvalidPropertyName);
+
+      boolean get_properties(
+         in PropertyNames property_names,
+         out Properties nproperties);
+
+      void get_all_properties(
+         in unsigned long how_many,
+         out Properties nproperties,
+         out PropertiesIterator rest);
+
+      /* Support for Deleting Properties              */
+      void delete_property(
+         in PropertyName property_name)
+         raises(  PropertyNotFound,
+                  InvalidPropertyName,
+                  FixedProperty);
+
+      void delete_properties(
+         in PropertyNames property_names)
+         raises(MultipleExceptions);
+
+      boolean delete_all_properties();
+
+      /* Support for Existence Check                  */
+      boolean is_property_defined(
+         in PropertyName property_name)
+         raises(InvalidPropertyName);
+   };
+
+   /*---------------------------------------------------*/
+   interface PropertySetDef:PropertySet
+   {
+      /* Support for retrieval of PropertySet constraints*/
+      void get_allowed_property_types(
+         out PropertyTypes property_types);
+
+      void get_allowed_properties(
+         out PropertyDefs property_defs);
+
+      /* Support for defining and modifying properties */
+      void define_property_with_mode(
+         in PropertyName property_name,
+         in any property_value,
+         in PropertyModeType property_mode)
+         raises(  InvalidPropertyName,
+                  ConflictingProperty,
+                  UnsupportedTypeCode,
+                  UnsupportedProperty,
+                  UnsupportedMode,
+                  ReadOnlyProperty);
+
+      void define_properties_with_modes(
+         in PropertyDefs property_defs)
+         raises(MultipleExceptions);
+
+      /* Support for Getting and Setting Property Modes */
+      PropertyModeType get_property_mode(
+         in  PropertyName property_name)
+         raises(  PropertyNotFound,
+                  InvalidPropertyName);
+
+      boolean get_property_modes(
+         in PropertyNames property_names,
+         out PropertyModes property_modes);
+
+      void set_property_mode(
+         in PropertyName property_name,
+         in PropertyModeType property_mode)
+         raises(  InvalidPropertyName,
+                  PropertyNotFound,
+                  UnsupportedMode);
+
+      void set_property_modes(
+         in PropertyModes property_modes)
+         raises(MultipleExceptions);
+   };
+
+   /*---------------------------------------------------*/
+   interface PropertyNamesIterator
+   {
+      void    reset();
+      boolean next_one(
+         out PropertyName property_name);
+      boolean next_n (
+         in  unsigned long how_many,
+         out PropertyNames property_names);
+      void    destroy();
+   };
+
+   /*---------------------------------------------------*/
+   interface PropertiesIterator
+   {
+      void    reset();
+      boolean next_one(
+         out Property aproperty);
+      boolean next_n(
+         in unsigned long how_many,
+         out Properties nproperties);
+      void    destroy();
+   };
+};
+#endif /* ifndef _COS_PROPERTY_SERVICE_IDL_ */

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosReference.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosReference.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosReference.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,18 +1,18 @@
-// CosReference Module, p 9-50 CORBAservices,
-//  Relationship Service V1.0, 3/94
-
-#include <CosGraphs.idl>
-
-#pragma prefix "omg.org"
-
-module CosReference 
-{
-
-        interface Relationship : 
-                        CosRelationships::Relationship {};
-
-        interface ReferencesRole : CosGraphs::Role {};
-
-        interface ReferencedByRole : CosGraphs::Role {};
-
-};
+// CosReference Module, p 9-50 CORBAservices,
+//  Relationship Service V1.0, 3/94
+
+#include <CosGraphs.idl>
+
+#pragma prefix "omg.org"
+
+module CosReference 
+{
+
+        interface Relationship : 
+                        CosRelationships::Relationship {};
+
+        interface ReferencesRole : CosGraphs::Role {};
+
+        interface ReferencedByRole : CosGraphs::Role {};
+
+};

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosRelationships.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosRelationships.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosRelationships.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,125 +1,125 @@
-// CosRelationships Module, p 9-21 CORBAservices, Relationship
-// Service V1.0, 3/94
-
-#ifndef __CosRelationships_IDL
-#define __CosRelationships_IDL
-
-#include <orb.idl>
-#include <CosObjectIdentity.idl>
-
-#pragma prefix "omg.org"
-
-module CosRelationships {
-
-        interface RoleFactory; 
-        interface RelationshipFactory; 
-        interface Relationship; 
-        interface Role;
-        interface RelationshipIterator;
-
-        typedef Object RelatedObject;
-        typedef sequence<Role> Roles;
-        typedef string RoleName;
-        typedef sequence<RoleName> RoleNames;
-
-        struct NamedRole {RoleName name; Role aRole;};
-        typedef sequence<NamedRole> NamedRoles;
-
-        struct RelationshipHandle {
-                        Relationship the_relationship;
-                        CosObjectIdentity::ObjectIdentifier constant_random_id;
-        };
-        typedef sequence<RelationshipHandle> RelationshipHandles;
-
-        interface RelationshipFactory {
-                        struct NamedRoleType {
-                                RoleName name;
-                                        CORBA::InterfaceDef named_role_type;
-                        };
-                        typedef sequence<NamedRoleType> NamedRoleTypes;
-                        readonly attribute CORBA::InterfaceDef relationship_type;
-                        readonly attribute unsigned short degree;
-                        readonly attribute NamedRoleTypes named_role_types;
-                        exception RoleTypeError {NamedRoles culprits;};
-                        exception MaxCardinalityExceeded {
-                                NamedRoles culprits;};
-                        exception DegreeError {unsigned short required_degree;};
-                        exception DuplicateRoleName {NamedRoles culprits;};
-                        exception UnknownRoleName {NamedRoles culprits;};
-
-                        Relationship create (in NamedRoles named_roles)
-                                        raises (RoleTypeError,
-                                                MaxCardinalityExceeded,
-                                                DegreeError,
-                                                DuplicateRoleName,
-                                                UnknownRoleName);
-        };
-
-        interface Relationship :                                                
-                                CosObjectIdentity::IdentifiableObject {
-                        exception CannotUnlink {
-                                Roles offending_roles;
-                        };
-                        readonly attribute NamedRoles named_roles;
-                        void destroy () raises(CannotUnlink);
-        };
-
-        interface Role {
-                        exception UnknownRoleName {};
-                        exception UnknownRelationship {};
-                        exception RelationshipTypeError {};
-                        exception CannotDestroyRelationship {
-                                RelationshipHandles offenders;
-                        };
-                        exception ParticipatingInRelationship {
-                                RelationshipHandles the_relationships;
-                        };
-                        readonly attribute RelatedObject related_object;
-                        RelatedObject get_other_related_object (
-                                                in RelationshipHandle rel,
-                                                in RoleName target_name)
-                                raises (UnknownRoleName,
-                                                UnknownRelationship);
-                        Role get_other_role (in RelationshipHandle rel, 
-                                                in RoleName target_name)
-                                raises (UnknownRoleName, UnknownRelationship);
-                        void get_relationships (
-                                                in unsigned long how_many,
-                                                out RelationshipHandles rels,
-                                                out RelationshipIterator iterator);
-                        void destroy_relationships()
-                                raises(CannotDestroyRelationship);
-                        void destroy() raises(ParticipatingInRelationship);
-                        boolean check_minimum_cardinality ();
-                        void link (in RelationshipHandle rel,
-                                                in NamedRoles named_roles)
-                                        raises(RelationshipFactory::MaxCardinalityExceeded,
-                                                RelationshipTypeError);
-                        void unlink (in RelationshipHandle rel)
-                                raises (UnknownRelationship);
-        };
-
-        interface RoleFactory {
-                        exception NilRelatedObject {};
-                        exception RelatedObjectTypeError {};
-                        readonly attribute CORBA::InterfaceDef role_type;
-                        readonly attribute unsigned long max_cardinality;
-                        readonly attribute unsigned long min_cardinality;
-// the following isn't allowed in IDL,
-//  readonly attribute sequence <CORBA::InterfaceDef> related_object_types;
-			typedef sequence <CORBA::InterfaceDef> InterfaceDefSeq;
-			readonly attribute InterfaceDefSeq related_object_types;
-                        Role create_role (in RelatedObject related_object)
-                                raises (NilRelatedObject, RelatedObjectTypeError);
-        };
-
-        interface RelationshipIterator {
-                        boolean next_one (out RelationshipHandle rel);
-                        boolean next_n (in unsigned long how_many,
-                                                out RelationshipHandles rels);
-                        void destroy ();
-        };
-
-};
-
-#endif
+// CosRelationships Module, p 9-21 CORBAservices, Relationship
+// Service V1.0, 3/94
+
+#ifndef __CosRelationships_IDL
+#define __CosRelationships_IDL
+
+#include <orb.idl>
+#include <CosObjectIdentity.idl>
+
+#pragma prefix "omg.org"
+
+module CosRelationships {
+
+        interface RoleFactory; 
+        interface RelationshipFactory; 
+        interface Relationship; 
+        interface Role;
+        interface RelationshipIterator;
+
+        typedef Object RelatedObject;
+        typedef sequence<Role> Roles;
+        typedef string RoleName;
+        typedef sequence<RoleName> RoleNames;
+
+        struct NamedRole {RoleName name; Role aRole;};
+        typedef sequence<NamedRole> NamedRoles;
+
+        struct RelationshipHandle {
+                        Relationship the_relationship;
+                        CosObjectIdentity::ObjectIdentifier constant_random_id;
+        };
+        typedef sequence<RelationshipHandle> RelationshipHandles;
+
+        interface RelationshipFactory {
+                        struct NamedRoleType {
+                                RoleName name;
+                                        CORBA::InterfaceDef named_role_type;
+                        };
+                        typedef sequence<NamedRoleType> NamedRoleTypes;
+                        readonly attribute CORBA::InterfaceDef relationship_type;
+                        readonly attribute unsigned short degree;
+                        readonly attribute NamedRoleTypes named_role_types;
+                        exception RoleTypeError {NamedRoles culprits;};
+                        exception MaxCardinalityExceeded {
+                                NamedRoles culprits;};
+                        exception DegreeError {unsigned short required_degree;};
+                        exception DuplicateRoleName {NamedRoles culprits;};
+                        exception UnknownRoleName {NamedRoles culprits;};
+
+                        Relationship create (in NamedRoles named_roles)
+                                        raises (RoleTypeError,
+                                                MaxCardinalityExceeded,
+                                                DegreeError,
+                                                DuplicateRoleName,
+                                                UnknownRoleName);
+        };
+
+        interface Relationship :                                                
+                                CosObjectIdentity::IdentifiableObject {
+                        exception CannotUnlink {
+                                Roles offending_roles;
+                        };
+                        readonly attribute NamedRoles named_roles;
+                        void destroy () raises(CannotUnlink);
+        };
+
+        interface Role {
+                        exception UnknownRoleName {};
+                        exception UnknownRelationship {};
+                        exception RelationshipTypeError {};
+                        exception CannotDestroyRelationship {
+                                RelationshipHandles offenders;
+                        };
+                        exception ParticipatingInRelationship {
+                                RelationshipHandles the_relationships;
+                        };
+                        readonly attribute RelatedObject related_object;
+                        RelatedObject get_other_related_object (
+                                                in RelationshipHandle rel,
+                                                in RoleName target_name)
+                                raises (UnknownRoleName,
+                                                UnknownRelationship);
+                        Role get_other_role (in RelationshipHandle rel, 
+                                                in RoleName target_name)
+                                raises (UnknownRoleName, UnknownRelationship);
+                        void get_relationships (
+                                                in unsigned long how_many,
+                                                out RelationshipHandles rels,
+                                                out RelationshipIterator iterator);
+                        void destroy_relationships()
+                                raises(CannotDestroyRelationship);
+                        void destroy() raises(ParticipatingInRelationship);
+                        boolean check_minimum_cardinality ();
+                        void link (in RelationshipHandle rel,
+                                                in NamedRoles named_roles)
+                                        raises(RelationshipFactory::MaxCardinalityExceeded,
+                                                RelationshipTypeError);
+                        void unlink (in RelationshipHandle rel)
+                                raises (UnknownRelationship);
+        };
+
+        interface RoleFactory {
+                        exception NilRelatedObject {};
+                        exception RelatedObjectTypeError {};
+                        readonly attribute CORBA::InterfaceDef role_type;
+                        readonly attribute unsigned long max_cardinality;
+                        readonly attribute unsigned long min_cardinality;
+// the following isn't allowed in IDL,
+//  readonly attribute sequence <CORBA::InterfaceDef> related_object_types;
+			typedef sequence <CORBA::InterfaceDef> InterfaceDefSeq;
+			readonly attribute InterfaceDefSeq related_object_types;
+                        Role create_role (in RelatedObject related_object)
+                                raises (NilRelatedObject, RelatedObjectTypeError);
+        };
+
+        interface RelationshipIterator {
+                        boolean next_one (out RelationshipHandle rel);
+                        boolean next_n (in unsigned long how_many,
+                                                out RelationshipHandles rels);
+                        void destroy ();
+        };
+
+};
+
+#endif

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosStream.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosStream.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosStream.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,90 +1,90 @@
-// CosStream Module, 8-15 CORBAservices, 
-// Externalization Service V1.0, 3/94
-
-#ifndef __CosStream_IDL
-#define __CosStream_IDL
-
-#include <CosLifeCycle.idl>
-#include <CosObjectIdentity.idl>
-
-// #include <CosCompoundExternalization.idl>
-
-#pragma prefix "omg.org"
-
-module CosCompoundExternalization
-{
-  interface Node{};
-};
-
-
-module CosStream 
-{
-    exception ObjectCreationError{};
-    exception StreamDataFormatError{};
-    interface StreamIO;
-
-    interface Streamable: CosObjectIdentity::IdentifiableObject
-	{
-	    readonly attribute CosLifeCycle::Key external_form_id;
-	    void externalize_to_stream(
-				       in StreamIO targetStreamIO);
-	    void internalize_from_stream(
-					 in StreamIO sourceStreamIO,
-					 in CosLifeCycle::FactoryFinder there)
-		raises( CosLifeCycle::NoFactory,
-			ObjectCreationError,
-			StreamDataFormatError );
-	};
-
-    interface StreamableFactory {
-	Streamable create_uninitialized();
-    };
-
-
-    interface StreamIO {
-	void write_string(in string aString);
-	void write_char(in char aChar);
-	void write_octet(in octet anOctet);
-	void write_unsigned_long(
-				 in unsigned long anUnsignedLong);
-	void write_unsigned_short(
-				  in unsigned short anUnsignedShort);
-	void write_long(in long aLong);
-	void write_short(in short aShort);
-	void write_float(in float aFloat);
-	void write_double(in double aDouble);
-	void write_boolean(in boolean aBoolean);
-	void write_object(in Streamable aStreamable);
-	void write_graph(in CosCompoundExternalization::Node aNode);
-	string read_string() 
-	    raises(StreamDataFormatError);
-	char read_char()                        
-	    raises(StreamDataFormatError );
-	octet read_octet()
-	    raises(StreamDataFormatError );
-	unsigned long read_unsigned_long() 
-	    raises(StreamDataFormatError );
-	unsigned short read_unsigned_short()
-	    raises(         StreamDataFormatError );
-	long read_long()                
-	    raises(StreamDataFormatError );
-	short read_short()
-	    raises(StreamDataFormatError );
-	float read_float()
-	    raises(StreamDataFormatError );
-	double read_double()
-	    raises(StreamDataFormatError );
-	boolean read_boolean()
-	    raises(StreamDataFormatError );
-	Streamable read_object(
-			       in CosLifeCycle::FactoryFinder there,
-			       in Streamable aStreamable)
-	    raises(StreamDataFormatError );
-	void read_graph(
-			in CosCompoundExternalization::Node starting_node,
-			in CosLifeCycle::FactoryFinder there)
-	    raises(StreamDataFormatError );
-    };
-};
-
-#endif
+// CosStream Module, 8-15 CORBAservices, 
+// Externalization Service V1.0, 3/94
+
+#ifndef __CosStream_IDL
+#define __CosStream_IDL
+
+#include <CosLifeCycle.idl>
+#include <CosObjectIdentity.idl>
+
+// #include <CosCompoundExternalization.idl>
+
+#pragma prefix "omg.org"
+
+module CosCompoundExternalization
+{
+  interface Node{};
+};
+
+
+module CosStream 
+{
+    exception ObjectCreationError{};
+    exception StreamDataFormatError{};
+    interface StreamIO;
+
+    interface Streamable: CosObjectIdentity::IdentifiableObject
+	{
+	    readonly attribute CosLifeCycle::Key external_form_id;
+	    void externalize_to_stream(
+				       in StreamIO targetStreamIO);
+	    void internalize_from_stream(
+					 in StreamIO sourceStreamIO,
+					 in CosLifeCycle::FactoryFinder there)
+		raises( CosLifeCycle::NoFactory,
+			ObjectCreationError,
+			StreamDataFormatError );
+	};
+
+    interface StreamableFactory {
+	Streamable create_uninitialized();
+    };
+
+
+    interface StreamIO {
+	void write_string(in string aString);
+	void write_char(in char aChar);
+	void write_octet(in octet anOctet);
+	void write_unsigned_long(
+				 in unsigned long anUnsignedLong);
+	void write_unsigned_short(
+				  in unsigned short anUnsignedShort);
+	void write_long(in long aLong);
+	void write_short(in short aShort);
+	void write_float(in float aFloat);
+	void write_double(in double aDouble);
+	void write_boolean(in boolean aBoolean);
+	void write_object(in Streamable aStreamable);
+	void write_graph(in CosCompoundExternalization::Node aNode);
+	string read_string() 
+	    raises(StreamDataFormatError);
+	char read_char()                        
+	    raises(StreamDataFormatError );
+	octet read_octet()
+	    raises(StreamDataFormatError );
+	unsigned long read_unsigned_long() 
+	    raises(StreamDataFormatError );
+	unsigned short read_unsigned_short()
+	    raises(         StreamDataFormatError );
+	long read_long()                
+	    raises(StreamDataFormatError );
+	short read_short()
+	    raises(StreamDataFormatError );
+	float read_float()
+	    raises(StreamDataFormatError );
+	double read_double()
+	    raises(StreamDataFormatError );
+	boolean read_boolean()
+	    raises(StreamDataFormatError );
+	Streamable read_object(
+			       in CosLifeCycle::FactoryFinder there,
+			       in Streamable aStreamable)
+	    raises(StreamDataFormatError );
+	void read_graph(
+			in CosCompoundExternalization::Node starting_node,
+			in CosLifeCycle::FactoryFinder there)
+	    raises(StreamDataFormatError );
+    };
+};
+
+#endif

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTSInteroperation.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTSInteroperation.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTSInteroperation.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,28 +1,28 @@
-// PIDL for CosTSInteroperation Module, p 10-59 
-// CORBAservices, Transaction Service V1.0, 3/94
-
-#include <CosTransactions.idl>
-
-#pragma prefix "omg.org"
-
-module CosTSInteroperation 
-{ 
-    // PIDL
-    struct otid_t {
-        long formatID; /*format identifier. 0 is OSI TP */
-        long bequal_length;
-        sequence <octet> tid;
-    };
-    struct TransIdentity {
-        CosTransactions::Coordinator coordinator;
-        CosTransactions::Terminator terminator;
-        otid_t otid;
-    };
-    struct PropagationContext {
-        unsigned long timeout;
-        TransIdentity current;
-        sequence <TransIdentity> parents;
-        any implementation_specific_data;
-    };
-};
-
+// PIDL for CosTSInteroperation Module, p 10-59 
+// CORBAservices, Transaction Service V1.0, 3/94
+
+#include <CosTransactions.idl>
+
+#pragma prefix "omg.org"
+
+module CosTSInteroperation 
+{ 
+    // PIDL
+    struct otid_t {
+        long formatID; /*format identifier. 0 is OSI TP */
+        long bequal_length;
+        sequence <octet> tid;
+    };
+    struct TransIdentity {
+        CosTransactions::Coordinator coordinator;
+        CosTransactions::Terminator terminator;
+        otid_t otid;
+    };
+    struct PropagationContext {
+        unsigned long timeout;
+        TransIdentity current;
+        sequence <TransIdentity> parents;
+        any implementation_specific_data;
+    };
+};
+

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTSPortability.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTSPortability.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTSPortability.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,64 +1,64 @@
-//File: CosTSPortability.idl
-
-//Part of the Transaction Service
-
-
-
-#ifndef _COS_TS_PORTABILITY_IDL_
-
-#define _COS_TS_PORTABILITY_IDL_
-
-
-
-//Note Even though this module is marked PIDL, it compiles with
-
-//     an IDL compiler. 
-
-
-
-#include <CosTransactions.idl>
-
-
-
-#pragma prefix "omg.org"
-
-
-
-module CosTSPortability { // PIDL
-
-	typedef long ReqId;
-
-
-
-	pseudo interface Sender {
-
-		void sending_request(in ReqId id,
-
-			out CosTransactions::PropagationContext ctx);
-
-		void received_reply(in ReqId id,
-
-			in CosTransactions::PropagationContext ctx, 
-
-			in CORBA::Environment env);
-
-	};
-
-
-
-	pseudo interface Receiver {
-
-		void received_request(in ReqId id,
-
-			in CosTransactions::PropagationContext ctx);
-
-		void sending_reply(in ReqId id,
-
-			out CosTransactions::PropagationContext ctx);
-
-	};
-
-};
-
-#endif /* ifndef _COS_TS_PORTABILITY_IDL_ */
-
+//File: CosTSPortability.idl
+
+//Part of the Transaction Service
+
+
+
+#ifndef _COS_TS_PORTABILITY_IDL_
+
+#define _COS_TS_PORTABILITY_IDL_
+
+
+
+//Note Even though this module is marked PIDL, it compiles with
+
+//     an IDL compiler. 
+
+
+
+#include <CosTransactions.idl>
+
+
+
+#pragma prefix "omg.org"
+
+
+
+module CosTSPortability { // PIDL
+
+	typedef long ReqId;
+
+
+
+	pseudo interface Sender {
+
+		void sending_request(in ReqId id,
+
+			out CosTransactions::PropagationContext ctx);
+
+		void received_reply(in ReqId id,
+
+			in CosTransactions::PropagationContext ctx, 
+
+			in CORBA::Environment env);
+
+	};
+
+
+
+	pseudo interface Receiver {
+
+		void received_request(in ReqId id,
+
+			in CosTransactions::PropagationContext ctx);
+
+		void sending_reply(in ReqId id,
+
+			out CosTransactions::PropagationContext ctx);
+
+	};
+
+};
+
+#endif /* ifndef _COS_TS_PORTABILITY_IDL_ */
+

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTime.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTime.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTime.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,158 +1,158 @@
-//File: CosTime.idl
-//Part of the Time Service
-
-#ifndef _COS_TIME_IDL_
-#define _COS_TIME_IDL_
-
-#include <TimeBase.idl>
-#pragma prefix  "omg.org";
-
-module CosTime {
-
- 	/**
-  	* TimeComparaison defines the possilbe values that can be returned as a result of comparaing two UTOs. The values are self explanatory.
-  	* In an IntervalC comparaison, TCIndeterminate value is returned if the error envelopes around the two times being compared overlap.
-  	* For this purpose the error envelope is assumed to be symmetricallly placed around the base time covering time-inaccuracy to time+inaccuracy.
-  	* For IntervalC comparaison, two UTOs are deemedto contain the same time only if the Time attribute of the two objects are equal and the Inaccuracy
-  	* attributes of both the objects are zero.
-  	*/
- 	enum TimeComparison {	
- 		TCEqualTo,
- 		TCLessThan,
- 		TCGreaterThan,
- 		TCIndeterminate
- 	};
-
- 	/**
-  	* ComparaisonType defines the two types of time comparaison that are supported.
-  	* IntervalC comparaison does the comparaison taking into account the error envelope.
-  	* MidC comparaison just compare the base times. A Midc comparaison can never return TCIndeterminate.
-  	*/
- 	enum ComparisonType{
- 		IntervalC,		
- 		MidC		
- 	};
-
- 	/**
-  	* OverlapType specifies the type of overlap between two time intervals.
-  	* When Interval A wholly contains interval B, then it is an OTContainer of interval B and the overlap interval
-  	* is the same as the interval B. When interval B wholly contains interval A, then interval A is OTContained in interval
-  	* B and the overlap region is the same as interval A. When neither interval is wholly contained in the other but
-  	* they overlap, then the OTOverlap case applies and the overlap region is the length of interval that overlaps.
-  	* Finally, when the two intervals do not overlap, the OTNoOverlap case applies.
-  	*/
- 	enum OverlapType {
- 		OTContainer,
- 		OTContained,
- 		OTOverlap,
- 		OTNoOverlap
- 	};
-
- 	/**
-  	* This exception is raised when the underlying trusted time service fails, or is unable to provide time that meets
-  	* the required security assusrance.
-  	*/
- 	exception TimeUnavailable {};
-	
-	 interface TIO;		// forward declaration
- 
- 	/**
-  	* The Uto provides various operations on basic time. These include the following groups of operations:
-  	* - Construction of a UTO from piece parts, and extraction of piece parts from a UTO
-  	* - Comparaison of time.
-  	* - Conversion from relative to absolute time, and conversion to an interval.
-  	* Of these, the first operation is required for completenesss,since in its absence it would be difficult to provide
-  	* a time input to the timer event handler, for example. The second operation is required by the RFP, and the third is
-  	* required for completeness and usability.
-  	* 
-  	* The Uto interface corresponds to an object that contains utc time,and is the means for manipulating the time contained in
-  	* the object. This interface has opearations for getting a UtcT type data structure containing the current value of time in the object,
-  	* as well as operations for getting the values of individual fields of utc time, getting absolute time from relative time, and comparing
-  	* and doing bounds operations on UTOs. The UTO interface does not provide any operation for modifying the time in the object. It is intended that
-  	* UTOs are immutable.
-  	*/
-  interface UTO {
-  		readonly attribute TimeBase::TimeT			time;
-  		readonly attribute TimeBase::InaccuracyT	inaccuracy;
-  		readonly attribute TimeBase::TdfT 			tdf;
-  		readonly attribute TimeBase::UtcT 			utc_time;
-  		UTO absolute_time();
-  		TimeComparison compare_time(
-  			in	ComparisonType	comparison_type,
-  			in	CosTime::UTO    uto
-  		);
-  		TIO time_to_interval(
-  			in	CosTime::UTO	uto);
-  		TIO interval();
-  };
-	
- 	/**
-  	* The TIO represents a time interval and contains operations relevant to time intervals
-  	*/
- 	interface TIO {
-   	
-   	/**
-    	* This attribute returns an IntervalT structure with the value of its fields filled in with the corresponding values from
-    	* the TIO
-    	*/
-  		readonly attribute TimeBase::IntervalT 	time_interval;
-   	
-   	/**
-    	* This operation returns a value of type OverlapType depending on how the interval in the object and the time range
-    	* represented by the parameter UTO overlap. The interval in the object is interval A and the interval in the parameter 
-    	* UTO is interval B. If OverlapType is not OTNoOverLap, then the out parameter overlap contains the overlap interval, otherwise
-    	* the out parameter contains the gap between the two intervals. The exception CORBA::BAD_PARAM is raised if the UTO passed in is invalid
-    	*/	
-  		OverlapType spans (
-  			in	UTO			time,
-  			out TIO			overlap);
-  	
-   	/**
-    	* This operation returns a value of type OverlapType depending on how the interval in the object and interval in the parameter TIO
-    	* overlap. The interval in the object is interval A and the interval in the parameter TOI is interval B. If OverlapType is not
-    	* OTNoOverlap, then the out parameter overlap contains the overlap interval, otherwise the out parameter contains the gap between the 
-    	* two interval. The exception CORBA::BAD_PARAM is raised if the TOI passed in is invalid.
-    	*/
-  		OverlapType overlaps (
-  			in 	TIO			interval,
-  			out TIO			overlap);
-  		UTO time ();
-  };
-
- 	/**
-  	* The TimeService interface provides operations for obtaining the current time, constructing a UTO with specified values for each
-  	* attribute, and constructing a TIO wuth specified upped and lower bounds.
-  	*/
- 	interface TimeService {
- 	
- 	/**
-  	* The universal_time operation returns the current time and an estimate of inaccuracy in a UTO. It raises TimeUnavailable exceptions
-  	* to indicate failure of an underlying time provider. The time returned in the UTO by this operation is not guaranteed to be secure
-  	* or trusted. If any time is available at alll, that tile is returned by this operation.
-  	*/
- 	UTO universal_time()
- 			raises(TimeUnavailable);
- 	/**
-  	* The secure_universal_time operation returns the current time in a UTO only if the time can be guaranteed to have been obtained
-  	* securely. In order to make such a guarantee, the  underlying TimeService must meet the criteria to be followed for secure time
-  	* implementation guideslines. If there is any uncertainty at all about meeting any aspect of these criteria, then this operation must
-  	* return the TimeUnavailable exception. Thus, time obtained through this operation can alwys be trusted.
-  	*/
- 	UTO secure_universal_time()
- 			raises(TimeUnavailable);
-			
-		UTO new_universal_time(
- 			in TimeBase::TimeT			time,
- 			in TimeBase::InaccuracyT	inaccuracy,
- 			in TimeBase::TdfT			tdf);
-		
-		UTO uto_from_utc(
-			 in TimeBase::UtcT			utc);
-		
-		TIO new_interval(
- 			in TimeBase::TimeT			lower,
- 			in TimeBase::TimeT			upper);
-	};
-};
-
-#endif // _COS_TIME_IDL_
+//File: CosTime.idl
+//Part of the Time Service
+
+#ifndef _COS_TIME_IDL_
+#define _COS_TIME_IDL_
+
+#include <TimeBase.idl>
+#pragma prefix  "omg.org";
+
+module CosTime {
+
+ 	/**
+  	* TimeComparaison defines the possilbe values that can be returned as a result of comparaing two UTOs. The values are self explanatory.
+  	* In an IntervalC comparaison, TCIndeterminate value is returned if the error envelopes around the two times being compared overlap.
+  	* For this purpose the error envelope is assumed to be symmetricallly placed around the base time covering time-inaccuracy to time+inaccuracy.
+  	* For IntervalC comparaison, two UTOs are deemedto contain the same time only if the Time attribute of the two objects are equal and the Inaccuracy
+  	* attributes of both the objects are zero.
+  	*/
+ 	enum TimeComparison {
+ 		TCEqualTo,
+ 		TCLessThan,
+ 		TCGreaterThan,
+ 		TCIndeterminate
+ 	};
+
+ 	/**
+  	* ComparaisonType defines the two types of time comparaison that are supported.
+  	* IntervalC comparaison does the comparaison taking into account the error envelope.
+  	* MidC comparaison just compare the base times. A Midc comparaison can never return TCIndeterminate.
+  	*/
+ 	enum ComparisonType{
+ 		IntervalC,
+ 		MidC
+ 	};
+
+ 	/**
+  	* OverlapType specifies the type of overlap between two time intervals.
+  	* When Interval A wholly contains interval B, then it is an OTContainer of interval B and the overlap interval
+  	* is the same as the interval B. When interval B wholly contains interval A, then interval A is OTContained in interval
+  	* B and the overlap region is the same as interval A. When neither interval is wholly contained in the other but
+  	* they overlap, then the OTOverlap case applies and the overlap region is the length of interval that overlaps.
+  	* Finally, when the two intervals do not overlap, the OTNoOverlap case applies.
+  	*/
+ 	enum OverlapType {
+ 		OTContainer,
+ 		OTContained,
+ 		OTOverlap,
+ 		OTNoOverlap
+ 	};
+
+ 	/**
+  	* This exception is raised when the underlying trusted time service fails, or is unable to provide time that meets
+  	* the required security assusrance.
+  	*/
+ 	exception TimeUnavailable {};
+
+	 interface TIO;		// forward declaration
+
+ 	/**
+  	* The Uto provides various operations on basic time. These include the following groups of operations:
+  	* - Construction of a UTO from piece parts, and extraction of piece parts from a UTO
+  	* - Comparaison of time.
+  	* - Conversion from relative to absolute time, and conversion to an interval.
+  	* Of these, the first operation is required for completenesss,since in its absence it would be difficult to provide
+  	* a time input to the timer event handler, for example. The second operation is required by the RFP, and the third is
+  	* required for completeness and usability.
+  	*
+  	* The Uto interface corresponds to an object that contains utc time,and is the means for manipulating the time contained in
+  	* the object. This interface has opearations for getting a UtcT type data structure containing the current value of time in the object,
+  	* as well as operations for getting the values of individual fields of utc time, getting absolute time from relative time, and comparing
+  	* and doing bounds operations on UTOs. The UTO interface does not provide any operation for modifying the time in the object. It is intended that
+  	* UTOs are immutable.
+  	*/
+  interface UTO {
+  		readonly attribute TimeBase::TimeT			time;
+  		readonly attribute TimeBase::InaccuracyT	inaccuracy;
+  		readonly attribute TimeBase::TdfT 			tdf;
+  		readonly attribute TimeBase::UtcT 			utc_time;
+  		UTO absolute_time();
+  		TimeComparison compare_time(
+  			in	ComparisonType	comparison_type,
+  			in	CosTime::UTO    uto_
+  		);
+  		TIO time_to_interval(
+  			in	CosTime::UTO	uto_);
+  		TIO interval();
+  };
+
+ 	/**
+  	* The TIO represents a time interval and contains operations relevant to time intervals
+  	*/
+ 	interface TIO {
+
+   	/**
+    	* This attribute returns an IntervalT structure with the value of its fields filled in with the corresponding values from
+    	* the TIO
+    	*/
+  		readonly attribute TimeBase::IntervalT 	time_interval;
+
+   	/**
+    	* This operation returns a value of type OverlapType depending on how the interval in the object and the time range
+    	* represented by the parameter UTO overlap. The interval in the object is interval A and the interval in the parameter
+    	* UTO is interval B. If OverlapType is not OTNoOverLap, then the out parameter overlap contains the overlap interval, otherwise
+    	* the out parameter contains the gap between the two intervals. The exception CORBA::BAD_PARAM is raised if the UTO passed in is invalid
+    	*/
+  		OverlapType spans (
+  			in	UTO			time,
+  			out TIO			overlap);
+
+   	/**
+    	* This operation returns a value of type OverlapType depending on how the interval in the object and interval in the parameter TIO
+    	* overlap. The interval in the object is interval A and the interval in the parameter TOI is interval B. If OverlapType is not
+    	* OTNoOverlap, then the out parameter overlap contains the overlap interval, otherwise the out parameter contains the gap between the
+    	* two interval. The exception CORBA::BAD_PARAM is raised if the TOI passed in is invalid.
+    	*/
+  		OverlapType overlaps (
+  			in 	TIO			interval,
+  			out TIO			overlap);
+  		UTO time ();
+  };
+
+ 	/**
+  	* The TimeService interface provides operations for obtaining the current time, constructing a UTO with specified values for each
+  	* attribute, and constructing a TIO wuth specified upped and lower bounds.
+  	*/
+ 	interface TimeService {
+
+ 	/**
+  	* The universal_time operation returns the current time and an estimate of inaccuracy in a UTO. It raises TimeUnavailable exceptions
+  	* to indicate failure of an underlying time provider. The time returned in the UTO by this operation is not guaranteed to be secure
+  	* or trusted. If any time is available at alll, that tile is returned by this operation.
+  	*/
+ 	UTO universal_time()
+ 			raises(TimeUnavailable);
+ 	/**
+  	* The secure_universal_time operation returns the current time in a UTO only if the time can be guaranteed to have been obtained
+  	* securely. In order to make such a guarantee, the  underlying TimeService must meet the criteria to be followed for secure time
+  	* implementation guideslines. If there is any uncertainty at all about meeting any aspect of these criteria, then this operation must
+  	* return the TimeUnavailable exception. Thus, time obtained through this operation can alwys be trusted.
+  	*/
+ 	UTO secure_universal_time()
+ 			raises(TimeUnavailable);
+
+		UTO new_universal_time(
+ 			in TimeBase::TimeT			time,
+ 			in TimeBase::InaccuracyT	inaccuracy,
+ 			in TimeBase::TdfT			tdf);
+
+		UTO uto_from_utc(
+			 in TimeBase::UtcT			utc);
+
+		TIO new_interval(
+ 			in TimeBase::TimeT			lower,
+ 			in TimeBase::TimeT			upper);
+	};
+};
+
+#endif // _COS_TIME_IDL_

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTrading.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTrading.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTrading.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,544 +1,544 @@
-#ifndef _CosTrading_idl_
-#define _CosTrading_idl_
-
-#pragma prefix "omg.org"
-
-module CosTrading 
-{
-	// forward references to our interfaces
-
-	interface Lookup;
-	interface Register;
-	interface Link;
-	interface Proxy;
-	interface Admin;
-	interface OfferIterator;
-	interface OfferIdIterator;
-
-	// type definitions used in more than one interface
-
-	typedef string Istring;
-	typedef Object TypeRepository;
-
-	typedef Istring PropertyName;
-	typedef sequence<PropertyName> PropertyNameSeq;
-	typedef any PropertyValue;
-	struct Property {
-		PropertyName name;
-		PropertyValue value;
-	};
-	typedef sequence<Property> PropertySeq;
-
-	struct Offer {
-		Object reference;
-		PropertySeq properties;
-	};
-	typedef sequence<Offer> OfferSeq;
-
-	typedef string OfferId;
-	typedef sequence<OfferId> OfferIdSeq;
-
-	typedef Istring ServiceTypeName;  // similar structure to IR::Identifier
-
-	typedef Istring Constraint;
-
-	enum FollowOption {
-		local_only, 
-		if_no_local, 
-		always
-	};
-
-	typedef Istring LinkName;
-	typedef sequence<LinkName> LinkNameSeq;
-	typedef LinkNameSeq TraderName;
-
-	typedef string PolicyName;  // policy names restricted to Latin1
-	typedef sequence<PolicyName> PolicyNameSeq;
-	typedef any PolicyValue;
-	struct Policy {
-		PolicyName name;
-		PolicyValue value;
-	};
-	typedef sequence<Policy> PolicySeq;
-
-	// exceptions used in more than one interface
-
-	exception UnknownMaxLeft {};
-
-	exception NotImplemented {};
-
-	exception IllegalServiceType {
-		ServiceTypeName type;
-	};
-
-	exception UnknownServiceType {
-		ServiceTypeName type;
-	};
-
-	exception IllegalPropertyName {
-		PropertyName name;
-	};
-
-	exception DuplicatePropertyName {
-		PropertyName name;
-	};
-	exception PropertyTypeMismatch {
-		ServiceTypeName type;
-		Property prop;
-	};
-
-	exception MissingMandatoryProperty {
-		ServiceTypeName type;
-		PropertyName name;
-	};
-
-	exception ReadonlyDynamicProperty {
-		ServiceTypeName type;
-		PropertyName name;
-	};
-
-	exception IllegalConstraint {
-		Constraint constr;
-	};
-
-	exception InvalidLookupRef {
-		Lookup target;
-	};
-	  
-	exception IllegalOfferId {
-		OfferId id;
-	};
-
-	exception UnknownOfferId {
-		OfferId id;
-	};
-
-	exception DuplicatePolicyName {
-		PolicyName name;
-	};
-
-	// the interfaces
-
-	interface TraderComponents {
-
-		readonly attribute Lookup lookup_if;
-		readonly attribute Register register_if;
-		readonly attribute Link link_if;
-		readonly attribute Proxy proxy_if;
-		readonly attribute Admin admin_if;
-	};
-
-	interface SupportAttributes {
-
-		readonly attribute boolean supports_modifiable_properties;
-		readonly attribute boolean supports_dynamic_properties;
-		readonly attribute boolean supports_proxy_offers;
-		readonly attribute TypeRepository type_repos;
-	};
-
-	interface ImportAttributes {
-
-		readonly attribute unsigned long def_search_card;
-		readonly attribute unsigned long max_search_card;
-		readonly attribute unsigned long def_match_card;
-		readonly attribute unsigned long max_match_card;
-		readonly attribute unsigned long def_return_card;
-		readonly attribute unsigned long max_return_card;
-		readonly attribute unsigned long max_list;
-		readonly attribute unsigned long def_hop_count;
-		readonly attribute unsigned long max_hop_count;
-		readonly attribute FollowOption def_follow_policy;
-		readonly attribute FollowOption max_follow_policy;
-	};
-
-	interface LinkAttributes {
-
-		readonly attribute FollowOption max_link_follow_policy;
-	};
-
-	interface Lookup:TraderComponents,SupportAttributes,ImportAttributes {
-
-		typedef Istring Preference;
-
-		enum HowManyProps { none, some, all };
-
-		union SpecifiedProps switch ( HowManyProps ) {
-                  //	 not in standard:
-                  // case none: short none_dummy; 
-                case some: PropertyNameSeq prop_names;
-                  //	 not in standard:
-                  //	case all:  short all_dummy;
-		};
-
-		exception IllegalPreference {
-			Preference pref;
-		};
-
-		exception IllegalPolicyName {
-			PolicyName name;
-		};
-
-		exception PolicyTypeMismatch {
-			Policy the_policy;
-		};
-
-		exception InvalidPolicyValue {
-			Policy the_policy;
-		};
-
-		void query ( 
-			in ServiceTypeName type,
-			in Constraint constr,
-			in Preference pref,
-			in PolicySeq policies,
-			in SpecifiedProps desired_props,
-			in unsigned long how_many,
-			out OfferSeq offers,
-			out OfferIterator offer_itr,
-			out PolicyNameSeq limits_applied
-		) raises (
-			IllegalServiceType,
-			UnknownServiceType,
-			IllegalConstraint,
-			IllegalPreference,
-			IllegalPolicyName,
-			PolicyTypeMismatch,
-			InvalidPolicyValue,
-			IllegalPropertyName,
-			DuplicatePropertyName,
-			DuplicatePolicyName
-		);
-	};
-
-	interface Register : TraderComponents, SupportAttributes {
-
-		struct OfferInfo {
-			Object reference;
-			ServiceTypeName type;
-			PropertySeq properties;
-		};
-
-		exception InvalidObjectRef {
-			Object ref;
-		};
-
-		exception UnknownPropertyName {
-			PropertyName name;
-		};
-
-		exception InterfaceTypeMismatch {
-			ServiceTypeName type;
-			Object reference;
-		};
-
-		exception ProxyOfferId {
-			OfferId id;
-		};
-
-		exception MandatoryProperty {
-			ServiceTypeName type;
-			PropertyName name;
-		};
-
-		exception ReadonlyProperty {
-			ServiceTypeName type;
-			PropertyName name;
-		};
-
-		exception NoMatchingOffers {
-			Constraint constr;
-		};
-
-		exception IllegalTraderName {
-			TraderName name;
-		};
-
-		exception UnknownTraderName {
-			TraderName name;
-		};
-
-		exception RegisterNotSupported {
-			TraderName name;
-		};
-
-		OfferId export (
-			in Object reference,
-			in ServiceTypeName type,
-			in PropertySeq properties
-		) raises ( 
-			InvalidObjectRef,
-			IllegalServiceType,
-			UnknownServiceType,
-			InterfaceTypeMismatch, 
-			IllegalPropertyName, // e.g. prop_name = "<foo-bar"
-			PropertyTypeMismatch,
-			ReadonlyDynamicProperty,
-			MissingMandatoryProperty,
-			DuplicatePropertyName
-		);
-
-		void withdraw (
-			in OfferId id
-		) raises (
-			IllegalOfferId,
-			UnknownOfferId,
-			ProxyOfferId
-		);
-
-		OfferInfo describe (
-			in OfferId id
-		) raises (
-			IllegalOfferId,
-			UnknownOfferId,
-			ProxyOfferId
-		);
-
-		void modify (
-			in OfferId id,
-			in PropertyNameSeq del_list,
-			in PropertySeq modify_list
-		) raises ( 
-			NotImplemented,
-			IllegalOfferId, 
-			UnknownOfferId,
-			ProxyOfferId,
-			IllegalPropertyName,
-			UnknownPropertyName,
-			PropertyTypeMismatch,
-			ReadonlyDynamicProperty,
-			MandatoryProperty,
-			ReadonlyProperty,
-			DuplicatePropertyName
-		);
-
-		void withdraw_using_constraint (
-			in ServiceTypeName type,
-			in Constraint constr
-		) raises (
-			IllegalServiceType,
-			UnknownServiceType,
-			IllegalConstraint,
-			NoMatchingOffers
-		);
-
-		Register resolve (
-			in TraderName name
-		) raises (
-			IllegalTraderName,
-			UnknownTraderName,
-			RegisterNotSupported
-		);
-	};
-
-	interface Link : TraderComponents, SupportAttributes, LinkAttributes {
-
-		struct LinkInfo {
-			Lookup target;
-			Register target_reg;
-			FollowOption def_pass_on_follow_rule;
-			FollowOption limiting_follow_rule;
-		};
-
-		exception IllegalLinkName {
-			LinkName name;
-		};
-
-		exception UnknownLinkName {
-			LinkName name;
-		};
-
-		exception DuplicateLinkName {
-			LinkName name;
-		};
-		exception DefaultFollowTooPermissive {
-			FollowOption def_pass_on_follow_rule;
-			FollowOption limiting_follow_rule;
-		};
-
-		exception LimitingFollowTooPermissive {
-			FollowOption limiting_follow_rule;
-			FollowOption max_link_follow_policy;
-		};
-
-		void add_link ( 
-			in LinkName name,
-			in Lookup target,
-			in FollowOption def_pass_on_follow_rule,
-			in FollowOption limiting_follow_rule
-		) raises ( 
-			IllegalLinkName,
-			DuplicateLinkName,
-			InvalidLookupRef, // e.g. nil
-			DefaultFollowTooPermissive,
-			LimitingFollowTooPermissive
-		);
-
-		void remove_link (
-			in LinkName name
-		) raises (
-			IllegalLinkName,
-			UnknownLinkName
-		);
-
-		LinkInfo describe_link (
-			in LinkName name
-		) raises (
-			IllegalLinkName,
-			UnknownLinkName
-		);
-
-		LinkNameSeq list_links ( );
-
-		void modify_link ( 
-			in LinkName name,
-			in FollowOption def_pass_on_follow_rule,
-			in FollowOption limiting_follow_rule
-		) raises ( 
-			IllegalLinkName,
-			UnknownLinkName,
-			DefaultFollowTooPermissive,
-			LimitingFollowTooPermissive
-		);
-	};
-
-	interface Proxy : TraderComponents, SupportAttributes {
-
-		typedef Istring ConstraintRecipe;
-
-		struct ProxyInfo { 
-			ServiceTypeName type;
-			Lookup target;
-			PropertySeq properties;
-			boolean if_match_all;
-			ConstraintRecipe recipe;
-			PolicySeq policies_to_pass_on;
-		};
-
-		exception IllegalRecipe {
-			ConstraintRecipe recipe;
-		};
-
-		exception NotProxyOfferId {
-			OfferId id;
-		};
-
-		OfferId export_proxy (
-			in Lookup target,
-			in ServiceTypeName type,
-			in PropertySeq properties,
-			in boolean if_match_all,
-			in ConstraintRecipe recipe,
-			in PolicySeq policies_to_pass_on
-		) raises (
-			IllegalServiceType,
-			UnknownServiceType,
-			InvalidLookupRef, // e.g. nil
-			IllegalPropertyName,
-			PropertyTypeMismatch,
-			ReadonlyDynamicProperty,
-			MissingMandatoryProperty,
-			IllegalRecipe,
-			DuplicatePropertyName,
-			DuplicatePolicyName
-		);
-
-		void withdraw_proxy (
-			in OfferId id
-		) raises (
-			IllegalOfferId,
-			UnknownOfferId,
-			NotProxyOfferId
-		);
-
-		ProxyInfo describe_proxy (
-			in OfferId id
-		) raises (
-			IllegalOfferId,
-			UnknownOfferId,
-			NotProxyOfferId
-		);
-	};
-
-	interface Admin : TraderComponents, SupportAttributes, ImportAttributes,
-						LinkAttributes {
-
-		typedef sequence<octet> OctetSeq;
-
-		readonly attribute OctetSeq request_id_stem;
-
-		unsigned long set_def_search_card (in unsigned long value);
-		unsigned long set_max_search_card (in unsigned long value);
-
-		unsigned long set_def_match_card (in unsigned long value);
-		unsigned long set_max_match_card (in unsigned long value);
-
-		unsigned long set_def_return_card (in unsigned long value);
-		unsigned long set_max_return_card (in unsigned long value);
-
-		unsigned long set_max_list (in unsigned long value);
-
-		boolean set_supports_modifiable_properties (in boolean value);
-		boolean set_supports_dynamic_properties (in boolean value);
-		boolean set_supports_proxy_offers (in boolean value);
-
-		unsigned long set_def_hop_count (in unsigned long value);
-		unsigned long set_max_hop_count (in unsigned long value);
-
-		FollowOption set_def_follow_policy (in FollowOption policy);
-		FollowOption set_max_follow_policy (in FollowOption policy);
-
-		FollowOption set_max_link_follow_policy (in FollowOption policy);
-
-		TypeRepository set_type_repos (in TypeRepository repository);
-
-		OctetSeq set_request_id_stem (in OctetSeq stem);
-
-		void list_offers (
-			in unsigned long how_many,
-			out OfferIdSeq ids,
-			out OfferIdIterator id_itr
-		) raises (
-			NotImplemented
-		);
-
-		void list_proxies (
-			in unsigned long how_many,
-			out OfferIdSeq ids,
-			out OfferIdIterator id_itr
-		) raises (
-			NotImplemented
-		);
-	};
-
-	interface OfferIterator {
-
-		unsigned long max_left (
-		) raises (
-			UnknownMaxLeft
-		);
-
-		boolean next_n (
-			in unsigned long n,
-			out OfferSeq offers
-		);
-
-		void destroy ();
-	};
-
-	interface OfferIdIterator {
-		unsigned long max_left (
-		) raises (
-			UnknownMaxLeft
-		);
-
-		boolean next_n (
-			in unsigned long n,
-			out OfferIdSeq ids
-		);
-
-		void destroy ();
-	};
-
-}; /* end module CosTrading */
-
-#endif
+#ifndef _CosTrading_idl_
+#define _CosTrading_idl_
+
+#pragma prefix "omg.org"
+
+module CosTrading 
+{
+	// forward references to our interfaces
+
+	interface Lookup;
+	interface Register;
+	interface Link;
+	interface Proxy;
+	interface Admin;
+	interface OfferIterator;
+	interface OfferIdIterator;
+
+	// type definitions used in more than one interface
+
+	typedef string Istring;
+	typedef Object TypeRepository;
+
+	typedef Istring PropertyName;
+	typedef sequence<PropertyName> PropertyNameSeq;
+	typedef any PropertyValue;
+	struct Property {
+		PropertyName name;
+		PropertyValue value;
+	};
+	typedef sequence<Property> PropertySeq;
+
+	struct Offer {
+		Object reference;
+		PropertySeq properties;
+	};
+	typedef sequence<Offer> OfferSeq;
+
+	typedef string OfferId;
+	typedef sequence<OfferId> OfferIdSeq;
+
+	typedef Istring ServiceTypeName;  // similar structure to IR::Identifier
+
+	typedef Istring Constraint;
+
+	enum FollowOption {
+		local_only, 
+		if_no_local, 
+		always
+	};
+
+	typedef Istring LinkName;
+	typedef sequence<LinkName> LinkNameSeq;
+	typedef LinkNameSeq TraderName;
+
+	typedef string PolicyName;  // policy names restricted to Latin1
+	typedef sequence<PolicyName> PolicyNameSeq;
+	typedef any PolicyValue;
+	struct Policy {
+		PolicyName name;
+		PolicyValue value;
+	};
+	typedef sequence<Policy> PolicySeq;
+
+	// exceptions used in more than one interface
+
+	exception UnknownMaxLeft {};
+
+	exception NotImplemented {};
+
+	exception IllegalServiceType {
+		ServiceTypeName type;
+	};
+
+	exception UnknownServiceType {
+		ServiceTypeName type;
+	};
+
+	exception IllegalPropertyName {
+		PropertyName name;
+	};
+
+	exception DuplicatePropertyName {
+		PropertyName name;
+	};
+	exception PropertyTypeMismatch {
+		ServiceTypeName type;
+		Property prop;
+	};
+
+	exception MissingMandatoryProperty {
+		ServiceTypeName type;
+		PropertyName name;
+	};
+
+	exception ReadonlyDynamicProperty {
+		ServiceTypeName type;
+		PropertyName name;
+	};
+
+	exception IllegalConstraint {
+		Constraint constr;
+	};
+
+	exception InvalidLookupRef {
+		Lookup target;
+	};
+	  
+	exception IllegalOfferId {
+		OfferId id;
+	};
+
+	exception UnknownOfferId {
+		OfferId id;
+	};
+
+	exception DuplicatePolicyName {
+		PolicyName name;
+	};
+
+	// the interfaces
+
+	interface TraderComponents {
+
+		readonly attribute Lookup lookup_if;
+		readonly attribute Register register_if;
+		readonly attribute Link link_if;
+		readonly attribute Proxy proxy_if;
+		readonly attribute Admin admin_if;
+	};
+
+	interface SupportAttributes {
+
+		readonly attribute boolean supports_modifiable_properties;
+		readonly attribute boolean supports_dynamic_properties;
+		readonly attribute boolean supports_proxy_offers;
+		readonly attribute TypeRepository type_repos;
+	};
+
+	interface ImportAttributes {
+
+		readonly attribute unsigned long def_search_card;
+		readonly attribute unsigned long max_search_card;
+		readonly attribute unsigned long def_match_card;
+		readonly attribute unsigned long max_match_card;
+		readonly attribute unsigned long def_return_card;
+		readonly attribute unsigned long max_return_card;
+		readonly attribute unsigned long max_list;
+		readonly attribute unsigned long def_hop_count;
+		readonly attribute unsigned long max_hop_count;
+		readonly attribute FollowOption def_follow_policy;
+		readonly attribute FollowOption max_follow_policy;
+	};
+
+	interface LinkAttributes {
+
+		readonly attribute FollowOption max_link_follow_policy;
+	};
+
+	interface Lookup:TraderComponents,SupportAttributes,ImportAttributes {
+
+		typedef Istring Preference;
+
+		enum HowManyProps { none, some, all };
+
+		union SpecifiedProps switch ( HowManyProps ) {
+                  //	 not in standard:
+                  // case none: short none_dummy; 
+                case some: PropertyNameSeq prop_names;
+                  //	 not in standard:
+                  //	case all:  short all_dummy;
+		};
+
+		exception IllegalPreference {
+			Preference pref;
+		};
+
+		exception IllegalPolicyName {
+			PolicyName name;
+		};
+
+		exception PolicyTypeMismatch {
+			Policy the_policy;
+		};
+
+		exception InvalidPolicyValue {
+			Policy the_policy;
+		};
+
+		void query ( 
+			in ServiceTypeName type,
+			in Constraint constr,
+			in Preference pref,
+			in PolicySeq policies,
+			in SpecifiedProps desired_props,
+			in unsigned long how_many,
+			out OfferSeq offers,
+			out OfferIterator offer_itr,
+			out PolicyNameSeq limits_applied
+		) raises (
+			IllegalServiceType,
+			UnknownServiceType,
+			IllegalConstraint,
+			IllegalPreference,
+			IllegalPolicyName,
+			PolicyTypeMismatch,
+			InvalidPolicyValue,
+			IllegalPropertyName,
+			DuplicatePropertyName,
+			DuplicatePolicyName
+		);
+	};
+
+	interface Register : TraderComponents, SupportAttributes {
+
+		struct OfferInfo {
+			Object reference;
+			ServiceTypeName type;
+			PropertySeq properties;
+		};
+
+		exception InvalidObjectRef {
+			Object ref;
+		};
+
+		exception UnknownPropertyName {
+			PropertyName name;
+		};
+
+		exception InterfaceTypeMismatch {
+			ServiceTypeName type;
+			Object reference;
+		};
+
+		exception ProxyOfferId {
+			OfferId id;
+		};
+
+		exception MandatoryProperty {
+			ServiceTypeName type;
+			PropertyName name;
+		};
+
+		exception ReadonlyProperty {
+			ServiceTypeName type;
+			PropertyName name;
+		};
+
+		exception NoMatchingOffers {
+			Constraint constr;
+		};
+
+		exception IllegalTraderName {
+			TraderName name;
+		};
+
+		exception UnknownTraderName {
+			TraderName name;
+		};
+
+		exception RegisterNotSupported {
+			TraderName name;
+		};
+
+		OfferId export (
+			in Object reference,
+			in ServiceTypeName type,
+			in PropertySeq properties
+		) raises ( 
+			InvalidObjectRef,
+			IllegalServiceType,
+			UnknownServiceType,
+			InterfaceTypeMismatch, 
+			IllegalPropertyName, // e.g. prop_name = "<foo-bar"
+			PropertyTypeMismatch,
+			ReadonlyDynamicProperty,
+			MissingMandatoryProperty,
+			DuplicatePropertyName
+		);
+
+		void withdraw (
+			in OfferId id
+		) raises (
+			IllegalOfferId,
+			UnknownOfferId,
+			ProxyOfferId
+		);
+
+		OfferInfo describe (
+			in OfferId id
+		) raises (
+			IllegalOfferId,
+			UnknownOfferId,
+			ProxyOfferId
+		);
+
+		void modify (
+			in OfferId id,
+			in PropertyNameSeq del_list,
+			in PropertySeq modify_list
+		) raises ( 
+			NotImplemented,
+			IllegalOfferId, 
+			UnknownOfferId,
+			ProxyOfferId,
+			IllegalPropertyName,
+			UnknownPropertyName,
+			PropertyTypeMismatch,
+			ReadonlyDynamicProperty,
+			MandatoryProperty,
+			ReadonlyProperty,
+			DuplicatePropertyName
+		);
+
+		void withdraw_using_constraint (
+			in ServiceTypeName type,
+			in Constraint constr
+		) raises (
+			IllegalServiceType,
+			UnknownServiceType,
+			IllegalConstraint,
+			NoMatchingOffers
+		);
+
+		Register resolve (
+			in TraderName name
+		) raises (
+			IllegalTraderName,
+			UnknownTraderName,
+			RegisterNotSupported
+		);
+	};
+
+	interface Link : TraderComponents, SupportAttributes, LinkAttributes {
+
+		struct LinkInfo {
+			Lookup target;
+			Register target_reg;
+			FollowOption def_pass_on_follow_rule;
+			FollowOption limiting_follow_rule;
+		};
+
+		exception IllegalLinkName {
+			LinkName name;
+		};
+
+		exception UnknownLinkName {
+			LinkName name;
+		};
+
+		exception DuplicateLinkName {
+			LinkName name;
+		};
+		exception DefaultFollowTooPermissive {
+			FollowOption def_pass_on_follow_rule;
+			FollowOption limiting_follow_rule;
+		};
+
+		exception LimitingFollowTooPermissive {
+			FollowOption limiting_follow_rule;
+			FollowOption max_link_follow_policy;
+		};
+
+		void add_link ( 
+			in LinkName name,
+			in Lookup target,
+			in FollowOption def_pass_on_follow_rule,
+			in FollowOption limiting_follow_rule
+		) raises ( 
+			IllegalLinkName,
+			DuplicateLinkName,
+			InvalidLookupRef, // e.g. nil
+			DefaultFollowTooPermissive,
+			LimitingFollowTooPermissive
+		);
+
+		void remove_link (
+			in LinkName name
+		) raises (
+			IllegalLinkName,
+			UnknownLinkName
+		);
+
+		LinkInfo describe_link (
+			in LinkName name
+		) raises (
+			IllegalLinkName,
+			UnknownLinkName
+		);
+
+		LinkNameSeq list_links ( );
+
+		void modify_link ( 
+			in LinkName name,
+			in FollowOption def_pass_on_follow_rule,
+			in FollowOption limiting_follow_rule
+		) raises ( 
+			IllegalLinkName,
+			UnknownLinkName,
+			DefaultFollowTooPermissive,
+			LimitingFollowTooPermissive
+		);
+	};
+
+	interface Proxy : TraderComponents, SupportAttributes {
+
+		typedef Istring ConstraintRecipe;
+
+		struct ProxyInfo { 
+			ServiceTypeName type;
+			Lookup target;
+			PropertySeq properties;
+			boolean if_match_all;
+			ConstraintRecipe recipe;
+			PolicySeq policies_to_pass_on;
+		};
+
+		exception IllegalRecipe {
+			ConstraintRecipe recipe;
+		};
+
+		exception NotProxyOfferId {
+			OfferId id;
+		};
+
+		OfferId export_proxy (
+			in Lookup target,
+			in ServiceTypeName type,
+			in PropertySeq properties,
+			in boolean if_match_all,
+			in ConstraintRecipe recipe,
+			in PolicySeq policies_to_pass_on
+		) raises (
+			IllegalServiceType,
+			UnknownServiceType,
+			InvalidLookupRef, // e.g. nil
+			IllegalPropertyName,
+			PropertyTypeMismatch,
+			ReadonlyDynamicProperty,
+			MissingMandatoryProperty,
+			IllegalRecipe,
+			DuplicatePropertyName,
+			DuplicatePolicyName
+		);
+
+		void withdraw_proxy (
+			in OfferId id
+		) raises (
+			IllegalOfferId,
+			UnknownOfferId,
+			NotProxyOfferId
+		);
+
+		ProxyInfo describe_proxy (
+			in OfferId id
+		) raises (
+			IllegalOfferId,
+			UnknownOfferId,
+			NotProxyOfferId
+		);
+	};
+
+	interface Admin : TraderComponents, SupportAttributes, ImportAttributes,
+						LinkAttributes {
+
+		typedef sequence<octet> OctetSeq;
+
+		readonly attribute OctetSeq request_id_stem;
+
+		unsigned long set_def_search_card (in unsigned long value);
+		unsigned long set_max_search_card (in unsigned long value);
+
+		unsigned long set_def_match_card (in unsigned long value);
+		unsigned long set_max_match_card (in unsigned long value);
+
+		unsigned long set_def_return_card (in unsigned long value);
+		unsigned long set_max_return_card (in unsigned long value);
+
+		unsigned long set_max_list (in unsigned long value);
+
+		boolean set_supports_modifiable_properties (in boolean value);
+		boolean set_supports_dynamic_properties (in boolean value);
+		boolean set_supports_proxy_offers (in boolean value);
+
+		unsigned long set_def_hop_count (in unsigned long value);
+		unsigned long set_max_hop_count (in unsigned long value);
+
+		FollowOption set_def_follow_policy (in FollowOption policy);
+		FollowOption set_max_follow_policy (in FollowOption policy);
+
+		FollowOption set_max_link_follow_policy (in FollowOption policy);
+
+		TypeRepository set_type_repos (in TypeRepository repository);
+
+		OctetSeq set_request_id_stem (in OctetSeq stem);
+
+		void list_offers (
+			in unsigned long how_many,
+			out OfferIdSeq ids,
+			out OfferIdIterator id_itr
+		) raises (
+			NotImplemented
+		);
+
+		void list_proxies (
+			in unsigned long how_many,
+			out OfferIdSeq ids,
+			out OfferIdIterator id_itr
+		) raises (
+			NotImplemented
+		);
+	};
+
+	interface OfferIterator {
+
+		unsigned long max_left (
+		) raises (
+			UnknownMaxLeft
+		);
+
+		boolean next_n (
+			in unsigned long n,
+			out OfferSeq offers
+		);
+
+		void destroy ();
+	};
+
+	interface OfferIdIterator {
+		unsigned long max_left (
+		) raises (
+			UnknownMaxLeft
+		);
+
+		boolean next_n (
+			in unsigned long n,
+			out OfferIdSeq ids
+		);
+
+		void destroy ();
+	};
+
+}; /* end module CosTrading */
+
+#endif

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTradingDynamic.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTradingDynamic.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTradingDynamic.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,38 +1,38 @@
-#ifndef _CosTradingDynamic_idl_
-#define _CosTradingDynamic_idl_
-#endif
-
-#include "CosTrading.idl"
-#include <orb.idl>
-
-#pragma prefix "omg.org"
-
-module CosTradingDynamic {
-
-	exception DPEvalFailure {
-		CosTrading::PropertyName name;
-		//TypeCode returned_type;
-		CORBA::TypeCode returned_type;
-		any extra_info;
-	};
-
-	interface DynamicPropEval {
-
-		any evalDP (
-			in CosTrading::PropertyName name,
-			//in TypeCode returned_type,
-			in CORBA::TypeCode returned_type,
-			in any extra_info
-		) raises (
-			DPEvalFailure
-		);
-	};
-
-	struct DynamicProp {
-		 DynamicPropEval eval_if;
-		 //TypeCode returned_type;
-		 CORBA::TypeCode returned_type;
-		 any extra_info;
-	};
-}; /* end module CosTradingDynamic */
-
+#ifndef _CosTradingDynamic_idl_
+#define _CosTradingDynamic_idl_
+#endif
+
+#include "CosTrading.idl"
+#include <orb.idl>
+
+#pragma prefix "omg.org"
+
+module CosTradingDynamic {
+
+	exception DPEvalFailure {
+		CosTrading::PropertyName name;
+		//TypeCode returned_type;
+		CORBA::TypeCode returned_type;
+		any extra_info;
+	};
+
+	interface DynamicPropEval {
+
+		any evalDP (
+			in CosTrading::PropertyName name,
+			//in TypeCode returned_type,
+			in CORBA::TypeCode returned_type,
+			in any extra_info
+		) raises (
+			DPEvalFailure
+		);
+	};
+
+	struct DynamicProp {
+		 DynamicPropEval eval_if;
+		 //TypeCode returned_type;
+		 CORBA::TypeCode returned_type;
+		 any extra_info;
+	};
+}; /* end module CosTradingDynamic */
+

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTradingRepos.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTradingRepos.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTradingRepos.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,141 +1,141 @@
-//File: CosTradingRepos.idl
-//Part of the Trading Object Service
-
-#ifndef _COS_TRADING_REPOS_IDL_
-#define _COS_TRADING_REPOS_IDL_
-
-#include <orb.idl>
-#include <CosTrading.idl>
-
-#pragma prefix "omg.org"
-
-module CosTradingRepos {
-
-	interface ServiceTypeRepository {
-
-	// local types
-		typedef sequence<CosTrading::ServiceTypeName> ServiceTypeNameSeq;
-		enum PropertyMode {
-			PROP_NORMAL, PROP_READONLY,
-			PROP_MANDATORY, PROP_MANDATORY_READONLY
-		};
-		struct PropStruct {
-			CosTrading::PropertyName name;
-			CORBA::TypeCode value_type;
-			PropertyMode mode;
-		};
-		typedef sequence<PropStruct> PropStructSeq;
-
-		typedef CosTrading::Istring Identifier;  // IR::Identifier
-		struct IncarnationNumber {
-			unsigned long high;
-			unsigned long low;
-		};
-		struct TypeStruct {
-			Identifier if_name;
-			PropStructSeq props;
-			ServiceTypeNameSeq super_types;
-			boolean masked;
-			IncarnationNumber incarnation;
-		};
-
-		enum ListOption { all, since };
-		union SpecifiedServiceTypes switch ( ListOption ) {
-			case since: IncarnationNumber incarnation;
-		};
-
-	// local exceptions
-		exception ServiceTypeExists {
-			CosTrading::ServiceTypeName name;
-		};
-		exception InterfaceTypeMismatch {
-			CosTrading::ServiceTypeName base_service;
-			Identifier base_if;
-			CosTrading::ServiceTypeName derived_service;
-			Identifier derived_if;
-		};
-		exception HasSubTypes {
-			CosTrading::ServiceTypeName the_type;
-			CosTrading::ServiceTypeName sub_type;
-		};
-		exception AlreadyMasked {
-			CosTrading::ServiceTypeName name;
-		};
-		exception NotMasked {
-			CosTrading::ServiceTypeName name;
-		};
-		exception ValueTypeRedefinition {
-			CosTrading::ServiceTypeName type_1;
-			PropStruct definition_1;
-			CosTrading::ServiceTypeName type_2;
-			PropStruct definition_2;
-		};
-		exception DuplicateServiceTypeName {
-			CosTrading::ServiceTypeName name;
-		};
-
-	// attributes
-		readonly attribute IncarnationNumber incarnation;
-
-	// operation signatures
-		IncarnationNumber add_type (
-			in CosTrading::ServiceTypeName name,
-			in Identifier if_name,
-			in PropStructSeq props,
-			in ServiceTypeNameSeq super_types
-		) raises (
-			CosTrading::IllegalServiceType,
-			ServiceTypeExists,
-			InterfaceTypeMismatch,
-			CosTrading::IllegalPropertyName,
-			CosTrading::DuplicatePropertyName,
-			ValueTypeRedefinition,
-			CosTrading::UnknownServiceType,
-			DuplicateServiceTypeName
-		);
-				
-		void remove_type (
-			in CosTrading::ServiceTypeName name
-		) raises (
-			CosTrading::IllegalServiceType,
-			CosTrading::UnknownServiceType,
-			HasSubTypes
-		);
-
-		ServiceTypeNameSeq list_types (
-			in SpecifiedServiceTypes which_types
-		);
-
-		TypeStruct describe_type (
-			in CosTrading::ServiceTypeName name
-		) raises (
-			CosTrading::IllegalServiceType,
-			CosTrading::UnknownServiceType
-		);
-
-		TypeStruct fully_describe_type (
-			in CosTrading::ServiceTypeName name
-		) raises (
-			CosTrading::IllegalServiceType,
-			CosTrading::UnknownServiceType
-		);
-
-		void mask_type (
-			in CosTrading::ServiceTypeName name
-		) raises (
-			CosTrading::IllegalServiceType,
-			CosTrading::UnknownServiceType,
-			AlreadyMasked
-		);
-
-		void unmask_type (
-			in CosTrading::ServiceTypeName name
-		) raises (
-			CosTrading::IllegalServiceType,
-			CosTrading::UnknownServiceType,
-			NotMasked
-		);
-
-	};
-}; /* end module CosTradingRepos */
-#endif /* ifndef _COS_TRADING_REPOS_IDL_ */
+//File: CosTradingRepos.idl
+//Part of the Trading Object Service
+
+#ifndef _COS_TRADING_REPOS_IDL_
+#define _COS_TRADING_REPOS_IDL_
+
+#include <orb.idl>
+#include <CosTrading.idl>
+
+#pragma prefix "omg.org"
+
+module CosTradingRepos {
+
+	interface ServiceTypeRepository {
+
+	// local types
+		typedef sequence<CosTrading::ServiceTypeName> ServiceTypeNameSeq;
+		enum PropertyMode {
+			PROP_NORMAL, PROP_READONLY,
+			PROP_MANDATORY, PROP_MANDATORY_READONLY
+		};
+		struct PropStruct {
+			CosTrading::PropertyName name;
+			CORBA::TypeCode value_type;
+			PropertyMode mode;
+		};
+		typedef sequence<PropStruct> PropStructSeq;
+
+		typedef CosTrading::Istring Identifier;  // IR::Identifier
+		struct IncarnationNumber {
+			unsigned long high;
+			unsigned long low;
+		};
+		struct TypeStruct {
+			Identifier if_name;
+			PropStructSeq props;
+			ServiceTypeNameSeq super_types;
+			boolean masked;
+			IncarnationNumber incarnation;
+		};
+
+		enum ListOption { all, since };
+		union SpecifiedServiceTypes switch ( ListOption ) {
+			case since: IncarnationNumber incarnation;
+		};
+
+	// local exceptions
+		exception ServiceTypeExists {
+			CosTrading::ServiceTypeName name;
+		};
+		exception InterfaceTypeMismatch {
+			CosTrading::ServiceTypeName base_service;
+			Identifier base_if;
+			CosTrading::ServiceTypeName derived_service;
+			Identifier derived_if;
+		};
+		exception HasSubTypes {
+			CosTrading::ServiceTypeName the_type;
+			CosTrading::ServiceTypeName sub_type;
+		};
+		exception AlreadyMasked {
+			CosTrading::ServiceTypeName name;
+		};
+		exception NotMasked {
+			CosTrading::ServiceTypeName name;
+		};
+		exception ValueTypeRedefinition {
+			CosTrading::ServiceTypeName type_1;
+			PropStruct definition_1;
+			CosTrading::ServiceTypeName type_2;
+			PropStruct definition_2;
+		};
+		exception DuplicateServiceTypeName {
+			CosTrading::ServiceTypeName name;
+		};
+
+	// attributes
+		readonly attribute IncarnationNumber incarnation;
+
+	// operation signatures
+		IncarnationNumber add_type (
+			in CosTrading::ServiceTypeName name,
+			in Identifier if_name,
+			in PropStructSeq props,
+			in ServiceTypeNameSeq super_types
+		) raises (
+			CosTrading::IllegalServiceType,
+			ServiceTypeExists,
+			InterfaceTypeMismatch,
+			CosTrading::IllegalPropertyName,
+			CosTrading::DuplicatePropertyName,
+			ValueTypeRedefinition,
+			CosTrading::UnknownServiceType,
+			DuplicateServiceTypeName
+		);
+				
+		void remove_type (
+			in CosTrading::ServiceTypeName name
+		) raises (
+			CosTrading::IllegalServiceType,
+			CosTrading::UnknownServiceType,
+			HasSubTypes
+		);
+
+		ServiceTypeNameSeq list_types (
+			in SpecifiedServiceTypes which_types
+		);
+
+		TypeStruct describe_type (
+			in CosTrading::ServiceTypeName name
+		) raises (
+			CosTrading::IllegalServiceType,
+			CosTrading::UnknownServiceType
+		);
+
+		TypeStruct fully_describe_type (
+			in CosTrading::ServiceTypeName name
+		) raises (
+			CosTrading::IllegalServiceType,
+			CosTrading::UnknownServiceType
+		);
+
+		void mask_type (
+			in CosTrading::ServiceTypeName name
+		) raises (
+			CosTrading::IllegalServiceType,
+			CosTrading::UnknownServiceType,
+			AlreadyMasked
+		);
+
+		void unmask_type (
+			in CosTrading::ServiceTypeName name
+		) raises (
+			CosTrading::IllegalServiceType,
+			CosTrading::UnknownServiceType,
+			NotMasked
+		);
+
+	};
+}; /* end module CosTradingRepos */
+#endif /* ifndef _COS_TRADING_REPOS_IDL_ */

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTransactions.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTransactions.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTransactions.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,206 +1,206 @@
-//File: CosTransactions.idl
-//Part of the Transaction Service
-
-#ifndef _COS_TRANSACTIONS_IDL_
-#define _COS_TRANSACTIONS_IDL_
-
-#include <orb.idl>
-
-#pragma prefix "omg.org"
-
-module CosTransactions {
-
-	// Forward references for interfaces defined later in module
-	interface Current;
-	interface TransactionFactory;
-	interface Control;
-	interface Terminator;
-	interface Coordinator;
-	interface RecoveryCoordinator;
-	interface Resource;
-	interface Synchronization;
-	interface SubtransactionAwareResource;
-	interface TransactionalObject; 
-
-	// DATATYPES 
-	enum Status {
-		StatusActive,
-		StatusMarkedRollback,
-		StatusPrepared,
-		StatusCommitted,
-		StatusRolledBack,
-		StatusUnknown,
-		StatusNoTransaction,
-		StatusPreparing,
-		StatusCommitting,
-		StatusRollingBack
-	};
-
-	enum Vote {
-		VoteCommit,
-		VoteRollback,
-		VoteReadOnly
-	};
-
-	// Structure definitions
-	struct otid_t {
-		long formatID; /*format identifier. 0 is OSI TP */
-		long bqual_length;
-		sequence <octet> tid;
-	};
-	struct TransIdentity {
-		Coordinator coord;
-		Terminator term;
-		otid_t otid;
-	};
-	struct PropagationContext {
-		unsigned long timeout;
-		TransIdentity current;
-		sequence <TransIdentity> parents;
-		any implementation_specific_data;
-	};
-
-	// Heuristic exceptions
-	exception HeuristicRollback {};
-	exception HeuristicCommit {};
-	exception HeuristicMixed {};
-	exception HeuristicHazard {};
-
-	// Other transaction-specific exceptions
-	exception SubtransactionsUnavailable {};
-	exception NotSubtransaction {};
-	exception Inactive {};
-	exception NotPrepared {};
-	exception NoTransaction {};
-	exception InvalidControl {};
-	exception Unavailable {};
-	exception SynchronizationUnavailable {};
-	
-	// Current transaction 
-	interface Current : CORBA::Current {
-		void begin()
-			raises(SubtransactionsUnavailable);
-		void commit(in boolean report_heuristics)
-			raises(
-				NoTransaction,
-				HeuristicMixed,
-				HeuristicHazard
-			);
-		void rollback()
-			raises(NoTransaction);
-		void rollback_only()
-			raises(NoTransaction);
-
-		Status get_status();
-		string get_transaction_name();
-		void set_timeout(in unsigned long seconds);
-		Control get_control();
-		Control suspend();
-		void resume(in Control which)
-			raises(InvalidControl);
-	};
-
-
-	interface TransactionFactory {
-		Control create(in unsigned long time_out);
-		Control recreate(in PropagationContext ctx);
-	};
-
-	interface Control {
-		Terminator get_terminator()
-			raises(Unavailable);
-		Coordinator get_coordinator()
-			raises(Unavailable);
-	};
-
-	interface Terminator {
-		void commit(in boolean report_heuristics)
-			raises(
-				HeuristicMixed,
-				HeuristicHazard
-			);
-		void rollback();
-	};
-
-	interface Coordinator {
-
-		Status get_status();
-		Status get_parent_status();
-		Status get_top_level_status();
-
-		boolean is_same_transaction(in Coordinator tc);
-		boolean is_related_transaction(in Coordinator tc);
-		boolean is_ancestor_transaction(in Coordinator tc);
-		boolean is_descendant_transaction(in Coordinator tc);
-		boolean is_top_level_transaction();
-
-		unsigned long hash_transaction();
-		unsigned long hash_top_level_tran();
-
-		RecoveryCoordinator register_resource(in Resource r)
-			raises(Inactive);
-
-		void register_synchronization (in Synchronization sync)
-			raises(Inactive, SynchronizationUnavailable);
-
-		void register_subtran_aware(in SubtransactionAwareResource r)
-			raises(Inactive, NotSubtransaction);
-
-		void rollback_only()
-			raises(Inactive);
-
-		string get_transaction_name();
-		Control create_subtransaction()
-			raises(SubtransactionsUnavailable, Inactive);
-
-		PropagationContext get_txcontext ()
-			raises(Unavailable);
-	};
-
-	interface RecoveryCoordinator {
-		Status replay_completion(in Resource r)
-			raises(NotPrepared);
-	};
-
-	interface Resource {
-		Vote prepare()
-			raises(
-				HeuristicMixed,
-				HeuristicHazard
-			);
-		void rollback()
-			raises(
-				HeuristicCommit,
-				HeuristicMixed,
-				HeuristicHazard
-			);
-		void commit()
-			raises(
-				NotPrepared,
-				HeuristicRollback,
-				HeuristicMixed,
-				HeuristicHazard
-			);
-		void commit_one_phase()
-			raises(
-				HeuristicHazard
-			);
-		void forget();
-	};
-
-	interface TransactionalObject {
-	};
-
-	interface Synchronization : TransactionalObject {
-		void before_completion();
-		void after_completion(in CosTransactions::Status status);
-	};
-
-	interface SubtransactionAwareResource : Resource {
-		void commit_subtransaction(in Coordinator parent);
-		void rollback_subtransaction();
-	};
-
-}; // End of CosTransactions Module
-
-#endif /* ifndef _COS_TRANSACTIONS_IDL_ */
+//File: CosTransactions.idl
+//Part of the Transaction Service
+
+#ifndef _COS_TRANSACTIONS_IDL_
+#define _COS_TRANSACTIONS_IDL_
+
+#include <orb.idl>
+
+#pragma prefix "omg.org"
+
+module CosTransactions {
+
+	// Forward references for interfaces defined later in module
+	interface Current;
+	interface TransactionFactory;
+	interface Control;
+	interface Terminator;
+	interface Coordinator;
+	interface RecoveryCoordinator;
+	interface Resource;
+	interface Synchronization;
+	interface SubtransactionAwareResource;
+	interface TransactionalObject;
+
+	// DATATYPES
+	enum Status {
+		StatusActive,
+		StatusMarkedRollback,
+		StatusPrepared,
+		StatusCommitted,
+		StatusRolledBack,
+		StatusUnknown,
+		StatusNoTransaction,
+		StatusPreparing,
+		StatusCommitting,
+		StatusRollingBack
+	};
+
+	enum Vote {
+		VoteCommit,
+		VoteRollback,
+		VoteReadOnly
+	};
+
+	// Structure definitions
+	struct otid_t {
+		long formatID; /*format identifier. 0 is OSI TP */
+		long bqual_length;
+		sequence <octet> tid;
+	};
+	struct TransIdentity {
+		Coordinator coord;
+		Terminator term;
+		otid_t otid;
+	};
+	struct PropagationContext {
+		unsigned long timeout;
+		TransIdentity current;
+		sequence <TransIdentity> parents;
+		any implementation_specific_data;
+	};
+
+	// Heuristic exceptions
+	exception HeuristicRollback {};
+	exception HeuristicCommit {};
+	exception HeuristicMixed {};
+	exception HeuristicHazard {};
+
+	// Other transaction-specific exceptions
+	exception SubtransactionsUnavailable {};
+	exception NotSubtransaction {};
+	exception Inactive {};
+	exception NotPrepared {};
+	exception NoTransaction {};
+	exception InvalidControl {};
+	exception Unavailable {};
+	exception SynchronizationUnavailable {};
+
+	// Current transaction
+	interface Current : CORBA::Current {
+		void begin()
+			raises(SubtransactionsUnavailable);
+		void commit(in boolean report_heuristics)
+			raises(
+				NoTransaction,
+				HeuristicMixed,
+				HeuristicHazard
+			);
+		void rollback()
+			raises(NoTransaction);
+		void rollback_only()
+			raises(NoTransaction);
+
+		Status get_status();
+		string get_transaction_name();
+		void set_timeout(in unsigned long seconds);
+		Control get_control();
+		Control suspend();
+		void resume(in Control which)
+			raises(InvalidControl);
+	};
+
+
+	interface TransactionFactory {
+		Control create(in unsigned long time_out);
+		Control recreate(in PropagationContext ctx);
+	};
+
+	interface Control {
+		Terminator get_terminator()
+			raises(Unavailable);
+		Coordinator get_coordinator()
+			raises(Unavailable);
+	};
+
+	interface Terminator {
+		void commit(in boolean report_heuristics)
+			raises(
+				HeuristicMixed,
+				HeuristicHazard
+			);
+		void rollback();
+	};
+
+	interface Coordinator {
+
+		Status get_status();
+		Status get_parent_status();
+		Status get_top_level_status();
+
+		boolean is_same_transaction(in Coordinator tc);
+		boolean is_related_transaction(in Coordinator tc);
+		boolean is_ancestor_transaction(in Coordinator tc);
+		boolean is_descendant_transaction(in Coordinator tc);
+		boolean is_top_level_transaction();
+
+		unsigned long hash_transaction();
+		unsigned long hash_top_level_tran();
+
+		RecoveryCoordinator register_resource(in Resource r)
+			raises(Inactive);
+
+		void register_synchronization (in Synchronization sync)
+			raises(Inactive, SynchronizationUnavailable);
+
+		void register_subtran_aware(in SubtransactionAwareResource r)
+			raises(Inactive, NotSubtransaction);
+
+		void rollback_only()
+			raises(Inactive);
+
+		string get_transaction_name();
+		Control create_subtransaction()
+			raises(SubtransactionsUnavailable, Inactive);
+
+		PropagationContext get_txcontext ()
+			raises(Unavailable);
+	};
+
+	interface RecoveryCoordinator {
+		Status replay_completion(in Resource r)
+			raises(NotPrepared);
+	};
+
+	interface Resource {
+		Vote prepare()
+			raises(
+				HeuristicMixed,
+				HeuristicHazard
+			);
+		void rollback()
+			raises(
+				HeuristicCommit,
+				HeuristicMixed,
+				HeuristicHazard
+			);
+		void commit()
+			raises(
+				NotPrepared,
+				HeuristicRollback,
+				HeuristicMixed,
+				HeuristicHazard
+			);
+		void commit_one_phase()
+			raises(
+				HeuristicHazard
+			);
+		void forget();
+	};
+
+	interface TransactionalObject {
+	};
+
+	interface Synchronization : TransactionalObject {
+		void before_completion();
+		void after_completion(in CosTransactions::Status status_);
+	};
+
+	interface SubtransactionAwareResource : Resource {
+		void commit_subtransaction(in Coordinator parent);
+		void rollback_subtransaction();
+	};
+
+}; // End of CosTransactions Module
+
+#endif /* ifndef _COS_TRANSACTIONS_IDL_ */

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTypedEventChannelAdmin.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTypedEventChannelAdmin.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTypedEventChannelAdmin.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,54 +1,54 @@
-//File: CosTypedEventChannelAdmin.idl
-//Part of the Event Service
-//Updated to reflect version 1.1 - March 2001
-
-#ifndef _COS_TYPED_EVENT_CHANNEL_ADMIN_IDL_
-#define _COS_TYPED_EVENT_CHANNEL_ADMIN_IDL_
-
-#include <CosEventChannelAdmin.idl>
-#include <CosTypedEventComm.idl>
-
-#pragma prefix "omg.org"
-
-module CosTypedEventChannelAdmin {  
-
-   exception InterfaceNotSupported {};
-   exception NoSuchImplementation {};
-   typedef string Key;                             //Repository ID
-
-   interface TypedProxyPushConsumer :  
-         CosEventChannelAdmin::ProxyPushConsumer,  
-         CosTypedEventComm::TypedPushConsumer  { };
-
-   interface TypedProxyPullSupplier :
-         CosEventChannelAdmin::ProxyPullSupplier,  
-         CosTypedEventComm::TypedPullSupplier { };
-
-   interface TypedSupplierAdmin :
-         CosEventChannelAdmin::SupplierAdmin {
-      TypedProxyPushConsumer obtain_typed_push_consumer(
-            in Key supported_interface)      
-         raises(InterfaceNotSupported);
-      CosEventChannelAdmin::ProxyPullConsumer obtain_typed_pull_consumer (
-            in Key uses_interface)     
-          raises(NoSuchImplementation);
-   };
-
-   interface TypedConsumerAdmin :
-         CosEventChannelAdmin::ConsumerAdmin {
-      TypedProxyPullSupplier obtain_typed_pull_supplier(
-            in Key supported_interface)      
-         raises (InterfaceNotSupported);
-      CosEventChannelAdmin::ProxyPushSupplier obtain_typed_push_supplier(
-            in Key uses_interface)     
-         raises(NoSuchImplementation);
-   };
-
-   interface TypedEventChannel {
-      TypedConsumerAdmin for_consumers();       
-      TypedSupplierAdmin for_suppliers();
-      void destroy ();
-   };
-};
-
-#endif /* ifndef _COS_TYPED_EVENT_CHANNEL_ADMIN_IDL_ */
+//File: CosTypedEventChannelAdmin.idl
+//Part of the Event Service
+//Updated to reflect version 1.1 - March 2001
+
+#ifndef _COS_TYPED_EVENT_CHANNEL_ADMIN_IDL_
+#define _COS_TYPED_EVENT_CHANNEL_ADMIN_IDL_
+
+#include <CosEventChannelAdmin.idl>
+#include <CosTypedEventComm.idl>
+
+#pragma prefix "omg.org"
+
+module CosTypedEventChannelAdmin {  
+
+   exception InterfaceNotSupported {};
+   exception NoSuchImplementation {};
+   typedef string Key;                             //Repository ID
+
+   interface TypedProxyPushConsumer :  
+         CosEventChannelAdmin::ProxyPushConsumer,  
+         CosTypedEventComm::TypedPushConsumer  { };
+
+   interface TypedProxyPullSupplier :
+         CosEventChannelAdmin::ProxyPullSupplier,  
+         CosTypedEventComm::TypedPullSupplier { };
+
+   interface TypedSupplierAdmin :
+         CosEventChannelAdmin::SupplierAdmin {
+      TypedProxyPushConsumer obtain_typed_push_consumer(
+            in Key supported_interface)      
+         raises(InterfaceNotSupported);
+      CosEventChannelAdmin::ProxyPullConsumer obtain_typed_pull_consumer (
+            in Key uses_interface)     
+          raises(NoSuchImplementation);
+   };
+
+   interface TypedConsumerAdmin :
+         CosEventChannelAdmin::ConsumerAdmin {
+      TypedProxyPullSupplier obtain_typed_pull_supplier(
+            in Key supported_interface)      
+         raises (InterfaceNotSupported);
+      CosEventChannelAdmin::ProxyPushSupplier obtain_typed_push_supplier(
+            in Key uses_interface)     
+         raises(NoSuchImplementation);
+   };
+
+   interface TypedEventChannel {
+      TypedConsumerAdmin for_consumers();       
+      TypedSupplierAdmin for_suppliers();
+      void destroy ();
+   };
+};
+
+#endif /* ifndef _COS_TYPED_EVENT_CHANNEL_ADMIN_IDL_ */

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTypedEventComm.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTypedEventComm.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTypedEventComm.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,22 +1,22 @@
-//File: CosTypedEventComm.idl
-//Part of the Event Service
-
-#ifndef _COS_TYPED_EVENT_COMM_IDL_
-#define _COS_TYPED_EVENT_COMM_IDL_
-
-#include <CosEventComm.idl>
-
-#pragma prefix "omg.org"
-
-module CosTypedEventComm {
-
-   interface TypedPushConsumer : CosEventComm::PushConsumer {
-      Object get_typed_consumer();
-   };
-
-   interface TypedPullSupplier : CosEventComm::PullSupplier {     
-      Object get_typed_supplier();
-   };
-};
-
-#endif /* ifndef _COS_TYPED_EVENT_COMM_IDL_ */
+//File: CosTypedEventComm.idl
+//Part of the Event Service
+
+#ifndef _COS_TYPED_EVENT_COMM_IDL_
+#define _COS_TYPED_EVENT_COMM_IDL_
+
+#include <CosEventComm.idl>
+
+#pragma prefix "omg.org"
+
+module CosTypedEventComm {
+
+   interface TypedPushConsumer : CosEventComm::PushConsumer {
+      Object get_typed_consumer();
+   };
+
+   interface TypedPullSupplier : CosEventComm::PullSupplier {     
+      Object get_typed_supplier();
+   };
+};
+
+#endif /* ifndef _COS_TYPED_EVENT_COMM_IDL_ */

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTypedNotifyChannelAdmin.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTypedNotifyChannelAdmin.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTypedNotifyChannelAdmin.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,165 +1,165 @@
-//File: CosTypedNotifyChannelAdmin.idl
-//Part of the Notification Service
-
-#ifndef _COS_TYPED_NOTIFY_CHANNEL_ADMIN_IDL_
-#define _COS_TYPED_NOTIFY_CHANNEL_ADMIN_IDL_
-#pragma prefix "omg.org"
-
-#include <CosNotifyChannelAdmin.idl>
-#include <CosTypedNotifyComm.idl>
-#include <CosTypedEventChannelAdmin.idl>
-
-module CosTypedNotifyChannelAdmin {
-
-   // Forward declaration
-   interface TypedEventChannelFactory;
-
-   typedef string Key;
-
-   interface TypedProxyPushConsumer :
-         CosNotifyChannelAdmin::ProxyConsumer,
-         CosTypedNotifyComm::TypedPushConsumer {
-
-      void connect_typed_push_supplier (
-            in CosEventComm::PushSupplier push_supplier )
-         raises(CosEventChannelAdmin::AlreadyConnected);
-
-   }; // TypedProxyPushConsumer
-
-   interface TypedProxyPullSupplier :
-         CosNotifyChannelAdmin::ProxySupplier,
-         CosTypedNotifyComm::TypedPullSupplier {
-
-      void connect_typed_pull_consumer (
-            in CosEventComm::PullConsumer pull_consumer )
-         raises(CosEventChannelAdmin::AlreadyConnected);
-
-   }; // TypedProxyPullSupplier
-
-   interface TypedProxyPullConsumer :
-         CosNotifyChannelAdmin::ProxyConsumer,
-         CosNotifyComm::PullConsumer {
-
-      void connect_typed_pull_supplier (
-            in CosTypedEventComm::TypedPullSupplier pull_supplier)
-         raises(CosEventChannelAdmin::AlreadyConnected,
-                CosEventChannelAdmin::TypeError);
-
-      void suspend_connection()
-         raises(CosNotifyChannelAdmin::ConnectionAlreadyInactive,
-                CosNotifyChannelAdmin::NotConnected);
-
-      void resume_connection()
-         raises(CosNotifyChannelAdmin::ConnectionAlreadyActive,
-                CosNotifyChannelAdmin::NotConnected);
-
-   }; // TypedProxyPullConsumer
-
-   interface TypedProxyPushSupplier :
-         CosNotifyChannelAdmin::ProxySupplier,
-         CosNotifyComm::PushSupplier {
-
-      void connect_typed_push_consumer (
-            in CosTypedEventComm::TypedPushConsumer push_consumer)
-         raises(CosEventChannelAdmin::AlreadyConnected,
-                CosEventChannelAdmin::TypeError);
-
-      void suspend_connection()
-         raises(CosNotifyChannelAdmin::ConnectionAlreadyInactive,
-                CosNotifyChannelAdmin::NotConnected);
-
-      void resume_connection()
-         raises(CosNotifyChannelAdmin::ConnectionAlreadyActive,
-                CosNotifyChannelAdmin::NotConnected);
-
-   }; // TypedProxyPushSupplier
-
-   interface TypedConsumerAdmin :
-         CosNotifyChannelAdmin::ConsumerAdmin,
-         CosTypedEventChannelAdmin::TypedConsumerAdmin {
-
-      TypedProxyPullSupplier obtain_typed_notification_pull_supplier(
-            in Key supported_interface,
-            out CosNotifyChannelAdmin::ProxyID proxy_id )
-         raises(CosTypedEventChannelAdmin::InterfaceNotSupported,
-                CosNotifyChannelAdmin::AdminLimitExceeded);
-
-      TypedProxyPushSupplier obtain_typed_notification_push_supplier(
-            in Key uses_interface,
-            out CosNotifyChannelAdmin::ProxyID proxy_id )
-         raises(CosTypedEventChannelAdmin::NoSuchImplementation,
-                CosNotifyChannelAdmin::AdminLimitExceeded);
-
-   }; // TypedConsumerAdmin
-
-   interface TypedSupplierAdmin :
-         CosNotifyChannelAdmin::SupplierAdmin,
-         CosTypedEventChannelAdmin::TypedSupplierAdmin {
-
-      TypedProxyPushConsumer obtain_typed_notification_push_consumer(
-            in Key supported_interface,
-            out CosNotifyChannelAdmin::ProxyID proxy_id )
-         raises(CosTypedEventChannelAdmin::InterfaceNotSupported,
-                CosNotifyChannelAdmin::AdminLimitExceeded);
-
-      TypedProxyPullConsumer obtain_typed_notification_pull_consumer(
-            in Key uses_interface,
-            out CosNotifyChannelAdmin::ProxyID proxy_id )
-         raises(CosTypedEventChannelAdmin::NoSuchImplementation,
-                CosNotifyChannelAdmin::AdminLimitExceeded);
-
-   }; // TypedSupplierAdmin
-
-   interface TypedEventChannel :
-         CosNotification::QoSAdmin,
-         CosNotification::AdminPropertiesAdmin,
-         CosTypedEventChannelAdmin::TypedEventChannel {
-
-      readonly attribute TypedEventChannelFactory MyFactory;
-
-      readonly attribute TypedConsumerAdmin default_consumer_admin;
-      readonly attribute TypedSupplierAdmin default_supplier_admin;
-
-      readonly attribute CosNotifyFilter::FilterFactory
-                     default_filter_factory;
-
-      TypedConsumerAdmin new_for_typed_notification_consumers(
-            in CosNotifyChannelAdmin::InterFilterGroupOperator op,
-            out CosNotifyChannelAdmin::AdminID id );
-
-      TypedSupplierAdmin new_for_typed_notification_suppliers(
-            in CosNotifyChannelAdmin::InterFilterGroupOperator op,
-            out CosNotifyChannelAdmin::AdminID id );
-
-      TypedConsumerAdmin get_consumeradmin (
-            in CosNotifyChannelAdmin::AdminID id )
-         raises(CosNotifyChannelAdmin::AdminNotFound);
-
-      TypedSupplierAdmin get_supplieradmin (
-            in CosNotifyChannelAdmin::AdminID id )
-         raises(CosNotifyChannelAdmin::AdminNotFound);
-
-      CosNotifyChannelAdmin::AdminIDSeq get_all_consumeradmins();
-      CosNotifyChannelAdmin::AdminIDSeq get_all_supplieradmins();
-
-   }; // TypedEventChannel
-
-   interface TypedEventChannelFactory {
-
-      TypedEventChannel create_typed_channel (
-            in CosNotification::QoSProperties initial_QoS,
-            in CosNotification::AdminProperties initial_admin,
-            out CosNotifyChannelAdmin::ChannelID id)
-         raises(CosNotification::UnsupportedQoS,
-                CosNotification::UnsupportedAdmin);
-
-      CosNotifyChannelAdmin::ChannelIDSeq get_all_typed_channels();
-
-      TypedEventChannel get_typed_event_channel (
-            in CosNotifyChannelAdmin::ChannelID id )
-         raises(CosNotifyChannelAdmin::ChannelNotFound);
-
-   }; // TypedEventChannelFactory
-}; // CosTypedNotifyChannelAdmin
-
-#endif /* _COS_TYPED_NOTIFY_CHANNEL_ADMIN_IDL_ */
+//File: CosTypedNotifyChannelAdmin.idl
+//Part of the Notification Service
+
+#ifndef _COS_TYPED_NOTIFY_CHANNEL_ADMIN_IDL_
+#define _COS_TYPED_NOTIFY_CHANNEL_ADMIN_IDL_
+#pragma prefix "omg.org"
+
+#include <CosNotifyChannelAdmin.idl>
+#include <CosTypedNotifyComm.idl>
+#include <CosTypedEventChannelAdmin.idl>
+
+module CosTypedNotifyChannelAdmin {
+
+   // Forward declaration
+   interface TypedEventChannelFactory;
+
+   typedef string Key;
+
+   interface TypedProxyPushConsumer :
+         CosNotifyChannelAdmin::ProxyConsumer,
+         CosTypedNotifyComm::TypedPushConsumer {
+
+      void connect_typed_push_supplier (
+            in CosEventComm::PushSupplier push_supplier )
+         raises(CosEventChannelAdmin::AlreadyConnected);
+
+   }; // TypedProxyPushConsumer
+
+   interface TypedProxyPullSupplier :
+         CosNotifyChannelAdmin::ProxySupplier,
+         CosTypedNotifyComm::TypedPullSupplier {
+
+      void connect_typed_pull_consumer (
+            in CosEventComm::PullConsumer pull_consumer )
+         raises(CosEventChannelAdmin::AlreadyConnected);
+
+   }; // TypedProxyPullSupplier
+
+   interface TypedProxyPullConsumer :
+         CosNotifyChannelAdmin::ProxyConsumer,
+         CosNotifyComm::PullConsumer {
+
+      void connect_typed_pull_supplier (
+            in CosTypedEventComm::TypedPullSupplier pull_supplier)
+         raises(CosEventChannelAdmin::AlreadyConnected,
+                CosEventChannelAdmin::TypeError);
+
+      void suspend_connection()
+         raises(CosNotifyChannelAdmin::ConnectionAlreadyInactive,
+                CosNotifyChannelAdmin::NotConnected);
+
+      void resume_connection()
+         raises(CosNotifyChannelAdmin::ConnectionAlreadyActive,
+                CosNotifyChannelAdmin::NotConnected);
+
+   }; // TypedProxyPullConsumer
+
+   interface TypedProxyPushSupplier :
+         CosNotifyChannelAdmin::ProxySupplier,
+         CosNotifyComm::PushSupplier {
+
+      void connect_typed_push_consumer (
+            in CosTypedEventComm::TypedPushConsumer push_consumer)
+         raises(CosEventChannelAdmin::AlreadyConnected,
+                CosEventChannelAdmin::TypeError);
+
+      void suspend_connection()
+         raises(CosNotifyChannelAdmin::ConnectionAlreadyInactive,
+                CosNotifyChannelAdmin::NotConnected);
+
+      void resume_connection()
+         raises(CosNotifyChannelAdmin::ConnectionAlreadyActive,
+                CosNotifyChannelAdmin::NotConnected);
+
+   }; // TypedProxyPushSupplier
+
+   interface TypedConsumerAdmin :
+         CosNotifyChannelAdmin::ConsumerAdmin,
+         CosTypedEventChannelAdmin::TypedConsumerAdmin {
+
+      TypedProxyPullSupplier obtain_typed_notification_pull_supplier(
+            in Key supported_interface,
+            out CosNotifyChannelAdmin::ProxyID proxy_id )
+         raises(CosTypedEventChannelAdmin::InterfaceNotSupported,
+                CosNotifyChannelAdmin::AdminLimitExceeded);
+
+      TypedProxyPushSupplier obtain_typed_notification_push_supplier(
+            in Key uses_interface,
+            out CosNotifyChannelAdmin::ProxyID proxy_id )
+         raises(CosTypedEventChannelAdmin::NoSuchImplementation,
+                CosNotifyChannelAdmin::AdminLimitExceeded);
+
+   }; // TypedConsumerAdmin
+
+   interface TypedSupplierAdmin :
+         CosNotifyChannelAdmin::SupplierAdmin,
+         CosTypedEventChannelAdmin::TypedSupplierAdmin {
+
+      TypedProxyPushConsumer obtain_typed_notification_push_consumer(
+            in Key supported_interface,
+            out CosNotifyChannelAdmin::ProxyID proxy_id )
+         raises(CosTypedEventChannelAdmin::InterfaceNotSupported,
+                CosNotifyChannelAdmin::AdminLimitExceeded);
+
+      TypedProxyPullConsumer obtain_typed_notification_pull_consumer(
+            in Key uses_interface,
+            out CosNotifyChannelAdmin::ProxyID proxy_id )
+         raises(CosTypedEventChannelAdmin::NoSuchImplementation,
+                CosNotifyChannelAdmin::AdminLimitExceeded);
+
+   }; // TypedSupplierAdmin
+
+   interface TypedEventChannel :
+         CosNotification::QoSAdmin,
+         CosNotification::AdminPropertiesAdmin,
+         CosTypedEventChannelAdmin::TypedEventChannel {
+
+      readonly attribute TypedEventChannelFactory MyFactory;
+
+      readonly attribute TypedConsumerAdmin default_consumer_admin;
+      readonly attribute TypedSupplierAdmin default_supplier_admin;
+
+      readonly attribute CosNotifyFilter::FilterFactory
+                     default_filter_factory;
+
+      TypedConsumerAdmin new_for_typed_notification_consumers(
+            in CosNotifyChannelAdmin::InterFilterGroupOperator op,
+            out CosNotifyChannelAdmin::AdminID id );
+
+      TypedSupplierAdmin new_for_typed_notification_suppliers(
+            in CosNotifyChannelAdmin::InterFilterGroupOperator op,
+            out CosNotifyChannelAdmin::AdminID id );
+
+      TypedConsumerAdmin get_consumeradmin (
+            in CosNotifyChannelAdmin::AdminID id )
+         raises(CosNotifyChannelAdmin::AdminNotFound);
+
+      TypedSupplierAdmin get_supplieradmin (
+            in CosNotifyChannelAdmin::AdminID id )
+         raises(CosNotifyChannelAdmin::AdminNotFound);
+
+      CosNotifyChannelAdmin::AdminIDSeq get_all_consumeradmins();
+      CosNotifyChannelAdmin::AdminIDSeq get_all_supplieradmins();
+
+   }; // TypedEventChannel
+
+   interface TypedEventChannelFactory {
+
+      TypedEventChannel create_typed_channel (
+            in CosNotification::QoSProperties initial_QoS,
+            in CosNotification::AdminProperties initial_admin,
+            out CosNotifyChannelAdmin::ChannelID id)
+         raises(CosNotification::UnsupportedQoS,
+                CosNotification::UnsupportedAdmin);
+
+      CosNotifyChannelAdmin::ChannelIDSeq get_all_typed_channels();
+
+      TypedEventChannel get_typed_event_channel (
+            in CosNotifyChannelAdmin::ChannelID id )
+         raises(CosNotifyChannelAdmin::ChannelNotFound);
+
+   }; // TypedEventChannelFactory
+}; // CosTypedNotifyChannelAdmin
+
+#endif /* _COS_TYPED_NOTIFY_CHANNEL_ADMIN_IDL_ */

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTypedNotifyComm.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTypedNotifyComm.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/CosTypedNotifyComm.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,25 +1,25 @@
-//File: CosTypedNotifyComm.idl
-//Part of the Notification Service
-
-#ifndef _COS_TYPED_NOTIFY_COMM_IDL_
-#define _COS_TYPED_NOTIFY_COMM_IDL_
-#pragma prefix "omg.org"
-
-#include <CosNotifyChannelAdmin.idl>
-#include <CosTypedEventComm.idl>
-
-module CosTypedNotifyComm {
-
-	interface TypedPushConsumer :
-		CosTypedEventComm::TypedPushConsumer,
-		CosNotifyComm::NotifyPublish {
-	}; // TypedPushConsumer
-
-	interface TypedPullSupplier :
-		CosTypedEventComm::TypedPullSupplier,
-		CosNotifyComm::NotifySubscribe {
-	}; // TypedPullSupplier
-
-}; // CosTypedNotifyComm
-
-#endif /* _COS_TYPED_NOTIFY_COMM_IDL_ */
+//File: CosTypedNotifyComm.idl
+//Part of the Notification Service
+
+#ifndef _COS_TYPED_NOTIFY_COMM_IDL_
+#define _COS_TYPED_NOTIFY_COMM_IDL_
+#pragma prefix "omg.org"
+
+#include <CosNotifyChannelAdmin.idl>
+#include <CosTypedEventComm.idl>
+
+module CosTypedNotifyComm {
+
+	interface TypedPushConsumer :
+		CosTypedEventComm::TypedPushConsumer,
+		CosNotifyComm::NotifyPublish {
+	}; // TypedPushConsumer
+
+	interface TypedPullSupplier :
+		CosTypedEventComm::TypedPullSupplier,
+		CosNotifyComm::NotifySubscribe {
+	}; // TypedPullSupplier
+
+}; // CosTypedNotifyComm
+
+#endif /* _COS_TYPED_NOTIFY_COMM_IDL_ */

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/Dynamic.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/Dynamic.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/Dynamic.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,64 +1,64 @@
-// File: Dynamic.idl
-
-// Used primarily for Interceptors
-
-
-
-#ifndef _DYNAMIC_IDL_
-
-#define _DYNAMIC_IDL_
-
-
-
-#ifndef CORBA3
-
-#define local  
-
-#endif
-
-
-
-#include <orb.idl>
-
-
-
-#pragma prefix "omg.org"
-
-
-
-module Dynamic {
-
-
-
-  struct Parameter {
-
-    any argument;
-
-    CORBA::ParameterMode mode;
-
-  };
-
-
-
-  typedef sequence<Parameter> ParameterList;
-
-
-
-  typedef CORBA::StringSeq ContextList;
-
-
-
-  typedef sequence<CORBA::TypeCode> ExceptionList;
-
-
-
-  typedef CORBA::StringSeq RequestContext;
-
-
-
-};
-
-#endif // _DYNAMIC_IDL_
-
-
-
+// File: Dynamic.idl
+
+// Used primarily for Interceptors
+
+
+
+#ifndef _DYNAMIC_IDL_
+
+#define _DYNAMIC_IDL_
+
+
+
+#ifndef CORBA3
+
+#define local  
+
+#endif
+
+
+
+#include <orb.idl>
+
+
+
+#pragma prefix "omg.org"
+
+
+
+module Dynamic {
+
+
+
+  struct Parameter {
+
+    any argument;
+
+    CORBA::ParameterMode mode;
+
+  };
+
+
+
+  typedef sequence<Parameter> ParameterList;
+
+
+
+  typedef CORBA::StringSeq ContextList;
+
+
+
+  typedef sequence<CORBA::TypeCode> ExceptionList;
+
+
+
+  typedef CORBA::StringSeq RequestContext;
+
+
+
+};
+
+#endif // _DYNAMIC_IDL_
+
+
+

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/DynamicAny.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/DynamicAny.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/DynamicAny.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,298 +1,306 @@
-// IDL
-// File: DynamicAny.idl
-
-#ifndef _DYNAMIC_ANY_IDL
-#define _DYNAMIC_ANY_IDL
-
-#pragma prefix "omg.org"
-#include <orb.idl>
-
-module DynamicAny
-{
-    // Dynamic Management of Anys
-
-    interface DynAny {
-	
-	exception InvalidValue { };
-	exception TypeMismatch { };
-
-	CORBA::TypeCode type();
-
-	void assign(in DynAny dyn_any) raises (TypeMismatch);
-
-	void from_any(in any value ) raises (InvalidValue, TypeMismatch);
-	any to_any();
-
-	boolean equal(in DynAny dyn_any);
-
-	void destroy();
-	DynAny copy();
-
-	void insert_boolean ( in boolean value ) 
-	    raises (TypeMismatch, InvalidValue );
-
-	void insert_octet ( in octet value )
-	    raises (TypeMismatch, InvalidValue);
-
-	void insert_char ( in char value ) 
-	    raises (TypeMismatch, InvalidValue );
-
-	void insert_short ( in short value )
-	    raises (TypeMismatch, InvalidValue );
-
-	void insert_ushort ( in unsigned short value )
-	    raises (TypeMismatch, InvalidValue);
-
-	void insert_long ( in long value )
-	    raises (TypeMismatch, InvalidValue);
-
-	void insert_ulong ( in unsigned long value )
-	    raises (TypeMismatch, InvalidValue);
-
-	void insert_float ( in float value ) 
-	    raises (TypeMismatch, InvalidValue);
-
-	void insert_double ( in double value ) 
-	    raises (TypeMismatch, InvalidValue);
-
-	void insert_string ( in string value ) 
-	    raises (TypeMismatch, InvalidValue);
-
-	void insert_reference ( in Object value )
-	    raises (TypeMismatch, InvalidValue);
-
-	void insert_typecode (in CORBA::TypeCode value )
-	    raises (TypeMismatch, InvalidValue);
-
-	void insert_longlong (in long long value )
-	    raises (TypeMismatch, InvalidValue);
-
-	void insert_ulonglong ( in unsigned long long value )
-	    raises (TypeMismatch, InvalidValue);
-
-	// not yet supported by the Java language mapping:
-	//	void insert_longdouble ( in long double value )
-	//	    raises (TypeMismatch, InvalidValue);
-
-
-	void insert_wchar ( in wchar value ) 
-	    raises (TypeMismatch, InvalidValue);
-
-	void insert_wstring ( in wstring value )
-	    raises (TypeMismatch, InvalidValue);
-
-	void insert_any ( in any value )
-	    raises (TypeMismatch, InvalidValue);
-
-	void insert_dyn_any (in DynAny value )
-	    raises (TypeMismatch, InvalidValue);
-
-	// void insert_val(in ValueBase value)	    raises (TypeMismatch, InvalidValue);
-
-
-	boolean get_boolean()
-	    raises (TypeMismatch, InvalidValue);
-
-	octet	get_octet()
-	    raises (TypeMismatch, InvalidValue);
-
-	char	get_char()
-	    raises (TypeMismatch, InvalidValue);
-
-	short	get_short()
-	    raises (TypeMismatch, InvalidValue);
-
-	unsigned short get_ushort()
-	    raises (TypeMismatch, InvalidValue);
-
-	long get_long()
-	    raises (TypeMismatch, InvalidValue);
-
-	unsigned long get_ulong ()
-	    raises (TypeMismatch, InvalidValue);
-
-	float	get_float () 
-	    raises (TypeMismatch, InvalidValue);
-
-	double get_double ()
-	    raises (TypeMismatch, InvalidValue);
-
-	string get_string ()
-	    raises (TypeMismatch, InvalidValue);
-
-	Object get_reference ()
-	    raises (TypeMismatch, InvalidValue);
-
-	CORBA::TypeCode get_typecode ()
-	    raises (TypeMismatch, InvalidValue);
-
-	long long get_longlong ()
-	    raises (TypeMismatch, InvalidValue);
-
-	unsigned long long get_ulonglong()
-	    raises (TypeMismatch, InvalidValue);
-
-       	// not yet supported by the Java language mapping
-	//	long double	get_longdouble()	    raises (TypeMismatch, InvalidValue);
-
-
-	wchar	get_wchar ()
-	    raises (TypeMismatch, InvalidValue);
-
-	wstring get_wstring ()
-	    raises (TypeMismatch, InvalidValue);
-
-	any get_any ()
-	    raises (TypeMismatch, InvalidValue);
-
-	DynAny get_dyn_any ()
-	    raises (TypeMismatch, InvalidValue);
-
-	// ValueBase get_val() 	    raises (TypeMismatch, InvalidValue);
-
-
-	boolean seek( in long index );
-	void rewind ();
-	boolean next();
-	unsigned long component_count();
-
-	DynAny current_component()
-	    raises(TypeMismatch);
-    };
-
-    interface DynFixed : DynAny {
-	string get_value();
-	boolean set_value( in string val ) 
-	    raises (TypeMismatch, InvalidValue );
-    };
-
-    interface DynEnum: DynAny {
-	string	get_as_string();
-	void	set_as_string(in string value)
-	    raises (InvalidValue);
-
-	unsigned long get_as_ulong();
- 	void set_as_ulong(in unsigned long value)
-	    raises (InvalidValue);
-   };
-
-    typedef string FieldName;
-
-    struct NameValuePair {
-	FieldName id;
-	any value;
-    };
-
-    typedef sequence<NameValuePair> NameValuePairSeq;
-
-    struct NameDynAnyPair {
-	FieldName id;
-	DynAny value;
-    };
-
-    typedef sequence<NameDynAnyPair> NameDynAnyPairSeq ;
-
-
-    
-    interface DynUnion: DynAny {
-
-	DynAny get_discriminator();
-
-	void set_discriminator(in DynAny d)
-	    raises (TypeMismatch);
-
-	void set_to_default_member()
-	    raises (TypeMismatch);
-
-	void set_to_no_active_member()
-	    raises (TypeMismatch);
-
-	boolean has_no_active_member();
-
-	CORBA::TCKind discriminator_kind();
-
-	DynAny member()
-	  raises (InvalidValue);
-
-	CORBA::TCKind member_kind()
-	    raises (InvalidValue);
-
-	FieldName member_name()
-	    raises (InvalidValue );
-    };
-
-    interface DynStruct: DynAny {
-
-	FieldName current_member_name()
-	    raises (TypeMismatch, InvalidValue );
-
-	CORBA::TCKind current_member_kind()
-	    raises (TypeMismatch, InvalidValue );
-
-	NameValuePairSeq get_members();
-
-	void set_members(in NameValuePairSeq value )
-	    raises (TypeMismatch, InvalidValue );
-
-	NameDynAnyPairSeq get_members_as_dyn_any();
-
-	void set_members_as_dyn_any(in NameDynAnyPairSeq value)
-	    raises (TypeMismatch, InvalidValue );
-    };
-
-    
-    typedef sequence<any> AnySeq;
-    typedef sequence<DynAny> DynAnySeq;
-
-    interface DynSequence: DynAny 
-    {
-	unsigned long get_length();
-	void set_length(in unsigned long len)
-	    raises (InvalidValue);
-
-	AnySeq get_elements();
-
-	void set_elements(in AnySeq value)
-	    raises (TypeMismatch, InvalidValue );
-
-	DynAnySeq get_elements_as_dyn_any();
-
-	void set_elements_as_dyn_any(in DynAnySeq value)
-	    raises (TypeMismatch, InvalidValue );
-    };
-
-    interface DynArray: DynAny 
-    {
-	AnySeq get_elements();
-
-	void set_elements(in AnySeq value)
-	    raises (TypeMismatch, InvalidValue );
-	
-	DynAnySeq get_elements_as_dyn_any();
-
-	void set_elements_as_dyn_any(in DynAnySeq value)
-	    raises (TypeMismatch, InvalidValue );
-    };
-
-    interface DynValue
-    {
-	//
-    };
-
-
-    interface DynAnyFactory
-    {
-	exception InconsistentTypeCode{};
-
-	DynAny create_dyn_any(in any value)
-	    raises(InconsistentTypeCode);
-
-	DynAny create_dyn_any_from_type_code(in CORBA::TypeCode type)
-	    raises(InconsistentTypeCode);
-    };
-
-};
-
-#endif // _DYNAMIC_ANY_IDL
-
-
+// IDL
+// File: DynamicAny.idl
+
+#ifndef _DYNAMIC_ANY_IDL
+#define _DYNAMIC_ANY_IDL
+
+#pragma prefix "omg.org"
+#include <orb.idl>
+
+module DynamicAny
+{
+   // Dynamic Management of Anys
+
+   interface DynAny {
+
+      exception InvalidValue { };
+      exception TypeMismatch { };
+
+      CORBA::TypeCode type();
+
+      void assign(in DynAny dyn_any) raises (TypeMismatch);
+
+      void from_any(in any value ) raises (InvalidValue, TypeMismatch);
+      any to_any();
+
+      boolean equal(in DynAny dyn_any);
+
+      void destroy();
+      DynAny copy();
+
+      void insert_boolean ( in boolean value )
+         raises (TypeMismatch, InvalidValue );
+
+      void insert_octet ( in octet value )
+         raises (TypeMismatch, InvalidValue);
+
+      void insert_char ( in char value )
+         raises (TypeMismatch, InvalidValue );
+
+      void insert_short ( in short value )
+         raises (TypeMismatch, InvalidValue );
+
+      void insert_ushort ( in unsigned short value )
+         raises (TypeMismatch, InvalidValue);
+
+      void insert_long ( in long value )
+         raises (TypeMismatch, InvalidValue);
+
+      void insert_ulong ( in unsigned long value )
+         raises (TypeMismatch, InvalidValue);
+
+      void insert_float ( in float value )
+         raises (TypeMismatch, InvalidValue);
+
+      void insert_double ( in double value )
+         raises (TypeMismatch, InvalidValue);
+
+      void insert_string ( in string value )
+         raises (TypeMismatch, InvalidValue);
+
+      void insert_reference ( in Object value )
+         raises (TypeMismatch, InvalidValue);
+
+      void insert_typecode (in CORBA::TypeCode value )
+         raises (TypeMismatch, InvalidValue);
+
+      void insert_longlong (in long long value )
+         raises (TypeMismatch, InvalidValue);
+
+      void insert_ulonglong ( in unsigned long long value )
+         raises (TypeMismatch, InvalidValue);
+
+      // not yet supported by the Java language mapping:
+      //  void insert_longdouble ( in long double value )
+      //      raises (TypeMismatch, InvalidValue);
+
+
+      void insert_wchar ( in wchar value )
+         raises (TypeMismatch, InvalidValue);
+
+      void insert_wstring ( in wstring value )
+         raises (TypeMismatch, InvalidValue);
+
+      void insert_any ( in any value )
+         raises (TypeMismatch, InvalidValue);
+
+      void insert_dyn_any (in DynAny value )
+         raises (TypeMismatch, InvalidValue);
+
+      // void insert_val(in ValueBase value)      raises (TypeMismatch, InvalidValue);
+
+
+      boolean get_boolean()
+         raises (TypeMismatch, InvalidValue);
+
+      octet  get_octet()
+         raises (TypeMismatch, InvalidValue);
+
+      char  get_char()
+         raises (TypeMismatch, InvalidValue);
+
+      short  get_short()
+         raises (TypeMismatch, InvalidValue);
+
+      unsigned short get_ushort()
+         raises (TypeMismatch, InvalidValue);
+
+      long get_long()
+         raises (TypeMismatch, InvalidValue);
+
+      unsigned long get_ulong ()
+         raises (TypeMismatch, InvalidValue);
+
+      float  get_float ()
+         raises (TypeMismatch, InvalidValue);
+
+      double get_double ()
+         raises (TypeMismatch, InvalidValue);
+
+      string get_string ()
+         raises (TypeMismatch, InvalidValue);
+
+      Object get_reference ()
+         raises (TypeMismatch, InvalidValue);
+
+      CORBA::TypeCode get_typecode ()
+         raises (TypeMismatch, InvalidValue);
+
+      long long get_longlong ()
+         raises (TypeMismatch, InvalidValue);
+
+      unsigned long long get_ulonglong()
+         raises (TypeMismatch, InvalidValue);
+
+      // not yet supported by the Java language mapping
+      //  long double  get_longdouble()      raises (TypeMismatch, InvalidValue);
+
+
+      wchar  get_wchar ()
+         raises (TypeMismatch, InvalidValue);
+
+      wstring get_wstring ()
+         raises (TypeMismatch, InvalidValue);
+
+      any get_any ()
+         raises (TypeMismatch, InvalidValue);
+
+      DynAny get_dyn_any ()
+         raises (TypeMismatch, InvalidValue);
+
+      // ValueBase get_val()       raises (TypeMismatch, InvalidValue);
+
+
+      boolean seek( in long index );
+      void rewind ();
+      boolean next();
+      unsigned long component_count();
+
+      DynAny current_component()
+         raises(TypeMismatch);
+   };
+
+   interface DynFixed : DynAny {
+      string get_value();
+      boolean set_value( in string val )
+         raises (TypeMismatch, InvalidValue );
+   };
+
+   interface DynEnum: DynAny {
+      string  get_as_string();
+      void  set_as_string(in string value)
+         raises (InvalidValue);
+
+      unsigned long get_as_ulong();
+      void set_as_ulong(in unsigned long value)
+         raises (InvalidValue);
+   };
+
+   typedef string FieldName;
+
+   struct NameValuePair {
+      FieldName id;
+      any value;
+   };
+
+   typedef sequence<NameValuePair> NameValuePairSeq;
+
+   struct NameDynAnyPair {
+      FieldName id;
+      DynAny value;
+   };
+
+   typedef sequence<NameDynAnyPair> NameDynAnyPairSeq ;
+
+
+
+   interface DynUnion: DynAny {
+
+      DynAny get_discriminator();
+
+      void set_discriminator(in DynAny d)
+         raises (TypeMismatch);
+
+      void set_to_default_member()
+         raises (TypeMismatch);
+
+      void set_to_no_active_member()
+         raises (TypeMismatch);
+
+      boolean has_no_active_member();
+
+      CORBA::TCKind discriminator_kind();
+
+      DynAny member()
+         raises (InvalidValue);
+
+      CORBA::TCKind member_kind()
+         raises (InvalidValue);
+
+      FieldName member_name()
+         raises (InvalidValue );
+   };
+
+   interface DynStruct: DynAny {
+
+      FieldName current_member_name()
+         raises (TypeMismatch, InvalidValue );
+
+      CORBA::TCKind current_member_kind()
+         raises (TypeMismatch, InvalidValue );
+
+      NameValuePairSeq get_members();
+
+      void set_members(in NameValuePairSeq value )
+         raises (TypeMismatch, InvalidValue );
+
+      NameDynAnyPairSeq get_members_as_dyn_any();
+
+      void set_members_as_dyn_any(in NameDynAnyPairSeq value)
+         raises (TypeMismatch, InvalidValue );
+   };
+
+
+   typedef sequence<any> AnySeq;
+   typedef sequence<DynAny> DynAnySeq;
+
+   interface DynSequence: DynAny
+   {
+      unsigned long get_length();
+      void set_length(in unsigned long len)
+         raises (InvalidValue);
+
+      AnySeq get_elements();
+
+      void set_elements(in AnySeq value)
+         raises (TypeMismatch, InvalidValue );
+
+      DynAnySeq get_elements_as_dyn_any();
+
+      void set_elements_as_dyn_any(in DynAnySeq value)
+         raises (TypeMismatch, InvalidValue );
+   };
+
+   interface DynArray: DynAny
+   {
+      AnySeq get_elements();
+
+      void set_elements(in AnySeq value)
+         raises (TypeMismatch, InvalidValue );
+
+      DynAnySeq get_elements_as_dyn_any();
+
+      void set_elements_as_dyn_any(in DynAnySeq value)
+         raises (TypeMismatch, InvalidValue );
+   };
+
+   interface DynValue: DynAny
+   {
+      FieldName current_member_name() raises(TypeMismatch, InvalidValue);
+
+      CORBA::TCKind current_member_kind() raises(TypeMismatch, InvalidValue);
+
+      NameValuePairSeq get_members() raises(InvalidValue);
+
+      void set_members(in NameValuePairSeq value) raises(TypeMismatch, InvalidValue);
+
+      NameDynAnyPairSeq get_members_as_dyn_any() raises(InvalidValue);
+
+      void set_members_as_dyn_any(in NameDynAnyPairSeq value) raises(TypeMismatch, InvalidValue);
+   };
+
+
+   interface DynAnyFactory
+   {
+      exception InconsistentTypeCode{};
+
+      DynAny create_dyn_any(in any value)
+         raises(InconsistentTypeCode);
+
+      DynAny create_dyn_any_from_type_code(in CORBA::TypeCode type)
+         raises(InconsistentTypeCode);
+   };
+
+};
+
+#endif // _DYNAMIC_ANY_IDL

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/ETF.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/ETF.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/ETF.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,131 +1,134 @@
-// File: ETF.idl
-
-// Taken from OMG document mars/2003-02-01, Extensible Transport Framework,
-// slightly adapted, AS
-
-#ifndef _ETF_IDL_
-#define _ETF_IDL_
-
-# pragma prefix "omg.org"
-# include "orb.idl"
-# include "IOP.idl"
-# include "GIOP.idl"
-# include "RTCORBA.idl"
-# include "TimeBase.idl"
-# ifdef _NO_LOCAL_
-# define local
-# endif
-
-module ETF
-{
-  typedef sequence<octet> Buffer;
-  typedef sequence<octet> ObjectKey;
-
-  local interface Profile
-  {
-    void marshal(inout IOP::TaggedProfile tagged_profile,
-                 inout IOP::TaggedComponentSeq components);
-    // marshal() must set data.profile_data.length()
-    // to the index of the last octet marshalled + 1
-    unsigned long hash();
-    Profile copy();
-    boolean is_match(in Profile prof);
-    readonly attribute GIOP::Version version;
-
-    // proposed additions to ETF standard below this line
-
-    void set_object_key (in ObjectKey key);
-    ObjectKey get_object_key();
-
-    readonly attribute long tag;
-  };
-
-  local interface Connection
-  {
-    void write(in boolean is_first,
-               in boolean is_last,
-               in Buffer data,
-               in unsigned long offset,
-               in unsigned long length,
-               in TimeBase::TimeT time_out);
-    void read(inout Buffer data,
-              in unsigned long offset,
-              in unsigned long min_length,
-              in unsigned long max_length,
-              in TimeBase::TimeT time_out);
-    // transport needs to set data.length() to
-    // offset + number of bytes actually read
-    void flush();
-    void connect(in Profile server_profile,
-                 in TimeBase::TimeT time_out);
-    void close();
-    boolean is_connected();
-    Profile get_server_profile();
-    boolean is_data_available();
-    boolean wait_next_data(in TimeBase::TimeT time_out);
-    readonly attribute boolean supports_callback;
-    readonly attribute boolean use_handle_time_out;
-  };
-
-  local interface Handle
-  {
-    boolean add_input(in Connection conn);
-    // Tells ORB that a new connection has come in
-    // ORB returns false if it rejects new connection
-    void signal_data_available(in Connection conn);
-    void closed_by_peer (in Connection conn);
-  };
-
-  local interface Listener
-  {
-    void set_handle(in Handle up);
-    Connection accept();
-    void listen();
-    void destroy();
-    void completed_data(in Connection conn) ;
-    readonly attribute Profile endpoint;
-  };
-
-  local interface Factories
-  {
-    Connection create_connection (in RTCORBA::ProtocolProperties props);
-
-    Listener create_listener (in RTCORBA::ProtocolProperties props,
-                              in unsigned long stacksize,
-                              in RTCORBA::Priority base_priority);
-
-    Profile demarshal_profile (inout IOP::TaggedProfile tagged_profile,
-                               out IOP::TaggedComponentSeq components);
-
-	// JacORB addition to ETF draft
-    Profile decode_corbaloc (in string corbaloc);
-
-    readonly attribute IOP::ProfileId profile_tag;
-  };
-
-  // Optional zero copy connection interface
-
-  local interface BufferList
-  {
-    unsigned long add_buffer(in unsigned long size, inout Buffer buf);
-    // Adds an additional buffer to the list.
-    // Returns the zero-origin index of the added buffer.
-    // buf.length() should be set to the actual size of the
-    // memory allocated whether more or less than size.
-    readonly attribute unsigned long num_buffers;
-    void get_buffer(in unsigned long index, inout Buffer buf);
-    // populates the buf argument with the pointer to data
-    void release_buffers();
-  };
-
-  local interface ConnectionZeroCopy : Connection
-  {
-    BufferList create_buffer_list();
-    void write_zc(inout BufferList data,
-                  in TimeBase::TimeT time_out);
-    void read_zc(inout BufferList data,
-                 in unsigned long min_length,
-                 in TimeBase::TimeT time_out);
-  };
-};
-#endif // _ETF_IDL_
+// File: ETF.idl
+
+// Taken from OMG document mars/2003-02-01, Extensible Transport Framework,
+// slightly adapted, AS
+
+#ifndef _ETF_IDL_
+#define _ETF_IDL_
+
+# pragma prefix "omg.org"
+# include "orb.idl"
+# include "IOP.idl"
+# include "GIOP.idl"
+# include "RTCORBA.idl"
+# include "TimeBase.idl"
+# ifdef _NO_LOCAL_
+# define local
+# endif
+
+module ETF
+{
+  typedef sequence<octet> Buffer;
+  typedef sequence<octet> ObjectKey;
+
+  local interface Profile
+  {
+    void marshal(inout IOP::TaggedProfile tagged_profile,
+                 inout IOP::TaggedComponentSeq components);
+    // marshal() must set data.profile_data.length()
+    // to the index of the last octet marshalled + 1
+    unsigned long hash();
+    Profile copy();
+    boolean is_match(in Profile prof);
+    readonly attribute GIOP::Version version;
+
+    // proposed additions to ETF standard below this line
+
+    void set_object_key (in ObjectKey key);
+    ObjectKey get_object_key();
+
+    readonly attribute long tag;
+  };
+
+  local interface Connection
+  {
+    void write(in boolean is_first,
+               in boolean is_last,
+               in Buffer data,
+               in unsigned long offset,
+               in unsigned long length,
+               in TimeBase::TimeT time_out);
+    unsigned long read(inout Buffer data,
+                       in unsigned long offset,
+                       in unsigned long min_length,
+                       in unsigned long max_length,
+                       in TimeBase::TimeT time_out);
+    // The ETF spec suggests that data.value.length()
+    // should be called to indicate the number of bytes
+    // actually read, but that won't work in Java.
+    // So we use the return value to report the
+    // actual number of bytes in JacORB.
+    void flush();
+    void connect(in Profile server_profile,
+                 in TimeBase::TimeT time_out);
+    void close();
+    boolean is_connected();
+    Profile get_server_profile();
+    boolean is_data_available();
+    boolean wait_next_data(in TimeBase::TimeT time_out);
+    readonly attribute boolean supports_callback;
+    readonly attribute boolean use_handle_time_out;
+  };
+
+  local interface Handle
+  {
+    boolean add_input(in Connection conn);
+    // Tells ORB that a new connection has come in
+    // ORB returns false if it rejects new connection
+    void signal_data_available(in Connection conn);
+    void closed_by_peer (in Connection conn);
+  };
+
+  local interface Listener
+  {
+    void set_handle(in Handle up);
+    Connection accept();
+    void listen();
+    void destroy();
+    void completed_data(in Connection conn) ;
+    readonly attribute Profile endpoint;
+  };
+
+  local interface Factories
+  {
+    Connection create_connection (in RTCORBA::ProtocolProperties props);
+
+    Listener create_listener (in RTCORBA::ProtocolProperties props,
+                              in unsigned long stacksize,
+                              in RTCORBA::Priority base_priority);
+
+    Profile demarshal_profile (inout IOP::TaggedProfile tagged_profile,
+                               out IOP::TaggedComponentSeq components);
+
+	// JacORB addition to ETF draft
+    Profile decode_corbaloc (in string corbaloc);
+
+    readonly attribute IOP::ProfileId profile_tag;
+  };
+
+  // Optional zero copy connection interface
+
+  local interface BufferList
+  {
+    unsigned long add_buffer(in unsigned long size, inout Buffer buf);
+    // Adds an additional buffer to the list.
+    // Returns the zero-origin index of the added buffer.
+    // buf.length() should be set to the actual size of the
+    // memory allocated whether more or less than size.
+    readonly attribute unsigned long num_buffers;
+    void get_buffer(in unsigned long index, inout Buffer buf);
+    // populates the buf argument with the pointer to data
+    void release_buffers();
+  };
+
+  local interface ConnectionZeroCopy : Connection
+  {
+    BufferList create_buffer_list();
+    void write_zc(inout BufferList data,
+                  in TimeBase::TimeT time_out);
+    void read_zc(inout BufferList data,
+                 in unsigned long min_length,
+                 in TimeBase::TimeT time_out);
+  };
+};
+#endif // _ETF_IDL_

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/GIOP.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/GIOP.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/GIOP.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,220 +1,220 @@
-/* This file contains OMG IDL from  CORBA V2.3.1
- *  $Id: GIOP.idl,v 1.1.1.1 2001/03/17 18:08:12 brose Exp $	
- */ 
-
-
-#ifndef __GIOP_IDL
-#define __GIOP_IDL
-
-#include <IOP.idl>
-#include <orb.idl>
-
-#pragma prefix "omg.org"
-
-
-module GIOP {
-  // IDL extended for version 1.1
-
-  struct Version {						 	
-    octet		major;
-    octet		minor;
-  };
-
-#ifndef GIOP_1_1
-  // GIOP 1.0
-  enum MsgType_1_0{ 	// rename from MsgType
-    Request, Reply, CancelRequest,
-    LocateRequest, LocateReply,
-    CloseConnection, MessageError
-  };
-#else
-  // GIOP 1.1
-  enum MsgType_1_1{
-    Request, Reply, CancelRequest,
-    LocateRequest, LocateReply,
-    CloseConnection, MessageError,					
-    Fragment			// GIOP 1.1 addition
-  };
-#endif
-
-  // GIOP 1.0
-  struct MessageHeader_1_0 {// Renamed from MessageHeader
-    char magic [4];
-    Version GIOP_version;
-    boolean byte_order;
-    octet message_type;
-    unsigned long message_size;
-  };
-
-  // GIOP 1.1
-  struct MessageHeader_1_1 {
-    char magic [4];
-    Version GIOP_version;
-    octet flags; // GIOP 1.1 change
-    octet message_type;
-    unsigned long message_size;
-  };
-
-  // GIOP 1.2
-  typedef MessageHeader_1_1 MessageHeader_1_2;
-
-  // GIOP 1.0
-  struct RequestHeader_1_0 {
-    IOP::ServiceContextList service_context;
-    unsigned long request_id;
-    boolean response_expected;
-    sequence <octet> object_key;
-    string operation;
-    CORBA::Principal requesting_principal;
-  };
-
-  // GIOP 1.1
-  struct RequestHeader_1_1 {
-    IOP::ServiceContextList service_context;
-    unsigned long request_id;
-    boolean response_expected;
-    octet reserved[3]; // Added in GIOP 1.1
-    sequence <octet> object_key;
-    string operation;
-    CORBA::Principal requesting_principal;
-  };
-
-  // GIOP 1.2
-  typedef short AddressingDisposition;
-
-  const short KeyAddr = 0;
-  const short ProfileAddr = 1;
-  const short ReferenceAddr = 2;
-
-  struct IORAddressingInfo {
-    unsigned long selected_profile_index;
-    IOP::IOR ior;
-  };
-
-  union TargetAddress switch (AddressingDisposition) {
-  case KeyAddr: sequence <octet> object_key;
-  case ProfileAddr: IOP::TaggedProfile profile;
-  case ReferenceAddr: IORAddressingInfo ior;
-  };
-  
-  struct RequestHeader_1_2 {
-    unsigned long request_id;
-    octet response_flags;
-    octet reserved[3];
-    TargetAddress target;
-    string operation;
-    // Principal not in GIOP 1.2
-    IOP::ServiceContextList service_context; // 1.2 change
-  };
-
-
-#ifndef GIOP_1_2
-  // GIOP 1.0 and 1.1
-  enum ReplyStatusType_1_0 {// Renamed from ReplyStatusType
-    NO_EXCEPTION,
-    USER_EXCEPTION,
-    SYSTEM_EXCEPTION,
-    LOCATION_FORWARD
-  };
-
-  // GIOP 1.0
-  struct ReplyHeader_1_0 {// Renamed from ReplyHeader
-    IOP::ServiceContextList service_context;
-    unsigned long request_id;
-    ReplyStatusType_1_0 reply_status;
-  };
-
-  // GIOP 1.1
-  typedef ReplyHeader_1_0 ReplyHeader_1_1;
-
-  // Same Header contents for 1.0 and 1.1
-#else
-  // GIOP 1.2
-  enum ReplyStatusType_1_2 {
-    NO_EXCEPTION,USER_EXCEPTION,
-    SYSTEM_EXCEPTION,
-    LOCATION_FORWARD,
-    LOCATION_FORWARD_PERM, // new value for 1.2
-    NEEDS_ADDRESSING_MODE // new value for 1.2
-  };
-  
-  struct ReplyHeader_1_2 {
-    unsigned long request_id;
-    ReplyStatusType_1_2 reply_status;
-    IOP::ServiceContextList service_context; // 1.2 change
-  };
-#endif // GIOP_1_2
-
-  struct SystemExceptionReplyBody {
-    string exception_id;
-    unsigned long minor_code_value;
-    unsigned long completion_status;
-  };
-
-  struct CancelRequestHeader {
-    unsigned long request_id;
-  };
-
-  // GIOP 1.0
-  struct LocateRequestHeader_1_0 {
-    // Renamed LocationRequestHeader
-    unsigned long request_id;
-    sequence <octet> object_key;
-  };
-
-  // GIOP 1.1
-  typedef LocateRequestHeader_1_0 LocateRequestHeader_1_1;
-
-  // Same Header contents for 1.0 and 1.1
-  // GIOP 1.2
-  struct LocateRequestHeader_1_2 {
-    unsigned long request_id;
-    TargetAddress target;
-  };
-
-#ifndef GIOP_1_2
-
-  // GIOP 1.0 and 1.1
-  enum LocateStatusType_1_0 {// Renamed from LocateStatusType
-    UNKNOWN_OBJECT,
-    OBJECT_HERE,
-    OBJECT_FORWARD
-  };
-
-  // GIOP 1.0
-  struct LocateReplyHeader_1_0 {
-    // Renamed from LocateReplyHeader
-    unsigned long request_id;
-    LocateStatusType_1_0 locate_status;
-  };
-
-  // GIOP 1.1
-  typedef LocateReplyHeader_1_0 LocateReplyHeader_1_1;
-
-  // same Header contents for 1.0 and 1.1
-#else
-  // GIOP 1.2
-  enum LocateStatusType_1_2 {
-    UNKNOWN_OBJECT,
-    OBJECT_HERE,
-    OBJECT_FORWARD,
-    OBJECT_FORWARD_PERM, // new value for GIOP 1.2
-    LOC_SYSTEM_EXCEPTION, // new value for GIOP 1.2
-    LOC_NEEDS_ADDRESSING_MODE // new value for GIOP 1.2
-  };
-
-  struct LocateReplyHeader_1_2 {
-    unsigned long request_id;
-    LocateStatusType_1_2 locate_status;
-  };
-
-#endif // GIOP_1_2
-
-  // GIOP 1.2
-  struct FragmentHeader_1_2 {
-    unsigned long request_id;
-  };
-
-};
-
-#endif
+/* This file contains OMG IDL from  CORBA V2.3.1
+ *  $Id: GIOP.idl,v 1.1.1.1 2001/03/17 18:08:12 brose Exp $	
+ */ 
+
+
+#ifndef __GIOP_IDL
+#define __GIOP_IDL
+
+#include <IOP.idl>
+#include <orb.idl>
+
+#pragma prefix "omg.org"
+
+
+module GIOP {
+  // IDL extended for version 1.1
+
+  struct Version {						 	
+    octet		major;
+    octet		minor;
+  };
+
+#ifndef GIOP_1_1
+  // GIOP 1.0
+  enum MsgType_1_0{ 	// rename from MsgType
+    Request, Reply, CancelRequest,
+    LocateRequest, LocateReply,
+    CloseConnection, MessageError
+  };
+#else
+  // GIOP 1.1
+  enum MsgType_1_1{
+    Request, Reply, CancelRequest,
+    LocateRequest, LocateReply,
+    CloseConnection, MessageError,					
+    Fragment			// GIOP 1.1 addition
+  };
+#endif
+
+  // GIOP 1.0
+  struct MessageHeader_1_0 {// Renamed from MessageHeader
+    char magic [4];
+    Version GIOP_version;
+    boolean byte_order;
+    octet message_type;
+    unsigned long message_size;
+  };
+
+  // GIOP 1.1
+  struct MessageHeader_1_1 {
+    char magic [4];
+    Version GIOP_version;
+    octet flags; // GIOP 1.1 change
+    octet message_type;
+    unsigned long message_size;
+  };
+
+  // GIOP 1.2
+  typedef MessageHeader_1_1 MessageHeader_1_2;
+
+  // GIOP 1.0
+  struct RequestHeader_1_0 {
+    IOP::ServiceContextList service_context;
+    unsigned long request_id;
+    boolean response_expected;
+    sequence <octet> object_key;
+    string operation;
+    CORBA::Principal requesting_principal;
+  };
+
+  // GIOP 1.1
+  struct RequestHeader_1_1 {
+    IOP::ServiceContextList service_context;
+    unsigned long request_id;
+    boolean response_expected;
+    octet reserved[3]; // Added in GIOP 1.1
+    sequence <octet> object_key;
+    string operation;
+    CORBA::Principal requesting_principal;
+  };
+
+  // GIOP 1.2
+  typedef short AddressingDisposition;
+
+  const short KeyAddr = 0;
+  const short ProfileAddr = 1;
+  const short ReferenceAddr = 2;
+
+  struct IORAddressingInfo {
+    unsigned long selected_profile_index;
+    IOP::IOR ior;
+  };
+
+  union TargetAddress switch (AddressingDisposition) {
+  case KeyAddr: sequence <octet> object_key;
+  case ProfileAddr: IOP::TaggedProfile profile;
+  case ReferenceAddr: IORAddressingInfo ior;
+  };
+  
+  struct RequestHeader_1_2 {
+    unsigned long request_id;
+    octet response_flags;
+    octet reserved[3];
+    TargetAddress target;
+    string operation;
+    // Principal not in GIOP 1.2
+    IOP::ServiceContextList service_context; // 1.2 change
+  };
+
+
+#ifndef GIOP_1_2
+  // GIOP 1.0 and 1.1
+  enum ReplyStatusType_1_0 {// Renamed from ReplyStatusType
+    NO_EXCEPTION,
+    USER_EXCEPTION,
+    SYSTEM_EXCEPTION,
+    LOCATION_FORWARD
+  };
+
+  // GIOP 1.0
+  struct ReplyHeader_1_0 {// Renamed from ReplyHeader
+    IOP::ServiceContextList service_context;
+    unsigned long request_id;
+    ReplyStatusType_1_0 reply_status;
+  };
+
+  // GIOP 1.1
+  typedef ReplyHeader_1_0 ReplyHeader_1_1;
+
+  // Same Header contents for 1.0 and 1.1
+#else
+  // GIOP 1.2
+  enum ReplyStatusType_1_2 {
+    NO_EXCEPTION,USER_EXCEPTION,
+    SYSTEM_EXCEPTION,
+    LOCATION_FORWARD,
+    LOCATION_FORWARD_PERM, // new value for 1.2
+    NEEDS_ADDRESSING_MODE // new value for 1.2
+  };
+  
+  struct ReplyHeader_1_2 {
+    unsigned long request_id;
+    ReplyStatusType_1_2 reply_status;
+    IOP::ServiceContextList service_context; // 1.2 change
+  };
+#endif // GIOP_1_2
+
+  struct SystemExceptionReplyBody {
+    string exception_id;
+    unsigned long minor_code_value;
+    unsigned long completion_status;
+  };
+
+  struct CancelRequestHeader {
+    unsigned long request_id;
+  };
+
+  // GIOP 1.0
+  struct LocateRequestHeader_1_0 {
+    // Renamed LocationRequestHeader
+    unsigned long request_id;
+    sequence <octet> object_key;
+  };
+
+  // GIOP 1.1
+  typedef LocateRequestHeader_1_0 LocateRequestHeader_1_1;
+
+  // Same Header contents for 1.0 and 1.1
+  // GIOP 1.2
+  struct LocateRequestHeader_1_2 {
+    unsigned long request_id;
+    TargetAddress target;
+  };
+
+#ifndef GIOP_1_2
+
+  // GIOP 1.0 and 1.1
+  enum LocateStatusType_1_0 {// Renamed from LocateStatusType
+    UNKNOWN_OBJECT,
+    OBJECT_HERE,
+    OBJECT_FORWARD
+  };
+
+  // GIOP 1.0
+  struct LocateReplyHeader_1_0 {
+    // Renamed from LocateReplyHeader
+    unsigned long request_id;
+    LocateStatusType_1_0 locate_status;
+  };
+
+  // GIOP 1.1
+  typedef LocateReplyHeader_1_0 LocateReplyHeader_1_1;
+
+  // same Header contents for 1.0 and 1.1
+#else
+  // GIOP 1.2
+  enum LocateStatusType_1_2 {
+    UNKNOWN_OBJECT,
+    OBJECT_HERE,
+    OBJECT_FORWARD,
+    OBJECT_FORWARD_PERM, // new value for GIOP 1.2
+    LOC_SYSTEM_EXCEPTION, // new value for GIOP 1.2
+    LOC_NEEDS_ADDRESSING_MODE // new value for GIOP 1.2
+  };
+
+  struct LocateReplyHeader_1_2 {
+    unsigned long request_id;
+    LocateStatusType_1_2 locate_status;
+  };
+
+#endif // GIOP_1_2
+
+  // GIOP 1.2
+  struct FragmentHeader_1_2 {
+    unsigned long request_id;
+  };
+
+};
+
+#endif

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/GSSUP.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/GSSUP.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/GSSUP.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,53 +1,53 @@
-#ifndef _GSSUP_IDL_
-#define _GSSUP_IDL_
-#include <CSI.idl>
-
-#pragma prefix "omg.org"
-
-module GSSUP {
-
-    // The GSS Object Identifier allocated for the 
-    // username/password mechanism is defined below.
-    //
-    // { iso-itu-t (2) international-organization (23) omg (130)
-    //	security (1) authentication (1) gssup-mechanism (1) }
-
-    const CSI::StringOID GSSUPMechOID = "oid:2.23.130.1.1.1";
-
-    // The following structure defines the inner contents of the
-    // username password initial context token. This structure is
-    // CDR encapsulated and appended at the end of the
-    // username/password GSS (initial context) Token.
-
-    struct InitialContextToken {
-	CSI::UTF8String username;
-	CSI::UTF8String password;
-	CSI::GSS_NT_ExportedName target_name;
-    };
-
-    typedef unsigned long ErrorCode;
-
-    // GSSUP Mechanism-Specific Error Token
-    struct ErrorToken {
-	ErrorCode error_code;
-    };
-
-    // The context validator has chosen not to reveal the GSSUP
-    // specific cause of the failure.
-    const ErrorCode GSS_UP_S_G_UNSPECIFIED = 1;
-
-    // The user identified in the username field of the
-    // GSSUP::InitialContextToken is unknown to the target.
-    const ErrorCode GSS_UP_S_G_NOUSER = 2;
-
-    // The password supplied in the GSSUP::InitialContextToken was
-    // incorrect.
-    const ErrorCode GSS_UP_S_G_BAD_PASSWORD = 3;
-
-    // The target_name supplied in the GSSUP::InitialContextToken does
-    // not match a target_name in a mechanism definition of the target.
-    const ErrorCode GSS_UP_S_G_BAD_TARGET = 4;
-
-}; // GSSUP
-
-#endif
+#ifndef _GSSUP_IDL_
+#define _GSSUP_IDL_
+#include <CSI.idl>
+
+#pragma prefix "omg.org"
+
+module GSSUP {
+
+    // The GSS Object Identifier allocated for the 
+    // username/password mechanism is defined below.
+    //
+    // { iso-itu-t (2) international-organization (23) omg (130)
+    //	security (1) authentication (1) gssup-mechanism (1) }
+
+    const CSI::StringOID GSSUPMechOID = "oid:2.23.130.1.1.1";
+
+    // The following structure defines the inner contents of the
+    // username password initial context token. This structure is
+    // CDR encapsulated and appended at the end of the
+    // username/password GSS (initial context) Token.
+
+    struct InitialContextToken {
+	CSI::UTF8String username;
+	CSI::UTF8String password;
+	CSI::GSS_NT_ExportedName target_name;
+    };
+
+    typedef unsigned long ErrorCode;
+
+    // GSSUP Mechanism-Specific Error Token
+    struct ErrorToken {
+	ErrorCode error_code;
+    };
+
+    // The context validator has chosen not to reveal the GSSUP
+    // specific cause of the failure.
+    const ErrorCode GSS_UP_S_G_UNSPECIFIED = 1;
+
+    // The user identified in the username field of the
+    // GSSUP::InitialContextToken is unknown to the target.
+    const ErrorCode GSS_UP_S_G_NOUSER = 2;
+
+    // The password supplied in the GSSUP::InitialContextToken was
+    // incorrect.
+    const ErrorCode GSS_UP_S_G_BAD_PASSWORD = 3;
+
+    // The target_name supplied in the GSSUP::InitialContextToken does
+    // not match a target_name in a mechanism definition of the target.
+    const ErrorCode GSS_UP_S_G_BAD_TARGET = 4;
+
+}; // GSSUP
+
+#endif

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/IIOP.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/IIOP.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/IIOP.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,50 +1,50 @@
-/* This file contains OMG IDL from  CORBA V2.3.1
-  $Id: IIOP.idl,v 1.1.1.1 2001/03/17 18:08:12 brose Exp $
-*/
-
-#ifndef __IIOP_IDL
-#define __IIOP_IDL
-
-#include <IOP.idl>
-
-#pragma prefix "omg.org"
-
-module IIOP 
-{				
-  // IDL extended for version 1.1
-						
-  struct Version {
-    octet			major;
-    octet			minor;
-  };
-
-  struct ProfileBody_1_0 { // renamed from ProfileBody
-    Version			iiop_version;
-    string			host;
-    unsigned short		port;
-    sequence <octet>	object_key;
-  };
-
-  struct ProfileBody_1_1 {
-    Version			iiop_version;
-    string			host;
-    unsigned short		port;
-    sequence <octet>       	object_key;
-    // Added in 1.1 unchanged for 1.2
-    sequence <IOP::TaggedComponent> components;
-  };
-
-  struct ListenPoint {
-    string host;
-    unsigned short port;
-  };
-
-  typedef sequence<ListenPoint> ListenPointList;
-
-  struct BiDirIIOPServiceContext {// BI_DIR_IIOP Service Context
-    ListenPointList listen_points;
-  };
-
-};
-
-#endif
+/* This file contains OMG IDL from  CORBA V2.3.1
+  $Id: IIOP.idl,v 1.1.1.1 2001/03/17 18:08:12 brose Exp $
+*/
+
+#ifndef __IIOP_IDL
+#define __IIOP_IDL
+
+#include <IOP.idl>
+
+#pragma prefix "omg.org"
+
+module IIOP 
+{				
+  // IDL extended for version 1.1
+						
+  struct Version {
+    octet			major;
+    octet			minor;
+  };
+
+  struct ProfileBody_1_0 { // renamed from ProfileBody
+    Version			iiop_version;
+    string			host;
+    unsigned short		port;
+    sequence <octet>	object_key;
+  };
+
+  struct ProfileBody_1_1 {
+    Version			iiop_version;
+    string			host;
+    unsigned short		port;
+    sequence <octet>       	object_key;
+    // Added in 1.1 unchanged for 1.2
+    sequence <IOP::TaggedComponent> components;
+  };
+
+  struct ListenPoint {
+    string host;
+    unsigned short port;
+  };
+
+  typedef sequence<ListenPoint> ListenPointList;
+
+  struct BiDirIIOPServiceContext {// BI_DIR_IIOP Service Context
+    ListenPointList listen_points;
+  };
+
+};
+
+#endif

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/IOP.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/IOP.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/IOP.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,94 +1,94 @@
-#ifndef _IOP_IDL_
-#define _IOP_IDL_
-
-#include <orb.idl>
-
-#pragma prefix "omg.org"
-
-module IOP
-{ 
-    local interface Codec
-    {
-        exception InvalidTypeForEncoding {};
-        exception FormatMismatch {};
-        exception TypeMismatch {};
-
-        CORBA::OctetSeq encode (in any data) raises (InvalidTypeForEncoding);
-        any decode (in CORBA::OctetSeq data) raises (FormatMismatch);
-        CORBA::OctetSeq encode_value (in any data) raises (InvalidTypeForEncoding);
-        any decode_value (in CORBA::OctetSeq data, in CORBA::TypeCode tc)
-            raises (FormatMismatch, TypeMismatch);
-    };
-
-    typedef short EncodingFormat;
-    const EncodingFormat ENCODING_CDR_ENCAPS = 0;
-
-    struct Encoding {
-        EncodingFormat format;
-        octet major_version;
-        octet minor_version;
-    };
-
-    local interface CodecFactory
-    {
-        exception UnknownEncoding {};
-
-        Codec create_codec (in Encoding enc) raises (UnknownEncoding);
-    };
-
-    typedef unsigned long  ProfileId;
-    const ProfileId	 TAG_INTERNET_IOP = 0;
-    const ProfileId	 TAG_MULTIPLE_COMPONENTS = 1;
-
-    struct TaggedProfile {
-        ProfileId  tag;
-        sequence <octet> profile_data;
-    };
-
-    struct IOR {
-        string	type_id;
-        sequence <TaggedProfile> profiles;
-    };
-
-    typedef unsigned long ComponentId;
-
-    const ComponentId TAG_ORB_TYPE = 0;
-    const ComponentId TAG_CODE_SETS= 1;
-    const ComponentId TAG_POLICIES= 2;
-    const ComponentId TAG_ALTERNATE_IIOP_ADDRESS = 3;
-    const ComponentId TAG_ASSOCIATION_OPTIONS = 13;
-    const ComponentId TAG_JAVA_CODEBASE = 25;
-    // ... others
-
-    struct TaggedComponent {
-        ComponentId  tag;
-        sequence <octet> component_data;
-    };
-
-    typedef sequence <TaggedComponent> MultipleComponentProfile;
-    typedef sequence<TaggedComponent> TaggedComponentSeq;
-
-    typedef unsigned long ServiceId;
-
-    struct ServiceContext {
-        ServiceId context_id;
-        sequence <octet> context_data;
-    };
-    typedef sequence <ServiceContext> ServiceContextList;
-
-    const ServiceId	TransactionService = 0;
-    const ServiceId	CodeSets = 1;
-    const ServiceId	ChainBypassCheck = 2;
-    const ServiceId	ChainBypassInfo = 3;
-    const ServiceId	LogicalThreadId = 4;
-    const ServiceId	BI_DIR_IIOP = 5;
-    const ServiceId	SendingContextRunTime = 6;
-    const ServiceId	INVOCATION_POLICIES = 7;
-    const ServiceId	FORWARDED_IDENTITY = 8;
-    const ServiceId	UnknownExceptionInfo = 9;
-    const ServiceId ExceptionDetailMessage = 14;
-    const ServiceId	SecurityAttributeService = 15;
-
-};  // IOP module
-
-#endif
+#ifndef _IOP_IDL_
+#define _IOP_IDL_
+
+#include <orb.idl>
+
+#pragma prefix "omg.org"
+
+module IOP
+{ 
+    local interface Codec
+    {
+        exception InvalidTypeForEncoding {};
+        exception FormatMismatch {};
+        exception TypeMismatch {};
+
+        CORBA::OctetSeq encode (in any data) raises (InvalidTypeForEncoding);
+        any decode (in CORBA::OctetSeq data) raises (FormatMismatch);
+        CORBA::OctetSeq encode_value (in any data) raises (InvalidTypeForEncoding);
+        any decode_value (in CORBA::OctetSeq data, in CORBA::TypeCode tc)
+            raises (FormatMismatch, TypeMismatch);
+    };
+
+    typedef short EncodingFormat;
+    const EncodingFormat ENCODING_CDR_ENCAPS = 0;
+
+    struct Encoding {
+        EncodingFormat format;
+        octet major_version;
+        octet minor_version;
+    };
+
+    local interface CodecFactory
+    {
+        exception UnknownEncoding {};
+
+        Codec create_codec (in Encoding enc) raises (UnknownEncoding);
+    };
+
+    typedef unsigned long  ProfileId;
+    const ProfileId	 TAG_INTERNET_IOP = 0;
+    const ProfileId	 TAG_MULTIPLE_COMPONENTS = 1;
+
+    struct TaggedProfile {
+        ProfileId  tag;
+        sequence <octet> profile_data;
+    };
+
+    struct IOR {
+        string	type_id;
+        sequence <TaggedProfile> profiles;
+    };
+
+    typedef unsigned long ComponentId;
+
+    const ComponentId TAG_ORB_TYPE = 0;
+    const ComponentId TAG_CODE_SETS= 1;
+    const ComponentId TAG_POLICIES= 2;
+    const ComponentId TAG_ALTERNATE_IIOP_ADDRESS = 3;
+    const ComponentId TAG_ASSOCIATION_OPTIONS = 13;
+    const ComponentId TAG_JAVA_CODEBASE = 25;
+    // ... others
+
+    struct TaggedComponent {
+        ComponentId  tag;
+        sequence <octet> component_data;
+    };
+
+    typedef sequence <TaggedComponent> MultipleComponentProfile;
+    typedef sequence<TaggedComponent> TaggedComponentSeq;
+
+    typedef unsigned long ServiceId;
+
+    struct ServiceContext {
+        ServiceId context_id;
+        sequence <octet> context_data;
+    };
+    typedef sequence <ServiceContext> ServiceContextList;
+
+    const ServiceId	TransactionService = 0;
+    const ServiceId	CodeSets = 1;
+    const ServiceId	ChainBypassCheck = 2;
+    const ServiceId	ChainBypassInfo = 3;
+    const ServiceId	LogicalThreadId = 4;
+    const ServiceId	BI_DIR_IIOP = 5;
+    const ServiceId	SendingContextRunTime = 6;
+    const ServiceId	INVOCATION_POLICIES = 7;
+    const ServiceId	FORWARDED_IDENTITY = 8;
+    const ServiceId	UnknownExceptionInfo = 9;
+    const ServiceId ExceptionDetailMessage = 14;
+    const ServiceId	SecurityAttributeService = 15;
+
+};  // IOP module
+
+#endif

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/IOP_N.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/IOP_N.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/IOP_N.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,49 +1,49 @@
-// File: IOP_N.idl
-// These definitions are intended to be added to the IOP module in 
-//    version "N" of CORBA. At that time, all references to the IOP_N 
-//    module should be changed appropriately and this file should not
-//    be separate from <IOP.idl>.
-
-#ifndef _IOP_N_IDL_
-#define _IOP_N_IDL_
-
-#ifndef CORBA3
-#define local  
-#endif
-
-#include <orb.idl>
-#include <IOP.idl>
-
-#pragma prefix "omg.org"
-module IOP_N {
-  typedef sequence<IOP::TaggedComponent> TaggedComponentSeq;
-
-  local interface Codec {
-    exception InvalidTypeForEncoding {};
-    exception FormatMismatch {};
-    exception TypeMismatch {};
-
-    CORBA::OctetSeq encode (in any data) raises (InvalidTypeForEncoding);
-    any decode (in CORBA::OctetSeq data) raises (FormatMismatch);
-    CORBA::OctetSeq encode_value (in any data) raises (InvalidTypeForEncoding);
-    any decode_value (in CORBA::OctetSeq data, in CORBA::TypeCode tc)
-      raises (FormatMismatch, TypeMismatch);
-  };
-
-  typedef short EncodingFormat;
-  const EncodingFormat ENCODING_CDR_ENCAPS = 0;
-
-  struct Encoding {
-    EncodingFormat format;
-    octet major_version;
-    octet minor_version;
-  };
-
-  local interface CodecFactory {
-    exception UnknownEncoding {};
-
-    Codec create_codec (in Encoding enc) raises (UnknownEncoding);
-  };
-};
-
-#endif // _IOP_N_IDL_
+// File: IOP_N.idl
+// These definitions are intended to be added to the IOP module in 
+//    version "N" of CORBA. At that time, all references to the IOP_N 
+//    module should be changed appropriately and this file should not
+//    be separate from <IOP.idl>.
+
+#ifndef _IOP_N_IDL_
+#define _IOP_N_IDL_
+
+#ifndef CORBA3
+#define local  
+#endif
+
+#include <orb.idl>
+#include <IOP.idl>
+
+#pragma prefix "omg.org"
+module IOP_N {
+  typedef sequence<IOP::TaggedComponent> TaggedComponentSeq;
+
+  local interface Codec {
+    exception InvalidTypeForEncoding {};
+    exception FormatMismatch {};
+    exception TypeMismatch {};
+
+    CORBA::OctetSeq encode (in any data) raises (InvalidTypeForEncoding);
+    any decode (in CORBA::OctetSeq data) raises (FormatMismatch);
+    CORBA::OctetSeq encode_value (in any data) raises (InvalidTypeForEncoding);
+    any decode_value (in CORBA::OctetSeq data, in CORBA::TypeCode tc)
+      raises (FormatMismatch, TypeMismatch);
+  };
+
+  typedef short EncodingFormat;
+  const EncodingFormat ENCODING_CDR_ENCAPS = 0;
+
+  struct Encoding {
+    EncodingFormat format;
+    octet major_version;
+    octet minor_version;
+  };
+
+  local interface CodecFactory {
+    exception UnknownEncoding {};
+
+    Codec create_codec (in Encoding enc) raises (UnknownEncoding);
+  };
+};
+
+#endif // _IOP_N_IDL_

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/InterfaceRepository.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/InterfaceRepository.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/InterfaceRepository.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,1175 +1,1175 @@
-// File: CORBA_InterfaceRepository.idl 
-
-// (part of formal/00-04-01)
-
-// CORBA 2.3, Chapter 10
-
-
-#pragma prefix "omg.org"
-
-
-
-// Forward references to Chapter 10, CORBA_InterfaceRepository.idl
-
-
-
-#pragma prefix "omg.org"
-
-    interface AliasDef;
-
-    interface ArrayDef;
-
-    interface AttributeDef;
-
-    interface ConstantDef;
-
-    interface Contained;
-
-    interface Container;
-
-    interface EnumDef;
-
-    interface ExceptionDef;
-
-    interface FixedDef;
-
-    interface IDLType;
-
-    interface InterfaceDef;
-
-    interface IRObject;
-
-    interface ModuleDef;
-
-    interface NativeDef;
-
-    interface OperationDef;
-
-    interface PrimitiveDef; 
-
-    interface Repository;
-
-    interface SequenceDef;
-
-    interface StringDef;
-
-    interface StructDef;
-
-    interface TypeCode;
-
-    interface TypedefDef;
-
-    interface UnionDef;
-
-    interface ValueDef;
-
-    interface ValueBoxDef;
-
-    interface ValueMemberDef;
-
-    interface WstringDef;
-
-
-
-    typedef string ScopedName;
-
-    typedef string RepositoryId;
-
-
-
-    enum DefinitionKind {
-
-
-
-        dk_none,        dk_all,
-
-        dk_Attribute,   dk_Constant,    dk_Exception,   dk_Interface,
-
-        dk_Module,      dk_Operation,   dk_Typedef,
-
-        dk_Alias,       dk_Struct,      dk_Union,       dk_Enum,
-
-        dk_Primitive,   dk_String,      dk_Sequence,    dk_Array,
-
-        dk_Repository,
-
-        dk_Wstring,     dk_Fixed,
-
-        dk_Value,       dk_ValueBox,    dk_ValueMember,
-
-        dk_Native
-
-    };
-
-    
-
-    interface IRObject {
-
-        // read interface
-
-        readonly attribute  DefinitionKind  def_kind;
-
-        // write interface
-
-        void                destroy ();
-
-    };
-
-    
-
-    typedef string VersionSpec;
-
-
-
-    interface Contained : IRObject {
-
-
-
-        // read/write interface
-
-        attribute           RepositoryId    id;
-
-        attribute           Identifier      name;
-
-        attribute           VersionSpec     version;
-
-        // read interface
-
-        readonly attribute  Container       defined_in;
-
-        readonly attribute  ScopedName      absolute_name;
-
-        readonly attribute  Repository      containing_repository;
-
-        struct Description {
-
-            DefinitionKind  kind;
-
-            any             value; 
-
-        }; 
-
-        Description         describe ();
-
-        // write interface
-
-        void                move (  in Container    new_container,
-
-                                    in Identifier   new_name,
-
-                                    in VersionSpec  new_version
-
-                                    );
-
-    };
-
-    typedef sequence <InterfaceDef> InterfaceDefSeq;
-
-    typedef sequence <ValueDef> ValueDefSeq;
-
-    typedef sequence <Contained> ContainedSeq;
-
-    
-
-    struct StructMember {
-
-        Identifier          name;
-
-        TypeCode            type;
-
-        IDLType             type_def;
-
-    };
-
-    typedef sequence <StructMember> StructMemberSeq;
-
-    struct Initializer {
-
-        StructMemberSeq     members;
-
-        Identifier          name;
-
-    };
-
-    typedef sequence <Initializer> InitializerSeq;
-
-    struct UnionMember {
-
-        Identifier          name;
-
-        any                 label;
-
-        TypeCode            type;
-
-        IDLType             type_def;
-
-    };
-
-    typedef sequence <UnionMember> UnionMemberSeq;
-
-    typedef sequence <Identifier> EnumMemberSeq;
-
-    interface Container : IRObject {
-
-        // read interface
-
-        Contained lookup (
-
-                          in ScopedName                   search_name);
-
-        ContainedSeq contents (
-
-                               in DefinitionKind               limit_type,
-
-                               in boolean                      exclude_inherited
-
-                               );
-
-        ContainedSeq lookup_name (
-
-                                  in Identifier                   search_name, 
-
-                                  in long                         levels_to_search, 
-
-                                  in DefinitionKind               limit_type,
-
-                                  in boolean                      exclude_inherited
-
-                                  );
-
-        struct Description {
-
-            Contained                       contained_object; 
-
-            DefinitionKind                  kind;
-
-            any                             value; 
-
-        };
-
-        typedef sequence<Description> DescriptionSeq;
-
-        DescriptionSeq describe_contents (
-
-                                          in DefinitionKind               limit_type,
-
-                                          in boolean                      exclude_inherited,
-
-                                          in long                         max_returned_objs
-
-                                          );
-
-        // write interface
-
-        ModuleDef create_module (
-
-                                 in RepositoryId                 id,
-
-                                 in Identifier                   name,
-
-                                 in VersionSpec                  version
-
-                                 );
-
-        ConstantDef create_constant (
-
-                                     in RepositoryId                 id,
-
-                                     in Identifier                   name,
-
-                                     in VersionSpec                  version,
-
-                                     in IDLType                      type,
-
-                                     in any                          value
-
-                                     );
-
-        StructDef create_struct (
-
-                                 in RepositoryId                 id,
-
-                                 in Identifier                   name,
-
-                                 in VersionSpec                  version,
-
-                                 in StructMemberSeq              members
-
-                                 );
-
-        UnionDef create_union (
-
-                               in RepositoryId                 id,
-
-                               in Identifier                   name,
-
-                               in VersionSpec                  version,
-
-                               in IDLType                      discriminator_type,
-
-                               in UnionMemberSeq               members
-
-                               );
-
-        EnumDef create_enum (
-
-                             in RepositoryId                 id,
-
-                             in Identifier                   name,
-
-                             in VersionSpec                  version,
-
-                             in EnumMemberSeq                members
-
-                             );
-
-        AliasDef create_alias (
-
-                               in RepositoryId                 id,
-
-                               in Identifier                   name,
-
-                               in VersionSpec                  version,
-
-                               in IDLType                      original_type
-
-                               );
-
-        InterfaceDef create_interface (
-
-                                       in RepositoryId                 id,
-
-                                       in Identifier                   name,
-
-                                       in VersionSpec                  version,
-
-                                       in InterfaceDefSeq              base_interfaces,
-
-                                       in boolean                      is_abstract
-
-                                       );
-
-        ValueDef create_value(
-
-                              in RepositoryId                 id,
-
-                              in Identifier                   name,
-
-                              in VersionSpec                  version,
-
-                              in boolean                      is_custom,
-
-                              in boolean                      is_abstract,
-
-                              in ValueDef                     base_value,
-
-                              in boolean                      is_truncatable,
-
-                              in ValueDefSeq                  abstract_base_values,
-
-                              in InterfaceDefSeq              supported_interfaces,
-
-                              in InitializerSeq               initializers
-
-                              );
-
-        ValueBoxDef create_value_box(
-
-                                     in RepositoryId                 id,
-
-                                     in Identifier                   name,
-
-                                     in VersionSpec                  version,
-
-                                     in IDLType                      original_type_def
-
-                                     );
-
-        ExceptionDef create_exception(
-
-                                      in RepositoryId                 id,
-
-                                      in Identifier                   name,
-
-                                      in VersionSpec                  version,
-
-                                      in StructMemberSeq              members
-
-                                      );
-
-        NativeDef create_native(
-
-                                in RepositoryId                 id,
-
-                                in Identifier                   name,
-
-                                in VersionSpec                  version
-
-                                );
-
-    };
-
-    interface IDLType : IRObject {
-
-        readonly attribute TypeCode     type;
-
-    };
-
-
-
-    enum PrimitiveKind {
-
-        pk_null,    pk_void,      pk_short,     pk_long,   pk_ushort, pk_ulong,
-
-        pk_float,   pk_double,    pk_boolean,   pk_char,   pk_octet,
-
-        pk_any,     pk_TypeCode,  pk_Principal, pk_string, pk_objref,
-
-        pk_longlong,pk_ulonglong, pk_longdouble, 
-
-        pk_wchar,   pk_wstring,   pk_value_base
-
-    };
-
-    
-
-    interface Repository : Container {
-
-        // read interface
-
-        Contained   lookup_id               (in RepositoryId    search_id);
-
-        TypeCode    get_canonical_typecode  (in TypeCode        tc); 
-
-        PrimitiveDef get_primitive          (in PrimitiveKind   kind);
-
-        // write interface
-
-        StringDef   create_string           (in unsigned long   bound);
-
-        WstringDef  create_wstring          (in unsigned long   bound);
-
-        SequenceDef create_sequence         (in unsigned long   bound,
-
-                                             in IDLType         element_type
-
-                                             );
-
-        ArrayDef create_array               (in unsigned long   length,
-
-                                             in IDLType         element_type
-
-                                             );
-
-        FixedDef create_fixed               (in unsigned short  digits,
-
-                                             in short           scale
-
-                                             );
-
-    };
-
-    interface ModuleDef : Container, Contained {
-
-    };
-
-    
-
-    struct ModuleDescription {
-
-        Identifier                      name; 
-
-        RepositoryId                    id; 
-
-        RepositoryId                    defined_in;
-
-        VersionSpec                     version;
-
-    };
-
-
-
-    interface ConstantDef : Contained {
-
-        readonly attribute TypeCode     type;
-
-        attribute IDLType               type_def;
-
-        attribute any                   value;
-
-    };
-
-    struct ConstantDescription {
-
-        Identifier                      name; 
-
-        RepositoryId                    id; 
-
-        RepositoryId                    defined_in; 
-
-        VersionSpec                     version;
-
-        TypeCode                        type; 
-
-        any                             value; 
-
-    };
-
-    
-
-    interface TypedefDef : Contained, IDLType {
-
-    };
-
-    
-
-    struct TypeDescription {
-
-        Identifier                      name; 
-
-        RepositoryId                    id; 
-
-        RepositoryId                    defined_in; 
-
-        VersionSpec                     version;
-
-        TypeCode                        type; 
-
-    };
-
-    
-
-    interface StructDef : TypedefDef, Container {
-
-        attribute StructMemberSeq       members;
-
-    };
-
-    
-
-    interface UnionDef : TypedefDef, Container {
-
-        readonly attribute TypeCode     discriminator_type;
-
-        attribute IDLType               discriminator_type_def;
-
-        attribute UnionMemberSeq        members;
-
-    };
-
-
-
-    interface EnumDef : TypedefDef {
-
-        attribute EnumMemberSeq         members;
-
-    };
-
-    interface AliasDef : TypedefDef {
-
-        attribute IDLType               original_type_def;
-
-    };
-
-    interface NativeDef : TypedefDef {
-
-    };
-
-    interface PrimitiveDef: IDLType {
-
-        readonly attribute PrimitiveKind kind;
-
-    };
-
-    interface StringDef : IDLType {
-
-        attribute unsigned long         bound;
-
-    };
-
-    interface WstringDef : IDLType {
-
-        attribute unsigned long         bound;
-
-    };
-
-    interface FixedDef : IDLType {
-
-        attribute unsigned short        digits;
-
-        attribute short                 scale;
-
-    };
-
-    interface SequenceDef : IDLType {
-
-        attribute unsigned long         bound;
-
-        readonly attribute TypeCode     element_type;
-
-        attribute IDLType               element_type_def;
-
-    };
-
-    interface ArrayDef : IDLType {
-
-        attribute unsigned long         length;
-
-        readonly attribute TypeCode     element_type;
-
-        attribute IDLType               element_type_def;
-
-    };
-
-    interface ExceptionDef : Contained, Container {
-
-        readonly attribute TypeCode     type;
-
-        attribute StructMemberSeq       members;
-
-    };
-
-    struct ExceptionDescription {
-
-        Identifier                      name; 
-
-        RepositoryId                    id; 
-
-        RepositoryId                    defined_in; 
-
-        VersionSpec                     version;
-
-        TypeCode                        type; 
-
-    };
-
-    enum AttributeMode {ATTR_NORMAL, ATTR_READONLY};
-
-    interface AttributeDef : Contained {
-
-        readonly attribute TypeCode     type;
-
-        attribute IDLType               type_def;
-
-        attribute AttributeMode         mode;
-
-    };
-
-    struct AttributeDescription {
-
-        Identifier                      name; 
-
-        RepositoryId                    id; 
-
-        RepositoryId                    defined_in; 
-
-        VersionSpec                     version;
-
-        TypeCode                        type;
-
-        AttributeMode                   mode; 
-
-    };
-
-    enum OperationMode {OP_NORMAL, OP_ONEWAY};
-
-    enum ParameterMode {PARAM_IN, PARAM_OUT, PARAM_INOUT};
-
-    struct ParameterDescription {
-
-        Identifier                      name; 
-
-        TypeCode                        type; 
-
-        IDLType                         type_def;
-
-        ParameterMode                   mode;
-
-    };
-
-    typedef sequence <ParameterDescription> ParDescriptionSeq;
-
-    typedef Identifier                      ContextIdentifier;
-
-    typedef sequence <ContextIdentifier>    ContextIdSeq;
-
-    typedef sequence <ExceptionDef>         ExceptionDefSeq;
-
-    typedef sequence <ExceptionDescription> ExcDescriptionSeq;
-
-    
-
-    interface OperationDef : Contained {
-
-        readonly attribute TypeCode     result;
-
-        attribute IDLType               result_def;
-
-        attribute ParDescriptionSeq     params;
-
-        attribute OperationMode         mode; 
-
-        attribute ContextIdSeq          contexts;
-
-        attribute ExceptionDefSeq       exceptions;
-
-    };
-
-    
-
-    struct OperationDescription {
-
-        Identifier                      name; 
-
-        RepositoryId                    id; 
-
-        RepositoryId                    defined_in; 
-
-        VersionSpec                     version;
-
-        TypeCode                        result; 
-
-        OperationMode                   mode; 
-
-        ContextIdSeq                    contexts; 
-
-        ParDescriptionSeq               parameters;
-
-        ExcDescriptionSeq               exceptions;
-
-    };
-
-    typedef sequence <RepositoryId>         RepositoryIdSeq;
-
-    typedef sequence <OperationDescription> OpDescriptionSeq;
-
-    typedef sequence <AttributeDescription> AttrDescriptionSeq;
-
-    
-
-    interface InterfaceDef : Container, Contained, IDLType {
-
-
-
-        // read/write interface
-
-        attribute InterfaceDefSeq       base_interfaces;
-
-        attribute boolean               is_abstract;
-
-
-
-        // read interface
-
-        boolean is_a (in RepositoryId   interface_id
-
-                      );
-
-
-
-        struct FullInterfaceDescription {
-
-            Identifier                  name;
-
-            RepositoryId                id;
-
-            RepositoryId                defined_in;
-
-            VersionSpec                 version;
-
-            OpDescriptionSeq            operations;
-
-            AttrDescriptionSeq          attributes;
-
-            RepositoryIdSeq             base_interfaces;
-
-            TypeCode                    type;
-
-            boolean                     is_abstract;
-
-        };
-
-
-
-        FullInterfaceDescription describe_interface();
-
-
-
-        // write interface
-
-
-
-        AttributeDef create_attribute (
-
-                                       in RepositoryId             id,
-
-                                       in Identifier               name,
-
-                                       in VersionSpec              version,
-
-                                       in IDLType                  type,
-
-                                       in AttributeMode            mode
-
-                                       );
-
-        OperationDef create_operation ( 
-
-                                       in RepositoryId             id,
-
-                                       in Identifier               name,
-
-                                       in VersionSpec              version,
-
-                                       in IDLType                  result,
-
-                                       in OperationMode            mode, 
-
-                                       in ParDescriptionSeq        params,
-
-                                       in ExceptionDefSeq          exceptions,
-
-                                       in ContextIdSeq             contexts
-
-                                       );
-
-    };
-
-
-
-    struct InterfaceDescription {
-
-        Identifier                      name; 
-
-        RepositoryId                    id; 
-
-        RepositoryId                    defined_in; 
-
-        VersionSpec                     version;
-
-        RepositoryIdSeq                 base_interfaces;
-
-        boolean                         is_abstract;
-
-    };
-
-
-
-    typedef short Visibility;
-
-    const Visibility PRIVATE_MEMBER = 0;
-
-    const Visibility PUBLIC_MEMBER  = 1;
-
-    
-
-    struct ValueMember {
-
-        Identifier                      name;
-
-        RepositoryId                    id;
-
-        RepositoryId                    defined_in;
-
-        VersionSpec                     version;
-
-        TypeCode                        type;
-
-        IDLType                         type_def;
-
-        Visibility                      access; 
-
-    };
-
-
-
-    typedef sequence <ValueMember> ValueMemberSeq;
-
-
-
-    interface ValueMemberDef : Contained {
-
-        readonly attribute              TypeCode type;
-
-        attribute IDLType               type_def;
-
-        attribute Visibility            access;
-
-    };
-
-
-
-    interface ValueDef : Container, Contained, IDLType {
-
-        // read/write interface
-
-        attribute InterfaceDefSeq       supported_interfaces;
-
-        attribute InitializerSeq        initializers;
-
-        attribute ValueDef              base_value;
-
-        attribute ValueDefSeq           abstract_base_values;
-
-        attribute boolean               is_abstract;
-
-        attribute boolean               is_custom;
-
-        attribute boolean               is_truncatable;
-
-        // read interface
-
-        boolean is_a(in RepositoryId    id);
-
-
-
-        struct FullValueDescription {
-
-            Identifier                  name;
-
-            RepositoryId                id;
-
-            boolean                     is_abstract;
-
-            boolean                     is_custom;
-
-            RepositoryId                defined_in;
-
-            VersionSpec                 version;
-
-            OpDescriptionSeq            operations;
-
-            AttrDescriptionSeq          attributes;
-
-            ValueMemberSeq              members;
-
-            InitializerSeq              initializers;
-
-            RepositoryIdSeq             supported_interfaces;
-
-            RepositoryIdSeq             abstract_base_values;
-
-            boolean                     is_truncatable;
-
-            RepositoryId                base_value;
-
-            TypeCode                    type;
-
-        };
-
-
-
-        FullValueDescription describe_value();
-
-
-
-        ValueMemberDef create_value_member(
-
-                                           in RepositoryId             id,
-
-                                           in Identifier               name,
-
-                                           in VersionSpec              version,
-
-                                           in IDLType                  type,
-
-                                           in Visibility               access
-
-                                           );
-
-        AttributeDef create_attribute(
-
-                                      in RepositoryId             id,
-
-                                      in Identifier               name,
-
-                                      in VersionSpec              version,
-
-                                      in IDLType                  type,
-
-                                      in AttributeMode            mode
-
-                                      );
-
-        OperationDef create_operation (
-
-                                       in RepositoryId             id,
-
-                                       in Identifier               name,
-
-                                       in VersionSpec              version,
-
-                                       in IDLType                  result,
-
-                                       in OperationMode            mode,
-
-                                       in ParDescriptionSeq        params,
-
-                                       in ExceptionDefSeq          exceptions,
-
-                                       in ContextIdSeq             contexts
-
-                                       );
-
-    };
-
-
-
-    struct ValueDescription {
-
-        Identifier                      name;
-
-        RepositoryId                    id;
-
-        boolean                         is_abstract;
-
-        boolean                         is_custom;
-
-        RepositoryId                    defined_in;
-
-        VersionSpec                     version;
-
-        RepositoryIdSeq                 supported_interfaces;
-
-        RepositoryIdSeq                 abstract_base_values;
-
-        boolean                         is_truncatable;
-
-        RepositoryId                    base_value; 
-
-    };
-
-
-
-    interface ValueBoxDef : TypedefDef {
-
-        attribute IDLType original_type_def;
-
-    };
-
-
-
-    enum TCKind {                               // PIDL
-
-        tk_null,    tk_void, 
-
-        tk_short,   tk_long,        tk_ushort,  tk_ulong, 
-
-        tk_float,   tk_double,      tk_boolean, tk_char, 
-
-        tk_octet,   tk_any,         tk_TypeCode,tk_Principal, tk_objref, 
-
-        tk_struct,  tk_union,       tk_enum,    tk_string, 
-
-        tk_sequence,tk_array,       tk_alias,   tk_except,
-
-        tk_longlong,tk_ulonglong,   tk_longdouble,
-
-        tk_wchar,   tk_wstring,     tk_fixed,
-
-        tk_value,   tk_value_box,
-
-        tk_native,
-
-        tk_abstract_interface
-
-    };
-
-    typedef short ValueModifier;                        // PIDL
-
-    const ValueModifier VM_NONE         = 0;
-
-    const ValueModifier VM_CUSTOM       = 1;
-
-    const ValueModifier VM_ABSTRACT     = 2;
-
-    const ValueModifier VM_TRUNCATABLE  = 3;
-
-
-
-    interface TypeCode {                            // PIDL
-
-        exception   Bounds {};
-
-        exception   BadKind {};
-
-        // for all TypeCode kinds
-
-        boolean     equal       (in TypeCode tc);
-
-        boolean     equivalent  (in TypeCode tc); 
-
-        TypeCode    get_compact_typecode(); 
-
-        TCKind      kind ();
-
-        // for tk_objref, tk_struct,    tk_union,  tk_enum, tk_alias, 
-
-        //     tk_value,  tk_value_box, tk_native, tk_abstract_interface
-
-        // and tk_except
-
-        RepositoryId    id () raises (BadKind);
-
-        // for tk_objref, tk_struct,    tk_union,  tk_enum, tk_alias, 
-
-        //     tk_value,  tk_value_box, tk_native, tk_abstract_interface
-
-        // and tk_except
-
-        Identifier name () raises (BadKind);
-
-        // for tk_struct, tk_union, tk_enum, tk_value, 
-
-        // and tk_except
-
-        unsigned long   member_count () raises (BadKind);
-
-        Identifier      member_name (in unsigned long index) 
-
-            raises (BadKind, Bounds);
-
-        // for tk_struct, tk_union, tk_value, and tk_except
-
-        TypeCode        member_type (in unsigned long index) 
-
-            raises (BadKind, Bounds);
-
-        // for tk_union
-
-        any             member_label (in unsigned long index) 
-
-            raises (BadKind, Bounds);
-
-        TypeCode        discriminator_type ()   raises (BadKind);
-
-        long            default_index ()        raises (BadKind); 
-
-        // for tk_string, tk_sequence, and tk_array
-
-        unsigned long   length ()               raises (BadKind);
-
-        // for tk_sequence, tk_array, tk_value_box, and tk_alias
-
-        TypeCode        content_type ()         raises (BadKind);
-
-        // for tk_fixed
-
-        unsigned short  fixed_digits()          raises (BadKind);
-
-        short           fixed_scale()           raises (BadKind);
-
-        // for tk_value
-
-        Visibility      member_visibility(in unsigned long index)
-
-            raises(BadKind, Bounds);
-
-        ValueModifier   type_modifier()         raises(BadKind);
-
-        TypeCode        concrete_base_type()    raises(BadKind);
-
-    };
-
-
-
+// File: CORBA_InterfaceRepository.idl 
+
+// (part of formal/00-04-01)
+
+// CORBA 2.3, Chapter 10
+
+
+#pragma prefix "omg.org"
+
+
+
+// Forward references to Chapter 10, CORBA_InterfaceRepository.idl
+
+
+
+#pragma prefix "omg.org"
+
+    interface AliasDef;
+
+    interface ArrayDef;
+
+    interface AttributeDef;
+
+    interface ConstantDef;
+
+    interface Contained;
+
+    interface Container;
+
+    interface EnumDef;
+
+    interface ExceptionDef;
+
+    interface FixedDef;
+
+    interface IDLType;
+
+    interface InterfaceDef;
+
+    interface IRObject;
+
+    interface ModuleDef;
+
+    interface NativeDef;
+
+    interface OperationDef;
+
+    interface PrimitiveDef; 
+
+    interface Repository;
+
+    interface SequenceDef;
+
+    interface StringDef;
+
+    interface StructDef;
+
+    interface TypeCode;
+
+    interface TypedefDef;
+
+    interface UnionDef;
+
+    interface ValueDef;
+
+    interface ValueBoxDef;
+
+    interface ValueMemberDef;
+
+    interface WstringDef;
+
+
+
+    typedef string ScopedName;
+
+    typedef string RepositoryId;
+
+
+
+    enum DefinitionKind {
+
+
+
+        dk_none,        dk_all,
+
+        dk_Attribute,   dk_Constant,    dk_Exception,   dk_Interface,
+
+        dk_Module,      dk_Operation,   dk_Typedef,
+
+        dk_Alias,       dk_Struct,      dk_Union,       dk_Enum,
+
+        dk_Primitive,   dk_String,      dk_Sequence,    dk_Array,
+
+        dk_Repository,
+
+        dk_Wstring,     dk_Fixed,
+
+        dk_Value,       dk_ValueBox,    dk_ValueMember,
+
+        dk_Native
+
+    };
+
+    
+
+    interface IRObject {
+
+        // read interface
+
+        readonly attribute  DefinitionKind  def_kind;
+
+        // write interface
+
+        void                destroy ();
+
+    };
+
+    
+
+    typedef string VersionSpec;
+
+
+
+    interface Contained : IRObject {
+
+
+
+        // read/write interface
+
+        attribute           RepositoryId    id;
+
+        attribute           Identifier      name;
+
+        attribute           VersionSpec     version;
+
+        // read interface
+
+        readonly attribute  Container       defined_in;
+
+        readonly attribute  ScopedName      absolute_name;
+
+        readonly attribute  Repository      containing_repository;
+
+        struct Description {
+
+            DefinitionKind  kind;
+
+            any             value; 
+
+        }; 
+
+        Description         describe ();
+
+        // write interface
+
+        void                move (  in Container    new_container,
+
+                                    in Identifier   new_name,
+
+                                    in VersionSpec  new_version
+
+                                    );
+
+    };
+
+    typedef sequence <InterfaceDef> InterfaceDefSeq;
+
+    typedef sequence <ValueDef> ValueDefSeq;
+
+    typedef sequence <Contained> ContainedSeq;
+
+    
+
+    struct StructMember {
+
+        Identifier          name;
+
+        TypeCode            type;
+
+        IDLType             type_def;
+
+    };
+
+    typedef sequence <StructMember> StructMemberSeq;
+
+    struct Initializer {
+
+        StructMemberSeq     members;
+
+        Identifier          name;
+
+    };
+
+    typedef sequence <Initializer> InitializerSeq;
+
+    struct UnionMember {
+
+        Identifier          name;
+
+        any                 label;
+
+        TypeCode            type;
+
+        IDLType             type_def;
+
+    };
+
+    typedef sequence <UnionMember> UnionMemberSeq;
+
+    typedef sequence <Identifier> EnumMemberSeq;
+
+    interface Container : IRObject {
+
+        // read interface
+
+        Contained lookup (
+
+                          in ScopedName                   search_name);
+
+        ContainedSeq contents (
+
+                               in DefinitionKind               limit_type,
+
+                               in boolean                      exclude_inherited
+
+                               );
+
+        ContainedSeq lookup_name (
+
+                                  in Identifier                   search_name, 
+
+                                  in long                         levels_to_search, 
+
+                                  in DefinitionKind               limit_type,
+
+                                  in boolean                      exclude_inherited
+
+                                  );
+
+        struct Description {
+
+            Contained                       contained_object; 
+
+            DefinitionKind                  kind;
+
+            any                             value; 
+
+        };
+
+        typedef sequence<Description> DescriptionSeq;
+
+        DescriptionSeq describe_contents (
+
+                                          in DefinitionKind               limit_type,
+
+                                          in boolean                      exclude_inherited,
+
+                                          in long                         max_returned_objs
+
+                                          );
+
+        // write interface
+
+        ModuleDef create_module (
+
+                                 in RepositoryId                 id,
+
+                                 in Identifier                   name,
+
+                                 in VersionSpec                  version
+
+                                 );
+
+        ConstantDef create_constant (
+
+                                     in RepositoryId                 id,
+
+                                     in Identifier                   name,
+
+                                     in VersionSpec                  version,
+
+                                     in IDLType                      type,
+
+                                     in any                          value
+
+                                     );
+
+        StructDef create_struct (
+
+                                 in RepositoryId                 id,
+
+                                 in Identifier                   name,
+
+                                 in VersionSpec                  version,
+
+                                 in StructMemberSeq              members
+
+                                 );
+
+        UnionDef create_union (
+
+                               in RepositoryId                 id,
+
+                               in Identifier                   name,
+
+                               in VersionSpec                  version,
+
+                               in IDLType                      discriminator_type,
+
+                               in UnionMemberSeq               members
+
+                               );
+
+        EnumDef create_enum (
+
+                             in RepositoryId                 id,
+
+                             in Identifier                   name,
+
+                             in VersionSpec                  version,
+
+                             in EnumMemberSeq                members
+
+                             );
+
+        AliasDef create_alias (
+
+                               in RepositoryId                 id,
+
+                               in Identifier                   name,
+
+                               in VersionSpec                  version,
+
+                               in IDLType                      original_type
+
+                               );
+
+        InterfaceDef create_interface (
+
+                                       in RepositoryId                 id,
+
+                                       in Identifier                   name,
+
+                                       in VersionSpec                  version,
+
+                                       in InterfaceDefSeq              base_interfaces,
+
+                                       in boolean                      is_abstract
+
+                                       );
+
+        ValueDef create_value(
+
+                              in RepositoryId                 id,
+
+                              in Identifier                   name,
+
+                              in VersionSpec                  version,
+
+                              in boolean                      is_custom,
+
+                              in boolean                      is_abstract,
+
+                              in ValueDef                     base_value,
+
+                              in boolean                      is_truncatable,
+
+                              in ValueDefSeq                  abstract_base_values,
+
+                              in InterfaceDefSeq              supported_interfaces,
+
+                              in InitializerSeq               initializers
+
+                              );
+
+        ValueBoxDef create_value_box(
+
+                                     in RepositoryId                 id,
+
+                                     in Identifier                   name,
+
+                                     in VersionSpec                  version,
+
+                                     in IDLType                      original_type_def
+
+                                     );
+
+        ExceptionDef create_exception(
+
+                                      in RepositoryId                 id,
+
+                                      in Identifier                   name,
+
+                                      in VersionSpec                  version,
+
+                                      in StructMemberSeq              members
+
+                                      );
+
+        NativeDef create_native(
+
+                                in RepositoryId                 id,
+
+                                in Identifier                   name,
+
+                                in VersionSpec                  version
+
+                                );
+
+    };
+
+    interface IDLType : IRObject {
+
+        readonly attribute TypeCode     type;
+
+    };
+
+
+
+    enum PrimitiveKind {
+
+        pk_null,    pk_void,      pk_short,     pk_long,   pk_ushort, pk_ulong,
+
+        pk_float,   pk_double,    pk_boolean,   pk_char,   pk_octet,
+
+        pk_any,     pk_TypeCode,  pk_Principal, pk_string, pk_objref,
+
+        pk_longlong,pk_ulonglong, pk_longdouble, 
+
+        pk_wchar,   pk_wstring,   pk_value_base
+
+    };
+
+    
+
+    interface Repository : Container {
+
+        // read interface
+
+        Contained   lookup_id               (in RepositoryId    search_id);
+
+        TypeCode    get_canonical_typecode  (in TypeCode        tc); 
+
+        PrimitiveDef get_primitive          (in PrimitiveKind   kind);
+
+        // write interface
+
+        StringDef   create_string           (in unsigned long   bound);
+
+        WstringDef  create_wstring          (in unsigned long   bound);
+
+        SequenceDef create_sequence         (in unsigned long   bound,
+
+                                             in IDLType         element_type
+
+                                             );
+
+        ArrayDef create_array               (in unsigned long   length,
+
+                                             in IDLType         element_type
+
+                                             );
+
+        FixedDef create_fixed               (in unsigned short  digits,
+
+                                             in short           scale
+
+                                             );
+
+    };
+
+    interface ModuleDef : Container, Contained {
+
+    };
+
+    
+
+    struct ModuleDescription {
+
+        Identifier                      name; 
+
+        RepositoryId                    id; 
+
+        RepositoryId                    defined_in;
+
+        VersionSpec                     version;
+
+    };
+
+
+
+    interface ConstantDef : Contained {
+
+        readonly attribute TypeCode     type;
+
+        attribute IDLType               type_def;
+
+        attribute any                   value;
+
+    };
+
+    struct ConstantDescription {
+
+        Identifier                      name; 
+
+        RepositoryId                    id; 
+
+        RepositoryId                    defined_in; 
+
+        VersionSpec                     version;
+
+        TypeCode                        type; 
+
+        any                             value; 
+
+    };
+
+    
+
+    interface TypedefDef : Contained, IDLType {
+
+    };
+
+    
+
+    struct TypeDescription {
+
+        Identifier                      name; 
+
+        RepositoryId                    id; 
+
+        RepositoryId                    defined_in; 
+
+        VersionSpec                     version;
+
+        TypeCode                        type; 
+
+    };
+
+    
+
+    interface StructDef : TypedefDef, Container {
+
+        attribute StructMemberSeq       members;
+
+    };
+
+    
+
+    interface UnionDef : TypedefDef, Container {
+
+        readonly attribute TypeCode     discriminator_type;
+
+        attribute IDLType               discriminator_type_def;
+
+        attribute UnionMemberSeq        members;
+
+    };
+
+
+
+    interface EnumDef : TypedefDef {
+
+        attribute EnumMemberSeq         members;
+
+    };
+
+    interface AliasDef : TypedefDef {
+
+        attribute IDLType               original_type_def;
+
+    };
+
+    interface NativeDef : TypedefDef {
+
+    };
+
+    interface PrimitiveDef: IDLType {
+
+        readonly attribute PrimitiveKind kind;
+
+    };
+
+    interface StringDef : IDLType {
+
+        attribute unsigned long         bound;
+
+    };
+
+    interface WstringDef : IDLType {
+
+        attribute unsigned long         bound;
+
+    };
+
+    interface FixedDef : IDLType {
+
+        attribute unsigned short        digits;
+
+        attribute short                 scale;
+
+    };
+
+    interface SequenceDef : IDLType {
+
+        attribute unsigned long         bound;
+
+        readonly attribute TypeCode     element_type;
+
+        attribute IDLType               element_type_def;
+
+    };
+
+    interface ArrayDef : IDLType {
+
+        attribute unsigned long         length;
+
+        readonly attribute TypeCode     element_type;
+
+        attribute IDLType               element_type_def;
+
+    };
+
+    interface ExceptionDef : Contained, Container {
+
+        readonly attribute TypeCode     type;
+
+        attribute StructMemberSeq       members;
+
+    };
+
+    struct ExceptionDescription {
+
+        Identifier                      name; 
+
+        RepositoryId                    id; 
+
+        RepositoryId                    defined_in; 
+
+        VersionSpec                     version;
+
+        TypeCode                        type; 
+
+    };
+
+    enum AttributeMode {ATTR_NORMAL, ATTR_READONLY};
+
+    interface AttributeDef : Contained {
+
+        readonly attribute TypeCode     type;
+
+        attribute IDLType               type_def;
+
+        attribute AttributeMode         mode;
+
+    };
+
+    struct AttributeDescription {
+
+        Identifier                      name; 
+
+        RepositoryId                    id; 
+
+        RepositoryId                    defined_in; 
+
+        VersionSpec                     version;
+
+        TypeCode                        type;
+
+        AttributeMode                   mode; 
+
+    };
+
+    enum OperationMode {OP_NORMAL, OP_ONEWAY};
+
+    enum ParameterMode {PARAM_IN, PARAM_OUT, PARAM_INOUT};
+
+    struct ParameterDescription {
+
+        Identifier                      name; 
+
+        TypeCode                        type; 
+
+        IDLType                         type_def;
+
+        ParameterMode                   mode;
+
+    };
+
+    typedef sequence <ParameterDescription> ParDescriptionSeq;
+
+    typedef Identifier                      ContextIdentifier;
+
+    typedef sequence <ContextIdentifier>    ContextIdSeq;
+
+    typedef sequence <ExceptionDef>         ExceptionDefSeq;
+
+    typedef sequence <ExceptionDescription> ExcDescriptionSeq;
+
+    
+
+    interface OperationDef : Contained {
+
+        readonly attribute TypeCode     result;
+
+        attribute IDLType               result_def;
+
+        attribute ParDescriptionSeq     params;
+
+        attribute OperationMode         mode; 
+
+        attribute ContextIdSeq          contexts;
+
+        attribute ExceptionDefSeq       exceptions;
+
+    };
+
+    
+
+    struct OperationDescription {
+
+        Identifier                      name; 
+
+        RepositoryId                    id; 
+
+        RepositoryId                    defined_in; 
+
+        VersionSpec                     version;
+
+        TypeCode                        result; 
+
+        OperationMode                   mode; 
+
+        ContextIdSeq                    contexts; 
+
+        ParDescriptionSeq               parameters;
+
+        ExcDescriptionSeq               exceptions;
+
+    };
+
+    typedef sequence <RepositoryId>         RepositoryIdSeq;
+
+    typedef sequence <OperationDescription> OpDescriptionSeq;
+
+    typedef sequence <AttributeDescription> AttrDescriptionSeq;
+
+    
+
+    interface InterfaceDef : Container, Contained, IDLType {
+
+
+
+        // read/write interface
+
+        attribute InterfaceDefSeq       base_interfaces;
+
+        attribute boolean               is_abstract;
+
+
+
+        // read interface
+
+        boolean is_a (in RepositoryId   interface_id
+
+                      );
+
+
+
+        struct FullInterfaceDescription {
+
+            Identifier                  name;
+
+            RepositoryId                id;
+
+            RepositoryId                defined_in;
+
+            VersionSpec                 version;
+
+            OpDescriptionSeq            operations;
+
+            AttrDescriptionSeq          attributes;
+
+            RepositoryIdSeq             base_interfaces;
+
+            TypeCode                    type;
+
+            boolean                     is_abstract;
+
+        };
+
+
+
+        FullInterfaceDescription describe_interface();
+
+
+
+        // write interface
+
+
+
+        AttributeDef create_attribute (
+
+                                       in RepositoryId             id,
+
+                                       in Identifier               name,
+
+                                       in VersionSpec              version,
+
+                                       in IDLType                  type,
+
+                                       in AttributeMode            mode
+
+                                       );
+
+        OperationDef create_operation ( 
+
+                                       in RepositoryId             id,
+
+                                       in Identifier               name,
+
+                                       in VersionSpec              version,
+
+                                       in IDLType                  result,
+
+                                       in OperationMode            mode, 
+
+                                       in ParDescriptionSeq        params,
+
+                                       in ExceptionDefSeq          exceptions,
+
+                                       in ContextIdSeq             contexts
+
+                                       );
+
+    };
+
+
+
+    struct InterfaceDescription {
+
+        Identifier                      name; 
+
+        RepositoryId                    id; 
+
+        RepositoryId                    defined_in; 
+
+        VersionSpec                     version;
+
+        RepositoryIdSeq                 base_interfaces;
+
+        boolean                         is_abstract;
+
+    };
+
+
+
+    typedef short Visibility;
+
+    const Visibility PRIVATE_MEMBER = 0;
+
+    const Visibility PUBLIC_MEMBER  = 1;
+
+    
+
+    struct ValueMember {
+
+        Identifier                      name;
+
+        RepositoryId                    id;
+
+        RepositoryId                    defined_in;
+
+        VersionSpec                     version;
+
+        TypeCode                        type;
+
+        IDLType                         type_def;
+
+        Visibility                      access; 
+
+    };
+
+
+
+    typedef sequence <ValueMember> ValueMemberSeq;
+
+
+
+    interface ValueMemberDef : Contained {
+
+        readonly attribute              TypeCode type;
+
+        attribute IDLType               type_def;
+
+        attribute Visibility            access;
+
+    };
+
+
+
+    interface ValueDef : Container, Contained, IDLType {
+
+        // read/write interface
+
+        attribute InterfaceDefSeq       supported_interfaces;
+
+        attribute InitializerSeq        initializers;
+
+        attribute ValueDef              base_value;
+
+        attribute ValueDefSeq           abstract_base_values;
+
+        attribute boolean               is_abstract;
+
+        attribute boolean               is_custom;
+
+        attribute boolean               is_truncatable;
+
+        // read interface
+
+        boolean is_a(in RepositoryId    id);
+
+
+
+        struct FullValueDescription {
+
+            Identifier                  name;
+
+            RepositoryId                id;
+
+            boolean                     is_abstract;
+
+            boolean                     is_custom;
+
+            RepositoryId                defined_in;
+
+            VersionSpec                 version;
+
+            OpDescriptionSeq            operations;
+
+            AttrDescriptionSeq          attributes;
+
+            ValueMemberSeq              members;
+
+            InitializerSeq              initializers;
+
+            RepositoryIdSeq             supported_interfaces;
+
+            RepositoryIdSeq             abstract_base_values;
+
+            boolean                     is_truncatable;
+
+            RepositoryId                base_value;
+
+            TypeCode                    type;
+
+        };
+
+
+
+        FullValueDescription describe_value();
+
+
+
+        ValueMemberDef create_value_member(
+
+                                           in RepositoryId             id,
+
+                                           in Identifier               name,
+
+                                           in VersionSpec              version,
+
+                                           in IDLType                  type,
+
+                                           in Visibility               access
+
+                                           );
+
+        AttributeDef create_attribute(
+
+                                      in RepositoryId             id,
+
+                                      in Identifier               name,
+
+                                      in VersionSpec              version,
+
+                                      in IDLType                  type,
+
+                                      in AttributeMode            mode
+
+                                      );
+
+        OperationDef create_operation (
+
+                                       in RepositoryId             id,
+
+                                       in Identifier               name,
+
+                                       in VersionSpec              version,
+
+                                       in IDLType                  result,
+
+                                       in OperationMode            mode,
+
+                                       in ParDescriptionSeq        params,
+
+                                       in ExceptionDefSeq          exceptions,
+
+                                       in ContextIdSeq             contexts
+
+                                       );
+
+    };
+
+
+
+    struct ValueDescription {
+
+        Identifier                      name;
+
+        RepositoryId                    id;
+
+        boolean                         is_abstract;
+
+        boolean                         is_custom;
+
+        RepositoryId                    defined_in;
+
+        VersionSpec                     version;
+
+        RepositoryIdSeq                 supported_interfaces;
+
+        RepositoryIdSeq                 abstract_base_values;
+
+        boolean                         is_truncatable;
+
+        RepositoryId                    base_value; 
+
+    };
+
+
+
+    interface ValueBoxDef : TypedefDef {
+
+        attribute IDLType original_type_def;
+
+    };
+
+
+
+    enum TCKind {                               // PIDL
+
+        tk_null,    tk_void, 
+
+        tk_short,   tk_long,        tk_ushort,  tk_ulong, 
+
+        tk_float,   tk_double,      tk_boolean, tk_char, 
+
+        tk_octet,   tk_any,         tk_TypeCode,tk_Principal, tk_objref, 
+
+        tk_struct,  tk_union,       tk_enum,    tk_string, 
+
+        tk_sequence,tk_array,       tk_alias,   tk_except,
+
+        tk_longlong,tk_ulonglong,   tk_longdouble,
+
+        tk_wchar,   tk_wstring,     tk_fixed,
+
+        tk_value,   tk_value_box,
+
+        tk_native,
+
+        tk_abstract_interface
+
+    };
+
+    typedef short ValueModifier;                        // PIDL
+
+    const ValueModifier VM_NONE         = 0;
+
+    const ValueModifier VM_CUSTOM       = 1;
+
+    const ValueModifier VM_ABSTRACT     = 2;
+
+    const ValueModifier VM_TRUNCATABLE  = 3;
+
+
+
+    interface TypeCode {                            // PIDL
+
+        exception   Bounds {};
+
+        exception   BadKind {};
+
+        // for all TypeCode kinds
+
+        boolean     equal       (in TypeCode tc);
+
+        boolean     equivalent  (in TypeCode tc); 
+
+        TypeCode    get_compact_typecode(); 
+
+        TCKind      kind ();
+
+        // for tk_objref, tk_struct,    tk_union,  tk_enum, tk_alias, 
+
+        //     tk_value,  tk_value_box, tk_native, tk_abstract_interface
+
+        // and tk_except
+
+        RepositoryId    id () raises (BadKind);
+
+        // for tk_objref, tk_struct,    tk_union,  tk_enum, tk_alias, 
+
+        //     tk_value,  tk_value_box, tk_native, tk_abstract_interface
+
+        // and tk_except
+
+        Identifier name () raises (BadKind);
+
+        // for tk_struct, tk_union, tk_enum, tk_value, 
+
+        // and tk_except
+
+        unsigned long   member_count () raises (BadKind);
+
+        Identifier      member_name (in unsigned long index) 
+
+            raises (BadKind, Bounds);
+
+        // for tk_struct, tk_union, tk_value, and tk_except
+
+        TypeCode        member_type (in unsigned long index) 
+
+            raises (BadKind, Bounds);
+
+        // for tk_union
+
+        any             member_label (in unsigned long index) 
+
+            raises (BadKind, Bounds);
+
+        TypeCode        discriminator_type ()   raises (BadKind);
+
+        long            default_index ()        raises (BadKind); 
+
+        // for tk_string, tk_sequence, and tk_array
+
+        unsigned long   length ()               raises (BadKind);
+
+        // for tk_sequence, tk_array, tk_value_box, and tk_alias
+
+        TypeCode        content_type ()         raises (BadKind);
+
+        // for tk_fixed
+
+        unsigned short  fixed_digits()          raises (BadKind);
+
+        short           fixed_scale()           raises (BadKind);
+
+        // for tk_value
+
+        Visibility      member_visibility(in unsigned long index)
+
+            raises(BadKind, Bounds);
+
+        ValueModifier   type_modifier()         raises(BadKind);
+
+        TypeCode        concrete_base_type()    raises(BadKind);
+
+    };
+
+
+

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/LifeCycleService.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/LifeCycleService.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/LifeCycleService.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,46 +1,46 @@
-// LifeCycleService Module, p 6- 55 CORBAservices, Life Cycle
-// Service V1.0, 3/94
-
-#include <CosLifeCycle.idl> 
-
-#pragma prefix "omg.org"
-
-module LifeCycleService {
-
-        typedef sequence <CosLifeCycle::NameValuePair> PolicyList;
-        typedef sequence <CosLifeCycle::Key> Keys;
-        typedef sequence <CosLifeCycle::NameValuePair> PropertyList; 
-        typedef sequence <CosNaming::NameComponent> NameComponents;
-
-        interface LifeCycleServiceAdmin {
-
-                attribute PolicyList policies;
-
-                void bind_generic_factory(
-                                in CosLifeCycle::GenericFactory gf,
-                                in CosNaming::NameComponent name,
-                                in Keys key_set,
-                                in PropertyList other_properties)
-                        raises (CosNaming::NamingContext::AlreadyBound, CosNaming::NamingContext::InvalidName);
-
-                void unbind_generic_factory(
-                                in CosNaming::NameComponent name)
-                        raises (CosNaming::NamingContext::NotFound, CosNaming::NamingContext::InvalidName);
-
-               CosLifeCycle::GenericFactory resolve_generic_factory(
-                                in CosNaming::NameComponent name)
-                        raises (CosNaming::NamingContext::NotFound, CosNaming::NamingContext::InvalidName);
-
-                NameComponents list_generic_factories();
-
-                boolean match_service (in CosLifeCycle::GenericFactory f);
-
-                string get_hint();
-
-                void get_link_properties(
-                                in CosNaming::NameComponent name,
-                                out Keys key_set,
-                                out PropertyList other_properties)
-                        raises (CosNaming::NamingContext::NotFound, CosNaming::NamingContext::InvalidName);
-        };
-};
+// LifeCycleService Module, p 6- 55 CORBAservices, Life Cycle
+// Service V1.0, 3/94
+
+#include <CosLifeCycle.idl> 
+
+#pragma prefix "omg.org"
+
+module LifeCycleService {
+
+        typedef sequence <CosLifeCycle::NameValuePair> PolicyList;
+        typedef sequence <CosLifeCycle::Key> Keys;
+        typedef sequence <CosLifeCycle::NameValuePair> PropertyList; 
+        typedef sequence <CosNaming::NameComponent> NameComponents;
+
+        interface LifeCycleServiceAdmin {
+
+                attribute PolicyList policies;
+
+                void bind_generic_factory(
+                                in CosLifeCycle::GenericFactory gf,
+                                in CosNaming::NameComponent name,
+                                in Keys key_set,
+                                in PropertyList other_properties)
+                        raises (CosNaming::NamingContext::AlreadyBound, CosNaming::NamingContext::InvalidName);
+
+                void unbind_generic_factory(
+                                in CosNaming::NameComponent name)
+                        raises (CosNaming::NamingContext::NotFound, CosNaming::NamingContext::InvalidName);
+
+               CosLifeCycle::GenericFactory resolve_generic_factory(
+                                in CosNaming::NameComponent name)
+                        raises (CosNaming::NamingContext::NotFound, CosNaming::NamingContext::InvalidName);
+
+                NameComponents list_generic_factories();
+
+                boolean match_service (in CosLifeCycle::GenericFactory f);
+
+                string get_hint();
+
+                void get_link_properties(
+                                in CosNaming::NameComponent name,
+                                out Keys key_set,
+                                out PropertyList other_properties)
+                        raises (CosNaming::NamingContext::NotFound, CosNaming::NamingContext::InvalidName);
+        };
+};

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/Messaging.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/Messaging.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/Messaging.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,296 +1,296 @@
-#include <TimeBase.idl>
-
-#include <IOP.idl>
-
-
-
-#pragma prefix "omg.org"
-
-module Messaging {
-
-	//
-
-	// Messaging Quality of Service
-
-	//
-
-	typedef short RebindMode;
-
-	const RebindMode TRANSPARENT = 0;
-
-	const RebindMode NO_REBIND = 1;
-
-	const RebindMode NO_RECONNECT = 2;
-
-	typedef short SyncScope;
-
-	const SyncScope SYNC_NONE = 0;
-
-	const SyncScope SYNC_WITH_TRANSPORT = 1;
-
-	const SyncScope SYNC_WITH_SERVER = 2;
-
-	const SyncScope SYNC_WITH_TARGET = 3;
-
-	typedef short RoutingType;
-
-	const RoutingType ROUTE_NONE = 0;
-
-	const RoutingType ROUTE_FORWARD = 1;
-
-	const RoutingType ROUTE_STORE_AND_FORWARD = 2;
-
-	typedef TimeBase::TimeT Timeout;
-
-	typedef short Priority;
-
-	typedef unsigned short Ordering;
-
-	const Ordering ORDER_ANY = 0x01;
-
-	const Ordering ORDER_TEMPORAL = 0x02;
-
-	const Ordering ORDER_PRIORITY = 0x04;
-
-	const Ordering ORDER_DEADLINE = 0x08;
-
-	//
-
-	// Locally-Constrained Policy Objects
-
-	//
-
-	// Rebind Policy (default = TRANSPARENT)
-
-	const CORBA::PolicyType REBIND_POLICY_TYPE = 23;
-
-	local interface RebindPolicy : CORBA::Policy {
-
-		readonly attribute RebindMode rebind_mode;
-
-	};
-
-	// Synchronization Policy (default = SYNC_WITH_TRANSPORT)
-
-	const CORBA::PolicyType SYNC_SCOPE_POLICY_TYPE = 24;
-
-	local interface SyncScopePolicy : CORBA::Policy {
-
-		readonly attribute SyncScope synchronization;
-
-	};
-
-	// Priority Policies
-
-
-
-
-
-
-
-	const CORBA::PolicyType REQUEST_PRIORITY_POLICY_TYPE = 25;
-
-	struct PriorityRange {
-
-		Priority min;
-
-		Priority max;
-
-	};
-
-	local interface RequestPriorityPolicy : CORBA::Policy {
-
-		readonly attribute PriorityRange priority_range;
-
-	};
-
-	const CORBA::PolicyType REPLY_PRIORITY_POLICY_TYPE = 26;
-
-	local interface ReplyPriorityPolicy : CORBA::Policy {
-
-		readonly attribute PriorityRange priority_range;
-
-	};
-
-	// Timeout Policies
-
-	const CORBA::PolicyType REQUEST_START_TIME_POLICY_TYPE = 27;
-
-	local interface RequestStartTimePolicy : CORBA::Policy {
-
-		readonly attribute TimeBase::UtcT start_time;
-
-	};
-
-	const CORBA::PolicyType REQUEST_END_TIME_POLICY_TYPE = 28;
-
-	local interface RequestEndTimePolicy : CORBA::Policy {
-
-		readonly attribute TimeBase::UtcT end_time;
-
-	};
-
-	const CORBA::PolicyType REPLY_START_TIME_POLICY_TYPE = 29;
-
-	local interface ReplyStartTimePolicy : CORBA::Policy {
-
-		readonly attribute TimeBase::UtcT start_time;
-
-	};
-
-	const CORBA::PolicyType REPLY_END_TIME_POLICY_TYPE = 30;
-
-	local interface ReplyEndTimePolicy : CORBA::Policy {
-
-		readonly attribute TimeBase::UtcT end_time;
-
-	};
-
-	const CORBA::PolicyType RELATIVE_REQ_TIMEOUT_POLICY_TYPE =
-
-		31;
-
-	local interface RelativeRequestTimeoutPolicy : CORBA::Policy {
-
-		readonly attribute TimeBase::TimeT relative_expiry;
-
-	};
-
-	const CORBA::PolicyType RELATIVE_RT_TIMEOUT_POLICY_TYPE = 32;
-
-	local interface RelativeRoundtripTimeoutPolicy : CORBA::Policy {
-
-		readonly attribute TimeBase::TimeT relative_expiry;
-
-	};
-
-	const CORBA::PolicyType ROUTING_POLICY_TYPE = 33;
-
-	struct RoutingTypeRange {
-
-		RoutingType min;
-
-		RoutingType max;
-
-	};
-
-	local interface RoutingPolicy : CORBA::Policy {
-
-		readonly attribute RoutingTypeRange routing_range;
-
-	};
-
-
-
-
-
-	const CORBA::PolicyType MAX_HOPS_POLICY_TYPE = 34;
-
-	local interface MaxHopsPolicy : CORBA::Policy {
-
-		readonly attribute unsigned short max_hops;
-
-	};
-
-	// Router Delivery-ordering Policy (default = ORDER_TEMPORAL)
-
-	const CORBA::PolicyType QUEUE_ORDER_POLICY_TYPE = 35;
-
-	local interface QueueOrderPolicy : CORBA::Policy {
-
-		readonly attribute Ordering allowed_orders;
-
-	};
-
-	//
-
-	// Propagation of QoS Policies
-
-	//
-
-	struct PolicyValue {
-
-		CORBA::PolicyType ptype;
-
-		sequence<octet> pvalue;
-
-	};
-
-	typedef sequence<PolicyValue> PolicyValueSeq;
-
-	const IOP::ComponentId TAG_POLICIES = 2;
-
-	const IOP::ServiceId INVOCATION_POLICIES = 7;
-
-	//
-
-	// Exception Delivery in the Callback Model
-
-	//
-
-        // native UserExceptionBase;
-
-        //
-
-        // Replaced with CORBA::UserException below,
-
-        // as specified in the Java mapping.
-
-        //
-
-	valuetype ExceptionHolder {
-
-                void raise_exception() raises (CORBA::UserException);
-
-                void raise_exception_with_list(
-
-                     in CORBA::ExceptionList  exc_list
-
-                ) raises (CORBA::UserException);
-
-		private boolean is_system_exception;
-
-		private boolean byte_order;
-
-		private sequence<octet> marshaled_exception;
-
-	};
-
-        //
-
-	// Base interface for the Callback model
-
-	//
-
-	interface ReplyHandler { };
-
-	//
-
-	// Base value for the Polling model
-
-	//
-
-	/*
-
-	value Poller supports CORBA::Pollable {
-
-		readonly attribute Object operation_target;
-
-		readonly attribute string operation_name;
-
-		attribute ReplyHandler associated_handler;
-
-		readonly attribute boolean is_from_poller;
-
-
-
-		Object target;
-
-		string op_name;
-
-	};
-
-	*/
-
-};
-
+#include <TimeBase.idl>
+
+#include <IOP.idl>
+
+
+
+#pragma prefix "omg.org"
+
+module Messaging {
+
+	//
+
+	// Messaging Quality of Service
+
+	//
+
+	typedef short RebindMode;
+
+	const RebindMode TRANSPARENT = 0;
+
+	const RebindMode NO_REBIND = 1;
+
+	const RebindMode NO_RECONNECT = 2;
+
+	typedef short SyncScope;
+
+	const SyncScope SYNC_NONE = 0;
+
+	const SyncScope SYNC_WITH_TRANSPORT = 1;
+
+	const SyncScope SYNC_WITH_SERVER = 2;
+
+	const SyncScope SYNC_WITH_TARGET = 3;
+
+	typedef short RoutingType;
+
+	const RoutingType ROUTE_NONE = 0;
+
+	const RoutingType ROUTE_FORWARD = 1;
+
+	const RoutingType ROUTE_STORE_AND_FORWARD = 2;
+
+	typedef TimeBase::TimeT Timeout;
+
+	typedef short Priority;
+
+	typedef unsigned short Ordering;
+
+	const Ordering ORDER_ANY = 0x01;
+
+	const Ordering ORDER_TEMPORAL = 0x02;
+
+	const Ordering ORDER_PRIORITY = 0x04;
+
+	const Ordering ORDER_DEADLINE = 0x08;
+
+	//
+
+	// Locally-Constrained Policy Objects
+
+	//
+
+	// Rebind Policy (default = TRANSPARENT)
+
+	const CORBA::PolicyType REBIND_POLICY_TYPE = 23;
+
+	local interface RebindPolicy : CORBA::Policy {
+
+		readonly attribute RebindMode rebind_mode;
+
+	};
+
+	// Synchronization Policy (default = SYNC_WITH_TRANSPORT)
+
+	const CORBA::PolicyType SYNC_SCOPE_POLICY_TYPE = 24;
+
+	local interface SyncScopePolicy : CORBA::Policy {
+
+		readonly attribute SyncScope synchronization;
+
+	};
+
+	// Priority Policies
+
+
+
+
+
+
+
+	const CORBA::PolicyType REQUEST_PRIORITY_POLICY_TYPE = 25;
+
+	struct PriorityRange {
+
+		Priority min;
+
+		Priority max;
+
+	};
+
+	local interface RequestPriorityPolicy : CORBA::Policy {
+
+		readonly attribute PriorityRange priority_range;
+
+	};
+
+	const CORBA::PolicyType REPLY_PRIORITY_POLICY_TYPE = 26;
+
+	local interface ReplyPriorityPolicy : CORBA::Policy {
+
+		readonly attribute PriorityRange priority_range;
+
+	};
+
+	// Timeout Policies
+
+	const CORBA::PolicyType REQUEST_START_TIME_POLICY_TYPE = 27;
+
+	local interface RequestStartTimePolicy : CORBA::Policy {
+
+		readonly attribute TimeBase::UtcT start_time;
+
+	};
+
+	const CORBA::PolicyType REQUEST_END_TIME_POLICY_TYPE = 28;
+
+	local interface RequestEndTimePolicy : CORBA::Policy {
+
+		readonly attribute TimeBase::UtcT end_time;
+
+	};
+
+	const CORBA::PolicyType REPLY_START_TIME_POLICY_TYPE = 29;
+
+	local interface ReplyStartTimePolicy : CORBA::Policy {
+
+		readonly attribute TimeBase::UtcT start_time;
+
+	};
+
+	const CORBA::PolicyType REPLY_END_TIME_POLICY_TYPE = 30;
+
+	local interface ReplyEndTimePolicy : CORBA::Policy {
+
+		readonly attribute TimeBase::UtcT end_time;
+
+	};
+
+	const CORBA::PolicyType RELATIVE_REQ_TIMEOUT_POLICY_TYPE =
+
+		31;
+
+	local interface RelativeRequestTimeoutPolicy : CORBA::Policy {
+
+		readonly attribute TimeBase::TimeT relative_expiry;
+
+	};
+
+	const CORBA::PolicyType RELATIVE_RT_TIMEOUT_POLICY_TYPE = 32;
+
+	local interface RelativeRoundtripTimeoutPolicy : CORBA::Policy {
+
+		readonly attribute TimeBase::TimeT relative_expiry;
+
+	};
+
+	const CORBA::PolicyType ROUTING_POLICY_TYPE = 33;
+
+	struct RoutingTypeRange {
+
+		RoutingType min;
+
+		RoutingType max;
+
+	};
+
+	local interface RoutingPolicy : CORBA::Policy {
+
+		readonly attribute RoutingTypeRange routing_range;
+
+	};
+
+
+
+
+
+	const CORBA::PolicyType MAX_HOPS_POLICY_TYPE = 34;
+
+	local interface MaxHopsPolicy : CORBA::Policy {
+
+		readonly attribute unsigned short max_hops;
+
+	};
+
+	// Router Delivery-ordering Policy (default = ORDER_TEMPORAL)
+
+	const CORBA::PolicyType QUEUE_ORDER_POLICY_TYPE = 35;
+
+	local interface QueueOrderPolicy : CORBA::Policy {
+
+		readonly attribute Ordering allowed_orders;
+
+	};
+
+	//
+
+	// Propagation of QoS Policies
+
+	//
+
+	struct PolicyValue {
+
+		CORBA::PolicyType ptype;
+
+		sequence<octet> pvalue;
+
+	};
+
+	typedef sequence<PolicyValue> PolicyValueSeq;
+
+	const IOP::ComponentId TAG_POLICIES = 2;
+
+	const IOP::ServiceId INVOCATION_POLICIES = 7;
+
+	//
+
+	// Exception Delivery in the Callback Model
+
+	//
+
+        // native UserExceptionBase;
+
+        //
+
+        // Replaced with CORBA::UserException below,
+
+        // as specified in the Java mapping.
+
+        //
+
+	valuetype ExceptionHolder {
+
+                void raise_exception() raises (CORBA::UserException);
+
+                void raise_exception_with_list(
+
+                     in CORBA::ExceptionList  exc_list
+
+                ) raises (CORBA::UserException);
+
+		private boolean is_system_exception;
+
+		private boolean byte_order;
+
+		private sequence<octet> marshaled_exception;
+
+	};
+
+        //
+
+	// Base interface for the Callback model
+
+	//
+
+	interface ReplyHandler { };
+
+	//
+
+	// Base value for the Polling model
+
+	//
+
+	/*
+
+	value Poller supports CORBA::Pollable {
+
+		readonly attribute Object operation_target;
+
+		readonly attribute string operation_name;
+
+		attribute ReplyHandler associated_handler;
+
+		readonly attribute boolean is_from_poller;
+
+
+
+		Object target;
+
+		string op_name;
+
+	};
+
+	*/
+
+};
+

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/NRService.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/NRService.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/NRService.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,162 +1,162 @@
-#ifndef _NR_SERVICE_IDL
-#define _NR_SERVICE_IDL
-
-#pragma prefix "omg.org"
-
-#include <SecurityLevel2.idl>
-
-module NRService  {
-
-    typedef Security::MechanismType 	NRMech;
-    typedef Security::ExtensibleFamily	NRPolicyId;
-
-    enum EvidenceType {     	
-        SecProofofCreation,
-        SecProofofReceipt,
-        SecProofofApproval,
-        SecProofofRetrieval,
-        SecProofofOrigin,
-        SecProofofDelivery,
-        SecNoEvidence     // used when request-only token desired
-    };
-
-    enum NRVerificationResult {
-        SecNRInvalid,
-        SecNRValid,
-        SecNRConditionallyValid 
-    };
-
-    // the following are used for evidence validity duration
-    typedef unsigned long   DurationInMinutes;
-
-    const DurationInMinutes DurationHour   = 60;
-    const DurationInMinutes DurationDay    = 1440;
-    const DurationInMinutes DurationWeek   = 10080; 
-    const DurationInMinutes DurationMonth = 43200;// 30 days;
-    const DurationInMinutes DurationYear   = 525600;//365 days;
-
-    typedef long TimeOffsetInMinutes; 
-
-    struct NRPolicyFeatures {
-         NRPolicyId         policy_id; 
-         unsigned long      policy_version;
-         NRMech             mechanism;
-    };
-
-    typedef sequence <NRPolicyFeatures> NRPolicyFeaturesList;
-
-    // features used when generating requests
-    struct RequestFeatures {
-        NRPolicyFeatures    requested_policy;
-        EvidenceType        requested_evidence;
-        string              requested_evidence_generators;
-        string              requested_evidence_recipients;
-        boolean             include_this_token_in_evidence;
-    };
-
-    struct EvidenceDescriptor {
-        EvidenceType        evidence_type;
-        DurationInMinutes   evidence_validity_duration;
-        boolean             must_use_trusted_time;
-    };
-
-    typedef sequence <EvidenceDescriptor> EvidenceDescriptorList;
-
-    struct AuthorityDescriptor {    
-        string              authority_name;
-        string              authority_role;
-        TimeOffsetInMinutes last_revocation_check_offset;
-                 // may be >0 or <0; add this to evid. gen. time to
-                 // get latest time at which mech. will check to see
-                 // if this authority's key has been revoked.
-    };
-
-    typedef sequence <AuthorityDescriptor> AuthorityDescriptorList;
-
-    struct MechanismDescriptor {
-        NRMech                  mech_type;
-        AuthorityDescriptorList authority_list;     
-        TimeOffsetInMinutes     max_time_skew; 
-                // max permissible difference between evid. gen. time
-                // and time of time service countersignature
-                // ignored if trusted time not reqd.
-    };
-
-    typedef sequence <MechanismDescriptor> MechanismDescriptorList;
-
-
-    interface NRCredentials : SecurityLevel2::Credentials{
-
-        boolean set_NR_features(
-            in   NRPolicyFeaturesList         requested_features,
-            out  NRPolicyFeaturesList         actual_features 
-        );
-
-        NRPolicyFeaturesList get_NR_features ();            
-
-        void generate_token(
-            in   Security::Opaque             input_buffer,
-            in   EvidenceType                 generate_evidence_type,
-            in   boolean                      include_data_in_token,
-            in   boolean                      generate_request,
-            in   RequestFeatures              request_features,
-            in   boolean                      input_buffer_complete,
-            out  Security::Opaque             nr_token,
-            out  Security::Opaque             evidence_check
-        );
-
-        NRVerificationResult verify_evidence(
-            in   Security::Opaque             input_token_buffer,
-            in   Security::Opaque             evidence_check, 
-            in   boolean                      form_complete_evidence,
-            in   boolean                      token_buffer_complete,
-            out  Security::Opaque             output_token,
-            out  Security::Opaque             data_included_in_token,
-            out  boolean                      evidence_is_complete,
-            out  boolean                      trusted_time_used,
-            out  Security::TimeT              complete_evidence_before,
-            out  Security::TimeT              complete_evidence_after
-        );
-
-        void get_token_details(
-            in   Security::Opaque             token_buffer,
-            in   boolean                      token_buffer_complete,
-            out  string                       token_generator_name,
-            out  NRPolicyFeatures             policy_features,
-            out  EvidenceType                 evidence_type,
-            out  Security::UtcT               evidence_generation_time,
-            out  Security::UtcT               evidence_valid_start_time,
-            out  DurationInMinutes            evidence_validity_duration,
-            out  boolean                      data_included_in_token,
-            out  boolean                      request_included_in_token,
-            out  RequestFeatures              request_features
-        );
-
-        boolean form_complete_evidence(
-            in   Security::Opaque             input_token,
-            out  Security::Opaque             output_token,
-            out  boolean                      trusted_time_used,
-            out  Security::TimeT              complete_evidence_before,
-            out  Security::TimeT              complete_evidence_after
-        );
-    };
-
-
-    interface NRPolicy : CORBA::Policy{
-
-        void get_NR_policy_info(
-            out  Security::ExtensibleFamily   NR_policy_id,
-            out  unsigned long                policy_version,
-            out  Security::TimeT              policy_effective_time,
-            out  Security::TimeT              policy_expiry_time,
-            out  EvidenceDescriptorList       supported_evidence_types,
-            out  MechanismDescriptorList      supported_mechanisms 
-        );
-
-        boolean set_NR_policy_info(
-            in   MechanismDescriptorList      requested_mechanisms,
-            out  MechanismDescriptorList      actual_mechanisms
-        );
-    };
-};
-#endif /* _NR_SERVICE_IDL */
+#ifndef _NR_SERVICE_IDL
+#define _NR_SERVICE_IDL
+
+#pragma prefix "omg.org"
+
+#include <SecurityLevel2.idl>
+
+module NRService  {
+
+    typedef Security::MechanismType 	NRMech;
+    typedef Security::ExtensibleFamily	NRPolicyId;
+
+    enum EvidenceType {     	
+        SecProofofCreation,
+        SecProofofReceipt,
+        SecProofofApproval,
+        SecProofofRetrieval,
+        SecProofofOrigin,
+        SecProofofDelivery,
+        SecNoEvidence     // used when request-only token desired
+    };
+
+    enum NRVerificationResult {
+        SecNRInvalid,
+        SecNRValid,
+        SecNRConditionallyValid 
+    };
+
+    // the following are used for evidence validity duration
+    typedef unsigned long   DurationInMinutes;
+
+    const DurationInMinutes DurationHour   = 60;
+    const DurationInMinutes DurationDay    = 1440;
+    const DurationInMinutes DurationWeek   = 10080; 
+    const DurationInMinutes DurationMonth = 43200;// 30 days;
+    const DurationInMinutes DurationYear   = 525600;//365 days;
+
+    typedef long TimeOffsetInMinutes; 
+
+    struct NRPolicyFeatures {
+         NRPolicyId         policy_id; 
+         unsigned long      policy_version;
+         NRMech             mechanism;
+    };
+
+    typedef sequence <NRPolicyFeatures> NRPolicyFeaturesList;
+
+    // features used when generating requests
+    struct RequestFeatures {
+        NRPolicyFeatures    requested_policy;
+        EvidenceType        requested_evidence;
+        string              requested_evidence_generators;
+        string              requested_evidence_recipients;
+        boolean             include_this_token_in_evidence;
+    };
+
+    struct EvidenceDescriptor {
+        EvidenceType        evidence_type;
+        DurationInMinutes   evidence_validity_duration;
+        boolean             must_use_trusted_time;
+    };
+
+    typedef sequence <EvidenceDescriptor> EvidenceDescriptorList;
+
+    struct AuthorityDescriptor {    
+        string              authority_name;
+        string              authority_role;
+        TimeOffsetInMinutes last_revocation_check_offset;
+                 // may be >0 or <0; add this to evid. gen. time to
+                 // get latest time at which mech. will check to see
+                 // if this authority's key has been revoked.
+    };
+
+    typedef sequence <AuthorityDescriptor> AuthorityDescriptorList;
+
+    struct MechanismDescriptor {
+        NRMech                  mech_type;
+        AuthorityDescriptorList authority_list;     
+        TimeOffsetInMinutes     max_time_skew; 
+                // max permissible difference between evid. gen. time
+                // and time of time service countersignature
+                // ignored if trusted time not reqd.
+    };
+
+    typedef sequence <MechanismDescriptor> MechanismDescriptorList;
+
+
+    interface NRCredentials : SecurityLevel2::Credentials{
+
+        boolean set_NR_features(
+            in   NRPolicyFeaturesList         requested_features,
+            out  NRPolicyFeaturesList         actual_features 
+        );
+
+        NRPolicyFeaturesList get_NR_features ();            
+
+        void generate_token(
+            in   Security::Opaque             input_buffer,
+            in   EvidenceType                 generate_evidence_type,
+            in   boolean                      include_data_in_token,
+            in   boolean                      generate_request,
+            in   RequestFeatures              request_features,
+            in   boolean                      input_buffer_complete,
+            out  Security::Opaque             nr_token,
+            out  Security::Opaque             evidence_check
+        );
+
+        NRVerificationResult verify_evidence(
+            in   Security::Opaque             input_token_buffer,
+            in   Security::Opaque             evidence_check, 
+            in   boolean                      form_complete_evidence,
+            in   boolean                      token_buffer_complete,
+            out  Security::Opaque             output_token,
+            out  Security::Opaque             data_included_in_token,
+            out  boolean                      evidence_is_complete,
+            out  boolean                      trusted_time_used,
+            out  Security::TimeT              complete_evidence_before,
+            out  Security::TimeT              complete_evidence_after
+        );
+
+        void get_token_details(
+            in   Security::Opaque             token_buffer,
+            in   boolean                      token_buffer_complete,
+            out  string                       token_generator_name,
+            out  NRPolicyFeatures             policy_features,
+            out  EvidenceType                 evidence_type,
+            out  Security::UtcT               evidence_generation_time,
+            out  Security::UtcT               evidence_valid_start_time,
+            out  DurationInMinutes            evidence_validity_duration,
+            out  boolean                      data_included_in_token,
+            out  boolean                      request_included_in_token,
+            out  RequestFeatures              request_features
+        );
+
+        boolean form_complete_evidence(
+            in   Security::Opaque             input_token,
+            out  Security::Opaque             output_token,
+            out  boolean                      trusted_time_used,
+            out  Security::TimeT              complete_evidence_before,
+            out  Security::TimeT              complete_evidence_after
+        );
+    };
+
+
+    interface NRPolicy : CORBA::Policy{
+
+        void get_NR_policy_info(
+            out  Security::ExtensibleFamily   NR_policy_id,
+            out  unsigned long                policy_version,
+            out  Security::TimeT              policy_effective_time,
+            out  Security::TimeT              policy_expiry_time,
+            out  EvidenceDescriptorList       supported_evidence_types,
+            out  MechanismDescriptorList      supported_mechanisms 
+        );
+
+        boolean set_NR_policy_info(
+            in   MechanismDescriptorList      requested_mechanisms,
+            out  MechanismDescriptorList      actual_mechanisms
+        );
+    };
+};
+#endif /* _NR_SERVICE_IDL */

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/PortableInterceptor.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/PortableInterceptor.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/PortableInterceptor.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,160 +1,160 @@
-// File: PortableInterceptor.idl
-
-#ifndef _PORTABLE_INTERCEPTOR_IDL_
-#define _PORTABLE_INTERCEPTOR_IDL_
-
-#ifndef CORBA3
-#define local  
-#endif
-
-#include <orb.idl>
-#include <Dynamic.idl>
-#include <IOP.idl>
-#include <Messaging.idl>
-
-#pragma prefix "omg.org"
-module PortableInterceptor {
-
-  local interface Interceptor {
-    readonly attribute string name;
-    
-    void destroy();
-  };
-
-  exception ForwardRequest {
-    Object forward;
-  };
-
-  typedef short ReplyStatus;
-
-  // Valid reply_status values:
-
-  const ReplyStatus SUCCESSFUL = 0;
-  const ReplyStatus SYSTEM_EXCEPTION = 1;
-  const ReplyStatus USER_EXCEPTION = 2;
-  const ReplyStatus LOCATION_FORWARD = 3;
-  const ReplyStatus TRANSPORT_RETRY = 4;
-
-  typedef unsigned long SlotId;
-
-  exception InvalidSlot {};
-
-  local interface Current : CORBA::Current {
-    any get_slot (in SlotId id) raises (InvalidSlot);
-    void set_slot (in SlotId id, in any data) raises (InvalidSlot);
-  };
-
-  local interface RequestInfo {
-    readonly attribute unsigned long request_id;
-    readonly attribute string operation;
-    readonly attribute Dynamic::ParameterList arguments;
-    readonly attribute Dynamic::ExceptionList exceptions;
-    readonly attribute Dynamic::ContextList contexts;
-    readonly attribute Dynamic::RequestContext operation_context;
-    readonly attribute any result;
-    readonly attribute boolean response_expected;
-    readonly attribute Messaging::SyncScope sync_scope;
-    readonly attribute ReplyStatus reply_status;
-    readonly attribute Object forward_reference;
-    any get_slot (in SlotId id) raises (InvalidSlot);
-    IOP::ServiceContext get_request_service_context (in IOP::ServiceId id);
-    IOP::ServiceContext get_reply_service_context (in IOP::ServiceId id);
-  };
-
-  local interface ClientRequestInfo : RequestInfo {
-    readonly attribute Object target;
-    readonly attribute Object effective_target;
-    readonly attribute IOP::TaggedProfile effective_profile;
-    readonly attribute any received_exception;
-    readonly attribute CORBA::RepositoryId received_exception_id;
-    IOP::TaggedComponent get_effective_component (in IOP::ComponentId id);
-    IOP::TaggedComponentSeq get_effective_components (in IOP::ComponentId id);
-    CORBA::Policy get_request_policy (in CORBA::PolicyType type);
-    void add_request_service_context (
-      in IOP::ServiceContext service_context,
-      in boolean replace);
-  };
-
-  local interface ServerRequestInfo : RequestInfo {
-    readonly attribute any sending_exception;
-    readonly attribute CORBA::OctetSeq object_id;
-    readonly attribute CORBA::OctetSeq adapter_id;
-    readonly attribute CORBA::RepositoryId target_most_derived_interface;
-    CORBA::Policy get_server_policy (in CORBA::PolicyType type);
-    void set_slot (in SlotId id, in any data) raises (InvalidSlot);
-    boolean target_is_a (in CORBA::RepositoryId id);
-    void add_reply_service_context (
-      in IOP::ServiceContext service_context,
-      in boolean replace);
-  };
-
-  local interface ClientRequestInterceptor : Interceptor {
-    void send_request  (in ClientRequestInfo ri) raises (ForwardRequest);
-    void send_poll (in ClientRequestInfo ri);
-    void receive_reply (in ClientRequestInfo ri);
-    void receive_exception (in ClientRequestInfo ri) raises (ForwardRequest);
-    void receive_other (in ClientRequestInfo ri) raises (ForwardRequest);
-  };
-
-  local interface ServerRequestInterceptor : Interceptor {
-    void receive_request_service_contexts (in ServerRequestInfo ri) raises (ForwardRequest);
-    void receive_request (in ServerRequestInfo ri) raises (ForwardRequest);
-    void send_reply (in ServerRequestInfo ri);
-    void send_exception (in ServerRequestInfo ri) raises (ForwardRequest);
-    void send_other (in ServerRequestInfo ri) raises (ForwardRequest);
-  };
-
-  local interface IORInfo {
-    CORBA::Policy get_effective_policy (in CORBA::PolicyType type);
-    void add_ior_component (in IOP::TaggedComponent component);
-    void add_ior_component_to_profile (
-      in IOP::TaggedComponent component,
-      in IOP::ProfileId profile_id);
-    };
-
-  local interface IORInterceptor : Interceptor {
-    void establish_components (in IORInfo info);
-  };
-
-  local interface PolicyFactory
-  {
-    CORBA::Policy create_policy (in CORBA::PolicyType type, in any value)
-      raises (CORBA::PolicyError);
-  };
-
-  local interface ORBInitInfo {
-    typedef string ObjectId;
-    exception DuplicateName {
-      string name;
-    };
-    exception InvalidName {};
-
-    readonly attribute CORBA::StringSeq arguments;
-    readonly attribute string orb_id;
-    readonly attribute IOP::CodecFactory codec_factory;
-    void register_initial_reference (in ObjectId id, in Object obj)
-      raises (InvalidName);
-    Object resolve_initial_references (in ObjectId id) raises (InvalidName);
-    void add_client_request_interceptor (in ClientRequestInterceptor interceptor)
-      raises (DuplicateName);
-    void add_server_request_interceptor (
-      in ServerRequestInterceptor interceptor)
-      raises (DuplicateName);
-    void add_ior_interceptor (in IORInterceptor interceptor)
-      raises (DuplicateName);
-    SlotId allocate_slot_id ();
-    void register_policy_factory (
-      in CORBA::PolicyType type,
-      in PolicyFactory policy_factory);
-  };
-
-  local interface ORBInitializer {
-    void pre_init (in ORBInitInfo info);
-    void post_init (in ORBInitInfo info);
-  };
-};
-#endif  // _PORTABLE_INTERCEPTOR_IDL_
-
-
-
-
+// File: PortableInterceptor.idl
+
+#ifndef _PORTABLE_INTERCEPTOR_IDL_
+#define _PORTABLE_INTERCEPTOR_IDL_
+
+#ifndef CORBA3
+#define local  
+#endif
+
+#include <orb.idl>
+#include <Dynamic.idl>
+#include <IOP.idl>
+#include <Messaging.idl>
+
+#pragma prefix "omg.org"
+module PortableInterceptor {
+
+  local interface Interceptor {
+    readonly attribute string name;
+    
+    void destroy();
+  };
+
+  exception ForwardRequest {
+    Object forward;
+  };
+
+  typedef short ReplyStatus;
+
+  // Valid reply_status values:
+
+  const ReplyStatus SUCCESSFUL = 0;
+  const ReplyStatus SYSTEM_EXCEPTION = 1;
+  const ReplyStatus USER_EXCEPTION = 2;
+  const ReplyStatus LOCATION_FORWARD = 3;
+  const ReplyStatus TRANSPORT_RETRY = 4;
+
+  typedef unsigned long SlotId;
+
+  exception InvalidSlot {};
+
+  local interface Current : CORBA::Current {
+    any get_slot (in SlotId id) raises (InvalidSlot);
+    void set_slot (in SlotId id, in any data) raises (InvalidSlot);
+  };
+
+  local interface RequestInfo {
+    readonly attribute unsigned long request_id;
+    readonly attribute string operation;
+    readonly attribute Dynamic::ParameterList arguments;
+    readonly attribute Dynamic::ExceptionList exceptions;
+    readonly attribute Dynamic::ContextList contexts;
+    readonly attribute Dynamic::RequestContext operation_context;
+    readonly attribute any result;
+    readonly attribute boolean response_expected;
+    readonly attribute Messaging::SyncScope sync_scope;
+    readonly attribute ReplyStatus reply_status;
+    readonly attribute Object forward_reference;
+    any get_slot (in SlotId id) raises (InvalidSlot);
+    IOP::ServiceContext get_request_service_context (in IOP::ServiceId id);
+    IOP::ServiceContext get_reply_service_context (in IOP::ServiceId id);
+  };
+
+  local interface ClientRequestInfo : RequestInfo {
+    readonly attribute Object target;
+    readonly attribute Object effective_target;
+    readonly attribute IOP::TaggedProfile effective_profile;
+    readonly attribute any received_exception;
+    readonly attribute CORBA::RepositoryId received_exception_id;
+    IOP::TaggedComponent get_effective_component (in IOP::ComponentId id);
+    IOP::TaggedComponentSeq get_effective_components (in IOP::ComponentId id);
+    CORBA::Policy get_request_policy (in CORBA::PolicyType type);
+    void add_request_service_context (
+      in IOP::ServiceContext service_context,
+      in boolean replace);
+  };
+
+  local interface ServerRequestInfo : RequestInfo {
+    readonly attribute any sending_exception;
+    readonly attribute CORBA::OctetSeq object_id;
+    readonly attribute CORBA::OctetSeq adapter_id;
+    readonly attribute CORBA::RepositoryId target_most_derived_interface;
+    CORBA::Policy get_server_policy (in CORBA::PolicyType type);
+    void set_slot (in SlotId id, in any data) raises (InvalidSlot);
+    boolean target_is_a (in CORBA::RepositoryId id);
+    void add_reply_service_context (
+      in IOP::ServiceContext service_context,
+      in boolean replace);
+  };
+
+  local interface ClientRequestInterceptor : Interceptor {
+    void send_request  (in ClientRequestInfo ri) raises (ForwardRequest);
+    void send_poll (in ClientRequestInfo ri);
+    void receive_reply (in ClientRequestInfo ri);
+    void receive_exception (in ClientRequestInfo ri) raises (ForwardRequest);
+    void receive_other (in ClientRequestInfo ri) raises (ForwardRequest);
+  };
+
+  local interface ServerRequestInterceptor : Interceptor {
+    void receive_request_service_contexts (in ServerRequestInfo ri) raises (ForwardRequest);
+    void receive_request (in ServerRequestInfo ri) raises (ForwardRequest);
+    void send_reply (in ServerRequestInfo ri);
+    void send_exception (in ServerRequestInfo ri) raises (ForwardRequest);
+    void send_other (in ServerRequestInfo ri) raises (ForwardRequest);
+  };
+
+  local interface IORInfo {
+    CORBA::Policy get_effective_policy (in CORBA::PolicyType type);
+    void add_ior_component (in IOP::TaggedComponent component);
+    void add_ior_component_to_profile (
+      in IOP::TaggedComponent component,
+      in IOP::ProfileId profile_id);
+    };
+
+  local interface IORInterceptor : Interceptor {
+    void establish_components (in IORInfo info);
+  };
+
+  local interface PolicyFactory
+  {
+    CORBA::Policy create_policy (in CORBA::PolicyType type, in any value)
+      raises (CORBA::PolicyError);
+  };
+
+  local interface ORBInitInfo {
+    typedef string ObjectId;
+    exception DuplicateName {
+      string name;
+    };
+    exception InvalidName {};
+
+    readonly attribute CORBA::StringSeq arguments;
+    readonly attribute string orb_id;
+    readonly attribute IOP::CodecFactory codec_factory;
+    void register_initial_reference (in ObjectId id, in Object obj)
+      raises (InvalidName);
+    Object resolve_initial_references (in ObjectId id) raises (InvalidName);
+    void add_client_request_interceptor (in ClientRequestInterceptor interceptor)
+      raises (DuplicateName);
+    void add_server_request_interceptor (
+      in ServerRequestInterceptor interceptor)
+      raises (DuplicateName);
+    void add_ior_interceptor (in IORInterceptor interceptor)
+      raises (DuplicateName);
+    SlotId allocate_slot_id ();
+    void register_policy_factory (
+      in CORBA::PolicyType type,
+      in PolicyFactory policy_factory);
+  };
+
+  local interface ORBInitializer {
+    void pre_init (in ORBInitInfo info);
+    void post_init (in ORBInitInfo info);
+  };
+};
+#endif  // _PORTABLE_INTERCEPTOR_IDL_
+
+
+
+

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/PortableServer.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/PortableServer.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/PortableServer.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,375 +1,375 @@
-// CORBA V2.6
-// PORTABLE OBJECT ADAPTER, Chapter 9
-// $Id: PortableServer.idl,v 1.8 2004/02/02 08:56:54 gerald Exp $
-
-#ifndef _POA_IDL_
-#define _POA_IDL_
-
-#pragma prefix "omg.org"
-
-#include <orb.idl>
-
-module PortableServer
-{
-    // forward declaration
-
-    local interface POA;
-    typedef sequence<POA> POAList;
-	
-    native Servant;
-	
-    typedef CORBA::OctetSeq ObjectId;
-	
-    exception ForwardRequest
-    {
-        Object forward_reference;
-    };
-	
-    // **********************************************
-    //
-    // Policy interfaces
-    //
-    // **********************************************
-
-    const CORBA::PolicyType THREAD_POLICY_ID = 16;
-    const CORBA::PolicyType LIFESPAN_POLICY_ID = 17;
-    const CORBA::PolicyType ID_UNIQUENESS_POLICY_ID = 18;
-    const CORBA::PolicyType ID_ASSIGNMENT_POLICY_ID = 19;
-    const CORBA::PolicyType IMPLICIT_ACTIVATION_POLICY_ID = 20;
-    const CORBA::PolicyType SERVANT_RETENTION_POLICY_ID = 21;
-    const CORBA::PolicyType REQUEST_PROCESSING_POLICY_ID = 22;
-
-    enum ThreadPolicyValue
-    {
-	ORB_CTRL_MODEL,
-	SINGLE_THREAD_MODEL,
-        MAIN_THREAD_MODEL
-    };
-
-    local interface ThreadPolicy : CORBA::Policy
-    {
-        readonly attribute ThreadPolicyValue value;
-    };
-	
-    enum LifespanPolicyValue
-    {
-	TRANSIENT,
-	PERSISTENT
-    };
-
-    local interface LifespanPolicy : CORBA::Policy
-    {
-        readonly attribute LifespanPolicyValue value;
-    };
-	
-    enum IdUniquenessPolicyValue
-    {
-	UNIQUE_ID,
-	MULTIPLE_ID
-    };
-
-    local interface IdUniquenessPolicy : CORBA::Policy
-    {
-	readonly attribute IdUniquenessPolicyValue value;
-    };
-	
-    enum IdAssignmentPolicyValue
-    {
-	USER_ID,
-	SYSTEM_ID
-    };
-
-    local interface IdAssignmentPolicy : CORBA::Policy
-    {
-        readonly attribute IdAssignmentPolicyValue value;
-    };
-	
-    enum ImplicitActivationPolicyValue
-    {
-	IMPLICIT_ACTIVATION,
-	NO_IMPLICIT_ACTIVATION
-    };
-
-    local interface ImplicitActivationPolicy : CORBA::Policy
-    {
-	readonly attribute ImplicitActivationPolicyValue value;
-    };
-	
-    enum ServantRetentionPolicyValue
-    {
-	RETAIN,
-	NON_RETAIN
-    };
-
-    local interface ServantRetentionPolicy : CORBA::Policy
-    {
-	readonly attribute ServantRetentionPolicyValue value;
-    };
-	
-    enum RequestProcessingPolicyValue
-    {
-	USE_ACTIVE_OBJECT_MAP_ONLY,
-	USE_DEFAULT_SERVANT,
-	USE_SERVANT_MANAGER
-    };
-
-    local interface RequestProcessingPolicy : CORBA::Policy
-    {
-	readonly attribute RequestProcessingPolicyValue value;
-    };
-	
-    // **************************************************
-    //
-    // POAManager interface
-    //
-    // **************************************************
-	
-    local interface POAManager
-    {
-	exception AdapterInactive {};
-	
-	enum State { HOLDING, ACTIVE, DISCARDING, INACTIVE };
-
-	void activate () 
-	    raises (AdapterInactive);
-	void hold_requests (in boolean wait_for_completion) 
-	    raises (AdapterInactive);
-	void discard_requests (in boolean wait_for_completion)
-	    raises (AdapterInactive );
-	void deactivate (in boolean etherealize_objects,
-			 in boolean wait_for_completion)
-	    raises (AdapterInactive);
-	
-	State get_state ();
-    };
-	
-    // **************************************************
-    //
-    // AdapterActivator interface
-    //
-    // **************************************************
-	
-    local interface AdapterActivator
-    {
-	boolean unknown_adapter (in POA parent, in string name);
-    };
-	
-    // **************************************************
-    //
-    // ServantManager interface
-    //
-    // **************************************************
-	
-    local interface ServantManager {};
-	
-    local interface ServantActivator : ServantManager 
-    {
-	Servant incarnate (in ObjectId oid,
-			   in POA adapter)
-	    raises (ForwardRequest);
-	
-	void etherealize (in ObjectId oid,
-			  in POA adapter,
-			  in Servant serv,
-			  in boolean cleanup_in_progress,
-			  in boolean remaining_activations);
-    };
-	
-    /* not compiled, mapping classes provided separately
-
-    local interface ServantLocator : ServantManager 
-    {
-	native 	Cookie;
-
-	Servant preinvoke (in ObjectId	       	oid,
-			   in POA	       	adapter,
-			   in CORBA::Identifier	operation,
-			   out Cookie	       	the_cookie)
-	    raises (ForwardRequest);
-	
-	void postinvoke(in ObjectId   		oid,
-			in POA			adapter,
-			in CORBA::Identifier	operation,
-			in Cookie    	       	the_cookie,
-			in Servant	       	the_servant	)
-	    raises (ForwardRequest); // this exception is only in the Java mapping!
-    };
-    */
-	
-    // **************************************************
-    //
-    // POA interface
-    //
-    // **************************************************
-	
-
-    local interface POA
-    {
-	    exception AdapterAlreadyExists {};
-	    exception AdapterInactive {};
-	    exception AdapterNonExistent {};
-	    exception InvalidPolicy {unsigned short index;};
-	    exception NoServant {};
-	    exception ObjectAlreadyActive {};
-	    exception ObjectNotActive {};
-	    exception ServantAlreadyActive {};
-	    exception ServantNotActive {};
-	    exception WrongAdapter {};
-	    exception WrongPolicy {};
-	
-	    //--------------------------------------------------
-	    //
-	    // POA creation and destruction
-	    //
-	    //--------------------------------------------------
-	
-	    POA create_POA( in string adapter_name,
-			    in POAManager a_POAManager,
-			    in CORBA::PolicyList policies )
-		raises ( AdapterAlreadyExists, InvalidPolicy );
-	
-	    POA find_POA( in string adapter_name, in boolean activate_it )
-		raises ( AdapterNonExistent );
-	
-	    void destroy(	in boolean etherealize_objects,
-				in boolean wait_for_completion );
-	
-	    // **************************************************
-	    //
-	    // Factories for Policy objects
-	    //
-	    // **************************************************
-	    ThreadPolicy create_thread_policy
-                (in ThreadPolicyValue value);
-	    LifespanPolicy create_lifespan_policy
-                (in LifespanPolicyValue value);
-	    IdUniquenessPolicy create_id_uniqueness_policy
-                (in IdUniquenessPolicyValue value);
-	    IdAssignmentPolicy create_id_assignment_policy
-                (in IdAssignmentPolicyValue value);
-	    ImplicitActivationPolicy create_implicit_activation_policy
-                (in ImplicitActivationPolicyValue value);
-	    ServantRetentionPolicy create_servant_retention_policy
-		(in ServantRetentionPolicyValue value);
-	    RequestProcessingPolicy create_request_processing_policy
-		(in RequestProcessingPolicyValue value);
-	
-	    //--------------------------------------------------
-	    //
-	    // POA attributes
-	    //
-	    //--------------------------------------------------
-	
-            readonly attribute string     the_name;
-            readonly attribute POA        the_parent;
-            readonly attribute POAList    the_children;
-            readonly attribute POAManager the_POAManager;
-            attribute AdapterActivator    the_activator;
-	
-	
-	    //--------------------------------------------------
-	    //
-	    // Servant Manager registration:
-	    //
-	    //--------------------------------------------------
-	
-	    ServantManager get_servant_manager( )
-		raises ( WrongPolicy );
-	
-	    void set_servant_manager( in ServantManager imgr )
-		raises ( WrongPolicy );
-	
-	    //--------------------------------------------------
-	    //
-	    // operations for the USE_DEFAULT_SERVANT policy
-	    //
-	    //--------------------------------------------------
-	
-	    Servant get_servant( )
-		raises ( NoServant, WrongPolicy );
-	
-	    void set_servant( in Servant p_servant )
-		raises ( WrongPolicy );
-	
-	    // **************************************************
-	    //
-	    // object activation and deactivation
-	    //
-	    // **************************************************
-	
-	    ObjectId activate_object( in Servant p_servant )
-		raises ( ServantAlreadyActive, WrongPolicy );
-	
-	    void activate_object_with_id (in ObjectId	id,
-					 in Servant	p_servant)
-		raises ( ServantAlreadyActive, ObjectAlreadyActive,
-			 WrongPolicy );
-	
-	    void deactivate_object( in ObjectId oid )
-		raises ( ObjectNotActive, WrongPolicy );
-	
-	    // **************************************************
-	    //
-	    // reference creation operations
-	    //
-	    // **************************************************
-	
-	    Object create_reference (in CORBA::RepositoryId intf)
-		raises (WrongPolicy);
-	
-	    Object create_reference_with_id
-            (
-               in ObjectId oid,
-               in CORBA::RepositoryId intf
-            )
-            raises (WrongPolicy);
-	
-	
-	    //--------------------------------------------------
-	    //
-	    // Identity mapping operations:
-	    //
-	    //--------------------------------------------------
-	
-	    ObjectId servant_to_id (in Servant p_servant)
-		raises (ServantNotActive, WrongPolicy);
-	
-	    Object servant_to_reference (in Servant p_servant)
-		raises (ServantNotActive, WrongPolicy);
-	
-	    Servant reference_to_servant (in Object reference)
-		raises (ObjectNotActive, WrongAdapter, WrongPolicy);
-	
-	    ObjectId reference_to_id (in Object reference)
-		raises (WrongAdapter, WrongPolicy);
-	
-	    Servant id_to_servant (in ObjectId oid)
-		raises (ObjectNotActive, WrongPolicy);
-	
-	    Object id_to_reference (in ObjectId oid)
-		raises (ObjectNotActive, WrongPolicy);
-    };
-	
-	
-    // **************************************************
-    //
-    // Current interface
-    //
-    // **************************************************
-
-    // not pseudo, because it must be returned as a subtype
-    // of CORBA::Object in resolve_initial_references()
-	
-    local interface Current : CORBA::Current
-    {
-	exception NoContext {};
-	
-	POA get_POA () raises (NoContext);
-	ObjectId get_object_id () raises (NoContext); 
-	Object get_reference () raises (NoContext); 
-	Servant get_servant () raises (NoContext); 
-    };
-	
-};
-
-#endif /* _POA_IDL_ */
+// CORBA V2.6
+// PORTABLE OBJECT ADAPTER, Chapter 9
+// $Id: PortableServer.idl,v 1.8 2004/02/02 08:56:54 gerald Exp $
+
+#ifndef _POA_IDL_
+#define _POA_IDL_
+
+#pragma prefix "omg.org"
+
+#include <orb.idl>
+
+module PortableServer
+{
+    // forward declaration
+
+    local interface POA;
+    typedef sequence<POA> POAList;
+	
+    native Servant;
+	
+    typedef CORBA::OctetSeq ObjectId;
+	
+    exception ForwardRequest
+    {
+        Object forward_reference;
+    };
+	
+    // **********************************************
+    //
+    // Policy interfaces
+    //
+    // **********************************************
+
+    const CORBA::PolicyType THREAD_POLICY_ID = 16;
+    const CORBA::PolicyType LIFESPAN_POLICY_ID = 17;
+    const CORBA::PolicyType ID_UNIQUENESS_POLICY_ID = 18;
+    const CORBA::PolicyType ID_ASSIGNMENT_POLICY_ID = 19;
+    const CORBA::PolicyType IMPLICIT_ACTIVATION_POLICY_ID = 20;
+    const CORBA::PolicyType SERVANT_RETENTION_POLICY_ID = 21;
+    const CORBA::PolicyType REQUEST_PROCESSING_POLICY_ID = 22;
+
+    enum ThreadPolicyValue
+    {
+	ORB_CTRL_MODEL,
+	SINGLE_THREAD_MODEL,
+        MAIN_THREAD_MODEL
+    };
+
+    local interface ThreadPolicy : CORBA::Policy
+    {
+        readonly attribute ThreadPolicyValue value;
+    };
+	
+    enum LifespanPolicyValue
+    {
+	TRANSIENT,
+	PERSISTENT
+    };
+
+    local interface LifespanPolicy : CORBA::Policy
+    {
+        readonly attribute LifespanPolicyValue value;
+    };
+	
+    enum IdUniquenessPolicyValue
+    {
+	UNIQUE_ID,
+	MULTIPLE_ID
+    };
+
+    local interface IdUniquenessPolicy : CORBA::Policy
+    {
+	readonly attribute IdUniquenessPolicyValue value;
+    };
+	
+    enum IdAssignmentPolicyValue
+    {
+	USER_ID,
+	SYSTEM_ID
+    };
+
+    local interface IdAssignmentPolicy : CORBA::Policy
+    {
+        readonly attribute IdAssignmentPolicyValue value;
+    };
+	
+    enum ImplicitActivationPolicyValue
+    {
+	IMPLICIT_ACTIVATION,
+	NO_IMPLICIT_ACTIVATION
+    };
+
+    local interface ImplicitActivationPolicy : CORBA::Policy
+    {
+	readonly attribute ImplicitActivationPolicyValue value;
+    };
+	
+    enum ServantRetentionPolicyValue
+    {
+	RETAIN,
+	NON_RETAIN
+    };
+
+    local interface ServantRetentionPolicy : CORBA::Policy
+    {
+	readonly attribute ServantRetentionPolicyValue value;
+    };
+	
+    enum RequestProcessingPolicyValue
+    {
+	USE_ACTIVE_OBJECT_MAP_ONLY,
+	USE_DEFAULT_SERVANT,
+	USE_SERVANT_MANAGER
+    };
+
+    local interface RequestProcessingPolicy : CORBA::Policy
+    {
+	readonly attribute RequestProcessingPolicyValue value;
+    };
+	
+    // **************************************************
+    //
+    // POAManager interface
+    //
+    // **************************************************
+	
+    local interface POAManager
+    {
+	exception AdapterInactive {};
+	
+	enum State { HOLDING, ACTIVE, DISCARDING, INACTIVE };
+
+	void activate () 
+	    raises (AdapterInactive);
+	void hold_requests (in boolean wait_for_completion) 
+	    raises (AdapterInactive);
+	void discard_requests (in boolean wait_for_completion)
+	    raises (AdapterInactive );
+	void deactivate (in boolean etherealize_objects,
+			 in boolean wait_for_completion)
+	    raises (AdapterInactive);
+	
+	State get_state ();
+    };
+	
+    // **************************************************
+    //
+    // AdapterActivator interface
+    //
+    // **************************************************
+	
+    local interface AdapterActivator
+    {
+	boolean unknown_adapter (in POA parent, in string name);
+    };
+	
+    // **************************************************
+    //
+    // ServantManager interface
+    //
+    // **************************************************
+	
+    local interface ServantManager {};
+	
+    local interface ServantActivator : ServantManager 
+    {
+	Servant incarnate (in ObjectId oid,
+			   in POA adapter)
+	    raises (ForwardRequest);
+	
+	void etherealize (in ObjectId oid,
+			  in POA adapter,
+			  in Servant serv,
+			  in boolean cleanup_in_progress,
+			  in boolean remaining_activations);
+    };
+	
+    /* not compiled, mapping classes provided separately
+
+    local interface ServantLocator : ServantManager 
+    {
+	native 	Cookie;
+
+	Servant preinvoke (in ObjectId	       	oid,
+			   in POA	       	adapter,
+			   in CORBA::Identifier	operation,
+			   out Cookie	       	the_cookie)
+	    raises (ForwardRequest);
+	
+	void postinvoke(in ObjectId   		oid,
+			in POA			adapter,
+			in CORBA::Identifier	operation,
+			in Cookie    	       	the_cookie,
+			in Servant	       	the_servant	)
+	    raises (ForwardRequest); // this exception is only in the Java mapping!
+    };
+    */
+	
+    // **************************************************
+    //
+    // POA interface
+    //
+    // **************************************************
+	
+
+    local interface POA
+    {
+	    exception AdapterAlreadyExists {};
+	    exception AdapterInactive {};
+	    exception AdapterNonExistent {};
+	    exception InvalidPolicy {unsigned short index;};
+	    exception NoServant {};
+	    exception ObjectAlreadyActive {};
+	    exception ObjectNotActive {};
+	    exception ServantAlreadyActive {};
+	    exception ServantNotActive {};
+	    exception WrongAdapter {};
+	    exception WrongPolicy {};
+	
+	    //--------------------------------------------------
+	    //
+	    // POA creation and destruction
+	    //
+	    //--------------------------------------------------
+	
+	    POA create_POA( in string adapter_name,
+			    in POAManager a_POAManager,
+			    in CORBA::PolicyList policies )
+		raises ( AdapterAlreadyExists, InvalidPolicy );
+	
+	    POA find_POA( in string adapter_name, in boolean activate_it )
+		raises ( AdapterNonExistent );
+	
+	    void destroy(	in boolean etherealize_objects,
+				in boolean wait_for_completion );
+	
+	    // **************************************************
+	    //
+	    // Factories for Policy objects
+	    //
+	    // **************************************************
+	    ThreadPolicy create_thread_policy
+                (in ThreadPolicyValue value);
+	    LifespanPolicy create_lifespan_policy
+                (in LifespanPolicyValue value);
+	    IdUniquenessPolicy create_id_uniqueness_policy
+                (in IdUniquenessPolicyValue value);
+	    IdAssignmentPolicy create_id_assignment_policy
+                (in IdAssignmentPolicyValue value);
+	    ImplicitActivationPolicy create_implicit_activation_policy
+                (in ImplicitActivationPolicyValue value);
+	    ServantRetentionPolicy create_servant_retention_policy
+		(in ServantRetentionPolicyValue value);
+	    RequestProcessingPolicy create_request_processing_policy
+		(in RequestProcessingPolicyValue value);
+	
+	    //--------------------------------------------------
+	    //
+	    // POA attributes
+	    //
+	    //--------------------------------------------------
+	
+            readonly attribute string     the_name;
+            readonly attribute POA        the_parent;
+            readonly attribute POAList    the_children;
+            readonly attribute POAManager the_POAManager;
+            attribute AdapterActivator    the_activator;
+	
+	
+	    //--------------------------------------------------
+	    //
+	    // Servant Manager registration:
+	    //
+	    //--------------------------------------------------
+	
+	    ServantManager get_servant_manager( )
+		raises ( WrongPolicy );
+	
+	    void set_servant_manager( in ServantManager imgr )
+		raises ( WrongPolicy );
+	
+	    //--------------------------------------------------
+	    //
+	    // operations for the USE_DEFAULT_SERVANT policy
+	    //
+	    //--------------------------------------------------
+	
+	    Servant get_servant( )
+		raises ( NoServant, WrongPolicy );
+	
+	    void set_servant( in Servant p_servant )
+		raises ( WrongPolicy );
+	
+	    // **************************************************
+	    //
+	    // object activation and deactivation
+	    //
+	    // **************************************************
+	
+	    ObjectId activate_object( in Servant p_servant )
+		raises ( ServantAlreadyActive, WrongPolicy );
+	
+	    void activate_object_with_id (in ObjectId	id,
+					 in Servant	p_servant)
+		raises ( ServantAlreadyActive, ObjectAlreadyActive,
+			 WrongPolicy );
+	
+	    void deactivate_object( in ObjectId oid )
+		raises ( ObjectNotActive, WrongPolicy );
+	
+	    // **************************************************
+	    //
+	    // reference creation operations
+	    //
+	    // **************************************************
+	
+	    Object create_reference (in CORBA::RepositoryId intf)
+		raises (WrongPolicy);
+	
+	    Object create_reference_with_id
+            (
+               in ObjectId oid,
+               in CORBA::RepositoryId intf
+            )
+            raises (WrongPolicy);
+	
+	
+	    //--------------------------------------------------
+	    //
+	    // Identity mapping operations:
+	    //
+	    //--------------------------------------------------
+	
+	    ObjectId servant_to_id (in Servant p_servant)
+		raises (ServantNotActive, WrongPolicy);
+	
+	    Object servant_to_reference (in Servant p_servant)
+		raises (ServantNotActive, WrongPolicy);
+	
+	    Servant reference_to_servant (in Object reference)
+		raises (ObjectNotActive, WrongAdapter, WrongPolicy);
+	
+	    ObjectId reference_to_id (in Object reference)
+		raises (WrongAdapter, WrongPolicy);
+	
+	    Servant id_to_servant (in ObjectId oid)
+		raises (ObjectNotActive, WrongPolicy);
+	
+	    Object id_to_reference (in ObjectId oid)
+		raises (ObjectNotActive, WrongPolicy);
+    };
+	
+	
+    // **************************************************
+    //
+    // Current interface
+    //
+    // **************************************************
+
+    // not pseudo, because it must be returned as a subtype
+    // of CORBA::Object in resolve_initial_references()
+	
+    local interface Current : CORBA::Current
+    {
+	exception NoContext {};
+	
+	POA get_POA () raises (NoContext);
+	ObjectId get_object_id () raises (NoContext); 
+	Object get_reference () raises (NoContext); 
+	Servant get_servant () raises (NoContext); 
+    };
+	
+};
+
+#endif /* _POA_IDL_ */

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/RTCORBA.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/RTCORBA.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/RTCORBA.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -10,7 +10,8 @@
 // Most of this file is commented out at the moment; we're only using
 // this for a few definitions that are needed in ETF.idl.
 
-module RTCORBA {
+module RTCORBA
+{
 
 //   typedef short NativePriority;
 //   typedef short Priority;
@@ -32,13 +33,13 @@
 //     unsigned long dynamic_threads;
 //   };
 //   typedef sequence <ThreadpoolLane> ThreadpoolLanes;
-//   // Priority Model Policy
-//   const CORBA::PolicyType
-//   PRIORITY_MODEL_POLICY_TYPE = 40;
-//   enum PriorityModel {
-//     CLIENT_PROPAGATED,
-//     SERVER_DECLARED
-//   };
+   // Priority Model Policy
+   const CORBA::PolicyType PRIORITY_MODEL_POLICY_TYPE = 40;
+   enum PriorityModel
+   {
+     CLIENT_PROPAGATED,
+     SERVER_DECLARED
+   };
 //   local interface PriorityModelPolicy : CORBA::Policy {
 //     readonly attribute PriorityModel priority_model;
 //     readonly attribute Priority server_priority;
@@ -51,28 +52,29 @@
 
   local interface ProtocolProperties {};
 
-//   struct Protocol {
-//     IOP::ProfileId protocol_type;
-//     ProtocolProperties orb_protocol_properties;
-//     ProtocolProperties transport_protocol_properties;
-//   };
-//   typedef sequence <Protocol> ProtocolList;
+   struct Protocol {
+     IOP::ProfileId protocol_type;
+     ProtocolProperties orb_protocol_properties;
+     ProtocolProperties transport_protocol_properties;
+   };
+   typedef sequence <Protocol> ProtocolList;
 //   // Server Protocol Policy
 //   const CORBA::PolicyType SERVER_PROTOCOL_POLICY_TYPE = 42;
 //   local interface ServerProtocolPolicy : CORBA::Policy {
 //     readonly attribute ProtocolList protocols;
 //   };
-//   // Client Protocol Policy
-//   const CORBA::PolicyType CLIENT_PROTOCOL_POLICY_TYPE = 43;
-//   local interface ClientProtocolPolicy : CORBA::Policy {
-//     readonly attribute ProtocolList protocols;
-//   };
+   // Client Protocol Policy
+   const CORBA::PolicyType CLIENT_PROTOCOL_POLICY_TYPE = 43;
+   local interface ClientProtocolPolicy : CORBA::Policy {
+     readonly attribute ProtocolList protocols;
+   };
 //   // Private Connection Policy
 //   const CORBA::PolicyType
 //   PRIVATE_CONNECTION_POLICY_TYPE = 44;
 //   local interface PrivateConnectionPolicy : CORBA::Policy {};
 
-  local interface TCPProtocolProperties : ProtocolProperties {
+  local interface TCPProtocolProperties : ProtocolProperties
+  {
     attribute long send_buffer_size;
     attribute long recv_buffer_size;
     attribute boolean keep_alive;
@@ -85,9 +87,8 @@
 //     Priority high;
 //   };
 //   typedef sequence <PriorityBand> PriorityBands;
-//   // PriorityBandedConnectionPolicy
-//   const CORBA::PolicyType
-//   PRIORITY_BANDED_CONNECTION_POLICY_TYPE = 45;
+   // PriorityBandedConnectionPolicy
+   const CORBA::PolicyType PRIORITY_BANDED_CONNECTION_POLICY_TYPE = 45;
 //   local interface PriorityBandedConnectionPolicy : CORBA::Policy {
 //     readonly attribute PriorityBands priority_bands;
 //   };
@@ -101,11 +102,12 @@
 //     boolean try_lock ( in TimeBase::TimeT max_wait );
 //     // if max_wait = 0 then return immediately
 //   };
-//   local interface RTORB {
+   local interface RTORB
+   {
 //     Mutex create_mutex( );
 //     void destroy_mutex( in Mutex the_mutex );
 //     exception InvalidThreadpool {};
-//     ThreadpoolId create_threadpool 
+//     ThreadpoolId create_threadpool
 //     (
 //      in unsigned long stacksize,
 //      in unsigned long static_threads,
@@ -113,51 +115,53 @@
 //      in Priority default_priority,
 //      in boolean allow_request_buffering,
 //      in unsigned long max_buffered_requests,
-//      in unsigned long max_request_buffer_size 
+//      in unsigned long max_request_buffer_size
 //      );
-//     ThreadpoolId create_threadpool_with_lanes 
+//     ThreadpoolId create_threadpool_with_lanes
 //     (
 //      in unsigned long stacksize,
 //      in ThreadpoolLanes lanes,
 //      in boolean allow_borrowing
 //      in boolean allow_request_buffering,
 //      in unsigned long max_buffered_requests,
-//      in unsigned long max_request_buffer_size 
+//      in unsigned long max_request_buffer_size
 //      );
 //     void destroy_threadpool ( in ThreadpoolId threadpool )
 //       raises (InvalidThreadpool);
-//     PriorityModelPolicy create_priority_model_policy 
+//     PriorityModelPolicy create_priority_model_policy
 //     (
 //      in PriorityModel priority_model,
 //      in Priority server_priority
 //     );
-//     ThreadpoolPolicy create_threadpool_policy 
+//     ThreadpoolPolicy create_threadpool_policy
 //     (
 //      in ThreadpoolId threadpool
 //      );
-    
+
 //     PriorityBandedConnectionPolicy
-//     create_priority_banded_connection_policy 
+//     create_priority_banded_connection_policy
 //     (
 //      in PriorityBands priority_bands
 //      );
-//     ServerProtocolPolicy create_server_protocol_policy 
+//     ServerProtocolPolicy create_server_protocol_policy
 //     (
 //      in ProtocolList protocols
 //      );
-//     ClientProtocolPolicy create_client_protocol_policy 
-//     (
-//      in ProtocolList protocols
-//      );
+
+      ClientProtocolPolicy create_client_protocol_policy
+      (
+          in ProtocolList protocols
+      );
+
 //     PrivateConnectionPolicy create_private_connection_policy ();
-//     TCPProtocolProperties create_tcp_protocol_properties 
+//     TCPProtocolProperties create_tcp_protocol_properties
 //     (
 //      in long send_buffer_size,
 //      in long recv_buffer_size,
 //      in boolean keep_alive,
 //      in boolean dont_route,
-//      in boolean no_delay 
+//      in boolean no_delay
 //      );
-//  };
+  };
 }; // End module RTCORBA
 #endif // _RT_CORBA_IDL_

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SECIOP.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SECIOP.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SECIOP.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,193 +1,193 @@
-#ifndef i_SECIOP_IDL_
-#define _SECIOP_IDL
-#include <IOP.idl>
-#include <Security.idl>
-#pragma prefix "omg.org"
-
-
-module SECIOP 
-{
-
-    const IOP::ComponentId TAG_GENERIC_SEC_MECH = 22;
-
-    const IOP::ComponentId TAG_ASSOCIATION_OPTIONS = 13;
-
-    const IOP::ComponentId TAG_SEC_NAME = 14;
-
-    struct TargetAssociationOptions{
-	Security::AssociationOptions target_supports;
-	Security::AssociationOptions                  target_requires;
-    };
-
-    struct GenericMechanismInfo {
-	sequence <octet>                              security_mechanism_type;
-	sequence <octet>                              mech_specific_data;
-	sequence <IOP::TaggedComponent>                      components;
-    };
-
-    enum MsgType {
-	MTEstablishContext, 
-	MTCompleteEstablishContext,
-	MTContinueEstablishContext,
-	MTDiscardContext,
-	MTMessageError,
-	MTMessageInContext
-    };
-
-    typedef unsigned long long ContextId;
-
-    enum ContextIdDefn {
-	CIDClient, 
-	CIDPeer,
-	CIDSender
-    };
-
-    struct EstablishContext {
-	ContextId                     client_context_id;
-	sequence <octet>              initial_context_token;
-    };
-
-    struct CompleteEstablishContext {
-	ContextId               client_context_id;
-	boolean                 target_context_id_valid;
-	ContextId               target_context_id;
-	sequence <octet>        final_context_token;
-    };
-
-    struct ContinueEstablishContext {
-	ContextId               client_context_id;
-	sequence <octet>        continuation_context_token;
-    };
-
-    struct DiscardContext {
-	ContextIdDefn           message_context_id_defn;
-	ContextId               message_context_id;
-	sequence <octet>        discard_context_token;
-    };
-
-    struct MessageError {
-	ContextIdDefn           message_context_id_defn;
-	ContextId               message_context_id;
-	long                    major_status;
-	long                    minor_status;
-    };
-
-    enum ContextTokenType {
-	SecTokenTypeWrap,
-	SecTokenTypeMIC
-    };
-
-    struct MessageInContext {
-	ContextIdDefn           message_context_id_defn;
-	ContextId               message_context_id;
-	ContextTokenType        message_context_type;
-	sequence <octet>        message_protection_token;
-    };
-
-    // message_protection_token is obtained by CDR encoding 
-    // the following SequencingHeader followed by the octets of the 
-    // frame data. SequencingHeader + Frame Data is called a 
-    // SequencedDataFrame
-
-    struct SequencingHeader {
-	octet                   control_state;
-	unsigned long           direct_sequence_number;
-	unsigned long           reverse_sequence_number;
-	unsigned long           reverse_window;
-    };
-
-
-    typedef sequence <octet> SecurityName;
-    typedef unsigned short CryptographicProfile;
-    typedef sequence <CryptographicProfile> CryptographicProfileList;
-
-    // Cryptographic profiles for SPKM
-
-    const CryptographicProfile              MD5_RSA = 20;
-    const CryptographicProfile              MD5_DES_CBC = 21;
-    const CryptographicProfile              DES_CBC = 22;
-    const CryptographicProfile              MD5_DES_CBC_SOURCE  = 23;
-    const CryptographicProfile              DES_CBC_SOURCE  = 24;
-
-    // Security Mechanism SPKM_1
-
-    const IOP::ComponentId                  TAG_SPKM_1_SEC_MECH = 15;
-
-    struct SPKM_1 {
-	Security::AssociationOptions                target_supports;
-	Security::AssociationOptions                target_requires;
-	CryptographicProfileList                    crypto_profile;
-	SecurityName                                security_name;
-    };
-
-    // Security Mechanism SPKM_1
-
-    const IOP::ComponentId TAG_SPKM_2_SEC_MECH = 16;
-
-    struct SPKM_2 {
-	Security::AssociationOptions                target_supports;
-	Security::AssociationOptions                target_requires;
-	CryptographicProfileList                    crypto_profile;
-	SecurityName                                security_name;
-    };
-
-    // Cryptographic profiles for GSS Kerberos Protocol
-
-    const CryptographicProfile                   DES_CBC_DES_MAC = 10;
-    const CryptographicProfile                   DES_CBC_MD5 = 11;
-    const CryptographicProfile                   DES_MAC = 12;
-    const CryptographicProfile                   MD5 = 13;
-
-    // Security Mechanism KerberosV5
-
-    const IOP::ComponentId TAG_KerberosV5_SEC_MECH = 17;
-
-    struct KerberosV5 {
-	Security::AssociationOptions                target_supports;
-	Security::AssociationOptions                target_requires;
-	CryptographicProfileList                    crypto_profile;
-	SecurityName                                security_name;
-    };
-
-    // Cryptographic profiles for CSI-ECMA Protocol
-
-    const CryptographicProfile            FullSecurity = 1;
-    const CryptographicProfile            NoDataConfidentiality = 2;
-    const CryptographicProfile            LowGradeConfidentiality = 3;
-    const CryptographicProfile            AgreedDefault = 5;
-
-    // Security Mechanism CSI_ECMA_Secret
-
-    const IOP::ComponentId TAG_CSI_ECMA_Secret_SEC_MECH = 18;
-
-    struct CSI_ECMA_Secret {
-	Security::AssociationOptions           target_supports;
-	Security::AssociationOptions           target_requires;
-	CryptographicProfileList               crypto_profile;
-	SecurityName                           security_name;
-    };
-
-    // Security Mechanism CSI_ECMA_Hybrid
-
-    const IOP::ComponentId TAG_CSI_ECMA_Hybrid_SEC_MECH = 19;
-
-    struct CSI_ECMA_Hybrid {
-	Security::AssociationOptions           target_supports;
-	Security::AssociationOptions           target_requires;
-	CryptographicProfileList               crypto_profile;
-	SecurityName                           security_name;
-    };
-
-    // Security Mechanism CSI_ECMA_Public
-
-    const IOP::ComponentId TAG_CSI_ECMA_Public_SEC_MECH = 21;
-
-    struct CSI_ECMA_Public {
-	Security::AssociationOptions           target_supports;
-	Security::AssociationOptions           target_requires;
-	CryptographicProfileList               crypto_profile;
-	SecurityName                           security_name;
-    };
-};
-
-#endif /* _SECIOP_IDL */
+#ifndef i_SECIOP_IDL_
+#define _SECIOP_IDL
+#include <IOP.idl>
+#include <Security.idl>
+#pragma prefix "omg.org"
+
+
+module SECIOP 
+{
+
+    const IOP::ComponentId TAG_GENERIC_SEC_MECH = 22;
+
+    const IOP::ComponentId TAG_ASSOCIATION_OPTIONS = 13;
+
+    const IOP::ComponentId TAG_SEC_NAME = 14;
+
+    struct TargetAssociationOptions{
+	Security::AssociationOptions target_supports;
+	Security::AssociationOptions                  target_requires;
+    };
+
+    struct GenericMechanismInfo {
+	sequence <octet>                              security_mechanism_type;
+	sequence <octet>                              mech_specific_data;
+	sequence <IOP::TaggedComponent>                      components;
+    };
+
+    enum MsgType {
+	MTEstablishContext, 
+	MTCompleteEstablishContext,
+	MTContinueEstablishContext,
+	MTDiscardContext,
+	MTMessageError,
+	MTMessageInContext
+    };
+
+    typedef unsigned long long ContextId;
+
+    enum ContextIdDefn {
+	CIDClient, 
+	CIDPeer,
+	CIDSender
+    };
+
+    struct EstablishContext {
+	ContextId                     client_context_id;
+	sequence <octet>              initial_context_token;
+    };
+
+    struct CompleteEstablishContext {
+	ContextId               client_context_id;
+	boolean                 target_context_id_valid;
+	ContextId               target_context_id;
+	sequence <octet>        final_context_token;
+    };
+
+    struct ContinueEstablishContext {
+	ContextId               client_context_id;
+	sequence <octet>        continuation_context_token;
+    };
+
+    struct DiscardContext {
+	ContextIdDefn           message_context_id_defn;
+	ContextId               message_context_id;
+	sequence <octet>        discard_context_token;
+    };
+
+    struct MessageError {
+	ContextIdDefn           message_context_id_defn;
+	ContextId               message_context_id;
+	long                    major_status;
+	long                    minor_status;
+    };
+
+    enum ContextTokenType {
+	SecTokenTypeWrap,
+	SecTokenTypeMIC
+    };
+
+    struct MessageInContext {
+	ContextIdDefn           message_context_id_defn;
+	ContextId               message_context_id;
+	ContextTokenType        message_context_type;
+	sequence <octet>        message_protection_token;
+    };
+
+    // message_protection_token is obtained by CDR encoding 
+    // the following SequencingHeader followed by the octets of the 
+    // frame data. SequencingHeader + Frame Data is called a 
+    // SequencedDataFrame
+
+    struct SequencingHeader {
+	octet                   control_state;
+	unsigned long           direct_sequence_number;
+	unsigned long           reverse_sequence_number;
+	unsigned long           reverse_window;
+    };
+
+
+    typedef sequence <octet> SecurityName;
+    typedef unsigned short CryptographicProfile;
+    typedef sequence <CryptographicProfile> CryptographicProfileList;
+
+    // Cryptographic profiles for SPKM
+
+    const CryptographicProfile              MD5_RSA = 20;
+    const CryptographicProfile              MD5_DES_CBC = 21;
+    const CryptographicProfile              DES_CBC = 22;
+    const CryptographicProfile              MD5_DES_CBC_SOURCE  = 23;
+    const CryptographicProfile              DES_CBC_SOURCE  = 24;
+
+    // Security Mechanism SPKM_1
+
+    const IOP::ComponentId                  TAG_SPKM_1_SEC_MECH = 15;
+
+    struct SPKM_1 {
+	Security::AssociationOptions                target_supports;
+	Security::AssociationOptions                target_requires;
+	CryptographicProfileList                    crypto_profile;
+	SecurityName                                security_name;
+    };
+
+    // Security Mechanism SPKM_1
+
+    const IOP::ComponentId TAG_SPKM_2_SEC_MECH = 16;
+
+    struct SPKM_2 {
+	Security::AssociationOptions                target_supports;
+	Security::AssociationOptions                target_requires;
+	CryptographicProfileList                    crypto_profile;
+	SecurityName                                security_name;
+    };
+
+    // Cryptographic profiles for GSS Kerberos Protocol
+
+    const CryptographicProfile                   DES_CBC_DES_MAC = 10;
+    const CryptographicProfile                   DES_CBC_MD5 = 11;
+    const CryptographicProfile                   DES_MAC = 12;
+    const CryptographicProfile                   MD5 = 13;
+
+    // Security Mechanism KerberosV5
+
+    const IOP::ComponentId TAG_KerberosV5_SEC_MECH = 17;
+
+    struct KerberosV5 {
+	Security::AssociationOptions                target_supports;
+	Security::AssociationOptions                target_requires;
+	CryptographicProfileList                    crypto_profile;
+	SecurityName                                security_name;
+    };
+
+    // Cryptographic profiles for CSI-ECMA Protocol
+
+    const CryptographicProfile            FullSecurity = 1;
+    const CryptographicProfile            NoDataConfidentiality = 2;
+    const CryptographicProfile            LowGradeConfidentiality = 3;
+    const CryptographicProfile            AgreedDefault = 5;
+
+    // Security Mechanism CSI_ECMA_Secret
+
+    const IOP::ComponentId TAG_CSI_ECMA_Secret_SEC_MECH = 18;
+
+    struct CSI_ECMA_Secret {
+	Security::AssociationOptions           target_supports;
+	Security::AssociationOptions           target_requires;
+	CryptographicProfileList               crypto_profile;
+	SecurityName                           security_name;
+    };
+
+    // Security Mechanism CSI_ECMA_Hybrid
+
+    const IOP::ComponentId TAG_CSI_ECMA_Hybrid_SEC_MECH = 19;
+
+    struct CSI_ECMA_Hybrid {
+	Security::AssociationOptions           target_supports;
+	Security::AssociationOptions           target_requires;
+	CryptographicProfileList               crypto_profile;
+	SecurityName                           security_name;
+    };
+
+    // Security Mechanism CSI_ECMA_Public
+
+    const IOP::ComponentId TAG_CSI_ECMA_Public_SEC_MECH = 21;
+
+    struct CSI_ECMA_Public {
+	Security::AssociationOptions           target_supports;
+	Security::AssociationOptions           target_requires;
+	CryptographicProfileList               crypto_profile;
+	SecurityName                           security_name;
+    };
+};
+
+#endif /* _SECIOP_IDL */

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SSLIOP.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SSLIOP.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SSLIOP.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,19 +1,19 @@
-#ifndef _SSLIOP_IDL
-#define _SSLIOP_IDL
-
-#pragma prefix "omg.org"
-#include <IOP.idl>
-#include <Security.idl>
-
-module SSLIOP {
-
-    // Security mechanism SSL
-    const IOP::ComponentId        TAG_SSL_SEC_TRANS = 20;
-
-    struct SSL {
-        Security::AssociationOptions    target_supports;
-        Security::AssociationOptions    target_requires;
-        unsigned short        port;
-    };
-};
-#endif /* _SSLIOP_IDL */
+#ifndef _SSLIOP_IDL
+#define _SSLIOP_IDL
+
+#pragma prefix "omg.org"
+#include <IOP.idl>
+#include <Security.idl>
+
+module SSLIOP {
+
+    // Security mechanism SSL
+    const IOP::ComponentId        TAG_SSL_SEC_TRANS = 20;
+
+    struct SSL {
+        Security::AssociationOptions    target_supports;
+        Security::AssociationOptions    target_requires;
+        unsigned short        port;
+    };
+};
+#endif /* _SSLIOP_IDL */

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/Security.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/Security.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/Security.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,385 +1,385 @@
-// From CORBASEC V 1.5
-// $Id: Security.idl,v 1.1.1.1 2001/03/17 18:08:13 brose Exp $
-
-
-#ifndef _SECURITY_IDL_
-#define _SECURITY_IDL_
-#include <orb.idl>
-#include <TimeBase.idl>
-#pragma prefix "omg.org"
-
-module Security 
-{
-
-    typedef string                    SecurityName;
-    typedef sequence <octet>          Opaque;
-
-    // Constant declarations for Security Service Options
-
-    const CORBA::ServiceOption SecurityLevel1 = 1;
-    const CORBA::ServiceOption SecurityLevel2 = 2;
-    const CORBA::ServiceOption NonRepudiation = 3;
-    const CORBA::ServiceOption SecurityORBServiceReady = 4;
-    const CORBA::ServiceOption SecurityServiceReady = 5;
-    const CORBA::ServiceOption ReplaceORBServices = 6;
-    const CORBA::ServiceOption ReplaceSecurityServices = 7;
-    const CORBA::ServiceOption StandardSecureInteroperability = 8;
-    const CORBA::ServiceOption DCESecureInteroperability = 9;
-
-    // Service options for Common Secure Interoperability
-
-    const CORBA::ServiceOption CommonInteroperabilityLevel0 = 10;
-    const CORBA::ServiceOption CommonInteroperabilityLevel1 = 11;
-    const CORBA::ServiceOption CommonInteroperabilityLevel2 = 12;
-
-    // Security mech types supported for secure association
-    const CORBA::ServiceDetailType SecurityMechanismType = 1;
-
-    // privilege types supported in standard access policy
-    const CORBA::ServiceDetailType SecurityAttribute = 2;
-
-    // Secure transport types supported for secure association
-    const CORBA::ServiceDetailType SecureTransportType = 3;
-
-    // extensible families for standard data types
-
-    struct ExtensibleFamily {
-	unsigned short          family_definer;
-	unsigned short          family;
-    };
-
-    // security association mechanism type
-
-    typedef string                     MechanismType;
-
-    typedef sequence<MechanismType> MechanismTypeList;
-
-    // security association transport type
-
-    typedef string                     TransportType;
-
-    // Association options which can be administered
-    // on secure invocation policy and used to
-    // initialize security context
-
-    typedef unsigned short                  AssociationOptions;
-
-    const AssociationOptions NoProtection = 1;
-    const AssociationOptions Integrity = 2; 
-    const AssociationOptions Confidentiality = 4; 
-    const AssociationOptions DetectReplay = 8; 
-    const AssociationOptions DetectMisordering = 16;
-    const AssociationOptions EstablishTrustInTarget = 32; 
-    const AssociationOptions EstablishTrustInClient = 64;
-    const AssociationOptions NoDelegation = 128;
-    const AssociationOptions SimpleDelegation = 256; 
-    const AssociationOptions CompositeDelegation = 512;
-
-    struct SecurityMechanismData {
-	MechanismType                mechanism;
-	SecurityName                 security_name;
-	AssociationOptions           options_supported;
-	AssociationOptions           options_required;
-    };
-
-    typedef sequence<SecurityMechanismData> SecurityMechanismDataList;
-
-    // security attributes
-
-    typedef unsigned long              SecurityAttributeType;
-
-    // other attributes; family = 0
-
-    const SecurityAttributeType                  AuditId = 1;
-    const SecurityAttributeType                  AccountingId = 2;
-    const SecurityAttributeType                  NonRepudiationId = 3;
-
-    // privilege attributes; family = 1
-
-    const SecurityAttributeType              _Public = 1;
-    const SecurityAttributeType              AccessId = 2; 
-    const SecurityAttributeType              PrimaryGroupId = 3;
-    const SecurityAttributeType              GroupId = 4;
-    const SecurityAttributeType              Role = 5;
-    const SecurityAttributeType              AttributeSet = 6;
-    const SecurityAttributeType              Clearance = 7; 
-    const SecurityAttributeType              Capability = 8;
-
-    struct AttributeType {
-	ExtensibleFamily             attribute_family;
-	SecurityAttributeType        attribute_type;
-    };
-
-    typedef sequence<AttributeType>                   AttributeTypeList;
-
-    struct SecAttribute {
-	AttributeType            attribute_type;
-	Opaque defining_authority; 
-	Opaque value;
-	// the value of this attribute can be 
-	// interpreted only with knowledge of type
-    };
-
-    typedef sequence <SecAttribute> AttributeList;
-
-    // Authentication return status
-
-    enum AuthenticationStatus {
-	SecAuthSuccess,
-	SecAuthFailure,
-	SecAuthContinue,
-	SecAuthExpired
-    };
-
-    // Association return status
-
-    enum AssociationStatus {
-	SecAssocSuccess,
-	SecAssocFailure,
-	SecAssocContinue
-    };
-
-    // Authentication method
-    typedef unsigned long AuthenticationMethod;
-
-    typedef sequence<AuthenticationMethod> AuthenticationMethodList;
-
-    // Credential types which can be set as Current default
-
-    enum CredentialType {
-	SecInvocationCredentials,
-	SecNRCredentials
-    };
-
-    enum InvocationCredentialsType {
-	SecOwnCredentials,
-	SecReceivedCredentials
-    };
-
-    // Declarations related to Rights 
-
-    struct Right {
-	ExtensibleFamily             rights_family;
-	string                       right;
-    };
-
-    typedef sequence <Right> RightsList;
-
-    enum RightsCombinator {
-	SecAllRights,
-	SecAnyRight
-    };
-
-    // Delegation related
-
-    enum DelegationState {
-	SecInitiator,
-	SecDelegate
-    };
-
-    enum DelegationDirective {
-	Delegate,
-	NoDelegate
-    };
-
-    // pick up from TimeBase
-
-    typedef TimeBase::UtcT                  UtcT;
-    typedef TimeBase::IntervalT IntervalT;
-    typedef TimeBase::TimeT                 TimeT;
-
-
-
-    // Security features available on credentials.
-
-    enum SecurityFeature {
-	SecNoDelegation,
-	SecSimpleDelegation,
-	SecCompositeDelegation,
-	SecNoProtection,
-	SecIntegrity,
-	SecConfidentiality,
-	SecIntegrityAndConfidentiality,
-	SecDetectReplay,
-	SecDetectMisordering,
-	SecEstablishTrustInTarget,
-	SecEstablishTrustInClient
-    };
-
-    // Quality of protection which can be specified
-    // for an object reference and used to protect messages
-
-    enum QOP {
-	SecQOPNoProtection,
-	SecQOPIntegrity,
-	SecQOPConfidentiality,
-	SecQOPIntegrityAndConfidentiality
-    };
-
-    // Type of SecurityContext
-
-    enum SecurityContextType {
-	SecClientSecurityContext,
-	SecServerSecurityContext
-    };
-
-    // Operational State of a Security Context
-
-    enum SecurityContextState {
-	SecContextInitialized,
-	SecContextContinued,
-	SecContextClientEstablished,
-	SecContextEstablished,
-	SecContextEstablishExpired,
-	SecContextExpired,
-	SecContextInvalid
-    };
-
-
-    // For use with SecurityReplaceable
-
-    struct OpaqueBuffer {
-	Opaque buffer;
-	unsigned long                startpos; 
-	unsigned long                endpos;
-	// startpos <= endpos
-	// OpaqueBuffer is said to be empty if startpos == endpos
-    };
-
-
-
-    // Flag to indicate whether association options being
-    // administered are the "required" or "supported" set
-
-    enum RequiresSupports {
-	SecRequires,
-	SecSupports
-    };
-
-    // Direction of communication for which
-    // secure invocation policy applies
-
-    enum CommunicationDirection { 
-	SecDirectionBoth,
-	SecDirectionRequest,
-	SecDirectionReply
-    };
-
-
-    // AssociationOptions-Direction pair
-
-    struct OptionsDirectionPair {
-	AssociationOptions       options;
-	CommunicationDirection   direction;
-    };
-
-    typedef sequence <OptionsDirectionPair> OptionsDirectionPairList;
-
-    // Delegation mode which can be administered
-
-    enum DelegationMode {
-	SecDelModeNoDelegation,                    // i.e. use own credentials
-	SecDelModeSimpleDelegation,   // delegate received credentials 
-	SecDelModeCompositeDelegation  // delegate both; 
-    };
-
-    // Association options supported by a given mech type
-
-    struct MechandOptions {
-	MechanismType            mechanism_type;
-	AssociationOptions       options_supported;
-    };
-
-    typedef sequence <MechandOptions>                         MechandOptionsList;
-
-    // Attribute of the SecurityLevel2::EstablishTrustPolicy
-
-    struct EstablishTrust {
-	boolean trust_in_client;
-	boolean trust_in_target;
-    };
-
-    // Audit 
-
-    typedef unsigned long                                     AuditChannelId;
-
-    typedef unsigned short                                     EventType;
-
-    const EventType            AuditAll = 0;
-    const EventType            AuditPrincipalAuth = 1;
-    const EventType            AuditSessionAuth = 2;
-    const EventType            AuditAuthorization = 3;
-    const EventType            AuditInvocation = 4;
-    const EventType            AuditSecEnvChange = 5;
-    const EventType            AuditPolicyChange = 6;
-    const EventType            AuditObjectCreation = 7;
-    const EventType            AuditObjectDestruction = 8;
-    const EventType            AuditNonRepudiation = 9;
-
-
-    enum DayOfTheWeek {
-	Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday};
-
-    enum AuditCombinator { 
-	SecAllSelectors, 
-	SecAnySelector 
-    }; 
-
-    struct AuditEventType {
-	ExtensibleFamily            event_family;
-	EventType                   event_type;
-    };
-    typedef 
-	sequence 
-	<AuditEventType> AuditEventTypeList;
-
-    typedef unsigned long                                   SelectorType;
-
-    const SelectorType            InterfaceName = 1;
-    const SelectorType            ObjectRef = 2;
-    const SelectorType            Operation = 3;
-    const SelectorType            Initiator = 4;
-    const SelectorType            SuccessFailure = 5;
-    const SelectorType            Time = 6;
-    const SelectorType            DayOfWeek = 7;
-
-    // values defined for audit_needed and audit_write are:
-    // InterfaceName: CORBA::RepositoryId
-    // ObjectRef: object reference
-    // Operation: op_name 
-    // Initiator: Credentials
-    // SuccessFailure: boolean
-    // Time: utc time on audit_write; time picked up from
-    //                  environment in audit_needed if required
-    // DayOfWeek: DayOfTheWeek
-
-    struct SelectorValue {
-	SelectorType           selector;
-	any                    value;
-    };
-    typedef sequence <SelectorValue>  SelectorValueList;
-
-    // Constant declaration for valid Security Policy Types
-
-    // General administrative policies
-    const CORBA::PolicyType SecClientInvocationAccess = 1;
-    const CORBA::PolicyType SecTargetInvocationAccess = 2;
-    const CORBA::PolicyType SecApplicationAccess = 3;
-    const CORBA::PolicyType SecClientInvocationAudit = 4;
-    const CORBA::PolicyType SecTargetInvocationAudit = 5;
-    const CORBA::PolicyType SecApplicationAudit = 6;
-    const CORBA::PolicyType SecDelegation = 7;
-    const CORBA::PolicyType SecClientSecureInvocation = 8;
-    const CORBA::PolicyType SecTargetSecureInvocation = 9;
-    const CORBA::PolicyType SecNonRepudiation = 10;
-
-    // Policies used to control attributes of a binding to a target
-    const CORBA::PolicyType SecMechanismsPolicy = 12;
-    const CORBA::PolicyType SecInvocationCredentialsPolicy = 13;
-    const CORBA::PolicyType SecFeaturePolicy = 14; // obsolete
-    const CORBA::PolicyType SecQOPPolicy = 15;
-
-    const CORBA::PolicyType SecDelegationDirectivePolicy = 38;
-    const CORBA::PolicyType SecEstablishTrustPolicy = 39;
-};
-#endif /* _SECURITY_IDL_ */
+// From CORBASEC V 1.5
+// $Id: Security.idl,v 1.1.1.1 2001/03/17 18:08:13 brose Exp $
+
+
+#ifndef _SECURITY_IDL_
+#define _SECURITY_IDL_
+#include <orb.idl>
+#include <TimeBase.idl>
+#pragma prefix "omg.org"
+
+module Security 
+{
+
+    typedef string                    SecurityName;
+    typedef sequence <octet>          Opaque;
+
+    // Constant declarations for Security Service Options
+
+    const CORBA::ServiceOption SecurityLevel1 = 1;
+    const CORBA::ServiceOption SecurityLevel2 = 2;
+    const CORBA::ServiceOption NonRepudiation = 3;
+    const CORBA::ServiceOption SecurityORBServiceReady = 4;
+    const CORBA::ServiceOption SecurityServiceReady = 5;
+    const CORBA::ServiceOption ReplaceORBServices = 6;
+    const CORBA::ServiceOption ReplaceSecurityServices = 7;
+    const CORBA::ServiceOption StandardSecureInteroperability = 8;
+    const CORBA::ServiceOption DCESecureInteroperability = 9;
+
+    // Service options for Common Secure Interoperability
+
+    const CORBA::ServiceOption CommonInteroperabilityLevel0 = 10;
+    const CORBA::ServiceOption CommonInteroperabilityLevel1 = 11;
+    const CORBA::ServiceOption CommonInteroperabilityLevel2 = 12;
+
+    // Security mech types supported for secure association
+    const CORBA::ServiceDetailType SecurityMechanismType = 1;
+
+    // privilege types supported in standard access policy
+    const CORBA::ServiceDetailType SecurityAttribute = 2;
+
+    // Secure transport types supported for secure association
+    const CORBA::ServiceDetailType SecureTransportType = 3;
+
+    // extensible families for standard data types
+
+    struct ExtensibleFamily {
+	unsigned short          family_definer;
+	unsigned short          family;
+    };
+
+    // security association mechanism type
+
+    typedef string                     MechanismType;
+
+    typedef sequence<MechanismType> MechanismTypeList;
+
+    // security association transport type
+
+    typedef string                     TransportType;
+
+    // Association options which can be administered
+    // on secure invocation policy and used to
+    // initialize security context
+
+    typedef unsigned short                  AssociationOptions;
+
+    const AssociationOptions NoProtection = 1;
+    const AssociationOptions Integrity = 2; 
+    const AssociationOptions Confidentiality = 4; 
+    const AssociationOptions DetectReplay = 8; 
+    const AssociationOptions DetectMisordering = 16;
+    const AssociationOptions EstablishTrustInTarget = 32; 
+    const AssociationOptions EstablishTrustInClient = 64;
+    const AssociationOptions NoDelegation = 128;
+    const AssociationOptions SimpleDelegation = 256; 
+    const AssociationOptions CompositeDelegation = 512;
+
+    struct SecurityMechanismData {
+	MechanismType                mechanism;
+	SecurityName                 security_name;
+	AssociationOptions           options_supported;
+	AssociationOptions           options_required;
+    };
+
+    typedef sequence<SecurityMechanismData> SecurityMechanismDataList;
+
+    // security attributes
+
+    typedef unsigned long              SecurityAttributeType;
+
+    // other attributes; family = 0
+
+    const SecurityAttributeType                  AuditId = 1;
+    const SecurityAttributeType                  AccountingId = 2;
+    const SecurityAttributeType                  NonRepudiationId = 3;
+
+    // privilege attributes; family = 1
+
+    const SecurityAttributeType              _Public = 1;
+    const SecurityAttributeType              AccessId = 2; 
+    const SecurityAttributeType              PrimaryGroupId = 3;
+    const SecurityAttributeType              GroupId = 4;
+    const SecurityAttributeType              Role = 5;
+    const SecurityAttributeType              AttributeSet = 6;
+    const SecurityAttributeType              Clearance = 7; 
+    const SecurityAttributeType              Capability = 8;
+
+    struct AttributeType {
+	ExtensibleFamily             attribute_family;
+	SecurityAttributeType        attribute_type;
+    };
+
+    typedef sequence<AttributeType>                   AttributeTypeList;
+
+    struct SecAttribute {
+	AttributeType            attribute_type;
+	Opaque defining_authority; 
+	Opaque value;
+	// the value of this attribute can be 
+	// interpreted only with knowledge of type
+    };
+
+    typedef sequence <SecAttribute> AttributeList;
+
+    // Authentication return status
+
+    enum AuthenticationStatus {
+	SecAuthSuccess,
+	SecAuthFailure,
+	SecAuthContinue,
+	SecAuthExpired
+    };
+
+    // Association return status
+
+    enum AssociationStatus {
+	SecAssocSuccess,
+	SecAssocFailure,
+	SecAssocContinue
+    };
+
+    // Authentication method
+    typedef unsigned long AuthenticationMethod;
+
+    typedef sequence<AuthenticationMethod> AuthenticationMethodList;
+
+    // Credential types which can be set as Current default
+
+    enum CredentialType {
+	SecInvocationCredentials,
+	SecNRCredentials
+    };
+
+    enum InvocationCredentialsType {
+	SecOwnCredentials,
+	SecReceivedCredentials
+    };
+
+    // Declarations related to Rights 
+
+    struct Right {
+	ExtensibleFamily             rights_family;
+	string                       right;
+    };
+
+    typedef sequence <Right> RightsList;
+
+    enum RightsCombinator {
+	SecAllRights,
+	SecAnyRight
+    };
+
+    // Delegation related
+
+    enum DelegationState {
+	SecInitiator,
+	SecDelegate
+    };
+
+    enum DelegationDirective {
+	Delegate,
+	NoDelegate
+    };
+
+    // pick up from TimeBase
+
+    typedef TimeBase::UtcT                  UtcT;
+    typedef TimeBase::IntervalT IntervalT;
+    typedef TimeBase::TimeT                 TimeT;
+
+
+
+    // Security features available on credentials.
+
+    enum SecurityFeature {
+	SecNoDelegation,
+	SecSimpleDelegation,
+	SecCompositeDelegation,
+	SecNoProtection,
+	SecIntegrity,
+	SecConfidentiality,
+	SecIntegrityAndConfidentiality,
+	SecDetectReplay,
+	SecDetectMisordering,
+	SecEstablishTrustInTarget,
+	SecEstablishTrustInClient
+    };
+
+    // Quality of protection which can be specified
+    // for an object reference and used to protect messages
+
+    enum QOP {
+	SecQOPNoProtection,
+	SecQOPIntegrity,
+	SecQOPConfidentiality,
+	SecQOPIntegrityAndConfidentiality
+    };
+
+    // Type of SecurityContext
+
+    enum SecurityContextType {
+	SecClientSecurityContext,
+	SecServerSecurityContext
+    };
+
+    // Operational State of a Security Context
+
+    enum SecurityContextState {
+	SecContextInitialized,
+	SecContextContinued,
+	SecContextClientEstablished,
+	SecContextEstablished,
+	SecContextEstablishExpired,
+	SecContextExpired,
+	SecContextInvalid
+    };
+
+
+    // For use with SecurityReplaceable
+
+    struct OpaqueBuffer {
+	Opaque buffer;
+	unsigned long                startpos; 
+	unsigned long                endpos;
+	// startpos <= endpos
+	// OpaqueBuffer is said to be empty if startpos == endpos
+    };
+
+
+
+    // Flag to indicate whether association options being
+    // administered are the "required" or "supported" set
+
+    enum RequiresSupports {
+	SecRequires,
+	SecSupports
+    };
+
+    // Direction of communication for which
+    // secure invocation policy applies
+
+    enum CommunicationDirection { 
+	SecDirectionBoth,
+	SecDirectionRequest,
+	SecDirectionReply
+    };
+
+
+    // AssociationOptions-Direction pair
+
+    struct OptionsDirectionPair {
+	AssociationOptions       options;
+	CommunicationDirection   direction;
+    };
+
+    typedef sequence <OptionsDirectionPair> OptionsDirectionPairList;
+
+    // Delegation mode which can be administered
+
+    enum DelegationMode {
+	SecDelModeNoDelegation,                    // i.e. use own credentials
+	SecDelModeSimpleDelegation,   // delegate received credentials 
+	SecDelModeCompositeDelegation  // delegate both; 
+    };
+
+    // Association options supported by a given mech type
+
+    struct MechandOptions {
+	MechanismType            mechanism_type;
+	AssociationOptions       options_supported;
+    };
+
+    typedef sequence <MechandOptions>                         MechandOptionsList;
+
+    // Attribute of the SecurityLevel2::EstablishTrustPolicy
+
+    struct EstablishTrust {
+	boolean trust_in_client;
+	boolean trust_in_target;
+    };
+
+    // Audit 
+
+    typedef unsigned long                                     AuditChannelId;
+
+    typedef unsigned short                                     EventType;
+
+    const EventType            AuditAll = 0;
+    const EventType            AuditPrincipalAuth = 1;
+    const EventType            AuditSessionAuth = 2;
+    const EventType            AuditAuthorization = 3;
+    const EventType            AuditInvocation = 4;
+    const EventType            AuditSecEnvChange = 5;
+    const EventType            AuditPolicyChange = 6;
+    const EventType            AuditObjectCreation = 7;
+    const EventType            AuditObjectDestruction = 8;
+    const EventType            AuditNonRepudiation = 9;
+
+
+    enum DayOfTheWeek {
+	Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday};
+
+    enum AuditCombinator { 
+	SecAllSelectors, 
+	SecAnySelector 
+    }; 
+
+    struct AuditEventType {
+	ExtensibleFamily            event_family;
+	EventType                   event_type;
+    };
+    typedef 
+	sequence 
+	<AuditEventType> AuditEventTypeList;
+
+    typedef unsigned long                                   SelectorType;
+
+    const SelectorType            InterfaceName = 1;
+    const SelectorType            ObjectRef = 2;
+    const SelectorType            Operation = 3;
+    const SelectorType            Initiator = 4;
+    const SelectorType            SuccessFailure = 5;
+    const SelectorType            Time = 6;
+    const SelectorType            DayOfWeek = 7;
+
+    // values defined for audit_needed and audit_write are:
+    // InterfaceName: CORBA::RepositoryId
+    // ObjectRef: object reference
+    // Operation: op_name 
+    // Initiator: Credentials
+    // SuccessFailure: boolean
+    // Time: utc time on audit_write; time picked up from
+    //                  environment in audit_needed if required
+    // DayOfWeek: DayOfTheWeek
+
+    struct SelectorValue {
+	SelectorType           selector;
+	any                    value;
+    };
+    typedef sequence <SelectorValue>  SelectorValueList;
+
+    // Constant declaration for valid Security Policy Types
+
+    // General administrative policies
+    const CORBA::PolicyType SecClientInvocationAccess = 1;
+    const CORBA::PolicyType SecTargetInvocationAccess = 2;
+    const CORBA::PolicyType SecApplicationAccess = 3;
+    const CORBA::PolicyType SecClientInvocationAudit = 4;
+    const CORBA::PolicyType SecTargetInvocationAudit = 5;
+    const CORBA::PolicyType SecApplicationAudit = 6;
+    const CORBA::PolicyType SecDelegation = 7;
+    const CORBA::PolicyType SecClientSecureInvocation = 8;
+    const CORBA::PolicyType SecTargetSecureInvocation = 9;
+    const CORBA::PolicyType SecNonRepudiation = 10;
+
+    // Policies used to control attributes of a binding to a target
+    const CORBA::PolicyType SecMechanismsPolicy = 12;
+    const CORBA::PolicyType SecInvocationCredentialsPolicy = 13;
+    const CORBA::PolicyType SecFeaturePolicy = 14; // obsolete
+    const CORBA::PolicyType SecQOPPolicy = 15;
+
+    const CORBA::PolicyType SecDelegationDirectivePolicy = 38;
+    const CORBA::PolicyType SecEstablishTrustPolicy = 39;
+};
+#endif /* _SECURITY_IDL_ */

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SecurityAdmin.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SecurityAdmin.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SecurityAdmin.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,127 +1,127 @@
-#ifndef _SECURITY_ADMIN_IDL
-#define _SECURITY_ADMIN_IDL
-
-#pragma prefix "omg.org"
-#include <SecurityLevel2.idl>
-
-module SecurityAdmin 
-{
-
-    // interface AccessPolicy
-    interface AccessPolicy : CORBA::Policy 
-    {
-
-	Security::RightsList get_effective_rights (
-		     in      Security::AttributeList            attrib_list,
-		     in Security::ExtensibleFamily  rights_family
-		     );
-
-	Security::RightsList get_all_effective_rights( 
-		     in     Security::AttributeList            attrib_list 
-		     ); 
-    };
-
-    // interface DomainAccessPolicy
-    interface DomainAccessPolicy : AccessPolicy 
-    {
-
-	void grant_rights(
-			  in Security::SecAttribute                  priv_attr,
-			  in Security::DelegationState               del_state,
-			  in Security::RightsList                    rights
-			  );
-
-	void revoke_rights(
-                           in Security::SecAttribute                  priv_attr,
-                           in Security::DelegationState               del_state,
-                           in Security::RightsList                    rights
-			   );
-
-	void replace_rights (
-			     in Security::SecAttribute                  priv_attr,
-			     in Security::DelegationState               del_state,
-			     in Security::RightsList                    rights
-			     );
-
-	Security::RightsList get_rights (
-			   in Security::SecAttribute                  priv_attr,
-			   in Security::DelegationState               del_state,
-			   in Security::ExtensibleFamily  rights_family
-			   );
-
-	Security::RightsList get_all_rights( 
-			   in     Security::SecAttribute                                   priv_attr, 
-			   in     Security::DelegationState                                del_state 
-			   ); 
-    };
-
-    // interface AuditPolicy
-    interface AuditPolicy : CORBA::Policy 
-    {
-
-	void set_audit_selectors (
-                    in      CORBA::RepositoryId                                      object_type,
-		    in      Security::AuditEventTypeList                             events,
-		    in      Security::SelectorValueList                              selectors,
-		    in Security::AuditCombinator  audit_combinator 
-		    );
-
-	void clear_audit_selectors (
-		    in      CORBA::RepositoryId                                      object_type,
-		    in      Security::AuditEventTypeList                             events 
-		    );
-
-	void replace_audit_selectors (
-		in      CORBA::RepositoryId                                     object_type,
-		in      Security::AuditEventTypeList                             events,
-		in      Security::SelectorValueList                              selectors,
-		in Security::AuditCombinator  audit_combinator 
-		); 
-
-	void get_audit_selectors (
-		   in      CORBA::RepositoryId                                      object_type,
-		   in      Security::AuditEventType event_type,
-		   out     Security::SelectorValueList                              selectors,
-		   out Security::AuditCombinator                                    audit_combinator 
-		   ); 
-
-	void set_audit_channel (
-		in      Security::AuditChannelId                                 audit_channel_id
-		);
-    };
-
-    // interface SecureInvocationPolicy
-    
-    interface SecureInvocationPolicy : CORBA::Policy 
-    {
-
-	void set_association_options(
-		in CORBA::InterfaceDef                                           object_type,
-		in Security::RequiresSupports                                    requires_supports,
-		in Security::CommunicationDirection  direction,
-		in Security::AssociationOptions                                  options 
-		);
-
-	Security::AssociationOptions get_association_options(
-		in CORBA::InterfaceDef                           object_type,
-		in Security::RequiresSupports                    requires_supports,
-		in Security::CommunicationDirection direction
-		); 
-    };
-
-    // interface DelegationPolicy
-    interface DelegationPolicy : CORBA::Policy 
-    {
-
-	void set_delegation_mode(
-		in CORBA::InterfaceDef                           object_type,
-		in Security::DelegationMode                      mode
-		);
-
-	Security::DelegationMode get_delegation_mode(
-		in CORBA::InterfaceDef                           object_type
-		);
-    };
-};
-
-#endif /* _SECURITY_ADMIN_IDL_ */
+#ifndef _SECURITY_ADMIN_IDL
+#define _SECURITY_ADMIN_IDL
+
+#pragma prefix "omg.org"
+#include <SecurityLevel2.idl>
+
+module SecurityAdmin 
+{
+
+    // interface AccessPolicy
+    interface AccessPolicy : CORBA::Policy 
+    {
+
+	Security::RightsList get_effective_rights (
+		     in      Security::AttributeList            attrib_list,
+		     in Security::ExtensibleFamily  rights_family
+		     );
+
+	Security::RightsList get_all_effective_rights( 
+		     in     Security::AttributeList            attrib_list 
+		     ); 
+    };
+
+    // interface DomainAccessPolicy
+    interface DomainAccessPolicy : AccessPolicy 
+    {
+
+	void grant_rights(
+			  in Security::SecAttribute                  priv_attr,
+			  in Security::DelegationState               del_state,
+			  in Security::RightsList                    rights
+			  );
+
+	void revoke_rights(
+                           in Security::SecAttribute                  priv_attr,
+                           in Security::DelegationState               del_state,
+                           in Security::RightsList                    rights
+			   );
+
+	void replace_rights (
+			     in Security::SecAttribute                  priv_attr,
+			     in Security::DelegationState               del_state,
+			     in Security::RightsList                    rights
+			     );
+
+	Security::RightsList get_rights (
+			   in Security::SecAttribute                  priv_attr,
+			   in Security::DelegationState               del_state,
+			   in Security::ExtensibleFamily  rights_family
+			   );
+
+	Security::RightsList get_all_rights( 
+			   in     Security::SecAttribute                                   priv_attr, 
+			   in     Security::DelegationState                                del_state 
+			   ); 
+    };
+
+    // interface AuditPolicy
+    interface AuditPolicy : CORBA::Policy 
+    {
+
+	void set_audit_selectors (
+                    in      CORBA::RepositoryId                                      object_type,
+		    in      Security::AuditEventTypeList                             events,
+		    in      Security::SelectorValueList                              selectors,
+		    in Security::AuditCombinator  audit_combinator 
+		    );
+
+	void clear_audit_selectors (
+		    in      CORBA::RepositoryId                                      object_type,
+		    in      Security::AuditEventTypeList                             events 
+		    );
+
+	void replace_audit_selectors (
+		in      CORBA::RepositoryId                                     object_type,
+		in      Security::AuditEventTypeList                             events,
+		in      Security::SelectorValueList                              selectors,
+		in Security::AuditCombinator  audit_combinator 
+		); 
+
+	void get_audit_selectors (
+		   in      CORBA::RepositoryId                                      object_type,
+		   in      Security::AuditEventType event_type,
+		   out     Security::SelectorValueList                              selectors,
+		   out Security::AuditCombinator                                    audit_combinator 
+		   ); 
+
+	void set_audit_channel (
+		in      Security::AuditChannelId                                 audit_channel_id
+		);
+    };
+
+    // interface SecureInvocationPolicy
+    
+    interface SecureInvocationPolicy : CORBA::Policy 
+    {
+
+	void set_association_options(
+		in CORBA::InterfaceDef                                           object_type,
+		in Security::RequiresSupports                                    requires_supports,
+		in Security::CommunicationDirection  direction,
+		in Security::AssociationOptions                                  options 
+		);
+
+	Security::AssociationOptions get_association_options(
+		in CORBA::InterfaceDef                           object_type,
+		in Security::RequiresSupports                    requires_supports,
+		in Security::CommunicationDirection direction
+		); 
+    };
+
+    // interface DelegationPolicy
+    interface DelegationPolicy : CORBA::Policy 
+    {
+
+	void set_delegation_mode(
+		in CORBA::InterfaceDef                           object_type,
+		in Security::DelegationMode                      mode
+		);
+
+	Security::DelegationMode get_delegation_mode(
+		in CORBA::InterfaceDef                           object_type
+		);
+    };
+};
+
+#endif /* _SECURITY_ADMIN_IDL_ */

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SecurityLevel1.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SecurityLevel1.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SecurityLevel1.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,21 +1,21 @@
-// $Id: SecurityLevel1.idl,v 1.1.1.1 2001/03/17 18:08:13 brose Exp $
-
-#ifndef _SECURITY_LEVEL_1_IDL
-#define _SECURITY_LEVEL_1_IDL
-
-#pragma prefix "omg.org"
-
-#include <Security.idl>
-
-module SecurityLevel1 
-{		
-    interface Current : CORBA::Current 
-    {	
-	// Locality Constrained
-	// thread specific operations
-
-      Security::AttributeList get_attributes (in Security::AttributeTypeList attributes );
-    };
-	
-};
-#endif /* _SECURITY_LEVEL_1_IDL */
+// $Id: SecurityLevel1.idl,v 1.1.1.1 2001/03/17 18:08:13 brose Exp $
+
+#ifndef _SECURITY_LEVEL_1_IDL
+#define _SECURITY_LEVEL_1_IDL
+
+#pragma prefix "omg.org"
+
+#include <Security.idl>
+
+module SecurityLevel1 
+{		
+    interface Current : CORBA::Current 
+    {	
+	// Locality Constrained
+	// thread specific operations
+
+      Security::AttributeList get_attributes (in Security::AttributeTypeList attributes );
+    };
+	
+};
+#endif /* _SECURITY_LEVEL_1_IDL */

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SecurityLevel2.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SecurityLevel2.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SecurityLevel2.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,267 +1,267 @@
-// $Id: SecurityLevel2.idl,v 1.2 2002/05/08 14:49:08 gerald Exp $
-
-#ifndef _SECURITY_LEVEL_2_IDL
-#define _SECURITY_LEVEL_2_IDL
-
-#pragma prefix "omg.org"
-#include <SecurityLevel1.idl>
-
-module SecurityLevel2 
-{
-    // Forward declaration of interfaces
-    interface PrincipalAuthenticator;
-    interface Credentials;
-    interface Current;
-
-
-    interface PrincipalAuthenticator 
-    {
-	
-	// Locality Constrained
-
-	Security::AuthenticationMethodList get_supported_authen_methods(
-                in     Security::MechanismType                   mechanism
-		);
-
-	Security::AuthenticationStatus authenticate (
-		in Security::AuthenticationMethod method,
-		in Security::MechanismType        mechanism,
-		in Security::SecurityName         security_name,
-		in Security::Opaque               auth_data,
-		in Security::AttributeList        privileges,
-		out Credentials                   creds,
-		out Security::Opaque              continuation_data,
-		out Security::Opaque              auth_specific_data
-		);
-	
-	Security::AuthenticationStatus continue_authentication (
-		in    Security::Opaque            response_data,
-		in    Credentials                 creds,
-		out  Security::Opaque             continuation_data,
-		out  Security::Opaque             auth_specific_data
-		);
-    };
-    
-
-    interface Credentials 
-    {
-	// Locality Constrained
-	
-
-	Credentials copy ();
-
-	void destroy();
-
-	readonly attribute Security::InvocationCredentialsType credentials_type;
-	readonly attribute Security::AuthenticationStatus authentication_state;
-	readonly attribute Security::MechanismType mechanism;
-
-	attribute Security::AssociationOptions accepting_options_supported;
-	attribute Security::AssociationOptions accepting_options_required;
-	attribute Security::AssociationOptions invocation_options_supported;
-	attribute Security::AssociationOptions invocation_options_required;
-
-	boolean get_security_feature(
-		in    Security::CommunicationDirection           direction,
-		in    Security::SecurityFeature                  feature
-		);
-
-	boolean set_privileges (
-		in      boolean                                force_commit,
-		in      Security::AttributeList                requested_privileges,
-		out     Security::AttributeList                actual_privileges
-		);
-
-	Security::AttributeList get_attributes (in Security::AttributeTypeList attributes);
-
-	boolean is_valid (
-                out     Security::UtcT                         expiry_time
-		);
-
-	boolean refresh(
-		in      Security::Opaque                               refresh_data
-		);
-    };
-
-    typedef sequence <Credentials>                          CredentialsList;
-
-    interface ReceivedCredentials : Credentials 
-    {
-	// Locality Constrained
-	
-
-	readonly attribute Credentials  accepting_credentials;
-	readonly attribute Security::AssociationOptions association_options_used;
-	readonly attribute Security::DelegationState  delegation_state;
-	readonly attribute Security::DelegationMode delegation_mode;
-    };
-
-    // RequiredRights Interface
-
-    interface RequiredRights
-    {
-	void get_required_rights(
-		in Object                                      obj,
-		in CORBA::Identifier                           operation_name,
-		in CORBA::RepositoryId                         interface_name,
-		out Security::RightsList                       rights,
-		out Security::RightsCombinator rights_combinator
-		);
-
-	    void set_required_rights(
-		in CORBA::Identifier                     operation_name,
-		in     CORBA::RepositoryId               interface_name,
-		in Security::RightsList                  rights,
-		in Security::RightsCombinator            rights_combinator
-		);
-    };
-
-    // interface audit channel
-    interface AuditChannel 
-    {
-	// Locality Constrained
-	
-
-	void audit_write (
-		in     Security::AuditEventType                               event_type,
-		in     CredentialsList                                        creds,  
-		in     Security::UtcT                                         time,
-		in     Security::SelectorValueList                            descriptors,
-		in     Security::Opaque                                       event_specific_data
-		);
-	
-	readonly attribute Security::AuditChannelId  audit_channel_id;
-    };
-
-    // interface for Audit Decision 
-
-    interface AuditDecision 
-    {
-	// Locality Constrained
-	
-
-	boolean audit_needed (
-		in Security::AuditEventType                                   event_type,
-		in Security::SelectorValueList                                value_list
-		);
-
-	readonly attribute AuditChannel audit_channel;
-    };
-
-    interface AccessDecision 
-    {
-	// Locality Constrained
-	
-
-	boolean access_allowed (
-		in     SecurityLevel2::CredentialsList cred_list,
-		in     Object                          target,
-		in     CORBA::Identifier               operation_name,
-		in     CORBA::Identifier               target_interface_name
-		);
-    };
-
-    // Policy interfaces to control bindings
-
-    interface QOPPolicy : CORBA::Policy 
-    {
-	// Locality Constrained
-	
-	readonly attribute Security::QOP                 qop;
-    };
-
-
-    interface MechanismPolicy : CORBA::Policy 
-    {
-	// Locality Constrained
-	
-	readonly attribute Security::MechanismTypeList mechanisms;
-    };
-
-    interface InvocationCredentialsPolicy : CORBA::Policy 
-    {
-	// Locality Constrained
-	
-	readonly attribute CredentialsList                          creds;
-    };
-
-    interface EstablishTrustPolicy : CORBA::Policy 
-    {
-	// Locality Constrained
-	
-	readonly attribute Security::EstablishTrust                 trust;
-    };
-
-    interface DelegationDirectivePolicy : CORBA::Policy 
-    { 
-	// Locality Constrained
-	
-	readonly attribute Security::DelegationDirective  delegation_directive;
-    };
-
-    enum DelegationMode { Delegate, NoDelegate };
-
-
-    // Interface Current derived from SecurityLevel1::Current  providing 
-    // additional operations on Current at this security level. 
-    // This is implemented by the ORB
-
-    interface Current : SecurityLevel1::Current 
-    {
-	// Locality Constrained
-	
-	   
-	// Thread specific
-
-	readonly attribute ReceivedCredentials received_credentials;
-
-	void set_credentials (
-		 in      Security::CredentialType cred_type,
-		 in      CredentialsList                     creds,
-		 in      DelegationMode                      del
-		 );
-
-	CredentialsList get_credentials (
-       		 in      Security::CredentialType cred_type
-		 );
-
-	CORBA::Policy get_policy (
-	      	 in      CORBA::PolicyType                   policy_type
-		 );
-
-	void remove_own_credentials(
-      	         in      Credentials                         credentials
-		 );
-
-	    // Process/Capsule/ORB Instance specific operations
-
-	readonly attribute Security::MechandOptionsList              supported_mechanisms;
-	readonly attribute CredentialsList                 own_credentials;
-	readonly attribute RequiredRights                  required_rights_object;
-	readonly attribute PrincipalAuthenticator          principal_authenticator;
-	readonly attribute AccessDecision                  access_decision;
-	readonly attribute AuditDecision                   audit_decision;
-
-	// Security mechanism data for a given target
-	Security::SecurityMechanismDataList get_security_mechanisms (
-		in    Object                                 obj_ref
-		);
-
-	// Factory operations for local policies controlling bindings
-	QOPPolicy create_qop_policy(
-	        in    Security::QOP                          qop
-		);
-
-	MechanismPolicy create_mechanism_policy(
-	      	in    Security::MechanismTypeList                               mechanisms
-		);
-
-	InvocationCredentialsPolicy create_invoc_creds_policy(
-		in    CredentialsList                        creds
-		);
-    };
-};
-
-
-
-#endif /* _SECURITY_LEVEL_2_IDL */
+// $Id: SecurityLevel2.idl,v 1.3 2006/07/11 14:16:07 nick.cross Exp $
+
+#ifndef _SECURITY_LEVEL_2_IDL
+#define _SECURITY_LEVEL_2_IDL
+
+#pragma prefix "omg.org"
+#include <SecurityLevel1.idl>
+
+module SecurityLevel2
+{
+    // Forward declaration of interfaces
+    interface PrincipalAuthenticator;
+    interface Credentials;
+    interface Current;
+
+
+    interface PrincipalAuthenticator
+    {
+
+	// Locality Constrained
+
+	Security::AuthenticationMethodList get_supported_authen_methods(
+                in     Security::MechanismType                   mechanism
+		);
+
+	Security::AuthenticationStatus authenticate (
+		in Security::AuthenticationMethod method,
+		in Security::MechanismType        mechanism,
+		in Security::SecurityName         security_name,
+		in Security::Opaque               auth_data,
+		in Security::AttributeList        privileges,
+		out Credentials                   creds,
+		out Security::Opaque              continuation_data,
+		out Security::Opaque              auth_specific_data
+		);
+
+	Security::AuthenticationStatus continue_authentication (
+		in    Security::Opaque            response_data,
+		in    Credentials                 creds,
+		out  Security::Opaque             continuation_data,
+		out  Security::Opaque             auth_specific_data
+		);
+    };
+
+
+    interface Credentials
+    {
+	// Locality Constrained
+
+
+	Credentials copy ();
+
+	void destroy();
+
+	readonly attribute Security::InvocationCredentialsType credentials_type;
+	readonly attribute Security::AuthenticationStatus authentication_state;
+	readonly attribute Security::MechanismType mechanism;
+
+	attribute Security::AssociationOptions accepting_options_supported;
+	attribute Security::AssociationOptions accepting_options_required;
+	attribute Security::AssociationOptions invocation_options_supported;
+	attribute Security::AssociationOptions invocation_options_required;
+
+	boolean get_security_feature(
+		in    Security::CommunicationDirection           direction,
+		in    Security::SecurityFeature                  feature
+		);
+
+	boolean set_privileges (
+		in      boolean                                force_commit,
+		in      Security::AttributeList                requested_privileges,
+		out     Security::AttributeList                actual_privileges
+		);
+
+	Security::AttributeList get_attributes (in Security::AttributeTypeList attributes);
+
+	boolean is_valid (
+                out     Security::UtcT                         expiry_time
+		);
+
+	boolean refresh(
+		in      Security::Opaque                               refresh_data
+		);
+    };
+
+    typedef sequence <Credentials>                          CredentialsList;
+
+    interface ReceivedCredentials : Credentials
+    {
+	// Locality Constrained
+
+
+	readonly attribute Credentials  accepting_credentials;
+	readonly attribute Security::AssociationOptions association_options_used;
+	readonly attribute Security::DelegationState  delegation_state;
+	readonly attribute Security::DelegationMode delegation_mode;
+    };
+
+    // RequiredRights Interface
+
+    interface RequiredRights
+    {
+	void get_required_rights(
+		in Object                                      obj,
+		in CORBA::Identifier                           operation_name,
+		in CORBA::RepositoryId                         interface_name,
+		out Security::RightsList                       rights,
+		out Security::RightsCombinator rights_combinator
+		);
+
+	    void set_required_rights(
+		in CORBA::Identifier                     operation_name,
+		in     CORBA::RepositoryId               interface_name,
+		in Security::RightsList                  rights,
+		in Security::RightsCombinator            rights_combinator
+		);
+    };
+
+    // interface audit channel
+    interface AuditChannel
+    {
+	// Locality Constrained
+
+
+	void audit_write (
+		in     Security::AuditEventType                               event_type,
+		in     CredentialsList                                        creds,
+		in     Security::UtcT                                         time,
+		in     Security::SelectorValueList                            descriptors,
+		in     Security::Opaque                                       event_specific_data
+		);
+
+	readonly attribute Security::AuditChannelId  audit_channel_id;
+    };
+
+    // interface for Audit Decision
+
+    interface AuditDecision
+    {
+	// Locality Constrained
+
+
+	boolean audit_needed (
+		in Security::AuditEventType                                   event_type,
+		in Security::SelectorValueList                                value_list
+		);
+
+	readonly attribute AuditChannel audit_channel;
+    };
+
+    interface AccessDecision
+    {
+	// Locality Constrained
+
+
+	boolean access_allowed (
+		in     SecurityLevel2::CredentialsList cred_list,
+		in     Object                          target,
+		in     CORBA::Identifier               operation_name,
+		in     CORBA::Identifier               target_interface_name
+		);
+    };
+
+    // Policy interfaces to control bindings
+
+    interface QOPPolicy : CORBA::Policy
+    {
+	// Locality Constrained
+
+	readonly attribute Security::QOP                 qop;
+    };
+
+
+    interface MechanismPolicy : CORBA::Policy
+    {
+	// Locality Constrained
+
+	readonly attribute Security::MechanismTypeList mechanisms;
+    };
+
+    interface InvocationCredentialsPolicy : CORBA::Policy
+    {
+	// Locality Constrained
+
+	readonly attribute CredentialsList                          creds;
+    };
+
+    interface EstablishTrustPolicy : CORBA::Policy
+    {
+	// Locality Constrained
+
+	readonly attribute Security::EstablishTrust                 trust;
+    };
+
+    interface DelegationDirectivePolicy : CORBA::Policy
+    {
+	// Locality Constrained
+
+	readonly attribute Security::DelegationDirective  delegation_directive;
+    };
+
+    enum DelegationMode { Delegate, NoDelegate };
+
+
+    // Interface Current derived from SecurityLevel1::Current  providing
+    // additional operations on Current at this security level.
+    // This is implemented by the ORB
+
+    interface Current : SecurityLevel1::Current
+    {
+	// Locality Constrained
+
+
+	// Thread specific
+
+	readonly attribute ReceivedCredentials received_credentials;
+
+	void set_credentials (
+		 in      Security::CredentialType cred_type,
+		 in      CredentialsList                     creds,
+		 in      DelegationMode                      del
+		 );
+
+	CredentialsList get_credentials (
+       		 in      Security::CredentialType cred_type
+		 );
+
+	CORBA::Policy get_policy (
+	      	 in      CORBA::PolicyType                   policy_type
+		 );
+
+	void remove_own_credentials(
+      	         in      Credentials                         credentials_
+		 );
+
+	    // Process/Capsule/ORB Instance specific operations
+
+	readonly attribute Security::MechandOptionsList              supported_mechanisms;
+	readonly attribute CredentialsList                 own_credentials;
+	readonly attribute RequiredRights                  required_rights_object;
+	readonly attribute PrincipalAuthenticator          principal_authenticator;
+	readonly attribute AccessDecision                  access_decision;
+	readonly attribute AuditDecision                   audit_decision;
+
+	// Security mechanism data for a given target
+	Security::SecurityMechanismDataList get_security_mechanisms (
+		in    Object                                 obj_ref
+		);
+
+	// Factory operations for local policies controlling bindings
+	QOPPolicy create_qop_policy(
+	        in    Security::QOP                          qop_
+		);
+
+	MechanismPolicy create_mechanism_policy(
+	      	in    Security::MechanismTypeList                               mechanisms
+		);
+
+	InvocationCredentialsPolicy create_invoc_creds_policy(
+		in    CredentialsList                        creds
+		);
+    };
+};
+
+
+
+#endif /* _SECURITY_LEVEL_2_IDL */

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SecurityReplaceable.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SecurityReplaceable.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SecurityReplaceable.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,143 +1,143 @@
-// taken from OMG Security Service Spec. V 1.5
-
-#ifndef _SECURITY_REPLACEABLE_IDL
-#define _SECURITY_REPLACEABLE_IDL
-
-#pragma prefix "omg.org"
-
-#include <SecurityLevel2.idl>
-
-module SecurityReplaceable 
-{
-
-    interface SecurityContext;
-    interface ClientSecurityContext;
-    interface ServerSecurityContext;
-
-    interface Vault 
-    {                            
-	    // Locality Constrained
-
-	Security::AuthenticationMethodList get_supported_authen_methods(
-		in Security::MechanismType mechanism
-		);
-
-	Security::AuthenticationStatus acquire_credentials(
-		in       Security::AuthenticationMethod method,
-		in       Security::MechanismType                 mechanism,
-		in       Security::SecurityName security_name,
-		in       Security::Opaque auth_data,
-		in       Security::AttributeList                 privileges,
-		out      SecurityLevel2::Credentials creds,
-		out      Security::Opaque                        continuation_data,
-		out      Security::Opaque                        auth_specific_data
-		);
-
-	Security::AuthenticationStatus continue_credentials_acquisition(
-		in       Security::Opaque response_data,
-		in       SecurityLevel2::Credentials             creds,
-		out      Security::Opaque                        continuation_data,
-		out      Security::Opaque                        auth_specific_data
-		);
-
-	Security::AssociationStatus init_security_context (
-	        in  SecurityLevel2::Credentials   creds,
-		in Security::SecurityName         target_security_name,
-		in Object                         target,
-		in Security::DelegationMode       delegation_mode,
-		in Security::OptionsDirectionPairList association_options,
-		in Security::MechanismType        mechanism,
-		in     Security::Opaque           mech_data, //from IOR
-		in Security::Opaque               chan_binding,
-		out Security::OpaqueBuffer        security_token,
-		out ClientSecurityContext         security_context
-		);
-	
-	Security::AssociationStatus accept_security_context (
-		in SecurityLevel2::CredentialsList creds_list,
-		in Security::Opaque                chan_bindings,
-		in Security::OpaqueBuffer          in_token,
-		out Security::OpaqueBuffer         out_token,
-		out    ServerSecurityContext       security_context
-		);
-
-	Security::MechandOptionsList get_supported_mechs ();
-    };
-
-    interface SecurityContext 
-    {              // Locality Constrained
-
-	readonly attribute Security::SecurityContextType    context_type; 
-	readonly attribute Security::SecurityContextState   context_state; 
-	readonly attribute Security::MechanismType          mechanism; 
-	readonly attribute boolean                          supports_refresh; 
-	readonly attribute Security::Opaque                 chan_binding; 
-	readonly attribute SecurityLevel2::ReceivedCredentials received_credentials;
-
-	Security::AssociationStatus continue_security_context (
-		in     Security::OpaqueBuffer in_token,
-		out    Security::OpaqueBuffer out_token
-		);
-
-
-	void protect_message (
-		in      Security::OpaqueBuffer message,
-		in      Security::QOP                       qop,
-		out     Security::OpaqueBuffer              text_buffer,
-		out     Security::OpaqueBuffer              token
-		);
-
-	boolean reclaim_message (
-		in      Security::OpaqueBuffer text_buffer,
-		in      Security::OpaqueBuffer token,
-		out     Security::QOP                       qop,
-		out     Security::OpaqueBuffer message
-		);
-
-	boolean is_valid (out Security::UtcT  expiry_time );
-
-	boolean refresh_security_context (
-		in      Security::Opaque refresh_data,
-		out     Security::OpaqueBuffer out_token
-		);
-
-	boolean process_refresh_token (
-		in      Security::OpaqueBuffer refresh_token
-		);
-
-	boolean discard_security_context (
-       	        in      Security::Opaque discard_data,
-		out     Security::OpaqueBuffer out_token
-		);
-
-	boolean process_discard_token (
-		in      Security::OpaqueBuffer discard_token
-		);
-    };
-
-
-    interface ClientSecurityContext : SecurityContext 
-    {
-	// Locality Constrained
-	readonly attribute Security::AssociationOptions  association_options_used; 
-	readonly attribute Security::DelegationMode      delegation_mode; 
-	readonly attribute Security::Opaque              mech_data; 
-	readonly attribute SecurityLevel2::Credentials         client_credentials; 
-	readonly attribute Security::AssociationOptions  server_options_supported; 
-	readonly attribute Security::Opaque server_security_name;
-    };
-
-    interface ServerSecurityContext : SecurityContext 
-    {
-	// Locality Constrained
-	readonly attribute Security::AssociationOptions
-	    association_options_used; 
-	readonly attribute Security::DelegationMode
-	    delegation_mode; 
-	readonly attribute SecurityLevel2::Credentials server_credentials; 
-	readonly attribute Security::AssociationOptions  server_options_supported; 
-	readonly attribute Security::Opaque server_security_name;
-    };
-};
-
-#endif /* _SECURITY_REPLACEABLE_IDL_ */
+// taken from OMG Security Service Spec. V 1.5
+
+#ifndef _SECURITY_REPLACEABLE_IDL
+#define _SECURITY_REPLACEABLE_IDL
+
+#pragma prefix "omg.org"
+
+#include <SecurityLevel2.idl>
+
+module SecurityReplaceable
+{
+
+    interface SecurityContext;
+    interface ClientSecurityContext;
+    interface ServerSecurityContext;
+
+    interface Vault
+    {
+	    // Locality Constrained
+
+	Security::AuthenticationMethodList get_supported_authen_methods(
+		in Security::MechanismType mechanism
+		);
+
+	Security::AuthenticationStatus acquire_credentials(
+		in       Security::AuthenticationMethod method,
+		in       Security::MechanismType                 mechanism,
+		in       Security::SecurityName security_name,
+		in       Security::Opaque auth_data,
+		in       Security::AttributeList                 privileges,
+		out      SecurityLevel2::Credentials creds,
+		out      Security::Opaque                        continuation_data,
+		out      Security::Opaque                        auth_specific_data
+		);
+
+	Security::AuthenticationStatus continue_credentials_acquisition(
+		in       Security::Opaque response_data,
+		in       SecurityLevel2::Credentials             creds,
+		out      Security::Opaque                        continuation_data,
+		out      Security::Opaque                        auth_specific_data
+		);
+
+	Security::AssociationStatus init_security_context (
+	        in  SecurityLevel2::Credentials   creds,
+		in Security::SecurityName         target_security_name,
+		in Object                         target,
+		in Security::DelegationMode       delegation_mode,
+		in Security::OptionsDirectionPairList association_options,
+		in Security::MechanismType        mechanism,
+		in     Security::Opaque           mech_data, //from IOR
+		in Security::Opaque               chan_binding,
+		out Security::OpaqueBuffer        security_token,
+		out ClientSecurityContext         security_context
+		);
+
+	Security::AssociationStatus accept_security_context (
+		in SecurityLevel2::CredentialsList creds_list,
+		in Security::Opaque                chan_bindings,
+		in Security::OpaqueBuffer          in_token,
+		out Security::OpaqueBuffer         out_token,
+		out    ServerSecurityContext       security_context
+		);
+
+	Security::MechandOptionsList get_supported_mechs ();
+    };
+
+    interface SecurityContext
+    {              // Locality Constrained
+
+	readonly attribute Security::SecurityContextType    context_type;
+	readonly attribute Security::SecurityContextState   context_state;
+	readonly attribute Security::MechanismType          mechanism;
+	readonly attribute boolean                          supports_refresh;
+	readonly attribute Security::Opaque                 chan_binding;
+	readonly attribute SecurityLevel2::ReceivedCredentials received_credentials;
+
+	Security::AssociationStatus continue_security_context (
+		in     Security::OpaqueBuffer in_token,
+		out    Security::OpaqueBuffer out_token
+		);
+
+
+	void protect_message (
+		in      Security::OpaqueBuffer message,
+		in      Security::QOP                       qop_,
+		out     Security::OpaqueBuffer              text_buffer,
+		out     Security::OpaqueBuffer              token
+		);
+
+	boolean reclaim_message (
+		in      Security::OpaqueBuffer text_buffer,
+		in      Security::OpaqueBuffer token,
+		out     Security::QOP                       qop_,
+		out     Security::OpaqueBuffer message
+		);
+
+	boolean is_valid (out Security::UtcT  expiry_time );
+
+	boolean refresh_security_context (
+		in      Security::Opaque refresh_data,
+		out     Security::OpaqueBuffer out_token
+		);
+
+	boolean process_refresh_token (
+		in      Security::OpaqueBuffer refresh_token
+		);
+
+	boolean discard_security_context (
+       	        in      Security::Opaque discard_data,
+		out     Security::OpaqueBuffer out_token
+		);
+
+	boolean process_discard_token (
+		in      Security::OpaqueBuffer discard_token
+		);
+    };
+
+
+    interface ClientSecurityContext : SecurityContext
+    {
+	// Locality Constrained
+	readonly attribute Security::AssociationOptions  association_options_used;
+	readonly attribute Security::DelegationMode      delegation_mode;
+	readonly attribute Security::Opaque              mech_data;
+	readonly attribute SecurityLevel2::Credentials         client_credentials;
+	readonly attribute Security::AssociationOptions  server_options_supported;
+	readonly attribute Security::Opaque server_security_name;
+    };
+
+    interface ServerSecurityContext : SecurityContext
+    {
+	// Locality Constrained
+	readonly attribute Security::AssociationOptions
+	    association_options_used;
+	readonly attribute Security::DelegationMode
+	    delegation_mode;
+	readonly attribute SecurityLevel2::Credentials server_credentials;
+	readonly attribute Security::AssociationOptions  server_options_supported;
+	readonly attribute Security::Opaque server_security_name;
+    };
+};
+
+#endif /* _SECURITY_REPLACEABLE_IDL_ */

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SystemException.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SystemException.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/SystemException.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,58 +1,58 @@
-/**
- * Definitions of all CORBA System Exceptions defined in the CORBA module.
- * We need the Helper classes generated for these exceptions but we do not
- * want the code for the Exception classes or Holder classes.
- */
-
-#ifndef _SYSEX_IDL
-#define _SYSEX_IDLx1
-
-
-#pragma prefix "omg.org"
-
-module CORBA 
-{
-    // Note: this used to be 'completion_status' but was renamed to
-    // CompletionStatus in the Java mapping
-
-    enum CompletionStatus { COMPLETED_YES, COMPLETED_NO, COMPLETED_MAYBE };
-
-#define ex_body { unsigned long minor; CompletionStatus completed;}
-	
-    exception UNKNOWN  ex_body;
-    exception BAD_PARAM  ex_body;
-    exception NO_MEMORY  ex_body;
-    exception IMP_LIMIT  ex_body;
-    exception COMM_FAILURE  ex_body;
-    exception INV_OBJREF  ex_body;
-    exception NO_PERMISSION  ex_body;
-    exception INTERNAL  ex_body;
-    exception MARSHAL  ex_body;
-    exception INITIALIZE  ex_body;
-    exception NO_IMPLEMENT  ex_body;
-    exception BAD_TYPECODE  ex_body;
-    exception BAD_OPERATION  ex_body;
-    exception NO_RESOURCES  ex_body;
-    exception NO_RESPONSE  ex_body;
-    exception PERSIST_STORE  ex_body;
-    exception BAD_INV_ORDER  ex_body;
-    exception TRANSIENT  ex_body;
-    exception FREE_MEM  ex_body;
-    exception INV_IDENT  ex_body;
-    exception INV_FLAG  ex_body;
-    exception INTF_REPOS  ex_body;
-    exception BAD_CONTEXT  ex_body;
-    exception OBJ_ADAPTER  ex_body;
-    exception DATA_CONVERSION  ex_body;
-    exception OBJECT_NOT_EXIST  ex_body;
-    exception TRANSACTION_REQUIRED  ex_body;
-    exception TRANSACTION_ROLLEDBACK  ex_body;
-    exception INVALID_TRANSACTION ex_body;
-    exception INV_POLICY ex_body;
-    exception CODESET_INCOMPATIBLE ex_body;
-    exception TRANSACTION_MODE ex_body;
-    exception TRANSACTION_UNAVAILABLE ex_body;
-
-};
-
-#endif /* _SYSEX_IDL */
+/**
+ * Definitions of all CORBA System Exceptions defined in the CORBA module.
+ * We need the Helper classes generated for these exceptions but we do not
+ * want the code for the Exception classes or Holder classes.
+ */
+
+#ifndef _SYSEX_IDL
+#define _SYSEX_IDLx1
+
+
+#pragma prefix "omg.org"
+
+module CORBA 
+{
+    // Note: this used to be 'completion_status' but was renamed to
+    // CompletionStatus in the Java mapping
+
+    enum CompletionStatus { COMPLETED_YES, COMPLETED_NO, COMPLETED_MAYBE };
+
+#define ex_body { unsigned long minor; CompletionStatus completed;}
+	
+    exception UNKNOWN  ex_body;
+    exception BAD_PARAM  ex_body;
+    exception NO_MEMORY  ex_body;
+    exception IMP_LIMIT  ex_body;
+    exception COMM_FAILURE  ex_body;
+    exception INV_OBJREF  ex_body;
+    exception NO_PERMISSION  ex_body;
+    exception INTERNAL  ex_body;
+    exception MARSHAL  ex_body;
+    exception INITIALIZE  ex_body;
+    exception NO_IMPLEMENT  ex_body;
+    exception BAD_TYPECODE  ex_body;
+    exception BAD_OPERATION  ex_body;
+    exception NO_RESOURCES  ex_body;
+    exception NO_RESPONSE  ex_body;
+    exception PERSIST_STORE  ex_body;
+    exception BAD_INV_ORDER  ex_body;
+    exception TRANSIENT  ex_body;
+    exception FREE_MEM  ex_body;
+    exception INV_IDENT  ex_body;
+    exception INV_FLAG  ex_body;
+    exception INTF_REPOS  ex_body;
+    exception BAD_CONTEXT  ex_body;
+    exception OBJ_ADAPTER  ex_body;
+    exception DATA_CONVERSION  ex_body;
+    exception OBJECT_NOT_EXIST  ex_body;
+    exception TRANSACTION_REQUIRED  ex_body;
+    exception TRANSACTION_ROLLEDBACK  ex_body;
+    exception INVALID_TRANSACTION ex_body;
+    exception INV_POLICY ex_body;
+    exception CODESET_INCOMPATIBLE ex_body;
+    exception TRANSACTION_MODE ex_body;
+    exception TRANSACTION_UNAVAILABLE ex_body;
+
+};
+
+#endif /* _SYSEX_IDL */

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/TimeBase.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/TimeBase.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/TimeBase.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,39 +1,39 @@
-// $Id: TimeBase.idl,v 1.1.1.1 2001/03/17 18:08:13 brose Exp $
-
-#ifndef _TIME_BASE_IDL
-#define _TIME_BASE_IDL
-#pragma prefix "omg.org"
-
-#include <orb.idl>
-
-module TimeBase 
-{
-		
-#ifdef NOLONGLONG
-    struct ulonglong {
-	unsigned long low;
-	unsigned long high;
-    };
-    typedef ulonglong TimeT;
-#else
-    typedef unsigned long long TimeT;
-#endif
-		
-    typedef TimeT              InaccuracyT;
-    typedef short              TdfT;
-		
-    struct UtcT {
-	TimeT            time;    // 8 octets
-	unsigned long    inacclo; // 4 octets
-	unsigned short   inacchi; // 4 octets
-	TdfT             tdf;     // 2 octets
-	// total 16 octets
-    };
-		
-    struct IntervalT {
-	TimeT            lower_bound;
-	TimeT            upper_bound;
-    };
-
-};
-#endif /* _TIME_BASE_IDL */
+// $Id: TimeBase.idl,v 1.1.1.1 2001/03/17 18:08:13 brose Exp $
+
+#ifndef _TIME_BASE_IDL
+#define _TIME_BASE_IDL
+#pragma prefix "omg.org"
+
+#include <orb.idl>
+
+module TimeBase 
+{
+		
+#ifdef NOLONGLONG
+    struct ulonglong {
+	unsigned long low;
+	unsigned long high;
+    };
+    typedef ulonglong TimeT;
+#else
+    typedef unsigned long long TimeT;
+#endif
+		
+    typedef TimeT              InaccuracyT;
+    typedef short              TdfT;
+		
+    struct UtcT {
+	TimeT            time;    // 8 octets
+	unsigned long    inacclo; // 4 octets
+	unsigned short   inacchi; // 4 octets
+	TdfT             tdf;     // 2 octets
+	// total 16 octets
+    };
+		
+    struct IntervalT {
+	TimeT            lower_bound;
+	TimeT            upper_bound;
+    };
+
+};
+#endif /* _TIME_BASE_IDL */

Added: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/dds_dcps.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/dds_dcps.idl	                        (rev 0)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/dds_dcps.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -0,0 +1,769 @@
+#define DOMAINID_TYPE_NATIVE long
+#define HANDLE_TYPE_NATIVE long
+#define HANDLE_NIL_NATIVE 0
+#define BUILTIN_TOPIC_KEY_TYPE_NATIVE long
+#define TheParticipantFactory
+#define PARTICIPANT_QOS_DEFAULT
+#define TOPIC_QOS_DEFAULT
+#define PUBLISHER_QOS_DEFAULT
+#define SUBSCRIBER_QOS_DEFAULT
+#define DATAWRITER_QOS_DEFAULT
+#define DATAREADER_QOS_DEFAULT
+#define DATAWRITER_QOS_USE_TOPIC_QOS
+#define DATAREADER_QOS_USE_TOPIC_QOS
+
+#pragma prefix "omg.org"
+module dds {
+        typedef DOMAINID_TYPE_NATIVE DomainId_t;
+	typedef   HANDLE_TYPE_NATIVE  InstanceHandle_t;
+	typedef   BUILTIN_TOPIC_KEY_TYPE_NATIVE BuiltinTopicKey_t[3];
+	typedef   sequence<InstanceHandle_t> InstanceHandleSeq;
+	typedef long   ReturnCode_t;
+	typedef   long QosPolicyId_t;
+	typedef sequence<string> StringSeq;
+
+	struct Duration_t {
+	  long sec;
+	   unsigned long nanosec;
+	};
+
+	struct Time_t {
+  	  long sec;
+	  unsigned long nanosec;
+	};
+	// ----------------------------------------------------------------------
+	// Pre-defined values
+	
+	// ----------------------------------------------------------------------
+	const InstanceHandle_t HANDLE_NIL = HANDLE_NIL_NATIVE;
+	const long LENGTH_UNLIMITED = -1;
+	const long DURATION_INFINITY_SEC = 0x7ffffff;
+	const unsigned long DURATION_INFINITY_NSEC = 0x7ffffff;
+	const long DURATION_ZERO_SEC = 0;
+	const unsigned long DURATION_ZERO_NSEC = 0;
+	const long TIMESTAMP_INVALID_SEC = -1;
+	const unsigned long TIMESTAMP_INVALID_NSEC = 0xffffffff;
+	// ----------------------------------------------------------------------
+	// Return codes
+	// ----------------------------------------------------------------------
+	const ReturnCode_t RETCODE_OK = 0;
+	const ReturnCode_t RETCODE_ERROR = 1;
+	const ReturnCode_t RETCODE_UNSUPPORTED = 2;
+	const ReturnCode_t   RETCODE_BAD_PARAMETER =   3;
+	const ReturnCode_t   RETCODE_PRECONDITION_NOT_MET =   4;
+	const ReturnCode_t   RETCODE_OUT_OF_RESOURCES =   5;
+	const ReturnCode_t   RETCODE_NOT_ENABLED =   6;
+	const ReturnCode_t   RETCODE_IMMUTABLE_POLICY =  7;
+	const ReturnCode_t   RETCODE_INCONSISTENT_POLICY =  8;
+	const ReturnCode_t   RETCODE_ALREADY_DELETED =   9;
+	const ReturnCode_t   RETCODE_TIMEOUT =  10;
+	const ReturnCode_t   RETCODE_NO_DATA =   11;
+	// ----------------------------------------------------------------------
+	// Status to support listeners and conditions
+	// ----------------------------------------------------------------------
+	typedef unsigned long StatusKind;
+	typedef unsigned long StatusKindMask; // bit-mask StatusKind
+	const StatusKind INCONSISTENT_TOPIC_STATUS = 0x0001 << 0;
+	const StatusKind OFFERED_DEADLINE_MISSED_STATUS = 0x0001 << 1;
+	const StatusKind   REQUESTED_DEADLINE_MISSED_STATUS = 0x0001 <<   2;
+	const StatusKind   OFFERED_INCOMPATIBLE_QOS_STATUS = 0x0001 <<   5;
+	const StatusKind   REQUESTED_INCOMPATIBLE_QOS_STATUS = 0x0001 <<   6;
+	const StatusKind   SAMPLE_LOST_STATUS= 0x0001 <<   7;
+	const StatusKind   SAMPLE_REJECTED_STATUS = 0x0001 <<   8;
+		  
+	const StatusKind   DATA_ON_READERS_STATUS = 0x0001 <<   9;
+	const StatusKind   DATA_AVAILABLE_STATUS = 0x0001 <<   10;
+	const StatusKind   LIVELINESS_LOST_STATUS = 0x0001 <<  11;
+	const StatusKind   LIVELINESS_CHANGED_STATUS = 0x0001 <<   12;
+	const StatusKind   PUBLICATION_MATCH_STATUS = 0x0001 <<   13;
+	const StatusKind   SUBSCRIPTION_MATCH_STATUS = 	0x0001 <<   14;
+
+	struct InconsistentTopicStatus {
+		long total_count;
+		long total_count_change;
+	};
+	struct SampleLostStatus {
+		long total_count;
+		long total_count_change;
+	};
+	enum SampleRejectedStatusKind {
+		REJECTED_BY_INSTANCE_LIMIT,
+		REJECTED_BY_TOPIC_LIMIT
+	};
+
+	struct SampleRejectedStatus {
+ 	long total_count;
+	long total_count_change;
+	SampleRejectedStatusKind last_reason;
+	InstanceHandle_t last_instance_handle;
+	};
+	struct LivelinessLostStatus {
+		long total_count;
+		long total_count_change;
+	};
+	struct LivelinessChangedStatus {
+		long active_count;
+		long inactive_count;
+		long active_count_change;
+		long inactive_count_change;
+	};
+	struct OfferedDeadlineMissedStatus {
+		long total_count;
+		long total_count_change;
+		InstanceHandle_t last_instance_handle;
+	};
+		
+	struct RequestedDeadlineMissedStatus {
+		long total_count;
+		long total_count_change;
+		InstanceHandle_t last_instance_handle;
+	};
+	struct QosPolicyCount {
+		QosPolicyId_t policy_id;
+		long count;
+	};
+	typedef sequence<QosPolicyCount> QosPolicyCountSeq;
+	struct OfferedIncompatibleQosStatus {
+		long total_count;
+		long total_count_change;
+		QosPolicyId_t last_policy_id;
+		  QosPolicyCountSeq policies;
+	};
+
+	struct RequestedIncompatibleQosStatus {
+		long total_count;
+		long total_count_change;
+		QosPolicyId_t last_policy_id;
+		  QosPolicyCountSeq policies;
+	};
+		struct PublicationMatchStatus {
+		long total_count;
+		long total_count_change;
+		InstanceHandle_t last_subscription_handle;
+		};
+		struct SubscriptionMatchStatus {
+		long total_count;
+		long total_count_change;
+		InstanceHandle_t last_publication_handle;
+		};
+		// ----------------------------------------------------------------------
+		// Listeners
+		// ----------------------------------------------------------------------
+		interface Listener;
+		interface   Entity;
+		interface   TopicDescription;
+		interface Topic;
+		interface ContentFilteredTopic;
+		interface MultiTopic;
+		interface DataWriter;
+		interface DataReader;
+		interface Subscriber;
+		interface Publisher;
+		
+		typedef sequence<Topic> TopicSeq;
+		typedef sequence<DataReader> DataReaderSeq;
+		interface Listener {};
+		interface TopicListener : Listener {
+		void on_inconsistent_topic(in Topic   the_topic,
+		in InconsistentTopicStatus status);
+		};
+		interface DataWriterListener : Listener {
+		void on_offered_deadline_missed(in DataWriter writer,
+		in OfferedDeadlineMissedStatus status);
+		void   on_offered_incompatible_qos(in DataWriter writer,
+		in   OfferedIncompatibleQosStatus status);
+		void   on_liveliness_lost(in DataWriter writer,
+		in   LivelinessLostStatus status);
+		void   on_publication_match(in DataWriter writer,
+		in   PublicationMatchStatus status);
+		};
+		interface PublisherListener : DataWriterListener {
+		};
+		interface DataReaderListener : Listener {
+		void on_requested_deadline_missed(in DataReader reader,
+		in RequestedDeadlineMissedStatus status);
+		void   on_requested_incompatible_qos(in DataReader reader,
+		in   RequestedIncompatibleQosStatus status);
+		void   on_sample_rejected(in DataReader reader  ,
+		in   SampleRejectedStatus status);
+		void   on_liveliness_changed(in DataReader reader  ,
+		in   LivelinessChangedStatus status);
+		void   on_data_available(in DataReader reader  );
+		void on_subscription_match(in   DataReader
+		reader,
+		  in   SubscriptionMatchStatus status);
+		void on_sample_lost(in DataReader reader,
+		in SampleLostStatus status);
+		};
+		interface SubscriberListener : DataReaderListener {
+		  void on_data_on_readers(in Subscriber subs);
+		};
+		interface DomainParticipantListener : TopicListener,
+		PublisherListener,
+		SubscriberListener {
+		};
+		// ----------------------------------------------------------------------
+		
+		// Conditions
+		// ----------------------------------------------------------------------
+		interface Condition {
+		boolean get_trigger_value();
+		};
+		typedef sequence<Condition> ConditionSeq;
+		interface WaitSet {
+		ReturnCode_t wait(out ConditionSeq active_conditions,
+		in Duration_t timeout);
+		ReturnCode_t attach_condition(in Condition cond);
+		ReturnCode_t detach_condition(in Condition cond);
+		ReturnCode_t get_conditions(out ConditionSeq attached_conditions);
+		};
+		interface GuardCondition : Condition {
+		void set_trigger_value(in boolean value);
+		};
+		interface StatusCondition : Condition {
+		  StatusKindMask   get_enabled_statuses();
+		  ReturnCode_t set_enabled_statuses(in StatusKindMask
+		  mask);
+		  Entity get_entity(  );
+		};
+		//   Sample states to support reads
+		typedef unsigned long SampleStateKind;
+		typedef sequence <SampleStateKind> SampleStateSeq;
+		const SampleStateKind READ_SAMPLE_STATE = 0x0001 << 0;
+		const SampleStateKind NOT_READ_SAMPLE_STATE = 0x0001 << 1;
+		// This is a bit-mask SampleStateKind
+		typedef unsigned long SampleStateMask;
+		const SampleStateMask ANY_SAMPLE_STATE = 0xffff;
+		// View states to support reads
+		  typedef unsigned long ViewStateKind;
+		typedef   sequence<ViewStateKind> ViewStateSeq;
+		const ViewStateKind NEW_VIEW_STATE = 0x0001 << 0;
+		const ViewStateKind NOT_NEW_VIEW_STATE = 0x0001 << 1;
+		// This is a bit-mask ViewStateKind
+		typedef   unsigned long ViewStateMask;
+		const   ViewStateMask ANY_VIEW_STATE =
+		  0xffff;
+		// Instance states to support reads
+		typedef unsigned long InstanceStateKind;
+		typedef sequence<InstanceStateKind> InstanceStateSeq;
+		const   InstanceStateKind
+		ALIVE_INSTANCE_STATE = 0x0001 <<   0;
+		
+		const   InstanceStateKind
+		NOT_ALIVE_DISPOSED_INSTANCE_STATE = 0x0001 <<   1;
+		const   InstanceStateKind
+		NOT_ALIVE_NO_WRITERS_INSTANCE_STATE = 0x0001 <<   2;
+		// This is a bit-mask   InstanceStateKind
+		typedef unsigned long   InstanceStateMask;
+		const   InstanceStateMask ANY_INSTANCE_STATE
+		= 0xffff;
+		const InstanceStateMask NOT_ALIVE_INSTANCE_STATE= 0x006;
+		interface ReadCondition : Condition {
+		  SampleStateMask
+		get_sample_state_mask();
+		  ViewStateMask
+		get_view_state_mask();
+		InstanceStateMask get_instance_state_mask();
+		DataReader get_datareader();
+		  };
+		  interface QueryCondition : ReadCondition {
+		  string   get_query_expression();
+		  StringSeq   get_query_arguments();
+		ReturnCode_t set_query_arguments(in StringSeq query_arguments);
+		};
+		// ----------------------------------------------------------------------
+		// Qos
+		// ----------------------------------------------------------------------
+		const string USERDATA_QOS_POLICY_NAME = "UserData";
+		const string DURABILITY_QOS_POLICY_NAME = "Durability";
+		const string PRESENTATION_QOS_POLICY_NAME = "Presentation";
+		const string DEADLINE_QOS_POLICY_NAME = "Deadline";
+		const string LATENCYBUDGET_QOS_POLICY_NAME = "LatencyBudget";
+		const string OWNERSHIP_QOS_POLICY_NAME = "Ownership";
+		const string OWNERSHIPSTRENGTH_QOS_POLICY_NAME = "OwnershipStrength";
+		const string   LIVELINESS_QOS_POLICY_NAME = "  Liveliness";
+		const string   TIMEBASEDFILTER_QOS_POLICY_NAME ="  TimeBasedFilter";
+		const string   PARTITION_QOS_POLICY_NAME = "  Partition";
+		const string   RELIABILITY_QOS_POLICY_NAME = "  Reliability";
+		const string   DESTINATIONORDER_QOS_POLICY_NAME= "  DestinationOrder";
+		const string   HISTORY_QOS_POLICY_NAME = "  History";
+		const string   RESOURCELIMITS_QOS_POLICY_NAME = "  Resource-Limits";
+		const string   ENTITYFACTORY_QOS_POLICY_NAME ="  EntityFactory";
+		const string   WRITERDATALIFECYCLE_QOS_POLICY_NAME = "  WriterDataLifecycle";
+		const string   READERDATALIFECYCLE_QOS_POLICY_NAME= "  ReaderDataLifecycle";
+		const string   TOPICDATA_QOS_POLICY_NAME = "  TopicData";
+		const string   GROUPDATA_QOS_POLICY_NAME ="  GroupData";
+		const string   TRANSPORTPRIORITY_QOS_POLICY_NAME ="  TransportPriority";
+		const string   LIFESPAN_QOS_POLICY_NAME ="  Lifespan";
+		const QosPolicyId_t USERDATA_QOS_POLICY_ID = 1;
+		const QosPolicyId_t DURABILITY_QOS_POLICY_ID = 2;
+		const QosPolicyId_t PRESENTATION_QOS_POLICY_ID = 3;
+		const QosPolicyId_t DEADLINE_QOS_POLICY_ID = 4;
+		const QosPolicyId_t LATENCYBUDGET_QOS_POLICY_ID = 5;
+		const QosPolicyId_t OWNERSHIP_QOS_POLICY_ID = 6;
+		const QosPolicyId_t OWNERSHIPSTRENGTH_QOS_POLICY_ID = 7;
+		const QosPolicyId_t   LIVELINESS_QOS_POLICY_ID =   8;
+		const QosPolicyId_t   TIMEBASEDFILTER_QOS_POLICY_ID =9;
+		const QosPolicyId_t   PARTITION_QOS_POLICY_ID =   10;
+		const QosPolicyId_t   RELIABILITY_QOS_POLICY_ID =   11;
+		const QosPolicyId_t   DESTINATIONORDER_QOS_POLICY_ID =   12;
+		const QosPolicyId_t   HISTORY_QOS_POLICY_ID =   13;
+		const QosPolicyId_t   RESOURCELIMITS_QOS_POLICY_ID =   14;
+		const QosPolicyId_t   ENTITYFACTORY_QOS_POLICY_ID =15;
+		const QosPolicyId_t   WRITERDATALIFECYCLE_QOS_POLICY_ID =   16;
+		const QosPolicyId_t   READERDATALIFECYCLE_QOS_POLICY_ID =   17;
+		const QosPolicyId_t   TOPICDATA_QOS_POLICY_ID =   18;
+		const QosPolicyId_t   GROUPDATA_QOS_POLICY_ID =19;
+		const QosPolicyId_t   TRANSPORTPRIORITY_QOS_POLICY_ID = 20;
+		const QosPolicyId_t   LIFESPAN_QOS_POLICY_ID=   21;
+		struct UserDataQosPolicy {
+		sequence<octet>   value;
+		};
+		  struct TopicDataQosPolicy {
+		sequence<octet> value;
+		};
+		struct GroupDataQosPolicy {
+		
+		sequence<octet> value;
+		};
+		struct TransportPriorityQosPolicy {
+		long value;
+		};
+		struct LifespanQosPolicy {
+		Duration_t duration;
+		};
+		enum DurabilityQosPolicyKind {
+		VOLATILE_DURABILITY_QOS,
+		  TRANSIENT_LOCAL_DURABILITY_QOS,
+		  TRANSIENT_DURABILITY_QOS,
+		PERSISTENT_DURABILITY_QOS
+		};
+		struct DurabilityQosPolicy {
+		DurabilityQosPolicyKind kind;
+		  Duration_t service_cleanup_delay;
+		};
+		enum PresentationQosPolicyAccessScopeKind {
+		INSTANCE_PRESENTATION_QOS,
+		TOPIC_PRESENTATION_QOS,
+		GROUP_PRESENTATION_QOS
+		};
+		struct PresentationQosPolicy {
+		PresentationQosPolicyAccessScopeKind access_scope;
+		boolean coherent_access;
+		boolean ordered_access;
+		};
+		struct DeadlineQosPolicy {
+		Duration_t period;
+		};
+		struct LatencyBudgetQosPolicy {
+		Duration_t duration;
+		};
+		enum OwnershipQosPolicyKind {
+		SHARED_OWNERSHIP_QOS,
+		EXCLUSIVE_OWNERSHIP_QOS
+		};
+		struct OwnershipQosPolicy {
+		OwnershipQosPolicyKind kind;
+		};
+		struct OwnershipStrengthQosPolicy {
+		long value;
+		};
+		enum LivelinessQosPolicyKind {
+		AUTOMATIC_LIVELINESS_QOS,
+		
+		MANUAL_BY_PARTICIPANT_LIVELINESS_QOS,
+		MANUAL_BY_TOPIC_LIVELINESS_QOS
+		};
+		struct LivelinessQosPolicy {
+		LivelinessQosPolicyKind kind;
+		Duration_t lease_duration;
+		};
+		struct TimeBasedFilterQosPolicy {
+		Duration_t minimum_separation;
+		};
+		struct PartitionQosPolicy {
+		StringSeq name;
+		};
+		enum ReliabilityQosPolicyKind {
+		BEST_EFFORT_RELIABILITY_QOS,
+		RELIABLE_RELIABILITY_QOS
+		};
+		struct ReliabilityQosPolicy {
+		ReliabilityQosPolicyKind kind;
+		  Duration_t max_blocking_time;
+		};
+		enum DestinationOrderQosPolicyKind {
+		BY_RECEPTION_TIMESTAMP_DESTINATIONORDER_QOS,
+		BY_SOURCE_TIMESTAMP_DESTINATIONORDER_QOS
+		};
+		struct DestinationOrderQosPolicy {
+		DestinationOrderQosPolicyKind kind;
+		};
+		enum HistoryQosPolicyKind {
+		KEEP_LAST_HISTORY_QOS,
+		KEEP_ALL_HISTORY_QOS
+		};
+		struct HistoryQosPolicy {
+		HistoryQosPolicyKind kind;
+		long depth;
+		};
+		struct ResourceLimitsQosPolicy {
+		long max_samples;
+		long max_instances;
+		long   max_samples_per_instance;
+		};
+		struct EntityFactoryQosPolicy {
+		  boolean autoenable_created_entities;
+		};
+		struct WriterDataLifecycleQosPolicy {
+		
+		boolean autodispose_unregistered_instances;
+		};
+		struct ReaderDataLifecycleQosPolicy {
+		  Duration_t autopurge_nowriter_samples_delay;
+		};
+		struct DomainParticipantQos {
+		UserDataQosPolicy user_data;
+		  EntityFactoryQosPolicy entity_factory;
+		};
+		struct TopicQos {
+		TopicDataQosPolicy topic_data;
+		DurabilityQosPolicy durability;
+		DeadlineQosPolicy deadline;
+		  LatencyBudgetQosPolicy   latency_budget;
+		  LivelinessQosPolicy   liveliness;
+		  ReliabilityQosPolicy   reliability;
+		  DestinationOrderQosPolicy   destination_order;
+		  HistoryQosPolicy   history;
+		  ResourceLimitsQosPolicy   resource_limits;
+		  TransportPriorityQosPolicy  transport_priority;
+		  LifespanQosPolicy  lifespan;
+		OwnershipQosPolicy ownership;
+		};
+		struct DataWriterQos {
+		DurabilityQosPolicy durability;
+		DeadlineQosPolicy deadline;
+		  LatencyBudgetQosPolicy   latency_budget;
+		  LivelinessQosPolicy   liveliness;
+		  ReliabilityQosPolicy   reliability;
+		  DestinationOrderQosPolicy   destination_order;
+		  HistoryQosPolicy   history;
+		  ResourceLimitsQosPolicy   resource_limits;
+		  TransportPriorityQosPolicy  transport_priority;
+		  LifespanQosPolicy  lifespan;
+		UserDataQosPolicy user_data;
+		  OwnershipStrengthQosPolicy   ownership_strength;
+		  WriterDataLifecycleQosPolicy
+		  writer_data_lifecycle;
+		};
+		struct PublisherQos {
+		  PresentationQosPolicy   presentation;
+		  PartitionQosPolicy   partition;
+		  GroupDataQosPolicy   group_data;
+		  EntityFactoryQosPolicy   entity_factory;
+		};
+		struct DataReaderQos {
+		DurabilityQosPolicy durability;
+		
+		DeadlineQosPolicy deadline;
+		LatencyBudgetQosPolicy   latency_budget;
+		LivelinessQosPolicy liveliness;
+		ReliabilityQosPolicy reliability;
+		DestinationOrderQosPolicy destination_order;
+		HistoryQosPolicy history;
+		ResourceLimitsQosPolicy resource_limits;
+		UserDataQosPolicy user_data;
+		TimeBasedFilterQosPolicy time_based_filter;
+		ReaderDataLifecycleQosPolicy reader_data_lifecycle;
+		};
+		struct SubscriberQos {
+		PresentationQosPolicy presentation;
+		  PartitionQosPolicy   partition;
+		  GroupDataQosPolicy   group_data;
+		  EntityFactoryQosPolicy   entity_factory;
+		};
+		// ----------------------------------------------------------------------
+		  struct ParticipantBuiltinTopicData {
+		BuiltinTopicKey_t key;
+		UserDataQosPolicy user_data;
+		};
+		struct TopicBuiltinTopicData {
+		BuiltinTopicKey_t key;
+		string name;
+		string type_name;
+		DurabilityQosPolicy durability;
+		DeadlineQosPolicy deadline;
+		LatencyBudgetQosPolicy latency_budget;
+		LivelinessQosPolicy liveliness;
+		ReliabilityQosPolicy reliability;
+		TransportPriorityQosPolicy transport_priority;
+		LifespanQosPolicy lifespan;
+		DestinationOrderQosPolicy destination_order;
+		HistoryQosPolicy history;
+		ResourceLimitsQosPolicy resource_limits;
+		OwnershipQosPolicy ownership;
+		TopicDataQosPolicy topic_data;
+		};
+		struct PublicationBuiltinTopicData {
+		BuiltinTopicKey_t key;
+		BuiltinTopicKey_t participant_key;
+		string topic_name;
+		string type_name;
+		DurabilityQosPolicy durability;
+		DeadlineQosPolicy deadline;
+		LatencyBudgetQosPolicy latency_budget;
+		LivelinessQosPolicy liveliness;
+		
+		ReliabilityQosPolicy reliability;
+		LifespanQosPolicy lifespan;
+		UserDataQosPolicy user_data;
+		OwnershipStrengthQosPolicy ownership_strength;
+		PresentationQosPolicy presentation;
+		PartitionQosPolicy partition;
+		TopicDataQosPolicy topic_data;
+		GroupDataQosPolicy group_data;
+		};
+		struct SubscriptionBuiltinTopicData {
+		BuiltinTopicKey_t key;
+		BuiltinTopicKey_t participant_key;
+		string topic_name;
+		string type_name;
+		DurabilityQosPolicy durability;
+		DeadlineQosPolicy deadline;
+		LatencyBudgetQosPolicy latency_budget;
+		LivelinessQosPolicy liveliness;
+		ReliabilityQosPolicy reliability;
+		DestinationOrderQosPolicy destination_order;
+		UserDataQosPolicy user_data;
+		TimeBasedFilterQosPolicy time_based_filter;
+		PresentationQosPolicy presentation;
+		PartitionQosPolicy partition;
+		TopicDataQosPolicy topic_data;
+		GroupDataQosPolicy group_data;
+		};
+		// ----------------------------------------------------------------------
+		interface Entity {
+		// ReturnCode_t set_qos(in   EntityQos qos);
+		// void get_qos(inout   EntityQos qos);
+		// ReturnCode_t set_listener(in Listener l, in StatusKindMask mask);
+		// Listener get_listener();
+		ReturnCode_t enable();
+		  StatusCondition get_statuscondition();
+		  StatusKindMask get_status_changes();
+		};
+		
+		// ----------------------------------------------------------------------
+		interface DomainParticipant : Entity {
+		// Factory interfaces
+		Publisher create_publisher(in PublisherQos qos,
+		in PublisherListener   a_listener);
+		ReturnCode_t delete_publisher(in Publisher p);
+		Subscriber create_subscriber(in SubscriberQos qos,
+		in SubscriberListener   a_listener);
+		ReturnCode_t delete_subscriber(in Subscriber s);
+		Subscriber get_builtin_subscriber();
+		Topic create_topic(in string topic_name, in string type_name,
+		  in   TopicQos qos,   in   TopicListener a_listener);
+		ReturnCode_t delete_topic(in   Topic a_topic);
+		  Topic find_topic(in string topic_name, in   Duration_t
+		timeout);
+		  TopicDescription lookup_topicdescription(in string   name);
+		ContentFilteredTopic create_contentfilteredtopic(in string name,in Topic related_topic,in string filter_expression,in StringSeq filter_parameters);
+		ReturnCode_t   delete_contentfilteredtopic(in ContentFilteredTopic a_contentfilteredtopic);
+		MultiTopic create_multitopic(in string name,in string   type_name,in string   subscription_expression,in   StringSeq expression_parameters);
+		ReturnCode_t delete_multitopic(in MultiTopic a_multitopic);
+		  ReturnCode_t delete_contained_entities();
+		ReturnCode_t set_qos(in DomainParticipantQos qos);
+		  void get_qos(  inout DomainParticipantQos
+		qos);
+		ReturnCode_t   set_listener(in   DomainParticipantListener
+		a_listener,
+		in StatusKindMask mask);
+		  DomainParticipantListener get_listener(  );
+		ReturnCode_t ignore_participant(in InstanceHandle_t handle);
+		ReturnCode_t ignore_topic(in InstanceHandle_t handle);
+		ReturnCode_t ignore_publication(in InstanceHandle_t handle);
+		ReturnCode_t ignore_subscription(in InstanceHandle_t handle);
+		DomainId_t get_domain_id();
+		  void assert_liveliness();
+		ReturnCode_t set_default_publisher_qos(in PublisherQos qos);
+		void get_default_publisher_qos(out PublisherQos qos);
+		ReturnCode_t set_default_subscriber_qos(in SubscriberQos qos);
+		
+		void get_default_subscriber_qos(out SubscriberQos qos);
+		ReturnCode_t set_default_topic_qos(in TopicQos qos);
+		void get_default_topic_qos(out TopicQos qos);
+		};
+		interface DomainParticipantFactory {
+		DomainParticipant create_participant(in DomainId_t domainId,
+		in DomainParticipantQos qos,
+		in DomainParticipantListener   a_listener);
+		ReturnCode_t delete_participant(in DomainParticipant a_participant);
+		DomainParticipant lookup_participant(in DomainId_t domainId);
+		ReturnCode_t set_default_participant_qos(in DomainParticipantQos qos);
+		void get_default_participant_qos(out DomainParticipantQos qos);
+		};
+
+		interface   TypeSupport {
+		  // ReturnCode_t register_type(in DomainParticipant domain, in string type_name);
+		};
+		// ----------------------------------------------------------------------
+		interface TopicDescription {
+		  string   get_type_name();
+		  string   get_name();
+		DomainParticipant get_participant();
+		};
+		interface Topic : Entity, TopicDescription {
+		  // Access the status
+		  InconsistentTopicStatus
+		  get_inconsistent_topic_status();
+		};
+		interface ContentFilteredTopic : TopicDescription {
+		string get_filter_expression();
+		  StringSeq get_expression_parameters();
+		ReturnCode_t set_expression_parameters(in StringSeq expression_parameters);
+		  Topic get_related_topic();
+		};
+		interface MultiTopic : TopicDescription {
+		string get_subscription_expression();
+		  StringSeq get_expression_parameters();
+		  ReturnCode_t set_expression_parameters(in StringSeq expression_parameters);
+		};
+		// ----------------------------------------------------------------------
+		interface Publisher : Entity {
+		DataWriter create_datawriter(in Topic   a_topic, in DataWriterQos qos,
+		in DataWriterListener a_listener);
+		
+		ReturnCode_t delete_datawriter(in   DataWriter
+		a_datawriter);
+		  DataWriter lookup_datawriter(in   string topic_name);
+		  ReturnCode_t delete_contained_entities(  );
+		ReturnCode_t set_qos(in PublisherQos qos);
+		void get_qos(inout PublisherQos qos);
+		ReturnCode_t set_listener(in PublisherListener a_listener, in StatusKindMask mask);
+		PublisherListener get_listener();
+		ReturnCode_t suspend_publications();
+		ReturnCode_t resume_publications();
+		ReturnCode_t begin_coherent_changes();
+		  ReturnCode_t end_coherent_changes();
+		  DomainParticipant get_participant();
+		ReturnCode_t set_default_datawriter_qos(in DataWriterQos qos);
+		  void get_default_datawriter_qos(out DataWriterQos qos);
+		ReturnCode_t   copy_from_topic_qos(  inout DataWriterQos
+		a_datawriter_qos,
+		in TopicQos a_topic_qos);
+		};
+		interface DataWriter : Entity {
+		// InstanceHandle_t register(in Data instance_data);
+		// InstanceHandle_t register_w_timestamp(in Data instance_data,
+		// in Time_t source_timestamp);
+		//   ReturnCode_t unregister(in Data instance_data  ,
+		//   in   InstanceHandle_t handle);
+		// ReturnCode_t unregister_w_timestamp(in   Data
+		//instance_data,
+		//   in InstanceHandle_t handle  ,
+		//   in   Time_t source_timestamp);
+		// ReturnCode_t write(in Data instance_data, in InstanceHandle_t handle  );
+		// ReturnCode_t write_w_timestamp(in   Data
+		//instance_data,
+		//   in   InstanceHandle_t handle,
+		// in   Time_t source_timestamp);
+		// ReturnCode_t dispose(in   Data instance_data,
+		//   in   InstanceHandle_t
+		//instance_handle);
+		// ReturnCode_t dispose_w_timestamp(in   Data
+		//instance_data,
+		// in   InstanceHandle_t instance_handle,
+		//   in   Time_t
+		//source_timestamp);
+		// ReturnCode_t get_key_value(inout Data key_holder, in InstanceHandle_t handle);
+		
+		ReturnCode_t set_qos(in DataWriterQos qos);
+		void get_qos(inout DataWriterQos qos);
+		ReturnCode_t set_listener(in DataWriterListener a_listener, in StatusKindMask mask);
+		  DataWriterListener get_listener();
+		  Topic get_topic();
+		  Publisher
+		get_publisher();
+		  // Access the status
+		LivelinessLostStatus get_liveliness_lost_status();
+		OfferedDeadlineMissedStatus get_offered_deadline_missed_status();
+		OfferedIncompatibleQosStatus get_offered_incompatible_qos_status();
+		PublicationMatchStatus get_publication_match_status();
+		void assert_liveliness();
+		ReturnCode_t get_matched_subscriptions(
+		inout InstanceHandleSeq subscription_handles);
+		ReturnCode_t get_matched_subscription_data(
+		inout SubscriptionBuiltinTopicData subscription_data,
+		in InstanceHandle_t subscription_handle);
+		};
+		// ----------------------------------------------------------------------
+		interface Subscriber : Entity {
+		DataReader create_datareader(in TopicDescription a_topic,
+		  in   DataReaderQos qos,
+		in   DataReaderListener a_listener);
+		ReturnCode_t delete_datareader(in   DataReader
+		a_datareader);
+		ReturnCode_t   delete_contained_entities(  );
+		DataReader lookup_datareader(in string topic_name);
+		ReturnCode_t get_datareaders(out DataReaderSeq readers,
+		in SampleStateMask sample_states,
+		in   ViewStateMask view_states,
+		in   InstanceStateMask instance_states);
+		void notify_datareaders(  );
+		ReturnCode_t set_qos(in   SubscriberQos qos);
+		void get_qos(inout SubscriberQos qos);
+		ReturnCode_t   set_listener(in SubscriberListener a_listener, in   StatusKindMask mask);
+		  SubscriberListener get_listener(  );
+		ReturnCode_t begin_access();
+		ReturnCode_t end_access();
+		  DomainParticipant
+		get_participant();
+		ReturnCode_t set_default_datareader_qos(in DataReaderQos qos);
+		
+		void get_default_datareader_qos(out DataReaderQos qos);
+		ReturnCode_t copy_from_topic_qos(inout DataReaderQos a_datareader_qos,
+		in TopicQos a_topic_qos);
+		};
+		interface DataReader : Entity {
+		
+		ReadCondition create_readcondition(in SampleStateMask   sample_states,in ViewStateMask view_states,in   InstanceStateMask instance_states);
+		QueryCondition create_querycondition(in SampleStateMask   sample_states,in ViewStateMask view_states,in InstanceStateMask instance_states,in   string query_expression,in   StringSeq query_parameters);
+		ReturnCode_t delete_readcondition(in   ReadCondition a_condition);
+		ReturnCode_t   delete_contained_entities(  );
+		ReturnCode_t set_qos(in DataReaderQos qos);
+		void get_qos(inout DataReaderQos qos);
+		ReturnCode_t set_listener(in DataReaderListener a_listener, in StatusKindMask mask);
+		DataReaderListener get_listener();
+		TopicDescription get_topicdescription();
+		Subscriber get_subscriber();
+		SampleRejectedStatus get_sample_rejected_status();
+		LivelinessChangedStatus get_liveliness_changed_status();
+		RequestedDeadlineMissedStatus get_requested_deadline_missed_status();
+		RequestedIncompatibleQosStatus get_requested_incompatible_qos_status();
+		SubscriptionMatchStatus get_subscription_match_status();
+		SampleLostStatus get_sample_lost_status();
+		ReturnCode_t wait_for_historical_data(in Duration_t max_wait);
+		ReturnCode_t get_matched_publications(inout InstanceHandleSeq publication_handles);
+		ReturnCode_t get_matched_publication_data(inout PublicationBuiltinTopicData publication_data,in InstanceHandle_t publication_handle);
+		
+		void take_instance_from_subscriber() ;
+		
+		};
+		struct SampleInfo {
+		SampleStateKind sample_state;
+		ViewStateKind view_state;
+		InstanceStateKind instance_state;
+		Time_t source_timestamp;
+		InstanceHandle_t instance_handle;
+		long disposed_generation_count;
+		long no_writers_generation_count;
+		long sample_rank;
+		long generation_rank;
+		long absolute_generation_rank;
+		};
+		typedef sequence<SampleInfo> SampleInfoSeq;
+};	
+		
+		
+		

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/orb.idl
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/orb.idl	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jacorb/idl/omg/orb.idl	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,179 +1,180 @@
-
-// Some definitions from the CORBA module as needed
-// by other modules. This file is for declaration
-// purposes only!!
-
-// $Id: orb.idl,v 1.8 2004/02/02 08:56:54 gerald Exp $
-
-#ifndef _ORB_IDL
-#define _ORB_IDL
-
-/*
-  the following pragma is proprietary to JacORB. It ensures
-  that no code is ever generated when this file is included in
-  other files even when the -all compiler option is set
-*/
-
-//#pragma inhibit_code_generation
-#pragma prefix "omg.org"
-
-module CORBA
-{
-   typedef unsigned short ServiceOption;
-   typedef unsigned short ServiceDetailType;
-
-   // for PortableInterceptors
-   typedef sequence<string> StringSeq;
-   typedef sequence<wstring> WStringSeq;
-   typedef sequence<octet> OctetSeq;
-
-   typedef unsigned long PolicyType;
-
-   // actually, Current is pseudo, but we need it this way so everything compiles
-   interface Current {};
-
-   pseudo interface Environment{};
-   pseudo interface NamedValue {};
-   pseudo interface NVList {};
-
-   // not suitable for deriving user-defined interfaces !
-   enum TCKind {
-      tk_null, tk_void,
-      tk_short, tk_long, tk_ushort, tk_ulong,
-      tk_float, tk_double, tk_boolean, tk_char,
-      tk_octet, tk_any, tk_TypeCode, tk_Principal, tk_objref,
-      tk_struct, tk_union, tk_enum, tk_string,
-      tk_sequence, tk_array, tk_alias, tk_except,
-      tk_longlong, tk_ulonglong, tk_longdouble,
-      tk_wchar, tk_wstring, tk_fixed, tk_value,
-      tk_value_box,
-      tk_native, tk_abstract_interface,
-      tk_local_interface // latest addition
-   };
-
-   // not suitable for deriving user-defined interfaces
-   typedef string Identifier;
-   typedef string RepositoryId;
-
-   pseudo interface TypeCode {}; // PIDL
-//       exception Bounds {};
-//       exception BadKind {};
-
-//       // for all TypeCode kinds
-//       boolean equal (in TypeCode tc);
-//       TCKind kind ();
-
-//       boolean equivalent(in TypeCode tc);
-//       TypeCode get_compact_typecode();
-
-//       // for tk_objref, tk_struct, tk_union, tk_enum,
-//       // tk_alias, and tk_except
-//       RepositoryId id () raises (BadKind);
-
-//       // for tk_objref, tk_struct, tk_union, tk_enum,
-//       // tk_alias, and tk_except
-//       Identifier name () raises (BadKind);
-
-//       // for tk_struct, tk_union, tk_enum, and tk_except
-//       unsigned long member_count () raises (BadKind);
-//       Identifier member_name (in unsigned long index)
-//          raises (BadKind, Bounds);
-
-//       // for tk_struct, tk_union, and tk_except
-//       TypeCode member_type (in unsigned long index)
-//          raises (BadKind, Bounds);
-
-//       // for tk_union
-//       any member_label (in unsigned long index)
-//          raises (BadKind, Bounds);
-//       TypeCode discriminator_type () raises (BadKind);
-//       long default_index () raises (BadKind);
-
-//       // for tk_string, tk_sequence, and tk_array
-//       unsigned long length () raises (BadKind);
-
-//       // for tk_sequence, tk_array, and tk_alias
-//       TypeCode content_type () raises (BadKind);
-
-//    };
-
-
-   interface InterfaceDef     {};
-
-   /* this is the original PIDL from the lang. mapping,
-      but we do not use it! Instead...
-
-      pseudo interface Principal
-      {
-      attribute sequence<octet> name;
-      };
-   */
-
-   /* ... we use this little hack. It saves us fiddling with
-      the generated code that uses  Principals. Actually, we
-      should not be doing this....
-   */
-
-   typedef sequence<octet> Principal;
-
-   interface IDLType {};
-
-   enum OperationMode {OP_NORMAL, OP_ONEWAY};
-   enum ParameterMode {PARAM_IN, PARAM_OUT, PARAM_INOUT};
-
-   struct ParameterDescription {
-      Identifier name;
-      TypeCode type;
-      IDLType type_def;
-      ParameterMode mode;
-   };
-   typedef sequence <ParameterDescription> ParDescriptionSeq;
-
-   interface Policy
-   {
-      readonly attribute PolicyType policy_type;
-      Policy copy();
-      void destroy();
-   };
-
-   typedef sequence <Policy> PolicyList;
-
-   interface DomainManager
-   {
-      Policy get_domain_policy(in PolicyType policy_type);
-   };
-
-   interface ConstructionPolicy: Policy
-   {
-      void make_domain_manager(in InterfaceDef object_type,
-                               in boolean constr_policy);
-   };
-
-   typedef sequence <DomainManager> DomainManagersList;
-
-
-   typedef short PolicyErrorCode;
-   const PolicyErrorCode BAD_POLICY = 0;
-   const PolicyErrorCode UNSUPPORTED_POLICY = 1;
-   const PolicyErrorCode BAD_POLICY_TYPE = 2;
-   const PolicyErrorCode BAD_POLICY_VALUE = 3;
-   const PolicyErrorCode UNSUPPORTED_POLICY_VALUE = 4;
-
-   exception PolicyError
-   {
-      PolicyErrorCode reason;
-   };
-
-   exception UserException {};
-   pseudo interface ExceptionList {};
-
-
-   valuetype WStringValue {
-      public wstring value;
-   };
-
-
-};
-
-
-#endif /* _ORB_IDL */
+
+// Some definitions from the CORBA module as needed
+// by other modules. This file is for declaration
+// purposes only!!
+
+// $Id: orb.idl,v 1.10 2006/05/15 14:35:52 alphonse.bendt Exp $
+
+#ifndef _ORB_IDL
+#define _ORB_IDL
+
+/*
+  the following pragma is proprietary to JacORB. It ensures
+  that no code is ever generated when this file is included in
+  other files even when the -all compiler option is set
+*/
+
+//#pragma inhibit_code_generation
+#pragma prefix "omg.org"
+
+module CORBA
+{
+   typedef unsigned short ServiceOption;
+   typedef unsigned short ServiceDetailType;
+
+   // for PortableInterceptors
+   typedef sequence<string> StringSeq;
+   typedef sequence<wstring> WStringSeq;
+   typedef sequence<octet> OctetSeq;
+
+   typedef unsigned long PolicyType;
+
+   // actually, Current is pseudo, but we need it this way so everything compiles
+   interface Current {};
+
+   pseudo interface Environment{};
+   pseudo interface NamedValue {};
+   pseudo interface NVList {};
+
+   // not suitable for deriving user-defined interfaces !
+   enum TCKind {
+      tk_null, tk_void,
+      tk_short, tk_long, tk_ushort, tk_ulong,
+      tk_float, tk_double, tk_boolean, tk_char,
+      tk_octet, tk_any, tk_TypeCode, tk_Principal, tk_objref,
+      tk_struct, tk_union, tk_enum, tk_string,
+      tk_sequence, tk_array, tk_alias, tk_except,
+      tk_longlong, tk_ulonglong, tk_longdouble,
+      tk_wchar, tk_wstring, tk_fixed, tk_value,
+      tk_value_box,
+      tk_native, tk_abstract_interface,
+      tk_local_interface // latest addition
+   };
+
+   // not suitable for deriving user-defined interfaces
+   typedef string Identifier;
+   typedef string RepositoryId;
+
+   pseudo interface TypeCode {}; // PIDL
+//       exception Bounds {};
+//       exception BadKind {};
+
+//       // for all TypeCode kinds
+//       boolean equal (in TypeCode tc);
+//       TCKind kind ();
+
+//       boolean equivalent(in TypeCode tc);
+//       TypeCode get_compact_typecode();
+
+//       // for tk_objref, tk_struct, tk_union, tk_enum,
+//       // tk_alias, and tk_except
+//       RepositoryId id () raises (BadKind);
+
+//       // for tk_objref, tk_struct, tk_union, tk_enum,
+//       // tk_alias, and tk_except
+//       Identifier name () raises (BadKind);
+
+//       // for tk_struct, tk_union, tk_enum, and tk_except
+//       unsigned long member_count () raises (BadKind);
+//       Identifier member_name (in unsigned long index)
+//          raises (BadKind, Bounds);
+
+//       // for tk_struct, tk_union, and tk_except
+//       TypeCode member_type (in unsigned long index)
+//          raises (BadKind, Bounds);
+
+//       // for tk_union
+//       any member_label (in unsigned long index)
+//          raises (BadKind, Bounds);
+//       TypeCode discriminator_type () raises (BadKind);
+//       long default_index () raises (BadKind);
+
+//       // for tk_string, tk_sequence, and tk_array
+//       unsigned long length () raises (BadKind);
+
+//       // for tk_sequence, tk_array, and tk_alias
+//       TypeCode content_type () raises (BadKind);
+
+//    };
+
+
+   interface InterfaceDef     {};
+
+   /* this is the original PIDL from the lang. mapping,
+      but we do not use it! Instead...
+
+      pseudo interface Principal
+      {
+      attribute sequence<octet> name;
+      };
+   */
+
+   /* ... we use this little hack. It saves us fiddling with
+      the generated code that uses  Principals. Actually, we
+      should not be doing this....
+   */
+
+   typedef sequence<octet> Principal;
+
+   interface IDLType {};
+
+   enum OperationMode {OP_NORMAL, OP_ONEWAY};
+   enum ParameterMode {PARAM_IN, PARAM_OUT, PARAM_INOUT};
+
+   struct ParameterDescription {
+      Identifier name;
+      TypeCode type;
+      IDLType type_def;
+      ParameterMode mode;
+   };
+   typedef sequence <ParameterDescription> ParDescriptionSeq;
+
+   interface Policy
+   {
+      readonly attribute PolicyType policy_type;
+      Policy copy();
+      void destroy();
+   };
+
+   typedef sequence <Policy> PolicyList;
+
+   interface DomainManager
+   {
+      Policy get_domain_policy(in PolicyType policy_type);
+   };
+
+   interface ConstructionPolicy: Policy
+   {
+      void make_domain_manager(in InterfaceDef object_type,
+                               in boolean constr_policy);
+   };
+
+   typedef sequence <DomainManager> DomainManagersList;
+
+
+   typedef short PolicyErrorCode;
+   const PolicyErrorCode BAD_POLICY = 0;
+   const PolicyErrorCode UNSUPPORTED_POLICY = 1;
+   const PolicyErrorCode BAD_POLICY_TYPE = 2;
+   const PolicyErrorCode BAD_POLICY_VALUE = 3;
+   const PolicyErrorCode UNSUPPORTED_POLICY_VALUE = 4;
+
+   exception PolicyError
+   {
+      PolicyErrorCode reason;
+   };
+
+   exception UserException {};
+   pseudo interface ExceptionList {};
+
+
+   // Taken from 04-03-12 CORBA 3.0.3
+   valuetype StringValue string;
+   valuetype WStringValue wstring;
+
+
+   exception WrongTransaction {};
+};
+
+
+#endif /* _ORB_IDL */

Added: labs/jbosstm/trunk/ArjunaJTS/jacorb/lib/backport-util-concurrent.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbosstm/trunk/ArjunaJTS/jacorb/lib/backport-util-concurrent.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Deleted: labs/jbosstm/trunk/ArjunaJTS/jacorb/lib/concurrent-1.3.2.jar
===================================================================
(Binary files differ)

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/lib/idl.jar
===================================================================
(Binary files differ)

Modified: labs/jbosstm/trunk/ArjunaJTS/jacorb/lib/jacorb.jar
===================================================================
(Binary files differ)

Deleted: labs/jbosstm/trunk/ArjunaJTS/jacorb/lib/picocontainer-1.2-021105.jar
===================================================================
(Binary files differ)

Added: labs/jbosstm/trunk/ArjunaJTS/jacorb/lib/picocontainer-1.2.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbosstm/trunk/ArjunaJTS/jacorb/lib/picocontainer-1.2.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/RecoverIOR.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/RecoverIOR.java	2007-07-16 05:41:12 UTC (rev 13541)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/RecoverIOR.java	2007-07-16 08:42:30 UTC (rev 13542)
@@ -1,20 +1,20 @@
 /*
  * JBoss, Home of Professional Open Source
  * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. 
- * See the copyright.txt in the distribution for a full listing 
+ * as indicated by the @author tags.
+ * See the copyright.txt in the distribution for a full listing
  * of individual contributors.
  * This copyrighted material is made available to anyone wishing to use,
  * modify, copy, or redistribute it subject to the terms and conditions
  * of the GNU General Public License, v. 2.0.
- * This program is distributed in the hope that it will be useful, but WITHOUT A 
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A 
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  * PARTICULAR PURPOSE.  See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License,
  * v. 2.0 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
- * 
+ *
  * (C) 2005-2006,
  * @author JBoss Inc.
  */
@@ -34,22 +34,23 @@
 import org.omg.IOP.TaggedProfile;
 import org.omg.IOP.TaggedProfileHolder;
 import org.omg.IOP.IOR;
- 
+
 import java.util.List;
 
 public class RecoverIOR
 {
- 
+
     private static class RecoverableParsedIOR extends ParsedIOR {
 	public RecoverableParsedIOR(String ior) {
         this((ORB)ORBManager.getORB().orb(), ior) ;
     }
-    
+
     public RecoverableParsedIOR(final ORB orb, final String ior) {
-	    super(ior, orb, orb.getConfiguration().getNamedLogger("arjuna.recovery.parsedior"));
+	    //super(ior, orb, orb.getConfiguration().getNamedLogger("arjuna.recovery.parsedior")); // old (JacORB 2.2)
+		super(orb, ior); // new (JacORB 2.3)
 	}
-	
-	
+
+
 	public IOR newObjectKey(String objectId) {
 
 	    String the_object_key = new String(get_object_key());
@@ -65,9 +66,9 @@
 	    {
 		IIOPProfile pb = (IIOPProfile) profiles.get(i);
 		IIOPProfile new_pb = (IIOPProfile) pb.copy();
-		
+
 		new_pb.set_object_key(new_object_key.getBytes());
-		
+
 		new_ior.profiles[i] = new TaggedProfile();
 		new_ior.profiles[i].tag = 0; // IIOP
 
@@ -76,7 +77,7 @@
 		new_pb.marshal(holder, null);
 		new_ior.profiles[i].profile_data = holder.value.profile_data;
 	    }
-	    
+
 	    return new_ior;
 	}
 
@@ -97,16 +98,15 @@
 	    IIOPProfile profile = (IIOPProfile) getEffectiveProfile();
 
 	    System.out.println("\n Print some Information -------------");
-	    System.out.println("Host Name "+ profile.getAddress().getHostname());
 	    System.out.println("Object ID "+ getIDString());
 	    System.out.println("Type Name "+ getTypeId());
 	    System.out.println("Host Address "+ profile.getAddress());
 	    System.out.println("Object Key "+ new String(get_object_key()));
 	    System.out.println("\n\n");
-	}	
-	
+	}
+
     }
-    
+
     public static String newObjectKey (String ior, String Key)
     {
 	RecoverableParsedIOR pior = new RecoverableParsedIOR(ior);
@@ -120,19 +120,19 @@
     {
 	RecoverableParsedIOR pior = new RecoverableParsedIOR(ior);
 	pior.printInfo();
-    }    
+    }
 
-    
+
     private static String iorToString(IOR ior) {
 
-	try  
-	   {  
+	try
+	   {
 	       CDROutputStream out = new CDROutputStream();
-	       
+
 	       // endianness = false, big-endian
 	       out.write_boolean(false);
 	       org.omg.IOP.IORHelper.write(out, ior);
-	       
+
 	       byte bytes[] = out.getBufferCopy();
 	       StringBuffer sb = new StringBuffer("IOR:");
 	       for (int j=0; j<bytes.length; j++) {
@@ -146,12 +146,12 @@
 		   sb.append((char)c2);
 	       }
 	       return sb.toString();
-	   } 
+	   }
 	catch (Exception e)
 	{
 	    return null;
 	}
-	
+
     }
-    
+
 }




More information about the jboss-svn-commits mailing list