geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r373216 [2/4] - /geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/
Date Sat, 28 Jan 2006 19:04:21 GMT
Modified: geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/CosTransactions.idl
URL: http://svn.apache.org/viewcvs/geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/CosTransactions.idl?rev=373216&r1=373215&r2=373216&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/CosTransactions.idl (original)
+++ geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/CosTransactions.idl Sat Jan 28 11:04:11 2006
@@ -1,14 +1,4 @@
-
-// CosTransactions Module
-// OMG Transaction Service v1.1, November 1997.
-
-#ifndef __COSTRANSACTIONS_IDL__
-#define __COSTRANSACTIONS_IDL__
-
-// #include <Corba.idl>
-#include <IOP.idl>
-
-#pragma prefix "omg.org"
+#include "geronimo-orb.idl"
 
 module CosTransactions {
 // DATATYPES
@@ -31,9 +21,22 @@
 	VoteReadOnly
 };
 
+typedef unsigned short TransactionPolicyValue;
+
+// TransactionPolicyValue definitions are deprecated and replaced //
+// with new InvocationPolicy and OTSPolicy definitions. They are //
+// retained for backward compatibility. //
+const TransactionPolicyValue Allows_shared = 0;
+const TransactionPolicyValue Allows_none = 1;
+const TransactionPolicyValue Requires_shared = 2;
+const TransactionPolicyValue Allows_unshared = 3;
+const TransactionPolicyValue Allows_either = 4;
+const TransactionPolicyValue Requires_unshared = 5;
+const TransactionPolicyValue Requires_either = 6;
+
 // Forward references for interfaces defined later in module
 interface Current;
-interface TransactionFactory; 
+interface TransactionFactory;
 interface Control;
 interface Terminator;
 interface Coordinator;
@@ -41,7 +44,6 @@
 interface Resource;
 interface Synchronization;
 interface SubtransactionAwareResource;
-interface TransactionalObject;
 
 // Structure definitions
 struct otid_t {
@@ -49,11 +51,13 @@
 	long bqual_length;
 	sequence <octet> tid;
 };
+
 struct TransIdentity {
 	Coordinator coord;
 	Terminator term;
 	otid_t otid;
 };
+
 struct PropagationContext {
 	unsigned long timeout;
 	TransIdentity current;
@@ -61,6 +65,9 @@
 	any implementation_specific_data;
 };
 
+// TransactionalObject has been deprecated. See 10.3.10.
+interface TransactionalObject;
+
 // Heuristic exceptions
 exception HeuristicRollback {};
 exception HeuristicCommit {};
@@ -75,168 +82,166 @@
 exception NoTransaction {};
 exception InvalidControl {};
 exception Unavailable {};
-exception SynchronizationUnavailable {}; 
+exception SynchronizationUnavailable {};
 
-// Current is a pseudo object. It cannot be marshaled outside the process 
-// in which it was created.
-// Commented out to prevent IDL compiler from generating stubs etc.
-//
-  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);
-  };
+// 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);
+	unsigned long get_timeout ();
+	Control get_control();
+	Control suspend();
+	void resume(in Control which)
+		raises(InvalidControl);
+};
 
-    interface TransactionFactory {
+interface TransactionFactory {
 	Control create(in unsigned long time_out);
 	Control recreate(in PropagationContext ctx);
-    };
+};
 
 interface Control {
 	Terminator get_terminator()
-		raises (Unavailable);
+		raises(Unavailable);
 	Coordinator get_coordinator()
-		raises (Unavailable);
+		raises(Unavailable);
 };
 
 interface Terminator {
 	void commit(in boolean report_heuristics)
-		raises (HeuristicMixed,
-			HeuristicHazard);
+		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 rr)
-		raises (Inactive);
-
-	void register_synchronization(in Synchronization sync)
-		raises (Inactive, 
-			SynchronizationUnavailable);
-
-	void register_subtran_aware(in SubtransactionAwareResource rr)
-		raises (Inactive, 
-			NotSubtransaction);
-
+	
+	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);
-
+		raises(Inactive);
+		
 	string get_transaction_name();
-
 	Control create_subtransaction()
-		raises (SubtransactionsUnavailable, 
-			Inactive);
+		raises(SubtransactionsUnavailable, Inactive);
 
