openorb-commits — A moderate volume list to track updates to the CVS repository.

[openorb-commits] CVS: tools/src/main/org/openorb/util NumberCache.java, 1.5, 1.6

[Lars Küh. <lk...@us...>]

Update of /cvsroot/openorb/tools/src/main/org/openorb/util
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19902/src/main/org/openorb/util

Modified Files:
	NumberCache.java 
Log Message:
Added patch from Eric Thomas to fix a bug that made NumberCache 
non-operational


Index: NumberCache.java
===================================================================
RCS file: /cvsroot/openorb/tools/src/main/org/openorb/util/NumberCache.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- NumberCache.java	23 Jun 2004 07:13:19 -0000	1.5
+++ NumberCache.java	2 Apr 2008 20:00:34 -0000	1.6
@@ -232,7 +232,7 @@
 
         static Short getShort( final short value )
         {
-            if ( ( CACHE_MIN <= value ) && ( value <= CACHE_MIN ) )
+            if ( ( CACHE_MIN <= value ) && ( value <= CACHE_MAX ) )
             {
                 return CACHE[value - CACHE_MIN];
             }
@@ -288,7 +288,7 @@
 
         static Integer getInteger( final int value )
         {
-            if ( ( CACHE_MIN <= value ) && ( value <= CACHE_MIN ) )
+            if ( ( CACHE_MIN <= value ) && ( value <= CACHE_MAX ) )
             {
                 return CACHE[value - CACHE_MIN];
             }
@@ -343,7 +343,7 @@
 
         static Long getLong( final long value )
         {
-            if ( ( CACHE_MIN <= value ) && ( value <= CACHE_MIN ) )
+            if ( ( CACHE_MIN <= value ) && ( value <= CACHE_MAX ) )
             {
                 return CACHE[( int ) ( value - CACHE_MIN )];
             }

[openorb-commits] CVS: tools WHATSNEW,1.86,1.87

[Lars Küh. <lk...@us...>]

Update of /cvsroot/openorb/tools
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19902

Modified Files:
	WHATSNEW 
Log Message:
Added patch from Eric Thomas to fix a bug that made NumberCache 
non-operational


Index: WHATSNEW
===================================================================
RCS file: /cvsroot/openorb/tools/WHATSNEW,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- WHATSNEW	28 Mar 2005 10:50:36 -0000	1.86
+++ WHATSNEW	2 Apr 2008 20:00:34 -0000	1.87
@@ -1,6 +1,9 @@
 OpenORB tools
 -------------
 
+- Added patch from Eric Thomas to fix a bug that made NumberCache
+  non-operational
+
 Version 1.4.0 - March, 28 2005 - tools_1_4_0_RELEASE
 
 - Changed the Copyright year to 2005

[openorb-commits] CVS: OpenORB WHATSNEW, 1.238, 1.239 build.sh, 1.24, 1.25

[<lk...@us...>]

Update of /cvsroot/openorb/OpenORB
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14407

Modified Files:
	WHATSNEW build.sh 
Log Message:
Handle Darwin/OSX in build.sh

Index: WHATSNEW
===================================================================
RCS file: /cvsroot/openorb/OpenORB/WHATSNEW,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -d -r1.238 -r1.239
--- WHATSNEW	28 Mar 2005 10:47:53 -0000	1.238
+++ WHATSNEW	15 Jan 2007 19:34:34 -0000	1.239
@@ -1,6 +1,8 @@
 OpenORB
 -------
 
+- Handle Darwin/MacOSX in build.sh
+
 Version 1.4.0 - March, 28 2005 - OpenORB_1_4_0_RELEASE
 
 - Fixed a NPE in the compiler (regression between 1.3.1 and 1.4.0 beta2).

Index: build.sh
===================================================================
RCS file: /cvsroot/openorb/OpenORB/build.sh,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- build.sh	23 Jul 2004 06:42:22 -0000	1.24
+++ build.sh	15 Jan 2007 19:34:35 -0000	1.25
@@ -46,7 +46,7 @@
       fi
       export LIBPATH
       ;;
-   Linux|SunOS)
+   Linux|SunOS|Darwin)
       if [ -z "${LD_LIBRARY_PATH}" ]; then
          LD_LIBRARY_PATH=$TWISTER_SLPATH:$TCOO_LIB_PATH
       else

[openorb-commits] CVS: OpenORB/src/compiler/org/openorb/compiler/generator IdlToJava.java, 1.24, 1.25

[<lk...@us...>]

Update of /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/generator
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27110

Modified Files:
	IdlToJava.java 
Log Message:
fixed typo in inactive Java5 code

Index: IdlToJava.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/generator/IdlToJava.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- IdlToJava.java	9 Oct 2006 18:23:35 -0000	1.24
+++ IdlToJava.java	9 Oct 2006 21:10:10 -0000	1.25
@@ -4611,7 +4611,7 @@
                     if (targetJava5)
                     {
                         output.println(tab2);
-                        output.println(tab2 + "if (value.percision() > " + ((IdlFixed) final_type(obj)).digits() + ")");
+                        output.println(tab2 + "if (value.precision() > " + ((IdlFixed) final_type(obj)).digits() + ")");
                         output.println(tab2 + "{");
                         output.println(tab3 + "throw new org.omg.CORBA.DATA_CONVERSION();");
                         output.println(tab2 + "}");

[openorb-commits] CVS: OpenORB/src/compiler/org/openorb/compiler/generator IdlToJava.java, 1.23, 1.24

[<lk...@us...>]

Update of /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/generator
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23629

Modified Files:
	IdlToJava.java 
Log Message:
applied patch from Stepan Koltsov to correct scale check behaviour for fixed values, see dicussion on user list.


Index: IdlToJava.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/compiler/org/openorb/compiler/generator/IdlToJava.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- IdlToJava.java	27 Mar 2005 07:32:35 -0000	1.23
+++ IdlToJava.java	9 Oct 2006 18:23:35 -0000	1.24
@@ -4596,10 +4596,25 @@
             else
                 if (final_kind(obj) == IdlType.e_fixed)
                 {
-                    if (((IdlFixed) final_type(obj)).scale() != 0)
+                    output.println(tab2 + "try");
+                    output.println(tab2 + "{");
+                    output.println(tab3 + "value = value.setScale(" + ((IdlFixed) final_type(obj)).scale() + ");");
+                    output.println(tab2 + "}");
+                    output.println(tab2 + "catch (java.lang.ArithmeticException e)");
+                    output.println(tab2 + "{");
+                    output.println(tab3 + "throw new org.omg.CORBA.DATA_CONVERSION();");
+                    output.println(tab2 + "}");
+
+                    // the following precision check is only available on Java5
+                    // disabled for now, since we currently target Java 1.4
+                    final boolean targetJava5 = false;
+                    if (targetJava5)
                     {
-                        output.println(tab2 + "if (value.scale() != " + ((IdlFixed) final_type(obj)).scale() + ")");
+                        output.println(tab2);
+                        output.println(tab2 + "if (value.percision() > " + ((IdlFixed) final_type(obj)).digits() + ")");
+                        output.println(tab2 + "{");
                         output.println(tab3 + "throw new org.omg.CORBA.DATA_CONVERSION();");
+                        output.println(tab2 + "}");
                     }
 
                     output.println(tab2 + "ostream.write_fixed(value);");

[openorb-commits] CVS: TransactionService/src/main/org/openorb/ots/Impl TimeOutControl.java,1.8,1.9 Terminator.java,1.16,1.17

[<lk...@us...>]

Update of /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/Impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14922/src/main/org/openorb/ots/Impl

Modified Files:
	TimeOutControl.java Terminator.java 
Log Message:
fix for bug 1240265, contributed by Chris Dodenhoff

Index: TimeOutControl.java
===================================================================
RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/Impl/TimeOutControl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- TimeOutControl.java	4 Jun 2004 09:58:48 -0000	1.8
+++ TimeOutControl.java	20 Jul 2005 19:12:18 -0000	1.9
@@ -86,14 +86,49 @@
      */
     public void run()
     {
-        try
-        {
-            sleep( m_time_out * 1000 );
-            proceed();
-        }
-        catch ( java.lang.Exception e )
+        long timeLeft = m_time_out * 1000;
+        long startTime = System.currentTimeMillis();
+        boolean bWait = true;
+
+        while ( bWait )
         {
-            m_logger.error( "OTS TimeoutControl error " + e.toString(), e );
+            try
+            {
+                sleep( timeLeft );
+                bWait = false;
+            }
+            catch ( InterruptedException e )
+            {
+                if ( !isTransactionComplete() )
+                {
+                    // Reduce time left to wait
+                    long timeNow = System.currentTimeMillis();
+                    long timeSleeping = startTime - timeNow;
+                    timeLeft -= timeSleeping;
+                    if ( timeLeft <= 0 )  // timeout !
+                    {
+                        bWait = false;
+                    }
+                    else
+                    {
+                        startTime = timeNow;
+                    }
+                }
+                else
+                {
+                    bWait = false;
+                }
+            }
         }
+
+        proceed();
+    }
+
+    /**
+     * Check if the transaction is complete
+     */
+    private boolean isTransactionComplete()
+    {
+        return ( m_transaction_state == FINISHED );
     }
 }

Index: Terminator.java
===================================================================
RCS file: /cvsroot/openorb/TransactionService/src/main/org/openorb/ots/Impl/Terminator.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- Terminator.java	4 Jun 2004 10:32:17 -0000	1.16
+++ Terminator.java	20 Jul 2005 19:12:18 -0000	1.17
@@ -123,6 +123,7 @@
         if ( m_time_ctrl != null )
         {
             m_time_ctrl.finish();
+            m_time_ctrl.interrupt();
         }
         //
         // Commit all sub transactions
@@ -264,6 +265,7 @@
         if ( m_time_ctrl != null )
         {
             m_time_ctrl.finish();
+            m_time_ctrl.interrupt();
         }
         //
         // Rollback all sub transactions

[openorb-commits] CVS: TransactionService WHATSNEW,1.42,1.43

[<lk...@us...>]

Update of /cvsroot/openorb/TransactionService
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14922

Modified Files:
	WHATSNEW 
Log Message:
fix for bug 1240265, contributed by Chris Dodenhoff

Index: WHATSNEW
===================================================================
RCS file: /cvsroot/openorb/TransactionService/WHATSNEW,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- WHATSNEW	28 Mar 2005 10:51:16 -0000	1.42
+++ WHATSNEW	20 Jul 2005 19:12:17 -0000	1.43
@@ -1,6 +1,10 @@
 OpenORB TransactionService
 --------------------------
 
+- Fixed problem where transactions with timeouts were using resources
+  (threads, memory) even after commit or rollback (sf bug id #1240265).
+  Contributed by Chris Dodenhoff
+
 Version 1.4.0 - March, 28 2005 - TransactionService_1_4_0_RELEASE
 
 - Fixed a potential bug in generation of unique XIDs, it allowed to generate

[openorb-commits] CVS: OpenORB/src build.xml,1.186,1.187

[Richard G C. <pim...@us...>]

Update of /cvsroot/openorb/OpenORB/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11416/OpenORB/src

Modified Files:
	build.xml 
Log Message:
turned off the bugged upToDateChecks for generating test IDL

Index: build.xml
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/build.xml,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- build.xml	26 Jan 2005 16:52:03 -0000	1.186
+++ build.xml	12 Jul 2005 01:00:02 -0000	1.187
@@ -838,7 +838,8 @@
               generateall="true"
               destdir="${gensrc.dir}/test"
               includepath="${idl.dir};${idl.dir}/test"
-              includeorbidl="false" />
+              includeorbidl="false"
+              uptodatechecks="false" />
     <delete failonerror="false" quiet="true" dir="${gensrc.dir}/test/org/omg" />
     <javac srcdir="${test.dir};${gensrc.dir}/test"
            destdir="${build.dir}/test"

[openorb-commits] CVS: website/src/documentation/content/xdocs who-we-are.xml,1.6,1.7

[<lk...@us...>]

Update of /cvsroot/openorb/website/src/documentation/content/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24124

Modified Files:
	who-we-are.xml 
Log Message:
marked Jesper as emeritus committer


Index: who-we-are.xml
===================================================================
RCS file: /cvsroot/openorb/website/src/documentation/content/xdocs/who-we-are.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- who-we-are.xml	22 Dec 2003 16:34:09 -0000	1.6
+++ who-we-are.xml	30 May 2005 17:46:09 -0000	1.7
@@ -27,7 +27,6 @@
 <ul>
 <li><link href="mailto:mrumpf_at_users.sf.net">Michael Rumpf</link></li>
 <li><link href="mailto:electric_steve_at_users.sf.net">Stephen McConnell</link></li>
-<li><link href="mailto:jews_at_users.sf.net">Jesper Pedersen</link></li>
 <li><link href="shawnboyce.html">Shawn Boyce</link></li>
 <li><link href="mailto:jscottevans_at_users.sf.net">J. Scott Evans</link></li>
 <li><link href="mailto:vtararin_at_users.sf.net">Viacheslav N. Tararin</link></li>
@@ -43,6 +42,19 @@
 </ul>
 </section>
 
+<section><title>Emeritus Committers</title>
+<p>
+At times, Committers may go inactive for a variety of reasons. A Committer
+that has been inactive for 6 months or more may lose their status as a
+Committer. Getting access back is as simple as re-requesting it on the
+Developer mailing list, full committer status will be restored without any vote.
+
+</p>
+<ul>
+<li><link href="mailto:jews_at_users.sf.net">Jesper Pedersen</link></li>
+</ul>
+</section>
+
 <section><title>Contributors</title>
 <p>
       We would like to thank the following people for their contributions to the project (in no particular order).

[openorb-commits] CVS: NotificationService/src/main/org/openorb/notify/impl ConsumerAdminImpl.java,1.31,1.32 SupplierAdminImpl.java,1.27,1.28

[<lk...@us...>]

Update of /cvsroot/openorb/NotificationService/src/main/org/openorb/notify/impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8839/src/main/org/openorb/notify/impl

Modified Files:
	ConsumerAdminImpl.java SupplierAdminImpl.java 
Log Message:
fix for the incorrect patch in last commit, contributed by jiangwei_1976 dot yahoo dot com dot cn

Index: ConsumerAdminImpl.java
===================================================================
RCS file: /cvsroot/openorb/NotificationService/src/main/org/openorb/notify/impl/ConsumerAdminImpl.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- ConsumerAdminImpl.java	23 May 2005 03:45:40 -0000	1.31
+++ ConsumerAdminImpl.java	24 May 2005 04:02:32 -0000	1.32
@@ -211,7 +211,7 @@
         return PersistenceRepository.getConsumerAdminHome(
                 propertiesRepository.isConnectionReliable() ).create(
                 consumerAdminId, channelId, operator, qosProperties,
-                connectionInfo, connectionInfo, 0, 0, referenceInfo,
+                connectionInfo, connectionInfo, 0, referenceInfo,
                 referenceInfo, 0, eventTypeInfo );
     }
 

Index: SupplierAdminImpl.java
===================================================================
RCS file: /cvsroot/openorb/NotificationService/src/main/org/openorb/notify/impl/SupplierAdminImpl.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- SupplierAdminImpl.java	23 May 2005 03:45:40 -0000	1.27
+++ SupplierAdminImpl.java	24 May 2005 04:02:33 -0000	1.28
@@ -195,7 +195,7 @@
         return PersistenceRepository.getSupplierAdminHome(
                 propertiesRepository.isConnectionReliable() ).create(
                 supplierAdminId, channelId, operator, qosProperties,
-                connectionInfo, connectionInfo, 0, 0, referenceInfo,
+                connectionInfo, connectionInfo, 0, referenceInfo,
                 referenceInfo, 0, eventTypeInfo );
     }
 

[openorb-commits] CVS: NotificationService/src/psdl notify.psdl,1.3,1.4

[<lk...@us...>]

Update of /cvsroot/openorb/NotificationService/src/psdl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8839/src/psdl

Modified Files:
	notify.psdl 
Log Message:
fix for the incorrect patch in last commit, contributed by jiangwei_1976 dot yahoo dot com dot cn

Index: notify.psdl
===================================================================
RCS file: /cvsroot/openorb/NotificationService/src/psdl/notify.psdl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- notify.psdl	23 May 2005 03:50:11 -0000	1.3
+++ notify.psdl	24 May 2005 04:02:32 -0000	1.4
@@ -375,8 +375,8 @@
     abstract storagehome ConsumerAdminHome of ConsumerAdmin {
     	
    	  factory create( id, channel_id, filter_operator, qos_properties, 
-   	                  pull_suppliers, push_suppliers, next_pull_supplier_id,
-   	                  next_push_supplier_id, filters, mapping_filters, next_filter_id, event_types );
+   	                  pull_suppliers, push_suppliers, next_supplier_id, 
+    	                  filters, mapping_filters, next_filter_id, event_types );
     };
          
     /**
@@ -443,7 +443,7 @@
     abstract storagehome SupplierAdminHome of SupplierAdmin {
     	 
     	 factory create( id, channel_id, filter_operator, qos_properties, pull_consumers, push_consumers,
-    	                 next_pull_consumer_id, next_push_consumer_id, filters, mapping_filters, next_filter_id, event_types );
+    	                 next_consumer_id, filters, mapping_filters, next_filter_id, event_types );
     };   
      
     /**
@@ -503,12 +503,12 @@
       state CosNotification::PropertySeq admin_properties;
             
       /**
-       * Indicates the next pull consumer id
+       * Indicates the next consumer id
        */
       state long next_consumer_admin_id; 
       
       /**
-       * Indicates the next push consumer id
+       * Indicates the next supplier id
        */
       state long next_supplier_admin_id;
       