-	PropagationContext get_txcontext()
-		raises (Unavailable);
+	PropagationContext get_txcontext ()
+		raises(Unavailable);
 };
 
 interface RecoveryCoordinator {
-	Status replay_completion(in Resource rr)
-		raises(NotPrepared);
+	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 ();
+	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();
 };
 
+// TransactionalObject has been deprecated. See 10.3.10.
 interface TransactionalObject {
 };
 
-interface Synchronization : TransactionalObject {
-	void before_completion ();
-	void after_completion (in Status stat);
+// TransactionalObject has been deprecated //
+// and replaced by the OTSPolicy component //
+// Synchronization will use the OTSPolicy of ADAPTS //
+// Inheritance from TransactionalObject is for backward compatability //
+
+interface Synchronization :TransactionalObject {
+	void before_completion();
+	void after_completion(in Status s);
 };
 
 interface SubtransactionAwareResource : Resource {
-	void commit_subtransaction (in Coordinator parent);
-	void rollback_subtransaction ();
+	void commit_subtransaction(in Coordinator parent);
+	void rollback_subtransaction();
 };
 
-typedef unsigned short TransactionPolicyValue;
-const TransactionPolicyValue Allows_shared = 0;
-const TransactionPolicyValue Allows_none = 1;
-const TransactionPolicyValue Requires_shared = 2;
-const TransactionPolicyValue Allows_unshared = 3;
-const TransactionPolicyValue Allows_either = 4;
-const TransactionPolicyValue Requires_unshared = 5;
-const TransactionPolicyValue Requires_either = 6;
-const CORBA::PolicyType TRANSACTION_POLICY_TYPE = 36;
-
-    typedef unsigned short OTSPolicyValue;
-    const OTSPolicyValue ADAPTS = 3;
-    const OTSPolicyValue FORBIDS = 2;
-    const OTSPolicyValue REQUIRES = 1;
-
-    const CORBA::PolicyType OTS_POLICY_TYPE = 56;
-
-    interface OTSPolicy : CORBA::Policy {
-	readonly attribute OTSPolicyValue value;
-    };
-
-}; // End of CosTransactions Module
-
-
-//  stored in the IOR of a transactional 
-module CosTSInteroperation {
-    const IOP::ComponentId TAG_TRANSACTION_POLICY = 26;
-    struct TransactionPolicyComponent {
-        CosTransactions::TransactionPolicyValue tpv;
-    };
-
-    const IOP::ComponentId TAG_OTS_POLICY = 31;
-    const IOP::ComponentId TAG_INV_POLICY= 32;
-    struct OTSPolicyComponent {
-        CosTransactions::OTSPolicyValue opv;
-    };
+// TransactionPolicyType is deprecated and replaced //
+// by InvocationPolicyType and OTSPolicyType //
+// It is retained for backward compatibility. //
+const CORBA::PolicyType TransactionPolicyType = 46;
+interface TransactionPolicy : CORBA::Policy {
+	readonly attribute TransactionPolicyValue tpv;
+};
+typedef unsigned short InvocationPolicyValue;
+const InvocationPolicyValue EITHER = 0;
+const InvocationPolicyValue SHARED = 1;
+const InvocationPolicyValue UNSHARED =2;
+typedef unsigned short OTSPolicyValue;
+const OTSPolicyValue REQUIRES = 1;
+const OTSPolicyValue FORBIDS =2;
+const OTSPolicyValue ADAPTS =3;
+typedef unsigned short NonTxTargetPolicyValue;
+const NonTxTargetPolicyValue PREVENT = 0;
+const NonTxTargetPolicyValue PERMIT = 1;
+const CORBA::PolicyType INVOCATION_POLICY_TYPE = 55;
+interface InvocationPolicy : CORBA::Policy {
+readonly attribute InvocationPolicyValue ipv;
+};
+const CORBA::PolicyType OTS_POLICY_TYPE = 56;
+interface OTSPolicy : CORBA::Policy {
+readonly attribute OTSPolicyValue tpv;
+};
+const CORBA::PolicyType NON_TX_TARGET_POLICY_TYPE = 57;
+interface NonTxTargetPolicy : CORBA::Policy {
+readonly attribute NonTxTargetPolicyValue tpv;
 };
-
-
-#endif
+}; // End of CosTransactions Module

Modified: geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/Current.idl
URL: http://svn.apache.org/viewcvs/geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/Current.idl?rev=373216&r1=373215&r2=373216&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/Current.idl (original)
+++ geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/Current.idl Sat Jan 28 11:04:11 2006
@@ -1,25 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2000
-// Object Oriented Concepts, Inc.
-// Billerica, MA, USA
-//
-// All Rights Reserved
-//
-// **********************************************************************
-
-#ifndef CURRENT_IDL
-#define CURRENT_IDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-
-interface Current
-{
-};
-
-};
-
-#endif

Modified: geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/Dynamic.idl
URL: http://svn.apache.org/viewcvs/geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/Dynamic.idl?rev=373216&r1=373215&r2=373216&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/Dynamic.idl (original)
+++ geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/Dynamic.idl Sat Jan 28 11:04:11 2006
@@ -1,32 +0,0 @@
-// 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: geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/DynamicAny.idl
URL: http://svn.apache.org/viewcvs/geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/DynamicAny.idl?rev=373216&r1=373215&r2=373216&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/DynamicAny.idl (original)
+++ geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/DynamicAny.idl Sat Jan 28 11:04:11 2006
@@ -1,298 +0,0 @@
-// 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();
-	void 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
-
-

Modified: geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/GIOP.idl
URL: http://svn.apache.org/viewcvs/geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/GIOP.idl?rev=373216&r1=373215&r2=373216&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/GIOP.idl (original)
+++ geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/GIOP.idl Sat Jan 28 11:04:11 2006
@@ -1,223 +1,239 @@
-/* This file contains OMG IDL from  CORBA V2.3.1
- *  $Id: GIOP.idl,v 1.2 2001/09/22 14:51:13 jso Exp $	
- */ 
+// File: GIOP.idl
+// From CORBA 3.0: Chapter 15, General Inter-ORB Protocol
 
+#define _PRE_3_0_COMPILER_ 
+#define GIOP_1_1
+#define GIOP_1_2
 
-#ifndef __GIOP_IDL
-#define __GIOP_IDL
-
-#include <IOP.idl>
-#include <orb.idl>
+#ifndef _GIOP_IDL_
+#define _GIOP_IDL_
 
+#ifdef _PRE_3_0_COMPILER_ 
 #pragma prefix "omg.org"
+#include <IOP.idl>
+#else
+import ::IOP;
+#endif // _PRE_3_0_COMPILER_
 
-#define GIOP_1_0
-#define GIOP_1_1
-#define GIOP_1_2
-
-module GIOP {
-  // IDL extended for version 1.1
+module GIOP {                   // IDL extended for version 1.1 and 1.2
 
-  struct Version {						 	
-    octet		major;
-    octet		minor;
-  };
+#ifndef _PRE_3_0_COMPILER_ 
+    typeprefix GIOP "omg.org";
+#endif // _PRE_3_0_COMPILER_
+
+    struct Version {                            
+        octet           major;
+        octet           minor;
+    };
+
+    // Note: Principal is not used in V1.2 and beyond. However, it must
+    //       be available for V1.0 and V1.1
+    typedef sequence<octet> Principal;
 
 #ifndef GIOP_1_1
-  // GIOP 1.0
-  enum MsgType_1_0{ 	// rename from MsgType
-    Request, Reply, CancelRequest,
-    LocateRequest, LocateReply,
-    CloseConnection, MessageError
-  };
+    // 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
-  };
+    // GIOP 1.1
+    enum MsgType_1_1{
+        Request,            Reply,          CancelRequest,
+        LocateRequest,      LocateReply,
+        CloseConnection,    MessageError,                  
+        Fragment            // GIOP 1.1 addition
+    };
+#endif // GIOP_1_1
+    typedef MsgType_1_1 MsgType_1_2;
+    typedef MsgType_1_1 MsgType_1_3;
+
+    
+    // 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.3
+    typedef MessageHeader_1_1 MessageHeader_1_3;                
+
+    // GIOP 1.0
+    struct RequestHeader_1_0 {
+        IOP::ServiceContextList     service_context;
+        unsigned long               request_id;
+        boolean                     response_expected;
+        sequence <octet>            object_key;
+        string                      operation;
+        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;
+        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
+    };
 
+    // GIOP 1.3
+    typedef RequestHeader_1_2 RequestHeader_1_3;
 
 #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 and 1.1
+    enum ReplyStatusType_1_0 {// Renamed from ReplyStatusType
+        NO_EXCEPTION,
+        USER_EXCEPTION,
+        SYSTEM_EXCEPTION,
+        LOCATION_FORWARD
+    };
 #endif
 
-  // 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
-  };
-  
-  // GIOP 1.0
-  struct ReplyHeader_1_0 {// Renamed from ReplyHeader
-      IOP::ServiceContextList     service_context;
-      unsigned long               request_id;
-      ReplyStatusType_1_2         reply_status;
-  };
-
-  // GIOP 1.1
-  typedef ReplyHeader_1_0 ReplyHeader_1_1;
-
-  // Same Header contents for 1.0 and 1.1
-
-  struct ReplyHeader_1_2 {
-    unsigned long request_id;
-    ReplyStatusType_1_2 reply_status;
-    IOP::ServiceContextList service_context; // 1.2 change
-  };
-
-  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;
-  };
+    // 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
+    };
+
+    // GIOP 1.3
+    typedef ReplyHeader_1_2 ReplyHeader_1_3;
+
+    // GIOP 1.0
+    struct ReplyHeader_1_0 {// Renamed from ReplyHeader
+        IOP::ServiceContextList     service_context;
+        unsigned long               request_id;
+        ReplyStatusType_1_2         reply_status;
+    };
+
+    // GIOP 1.1
+    typedef ReplyHeader_1_0 ReplyHeader_1_1;
+    // Same Header contents for 1.0 and 1.1
+
+    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.3
+    typedef LocateRequestHeader_1_2 LocateRequestHeader_1_3;
 