[openorb-commits] CVS: NotificationService/src/psdl notify.psdl,1.2,1.3

[<lk...@us...>]

Update of /cvsroot/openorb/NotificationService/src/psdl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2045/src/psdl

Modified Files:
	notify.psdl 
Log Message:
ConsumerAdmin no longer generates overlapping proxy ids for pull and push suppliers.
Fix contributed by jiangwei_1976 at yahoo _dot_ com _dot_ cn


Index: notify.psdl
===================================================================
RCS file: /cvsroot/openorb/NotificationService/src/psdl/notify.psdl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- notify.psdl	21 Aug 2002 08:11:21 -0000	1.2
+++ notify.psdl	23 May 2005 03:50:11 -0000	1.3
@@ -363,15 +363,10 @@
       state ConnectionInfoSeq push_suppliers;
       
       /**
-       * Indicates the next pull supplier id
+       * Indicates the next pull/push supplier id
        */
-      state long next_pull_supplier_id; 
+      state long next_supplier_id; 
       
-      /**
-       * Indicates the next push supplier id
-       */
-      state long next_push_supplier_id; 
-         
     };
     
     /**
@@ -437,14 +432,9 @@
       state ConnectionInfoSeq push_consumers;
       
       /**
-       * Indicates the next pull consumer id
-       */
-      state long next_pull_consumer_id; 
-      
-      /**
-       * Indicates the next push consumer id
+       * Indicates the next pull/push consumer id
        */