-  // 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;
-  };
+#ifndef GIOP_1_2
+    // GIOP 1.0 and 1.1
+    enum LocateStatusType_1_0 {// Renamed from LocateStatusType
+            UNKNOWN_OBJECT,
+            OBJECT_HERE,
+            OBJECT_FORWARD
+    };
+#endif
 
-  // GIOP 1.1
-  typedef LocateReplyHeader_1_0 LocateReplyHeader_1_1;
+    // 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;
+    };
+
+    // GIOP 1.3
+    typedef LocateReplyHeader_1_2 LocateReplyHeader_1_3;
+
+    // GIOP 1.0
+    struct LocateReplyHeader_1_0 {// Renamed from LocateReplyHeader
+            unsigned long           request_id;
+            LocateStatusType_1_2    locate_status;
+    };
+
+    // GIOP 1.1
+    typedef LocateReplyHeader_1_0 LocateReplyHeader_1_1;
+    // same Header contents for 1.0 and 1.1
+
+    // GIOP 1.2
+    struct FragmentHeader_1_2 {
+        unsigned long               request_id;
+    };
 
-  // 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;
-  };
+    // GIOP 1.3
+    typedef FragmentHeader_1_2 FragmentHeader_1_3;
 
 };
-
-#endif
+#endif // _GIOP_IDL_

Modified: geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/GSSUP.idl
URL: http://svn.apache.org/viewcvs/geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/GSSUP.idl?rev=373216&r1=373215&r2=373216&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/GSSUP.idl (original)
+++ geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/GSSUP.idl Sat Jan 28 11:04:11 2006
@@ -1,39 +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;
+
+	// 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: geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/IIOP.idl
URL: http://svn.apache.org/viewcvs/geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/IIOP.idl?rev=373216&r1=373215&r2=373216&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/IIOP.idl (original)
+++ geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/IIOP.idl Sat Jan 28 11:04:11 2006
@@ -1,50 +1,53 @@
-/* This file contains OMG IDL from  CORBA V2.3.1
-  $Id: IIOP.idl,v 1.3 2002/04/11 15:22:07 krab Exp $
-*/
+// File: IIOP.idl
+// From CORBA 3.0: Chapter 15, General Inter-ORB Protocol
 
-#ifndef __IIOP_IDL
-#define __IIOP_IDL
+#define _PRE_3_0_COMPILER_ 
 
-#include <IOP.idl>
+#ifndef _IIOP_IDL_
+#define _IIOP_IDL_
 
+#ifdef _PRE_3_0_COMPILER_ 
 #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
-    IOP::TaggedComponentSeq components;
-  };
-
-  struct ListenPoint {
-    string host;
-    unsigned short port;
-  };
-
-  typedef sequence<ListenPoint> ListenPointList;
-
-  struct BiDirIIOPServiceContext {// BI_DIR_IIOP Service Context
-    ListenPointList listen_points;
-  };
-
+#include <IOP.idl>
+#else
+import ::IOP;
+#endif // _PRE_3_0_COMPILER_
+
+module IIOP {       // IDL extended for version 1.1 and 1.2
+
+#ifndef _PRE_3_0_COMPILER_ 
+    typeprefix IIOP "omg.org";
+#endif // _PRE_3_0_COMPILER_
+
+    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 {// also used for 1.2
+        Version             iiop_version;
+        string              host;
+        unsigned short      port;
+        sequence <octet>    object_key;
+        // Added in 1.1 unchanged for 1.2
+        sequence <IOP::TaggedComponent> components; 
+    };              
+
+    // BiDirectional IIOP
+
+    struct ListenPoint {
+        string              host;
+        unsigned short      port;
+    };
+    typedef sequence<ListenPoint> ListenPointList;
+    struct BiDirIIOPServiceContext {// BI_DIR_IIOP Service Context
+        ListenPointList listen_points;
+    };
 };
+#endif // _IIOP_IDL_
 
-#endif

Modified: geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/IOP.idl
URL: http://svn.apache.org/viewcvs/geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/IOP.idl?rev=373216&r1=373215&r2=373216&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/IOP.idl (original)
+++ geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/IOP.idl Sat Jan 28 11:04:11 2006
@@ -1,95 +1,175 @@
-#pragma prefix "omg.org"
+// File: IOP.idl
+// From CORBA 3.0: Chapter 13, ORB Interoperability Achitecture
+
+#define _PRE_3_0_COMPILER_ 
 
 #ifndef _IOP_IDL_
 #define _IOP_IDL_
 