-      state long next_push_consumer_id; 
+      state long next_consumer_id; 
     };
     
     /**

[openorb-commits] CVS: NotificationService/src/main/org/openorb/notify/impl ConsumerAdminImpl.java,1.30,1.31 SupplierAdminImpl.java,1.26,1.27

[<lk...@us...>]

Update of /cvsroot/openorb/NotificationService/src/main/org/openorb/notify/impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1607/src/main/org/openorb/notify/impl

Modified Files:
	ConsumerAdminImpl.java SupplierAdminImpl.java 
Log Message:
ConsumerAdmin no longer generates overlapping proxy ids for pull and push suppliers.
Fix contributed by jiangwei_1976 at yahoo _dot_ com _dot_ cn


Index: ConsumerAdminImpl.java
===================================================================
RCS file: /cvsroot/openorb/NotificationService/src/main/org/openorb/notify/impl/ConsumerAdminImpl.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- ConsumerAdminImpl.java	10 Dec 2004 15:32:57 -0000	1.30
+++ ConsumerAdminImpl.java	23 May 2005 03:45:40 -0000	1.31
@@ -556,7 +556,7 @@
             {
                 case ClientType._STRUCTURED_EVENT :
 
-                    proxy_id.value = m_pssConsumerAdmin.next_pull_supplier_id();
+                    proxy_id.value = m_pssConsumerAdmin.next_supplier_id();
 
                     if ( getLogger().isDebugEnabled() )
                     {
@@ -572,7 +572,7 @@
 
                 case ClientType._SEQUENCE_EVENT :
 
-                    proxy_id.value = m_pssConsumerAdmin.next_pull_supplier_id();
+                    proxy_id.value = m_pssConsumerAdmin.next_supplier_id();
 
                     if ( getLogger().isDebugEnabled() )
                     {
@@ -589,7 +589,7 @@
 
                 case ClientType._ANY_EVENT :
 
-                    proxy_id.value = m_pssConsumerAdmin.next_pull_supplier_id();
+                    proxy_id.value = m_pssConsumerAdmin.next_supplier_id();
 
                     if ( getLogger().isDebugEnabled() )
                     {
@@ -630,7 +630,7 @@
                 newSuppliers[suppliers.length] =
                         new ConnectionInfo( proxy_id.value, pid, m_poa.id_to_reference( pid ) );
 
-                m_pssConsumerAdmin.next_pull_supplier_id( proxy_id.value + 1 );
+                m_pssConsumerAdmin.next_supplier_id( proxy_id.value + 1 );
 
                 m_pssConsumerAdmin.pull_suppliers( newSuppliers );
 
@@ -699,7 +699,7 @@
 
                 case ClientType._STRUCTURED_EVENT :
 
-                    proxy_id.value = m_pssConsumerAdmin.next_push_supplier_id();
+                    proxy_id.value = m_pssConsumerAdmin.next_supplier_id();
 
                     if ( getLogger().isDebugEnabled() )
                     {
@@ -716,7 +716,7 @@
 
                 case ClientType._SEQUENCE_EVENT :
 
-                    proxy_id.value = m_pssConsumerAdmin.next_push_supplier_id();
+                    proxy_id.value = m_pssConsumerAdmin.next_supplier_id();
 
                     if ( getLogger().isDebugEnabled() )
                     {
@@ -733,7 +733,7 @@
 
                 case ClientType._ANY_EVENT :
 
-                    proxy_id.value = m_pssConsumerAdmin.next_push_supplier_id();
+                    proxy_id.value = m_pssConsumerAdmin.next_supplier_id();
 
                     if ( getLogger().isDebugEnabled() )
                     {
@@ -774,7 +774,7 @@
                 newSuppliers[suppliers.length] =
                         new ConnectionInfo( proxy_id.value, pid, m_poa.id_to_reference( pid ) );
 
-                m_pssConsumerAdmin.next_push_supplier_id( proxy_id.value + 1 );
+                m_pssConsumerAdmin.next_supplier_id( proxy_id.value + 1 );
 
                 m_pssConsumerAdmin.push_suppliers( newSuppliers );
 

Index: SupplierAdminImpl.java
===================================================================
RCS file: /cvsroot/openorb/NotificationService/src/main/org/openorb/notify/impl/SupplierAdminImpl.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- SupplierAdminImpl.java	16 May 2004 17:55:01 -0000	1.26
+++ SupplierAdminImpl.java	23 May 2005 03:45:40 -0000	1.27
@@ -422,7 +422,7 @@
             {
                 case ClientType._STRUCTURED_EVENT:
 
-                    proxy_id.value = m_pssSupplierAdmin.next_pull_consumer_id();
+                    proxy_id.value = m_pssSupplierAdmin.next_consumer_id();
 
                     if ( getLogger().isDebugEnabled() )
                     {
@@ -439,7 +439,7 @@
 
                 case ClientType._SEQUENCE_EVENT:
 
-                    proxy_id.value = m_pssSupplierAdmin.next_pull_consumer_id();
+                    proxy_id.value = m_pssSupplierAdmin.next_consumer_id();
 
                     if ( getLogger().isDebugEnabled() )
                     {
@@ -456,7 +456,7 @@
 
                 case ClientType._ANY_EVENT:
 
-                    proxy_id.value = m_pssSupplierAdmin.next_pull_consumer_id();
+                    proxy_id.value = m_pssSupplierAdmin.next_consumer_id();
 
                     getLogger().debug( getId()
                             + " AnyPullConsumer created with id "
@@ -494,7 +494,7 @@
                 newConsumers[consumers.length] =
                         new ConnectionInfo( proxy_id.value, pid, m_poa.id_to_reference( pid ) );
 
-                m_pssSupplierAdmin.next_pull_consumer_id( proxy_id.value + 1 );
+                m_pssSupplierAdmin.next_consumer_id( proxy_id.value + 1 );
 
                 m_pssSupplierAdmin.pull_consumers( newConsumers );
 
@@ -560,7 +560,7 @@
 
                 case ClientType._STRUCTURED_EVENT:
 
-                    proxy_id.value = m_pssSupplierAdmin.next_push_consumer_id();
+                    proxy_id.value = m_pssSupplierAdmin.next_consumer_id();
 
                     if ( getLogger().isDebugEnabled() )
                     {
@@ -577,7 +577,7 @@
 
                 case ClientType._SEQUENCE_EVENT:
 
-                    proxy_id.value = m_pssSupplierAdmin.next_push_consumer_id();
+                    proxy_id.value = m_pssSupplierAdmin.next_consumer_id();
 
                     if ( getLogger().isDebugEnabled() )
                     {
@@ -594,7 +594,7 @@
 
                 case ClientType._ANY_EVENT:
 
-                    proxy_id.value = m_pssSupplierAdmin.next_push_consumer_id();
+                    proxy_id.value = m_pssSupplierAdmin.next_consumer_id();
 
                     if ( getLogger().isDebugEnabled() )
                     {
@@ -636,7 +636,7 @@
                 newConsumers[consumers.length] =
                         new ConnectionInfo( proxy_id.value, pid, m_poa.id_to_reference( pid ) );
 
-                m_pssSupplierAdmin.next_push_consumer_id( proxy_id.value + 1 );
+                m_pssSupplierAdmin.next_consumer_id( proxy_id.value + 1 );
 
                 m_pssSupplierAdmin.push_consumers( newConsumers );
 

[openorb-commits] CVS: NotificationService WHATSNEW,1.71,1.72

[<lk...@us...>]

Update of /cvsroot/openorb/NotificationService
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1607

Modified Files:
	WHATSNEW 
Log Message:
ConsumerAdmin no longer generates overlapping proxy ids for pull and push suppliers.
Fix contributed by jiangwei_1976 at yahoo _dot_ com _dot_ cn


Index: WHATSNEW
===================================================================
RCS file: /cvsroot/openorb/NotificationService/WHATSNEW,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- WHATSNEW	28 Mar 2005 10:47:14 -0000	1.71
+++ WHATSNEW	23 May 2005 03:45:40 -0000	1.72
@@ -1,6 +1,10 @@
 OpenORB NotificationService
 ---------------------------
 
+- ConsumerAdmin no longer generates overlapping proxy ids for
+  pull and push suppliers.  Fix contributed by
+  jiangwei_1976 at yahoo _dot_ com _dot_ cn
+
 Version 1.4.0 - March, 28 2005 - NotificationService_1_4_0_RELEASE
 
 - notify.resourcesTimeout didn't work when both Events and

[openorb-commits] CVS: website/src/documentation/content/xdocs index.xml,1.6,1.7

[<lk...@us...>]

Update of /cvsroot/openorb/website/src/documentation/content/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18661

Modified Files:
	index.xml 
Log Message:
removed dead ling to dog.intalio.com


Index: index.xml
===================================================================
RCS file: /cvsroot/openorb/website/src/documentation/content/xdocs/index.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- index.xml	4 Apr 2003 13:09:25 -0000	1.6
+++ index.xml	11 Apr 2005 06:24:17 -0000	1.7
@@ -40,7 +40,7 @@
         <title>What is It?</title>
 <p>
 This is a community fork of the open source project OpenORB 
-(<link href="http://openorb.exolab.org">openorb.exolab.org</link>, <link href="http://dog.intalio.com/">dog.intalio.com</link>). 
+(<link href="http://openorb.exolab.org">openorb.exolab.org</link>). 
 The goal of this initiative is to make the evolution
 of the OpenORB project more transparent and to allow the community to take
 part in making decisions about its future. 

[openorb-commits] CVS: NamingService/src/test/org/openorb/ns/test/jndi NamingTest.java,1.5,1.6

[<lk...@us...>]

Update of /cvsroot/openorb/NamingService/src/test/org/openorb/ns/test/jndi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24907/src/test/org/openorb/ns/test/jndi

Modified Files:
	NamingTest.java 
Log Message:
changed name of enum variable to allow compilation on JDK 1.5

Index: NamingTest.java
===================================================================
RCS file: /cvsroot/openorb/NamingService/src/test/org/openorb/ns/test/jndi/NamingTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- NamingTest.java	19 Feb 2004 06:29:59 -0000	1.5
+++ NamingTest.java	29 Mar 2005 04:58:47 -0000	1.6
@@ -280,10 +280,10 @@
         {
             javax.naming.Context ctx = getInitialContext();
             ctx.createSubcontext( "sub" );
-            javax.naming.NamingEnumeration enum = ctx.list( "sub" );
-            enum = ctx.listBindings( "sub" );
+            javax.naming.NamingEnumeration en = ctx.list( "sub" );
+            en = ctx.listBindings( "sub" );
             javax.naming.CompositeName cname = new javax.naming.CompositeName( "sub" );
-            enum = ctx.list( cname );
+            en = ctx.list( cname );
         }
         catch ( NamingException ex )
         {
@@ -308,12 +308,12 @@
             sub.bind( "target3", m_impl );
             sub.bind( "target4", m_impl );
             sub.bind( "target5", m_impl );
-            javax.naming.NamingEnumeration enum = ctx.list( "sub" );
-            while ( enum.hasMore() )
+            javax.naming.NamingEnumeration en = ctx.list( "sub" );
+            while ( en.hasMore() )
             {
-                enum.next();
+                en.next();
             }
-            enum.close();
+            en.close();
             sub.unbind( "target1" );
             sub.unbind( "target2" );
             sub.unbind( "target3" );

[openorb-commits] CVS: TransactionService WHATSNEW,1.41,1.42

[<lk...@us...>]

Update of /cvsroot/openorb/TransactionService
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9503

Modified Files:
	WHATSNEW 
Log Message:
corrected release tag

Index: WHATSNEW
===================================================================
RCS file: /cvsroot/openorb/TransactionService/WHATSNEW,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- WHATSNEW	28 Mar 2005 07:01:44 -0000	1.41
+++ WHATSNEW	28 Mar 2005 10:51:16 -0000	1.42
@@ -1,7 +1,7 @@
 OpenORB TransactionService
 --------------------------
 
-Version 1.4.0 - March, 28 2005 - TransactionService_1_4_0_FINAL
+Version 1.4.0 - March, 28 2005 - TransactionService_1_4_0_RELEASE
 
 - Fixed a potential bug in generation of unique XIDs, it allowed to generate
   the same id within the same millisecond.

[openorb-commits] CVS: TradingService WHATSNEW,1.41,1.42

[<lk...@us...>]

Update of /cvsroot/openorb/TradingService
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9167

Modified Files:
	WHATSNEW 
Log Message:
corrected release tag

Index: WHATSNEW
===================================================================
RCS file: /cvsroot/openorb/TradingService/WHATSNEW,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- WHATSNEW	28 Mar 2005 07:01:20 -0000	1.41
+++ WHATSNEW	28 Mar 2005 10:51:01 -0000	1.42
@@ -1,7 +1,7 @@
 OpenORB TradingService
 ----------------------
 
-Version 1.4.0 - March, 28 2005 - TradingService_1_4_0_FINAL
+Version 1.4.0 - March, 28 2005 - TradingService_1_4_0_RELEASE
 
 - removed reference to the JDK tools.jar from build.xml
   to allow compilation on OSX

[openorb-commits] CVS: tools WHATSNEW,1.85,1.86

[<lk...@us...>]

Update of /cvsroot/openorb/tools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9082

Modified Files:
	WHATSNEW 
Log Message:
corrected release tag

Index: WHATSNEW
===================================================================
RCS file: /cvsroot/openorb/tools/WHATSNEW,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- WHATSNEW	28 Mar 2005 07:23:34 -0000	1.85
+++ WHATSNEW	28 Mar 2005 10:50:36 -0000	1.86
@@ -1,7 +1,7 @@
 OpenORB tools
 -------------
 
-Version 1.4.0 - March, 28 2005 - tools_1_4_0_FINAL
+Version 1.4.0 - March, 28 2005 - tools_1_4_0_RELEASE
 
 - Changed the Copyright year to 2005
 

[openorb-commits] CVS: TimeService WHATSNEW,1.25,1.26

[<lk...@us...>]

Update of /cvsroot/openorb/TimeService
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8647

Modified Files:
	WHATSNEW 
Log Message:
corrected release tag

Index: WHATSNEW
===================================================================
RCS file: /cvsroot/openorb/TimeService/WHATSNEW,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- WHATSNEW	26 Jan 2005 16:58:28 -0000	1.25
+++ WHATSNEW	28 Mar 2005 10:50:05 -0000	1.26
@@ -1,6 +1,8 @@
 OpenORB TimeService
 -------------------
 
+Version 1.4.0 - March, 28 2005 - TimeService_1_4_0_RELEASE
+
 - removed reference to the JDK tools.jar from build.xml
   to allow compilation on OSX
 

[openorb-commits] CVS: SSL WHATSNEW,1.43,1.44

[<lk...@us...>]

Update of /cvsroot/openorb/SSL
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8054

Modified Files:
	WHATSNEW 
Log Message:
corrected release tag

Index: WHATSNEW
===================================================================
RCS file: /cvsroot/openorb/SSL/WHATSNEW,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- WHATSNEW	28 Mar 2005 07:00:38 -0000	1.43
+++ WHATSNEW	28 Mar 2005 10:49:18 -0000	1.44
@@ -1,7 +1,7 @@
 OpenORB SSL
 -----------
 
-Version 1.4.0 - March, 28 2005 - SSL_1_4_0_FINAL
+Version 1.4.0 - March, 28 2005 - SSL_1_4_0_RELEASE
 
 - removed reference to the JDK tools.jar from build.xml
   to allow compilation on OSX

[openorb-commits] CVS: PropertyService WHATSNEW,1.27,1.28

[<lk...@us...>]

Update of /cvsroot/openorb/PropertyService
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7680

Modified Files:
	WHATSNEW 
Log Message:
corrected release tag

Index: WHATSNEW
===================================================================
RCS file: /cvsroot/openorb/PropertyService/WHATSNEW,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- WHATSNEW	28 Mar 2005 07:00:09 -0000	1.27
+++ WHATSNEW	28 Mar 2005 10:48:46 -0000	1.28
@@ -1,7 +1,7 @@
 OpenORB PropertyService
 -----------------------
 
-Version 1.4.0 - March, 28 2005 - PropertyService_1_4_0_FINAL
+Version 1.4.0 - March, 28 2005 - PropertyService_1_4_0_RELEASE
 
 - removed reference to the JDK tools.jar from build.xml
   to allow compilation on OSX

[openorb-commits] CVS: PersistentStateService WHATSNEW,1.44,1.45

[<lk...@us...>]

Update of /cvsroot/openorb/PersistentStateService
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7380

Modified Files:
	WHATSNEW 
Log Message:
corrected release tag

Index: WHATSNEW
===================================================================
RCS file: /cvsroot/openorb/PersistentStateService/WHATSNEW,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- WHATSNEW	28 Mar 2005 06:59:45 -0000	1.44
+++ WHATSNEW	28 Mar 2005 10:48:25 -0000	1.45
@@ -1,7 +1,7 @@
 OpenORB PersistentStateService
 ------------------------------
 
-Version 1.4.0 - March, 28 2005 - PersistentStateService_1_4_0_FINAL
+Version 1.4.0 - March, 28 2005 - PersistentStateService_1_4_0_RELEASE
 
 - removed reference to the JDK tools.jar from build.xml
   to allow compilation on OSX

[openorb-commits] CVS: OpenORB WHATSNEW,1.237,1.238

[<lk...@us...>]

Update of /cvsroot/openorb/OpenORB
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6967

Modified Files:
	WHATSNEW 
Log Message:
corrected release tag

Index: WHATSNEW
===================================================================
RCS file: /cvsroot/openorb/OpenORB/WHATSNEW,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -d -r1.237 -r1.238
--- WHATSNEW	28 Mar 2005 06:59:29 -0000	1.237
+++ WHATSNEW	28 Mar 2005 10:47:53 -0000	1.238
@@ -1,7 +1,7 @@
 OpenORB
 -------
 
-Version 1.4.0 - March, 28 2005 - OpenORB_1_4_0_FINAL
+Version 1.4.0 - March, 28 2005 - OpenORB_1_4_0_RELEASE
 
 - Fixed a NPE in the compiler (regression between 1.3.1 and 1.4.0 beta2).
   See http://marc.theaimsgroup.com/?l=openorb-devel&m=111073137117247&w=2

[openorb-commits] CVS: NotificationService WHATSNEW,1.70,1.71

[<lk...@us...>]

Update of /cvsroot/openorb/NotificationService
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6778

Modified Files:
	WHATSNEW 
Log Message:
corrected release tag

Index: WHATSNEW
===================================================================
RCS file: /cvsroot/openorb/NotificationService/WHATSNEW,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- WHATSNEW	28 Mar 2005 06:58:59 -0000	1.70
+++ WHATSNEW	28 Mar 2005 10:47:14 -0000	1.71
@@ -1,7 +1,7 @@
 OpenORB NotificationService
 ---------------------------
 
-Version 1.4.0 - March, 28 2005 - NotificationService_1_4_0_FINAL
+Version 1.4.0 - March, 28 2005 - NotificationService_1_4_0_RELEASE
 
 - notify.resourcesTimeout didn't work when both Events and
   Connections were reliable. Fix submitted by Eddie Lim Po.