-#include "orb.idl"
-
-module IOP { 
-
-	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_ALTERNATIVE_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 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 RTCorbaPriority = 10;
-	const ServiceId RTCorbaPriorityRange = 11;
-	const ServiceId ExceptionDetailMessage = 14;
-
-  typedef sequence<IOP::TaggedComponent> TaggedComponentSeq;
-
-  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;
-  };
-
-  interface CodecFactory {
-    exception UnknownEncoding {};
+#ifdef _PRE_3_0_COMPILER_ 
+#pragma prefix "omg.org"
 
-    Codec create_codec (in Encoding enc) raises (UnknownEncoding);
-  };
+// #include <orb.idl>
+#else
+import ::CORBA;
+#endif // _PRE_3_0_COMPILER_
+
+module IOP {
+
+#ifndef _PRE_3_0_COMPILER_ 
+    typeprefix IOP "omg.org";
+#endif // _PRE_3_0_COMPILER_
+
+    // IOR Profiles
+
+    // Standard Protocol Profile tag values 
+    typedef unsigned long           ProfileId;
+    const ProfileId                 TAG_INTERNET_IOP = 0;
+    const ProfileId                 TAG_MULTIPLE_COMPONENTS = 1;
+    const ProfileId                 TAG_SCCP_IOP = 2;
+
+    struct TaggedProfile {
+        ProfileId                   tag;
+        sequence <octet>            profile_data;
+    };
+    
+   
+    // The IOR
+
+    // an Interoperable Object Reference is a sequence of
+    // object-specific protocol profiles, plus a type ID.
+    struct IOR {
+        string                      type_id;
+        sequence <TaggedProfile>    profiles;
+    };
+    
+
+    // IOR Components
+
+
+    // Standard way of representing multicomponent profiles.
+    // This would be encapsulated in a TaggedProfile.
+
+    typedef unsigned long ComponentId;
+
+    struct TaggedComponent {
+        ComponentId                 tag;
+        sequence <octet>            component_data;
+    };
+
+    typedef sequence <TaggedComponent> MultipleComponentProfile;
+
+    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_SEC_NAME                = 14;
+    const ComponentId           TAG_SPKM_1_SEC_MECH         = 15;
+    const ComponentId           TAG_SPKM_2_SEC_MECH         = 16;
+    const ComponentId           TAG_KerberosV5_SEC_MECH     = 17;
+    const ComponentId           TAG_CSI_ECMA_Secret_SEC_MECH= 18;
+    const ComponentId           TAG_CSI_ECMA_Hybrid_SEC_MECH= 19;
+    const ComponentId           TAG_SSL_SEC_TRANS           = 20;
+    const ComponentId           TAG_CSI_ECMA_Public_SEC_MECH= 21;
+    const ComponentId           TAG_GENERIC_SEC_MECH        = 22;
+    const ComponentId           TAG_FIREWALL_TRANS          = 23; 
+    const ComponentId           TAG_SCCP_CONTACT_INFO       = 24; 
+    const ComponentId           TAG_JAVA_CODEBASE           = 25;
+
+    const ComponentId           TAG_TRANSACTION_POLICY      = 26;
+    const ComponentId           TAG_MESSAGE_ROUTER          = 30;
+    const ComponentId           TAG_OTS_POLICY              = 31;
+    const ComponentId           TAG_INV_POLICY              = 32;
+
+    const ComponentId           TAG_CSI_SEC_MECH_LIST       = 33;
+    const ComponentId           TAG_NULL_TAG                = 34;
+    const ComponentId           TAG_SECIOP_SEC_TRANS        = 35;
+
+    const ComponentId           TAG_TLS_SEC_TRANS           = 36;
+
+    const ComponentId           TAG_ACTIVITY_POLICY         = 37;
+ 
+
+    const ComponentId           TAG_COMPLETE_OBJECT_KEY     = 5;
+    const ComponentId           TAG_ENDPOINT_ID_POSITION    = 6;
+    const ComponentId           TAG_LOCATION_POLICY         = 12;
+    const ComponentId           TAG_DCE_STRING_BINDING      = 100;
+    const ComponentId           TAG_DCE_BINDING_NAME        = 101;
+    const ComponentId           TAG_DCE_NO_PIPES            = 102;
+
+    const ComponentId           TAG_DCE_SEC_MECH            = 103;
+
+    const ComponentId           TAG_INET_SEC_TRANS          = 123;
+
+    // Service Contexts
+
+    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             RTCorbaPriority             = 10;
+    const ServiceId             RTCorbaPriorityRange        = 11;
+    const ServiceId             FT_GROUP_VERSION            = 12;
+    const ServiceId             FT_REQUEST                  = 13;
+    const ServiceId             ExceptionDetailMessage      = 14;
+    const ServiceId             SecurityAttributeService    = 15;
+    const ServiceId             ActivityService             = 16;
+
+    /*
+    
+    // Coder Decoder from Portable Interceptor
+
+    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);
+    };
+
+    // Codec Factory
+
+    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);
+    };
+    
+    */
+};
 
+// #include <IOP_DCE.idl>
 
-};  // IOP module
+#endif  // _IOP_IDL_
 
-#endif

Modified: geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/IOP_N.idl
URL: http://svn.apache.org/viewcvs/geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/IOP_N.idl?rev=373216&r1=373215&r2=373216&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/IOP_N.idl (original)
+++ geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/IOP_N.idl Sat Jan 28 11:04:11 2006
@@ -1,49 +0,0 @@
-// 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;
-
-  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;
-  };
-
-  interface CodecFactory {
-    exception UnknownEncoding {};
-
-    Codec create_codec (in Encoding enc) raises (UnknownEncoding);
-  };
-};
-
-#endif // _IOP_N_IDL_

Modified: geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/InterfaceRepository.idl
URL: http://svn.apache.org/viewcvs/geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/InterfaceRepository.idl?rev=373216&r1=373215&r2=373216&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/InterfaceRepository.idl (original)
+++ geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/InterfaceRepository.idl Sat Jan 28 11:04:11 2006
@@ -1,596 +0,0 @@
-// File: CORBA_InterfaceRepository.idl 
-// (part of formal/00-04-01)
-// CORBA 2.3, Chapter 10
-
-// Forward references to Chapter 10, CORBA_InterfaceRepository.idl
-
-#ifndef InterfaceRepository_IDL
-#define InterfaceRepository_IDL
-
-#include <InterfaceRepository.idl>
-
-#pragma prefix "omg.org"
-
-module CORBA {
-    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 Identifier;
-    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);
-    };
-};
-
-#endif

Modified: geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/LifeCycleService.idl
URL: http://svn.apache.org/viewcvs/geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/LifeCycleService.idl?rev=373216&r1=373215&r2=373216&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/LifeCycleService.idl (original)
+++ geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/LifeCycleService.idl Sat Jan 28 11:04:11 2006
@@ -1,44 +0,0 @@
-// LifeCycleService Module, p 6- 55 CORBAservices, Life Cycle
-// Service V1.0, 3/94
-
-#include <CosLifeCycle.idl> 
-
-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: geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/Messaging.idl
URL: http://svn.apache.org/viewcvs/geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/Messaging.idl?rev=373216&r1=373215&r2=373216&view=diff
==============================================================================
--- geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/Messaging.idl (original)
+++ geronimo/specs/trunk/geronimo-spec-corba-2.3/src/main/idl/Messaging.idl Sat Jan 28 11:04:11 2006
@@ -1,141 +0,0 @@
-#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;
-	interface RebindPolicy : CORBA::Policy {
-		readonly attribute RebindMode rebind_mode;
-	};
-	// Synchronization Policy (default = SYNC_WITH_TRANSPORT)
-	const CORBA::PolicyType SYNC_SCOPE_POLICY_TYPE = 24;
-	interface SyncScopePolicy : CORBA::Policy {
-		readonly attribute SyncScope synchronization;
-	};
-	// Priority Policies
-
-
-
-	const CORBA::PolicyType REQUEST_PRIORITY_POLICY_TYPE = 25;
-	struct PriorityRange {
-		Priority min;
-		Priority max;
-	};
-	interface RequestPriorityPolicy : CORBA::Policy {
-		readonly attribute PriorityRange priority_range;
-	};
-	const CORBA::PolicyType REPLY_PRIORITY_POLICY_TYPE = 26;
-	interface ReplyPriorityPolicy : CORBA::Policy {
-		readonly attribute PriorityRange priority_range;
-	};
-	// Timeout Policies
-	const CORBA::PolicyType REQUEST_START_TIME_POLICY_TYPE = 27;
-	interface RequestStartTimePolicy : CORBA::Policy {
-		readonly attribute TimeBase::UtcT start_time;
-	};
-	const CORBA::PolicyType REQUEST_END_TIME_POLICY_TYPE = 28;
-	interface RequestEndTimePolicy : CORBA::Policy {
-		readonly attribute TimeBase::UtcT end_time;
-	};
-	const CORBA::PolicyType REPLY_START_TIME_POLICY_TYPE = 29;
-	interface ReplyStartTimePolicy : CORBA::Policy {
-		readonly attribute TimeBase::UtcT start_time;
-	};
-	const CORBA::PolicyType REPLY_END_TIME_POLICY_TYPE = 30;
-	interface ReplyEndTimePolicy : CORBA::Policy {
-		readonly attribute TimeBase::UtcT end_time;
-	};
-	const CORBA::PolicyType RELATIVE_REQ_TIMEOUT_POLICY_TYPE =
-		31;
-	interface RelativeRequestTimeoutPolicy : CORBA::Policy {
-		readonly attribute TimeBase::TimeT relative_expiry;
-	};
-	const CORBA::PolicyType RELATIVE_RT_TIMEOUT_POLICY_TYPE = 32;
-	interface RelativeRoundtripTimeoutPolicy : CORBA::Policy {
-		readonly attribute TimeBase::TimeT relative_expiry;
-	};
-	const CORBA::PolicyType ROUTING_POLICY_TYPE = 33;
-	struct RoutingTypeRange {
-		RoutingType min;
-		RoutingType max;
-	};
-	interface RoutingPolicy : CORBA::Policy {
-		readonly attribute RoutingTypeRange routing_range;
-	};
-
-
-	const CORBA::PolicyType MAX_HOPS_POLICY_TYPE = 34;
-	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;
-	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 = 2;
-	//
-	// Exception Delivery in the Callback Model
-	//
-	/*
-	value ExceptionHolder {
-		boolean is_system_exception;
-		boolean byte_order;
-		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;
-	};
-	*/
-};



Mime
View raw message