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

[openorb-commits] CVS: OpenORB/src/examples/org/openorb/orb/examples/dsi/poa Server.java,NONE,1.1 Client.java,1.3,1.4 DynServer.java,1.4,NONE

[Michael R. <mr...@us...>]

Update of /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/dsi/poa
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7788/src/examples/org/openorb/orb/examples/dsi/poa

Modified Files:
	Client.java 
Added Files:
	Server.java 
Removed Files:
	DynServer.java 
Log Message:
Fixed the remaining checkstyle warnings

--- NEW FILE: Server.java ---
/*
* Copyright (C) The Community OpenORB Project. All rights reserved.
*
* This software is published under the terms of The OpenORB Community Software
* License version 1.0, a copy of which has been included with this distribution
* in the LICENSE.txt file.
*/

package org.openorb.orb.examples.dsi.poa;

public final class Server
{
    // do not instantiate
    private Server()
    {
    }

    public static void main( String[] args )
    {
        org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );
        org.omg.CORBA.Object objPoa = null;
        org.omg.PortableServer.POA rootPOA = null;
        try
        {
            objPoa = orb.resolve_initial_references( "RootPOA" );
        }
        catch ( org.omg.CORBA.ORBPackage.InvalidName ex )
        {
            System.out.println( "Couldn't find RootPOA!" );
            System.exit( 1 );
        }

        rootPOA = org.omg.PortableServer.POAHelper.narrow( objPoa );
        DynSkeleton skeleton = new DynSkeleton( orb );
        byte[] servantId = null;
        try
        {
            servantId = rootPOA.activate_object( skeleton );
        }
        catch ( org.omg.PortableServer.POAPackage.WrongPolicy ex )
        {
            ex.printStackTrace();
        }
        catch ( org.omg.PortableServer.POAPackage.ServantAlreadyActive ex )
        {
            ex.printStackTrace();
        }

        org.omg.CORBA.Object obj = null;
        try
        {
            obj = rootPOA.id_to_reference( servantId );
        }
        catch ( org.omg.PortableServer.POAPackage.WrongPolicy ex )
        {
            ex.printStackTrace();
        }
        catch ( org.omg.PortableServer.POAPackage.ObjectNotActive ex )
        {
            ex.printStackTrace();
        }

        String reference = orb.object_to_string( obj );
        try
        {
            java.io.FileOutputStream file = new java.io.FileOutputStream( "ObjectId" );
            java.io.PrintStream pfile = new java.io.PrintStream( file );
            pfile.println( reference );
            file.close();
        }
        catch ( java.io.IOException ex )
        {
            System.out.println( "File error" );
        }

        try
        {
            rootPOA.the_POAManager().activate();
            System.out.println( "The server is ready..." );
            orb.run();
        }
        catch ( Exception ex )
        {
            ex.printStackTrace();
        }
    }
}


Index: Client.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/dsi/poa/Client.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Client.java	16 Feb 2004 09:41:53 -0000	1.3
+++ Client.java	10 Aug 2004 13:28:38 -0000	1.4
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.dsi.poa;
 
-public class Client
+public final class Client
 {
+    // do not instantiate
+    private Client()
+    {
+    }
+
     public static void main( String[] args )
     {
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );

--- DynServer.java DELETED ---

[openorb-commits] CVS: OpenORB/src/examples/org/openorb/orb/examples/obv/valuebox Client.java,1.3,1.4 Server.java,1.2,1.3

[Michael R. <mr...@us...>]

Update of /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/obv/valuebox
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7788/src/examples/org/openorb/orb/examples/obv/valuebox

Modified Files:
	Client.java Server.java 
Log Message:
Fixed the remaining checkstyle warnings

Index: Client.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/obv/valuebox/Client.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Client.java	16 Feb 2004 09:41:55 -0000	1.3
+++ Client.java	10 Aug 2004 13:28:39 -0000	1.4
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.obv.valuebox;
 
-public class Client
+public final class Client
 {
+    // do not instantiate
+    private Client()
+    {
+    }
+
     public static void main( String[] args )
     {
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );

Index: Server.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/obv/valuebox/Server.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Server.java	16 Feb 2004 09:41:55 -0000	1.2
+++ Server.java	10 Aug 2004 13:28:39 -0000	1.3
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.obv.valuebox;
 
-public class Server
+public final class Server
 {
+    // do not instantiate
+    private Server()
+    {
+    }
+
     public static void main( String[] args )
     {
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );

[openorb-commits] CVS: OpenORB/src/examples/org/openorb/orb/examples/obv/truncate Client.java,1.3,1.4 Server.java,1.2,1.3

[Michael R. <mr...@us...>]

Update of /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/obv/truncate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7788/src/examples/org/openorb/orb/examples/obv/truncate

Modified Files:
	Client.java Server.java 
Log Message:
Fixed the remaining checkstyle warnings

Index: Client.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/obv/truncate/Client.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Client.java	16 Feb 2004 09:41:55 -0000	1.3
+++ Client.java	10 Aug 2004 13:28:39 -0000	1.4
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.obv.truncate;
 
-public class Client
+public final class Client
 {
+    // do not instantiate
+    private Client()
+    {
+    }
+
     public static void main( String[] args )
     {
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );

Index: Server.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/obv/truncate/Server.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Server.java	16 Feb 2004 09:41:55 -0000	1.2
+++ Server.java	10 Aug 2004 13:28:39 -0000	1.3
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.obv.truncate;
 
-public class Server
+public final class Server
 {
+    // do not instantiate
+    private Server()
+    {
+    }
+
     public static void main( String[] args )
     {
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );

[openorb-commits] CVS: OpenORB/src/examples/org/openorb/orb/examples/poa/AdapterActivator Client.java,1.2,1.3 Server.java,1.2,1.3

[Michael R. <mr...@us...>]

Update of /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/poa/AdapterActivator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7788/src/examples/org/openorb/orb/examples/poa/AdapterActivator

Modified Files:
	Client.java Server.java 
Log Message:
Fixed the remaining checkstyle warnings

Index: Client.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/poa/AdapterActivator/Client.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Client.java	16 Feb 2004 09:41:56 -0000	1.2
+++ Client.java	10 Aug 2004 13:28:40 -0000	1.3
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.poa.AdapterActivator;
 
-public class Client
+public final class Client
 {
+    // do not instantiate
+    private Client()
+    {
+    }
+
     public static void main( String[] args )
     {
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );

Index: Server.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/poa/AdapterActivator/Server.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Server.java	16 Feb 2004 09:41:56 -0000	1.2
+++ Server.java	10 Aug 2004 13:28:40 -0000	1.3
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.poa.AdapterActivator;
 
-public class Server
+public final class Server
 {
+    // do not instantiate
+    private Server()
+    {
+    }
+
     public static void main( String[] args )
     {
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );

[openorb-commits] CVS: OpenORB/src/examples/org/openorb/orb/examples/obv/support/itf Client.java,1.3,1.4 Server.java,1.2,1.3

[Michael R. <mr...@us...>]

Update of /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/obv/support/itf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7788/src/examples/org/openorb/orb/examples/obv/support/itf

Modified Files:
	Client.java Server.java 
Log Message:
Fixed the remaining checkstyle warnings

Index: Client.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/obv/support/itf/Client.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Client.java	16 Feb 2004 09:41:55 -0000	1.3
+++ Client.java	10 Aug 2004 13:28:39 -0000	1.4
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.obv.support.itf;
 
-public class Client
+public final class Client
 {
+    // do not instantiate
+    private Client()
+    {
+    }
+
     public static void main( String[] args )
     {
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );

Index: Server.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/obv/support/itf/Server.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Server.java	16 Feb 2004 09:41:55 -0000	1.2
+++ Server.java	10 Aug 2004 13:28:39 -0000	1.3
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.obv.support.itf;
 
-public class Server
+public final class Server
 {
+    // do not instantiate
+    private Server()
+    {
+    }
+
     public static void main( String[] args )
     {
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );

[openorb-commits] CVS: OpenORB/src/examples/org/openorb/orb/examples/obv/valuetype Client.java,1.3,1.4 Server.java,1.2,1.3

[Michael R. <mr...@us...>]

Update of /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/obv/valuetype
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7788/src/examples/org/openorb/orb/examples/obv/valuetype

Modified Files:
	Client.java Server.java 
Log Message:
Fixed the remaining checkstyle warnings

Index: Client.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/obv/valuetype/Client.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Client.java	16 Feb 2004 09:41:55 -0000	1.3
+++ Client.java	10 Aug 2004 13:28:40 -0000	1.4
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.obv.valuetype;
 
-public class Client
+public final class Client
 {
+    // do not instantiate
+    private Client()
+    {
+    }
+
     public static void main( String[] args )
     {
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );

Index: Server.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/obv/valuetype/Server.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Server.java	16 Feb 2004 09:41:56 -0000	1.2
+++ Server.java	10 Aug 2004 13:28:40 -0000	1.3
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.obv.valuetype;
 
-public class Server
+public final class Server
 {
+    // do not instantiate
+    private Server()
+    {
+    }
+
     public static void main( String[] args )
     {
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );

[openorb-commits] CVS: OpenORB/src/examples/org/openorb/orb/examples/obv/inheritance Client.java,1.3,1.4 Server.java,1.2,1.3

[Michael R. <mr...@us...>]

Update of /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/obv/inheritance
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7788/src/examples/org/openorb/orb/examples/obv/inheritance

Modified Files:
	Client.java Server.java 
Log Message:
Fixed the remaining checkstyle warnings

Index: Client.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/obv/inheritance/Client.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Client.java	16 Feb 2004 09:41:54 -0000	1.3
+++ Client.java	10 Aug 2004 13:28:39 -0000	1.4
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.obv.inheritance;
 
-public class Client
+public final class Client
 {
+    // do not instantiate
+    private Client()
+    {
+    }
+
     public static void main( String[] args )
     {
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );

Index: Server.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/obv/inheritance/Server.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Server.java	16 Feb 2004 09:41:54 -0000	1.2
+++ Server.java	10 Aug 2004 13:28:39 -0000	1.3
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.obv.inheritance;
 
-public class Server
+public final class Server
 {
+    // do not instantiate
+    private Server()
+    {
+    }
+
     public static void main( String[] args )
     {
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );

[openorb-commits] CVS: OpenORB/src/examples/org/openorb/orb/examples/rmi/simple Client.java,1.3,1.4 Server.java,1.3,1.4

[Michael R. <mr...@us...>]

Update of /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/rmi/simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7788/src/examples/org/openorb/orb/examples/rmi/simple

Modified Files:
	Client.java Server.java 
Log Message:
Fixed the remaining checkstyle warnings

Index: Client.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/rmi/simple/Client.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Client.java	1 Mar 2004 11:06:08 -0000	1.3
+++ Client.java	10 Aug 2004 13:28:41 -0000	1.4
@@ -12,8 +12,13 @@
 
 import javax.rmi.PortableRemoteObject;
 
-public class Client
+public final class Client
 {
+    // do not instantiate
+    private Client()
+    {
+    }
+
     public static void main( String[] args )
     {
         Properties props = new Properties();

Index: Server.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/rmi/simple/Server.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Server.java	1 Mar 2004 11:06:08 -0000	1.3
+++ Server.java	10 Aug 2004 13:28:41 -0000	1.4
@@ -14,8 +14,9 @@
 
 import javax.rmi.PortableRemoteObject;
 
-public class Server
+public final class Server
 {
+    // do not instantiate
     private Server()
     {
     }

[openorb-commits] CVS: OpenORB/src/examples/org/openorb/orb/examples/rmi/hello HelloCORBAClient.java,1.4,1.5 HelloClient.java,1.3,1.4

[Michael R. <mr...@us...>]

Update of /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/rmi/hello
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7788/src/examples/org/openorb/orb/examples/rmi/hello

Modified Files:
	HelloCORBAClient.java HelloClient.java 
Log Message:
Fixed the remaining checkstyle warnings

Index: HelloCORBAClient.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/rmi/hello/HelloCORBAClient.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- HelloCORBAClient.java	19 Feb 2004 07:21:30 -0000	1.4
+++ HelloCORBAClient.java	10 Aug 2004 13:28:41 -0000	1.5
@@ -29,8 +29,9 @@
  *
  * @author Chris Wood
  */
-public class HelloCORBAClient
+public final class HelloCORBAClient
 {
+    // do not instantiate
     private HelloCORBAClient()
     {
     }

Index: HelloClient.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/rmi/hello/HelloClient.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- HelloClient.java	19 Feb 2004 07:21:30 -0000	1.3
+++ HelloClient.java	10 Aug 2004 13:28:41 -0000	1.4
@@ -15,8 +15,9 @@
  *
  * @author Chris Wood
  */
-public class HelloClient
+public final class HelloClient
 {
+    // do not instantiate
     private HelloClient()
     {
     }

[openorb-commits] CVS: OpenORB/src/examples/org/openorb/orb/examples/rmi/calculator Client.java,NONE,1.1 Server.java,NONE,1.1 CalculatorClt.java,1.2,NONE CalculatorServer.java,1.3,NONE

[Michael R. <mr...@us...>]

Update of /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/rmi/calculator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7788/src/examples/org/openorb/orb/examples/rmi/calculator

Added Files:
	Client.java Server.java 
Removed Files:
	CalculatorClt.java CalculatorServer.java 
Log Message:
Fixed the remaining checkstyle warnings

--- NEW FILE: Client.java ---
/*
* Copyright (C) The Community OpenORB Project. All rights reserved.
*
* This software is published under the terms of The OpenORB Community Software
* License version 1.0, a copy of which has been included with this distribution
* in the LICENSE.txt file.
*/

package org.openorb.orb.examples.rmi.calculator;

import javax.naming.InitialContext;

/**
 * The clien application for the calculator.
 *
 * @author Chris Wood
 */
public final class Client
{
    // do not instantiate
    private Client()
    {
    }

    /**
     * The entry point for this application.
     *
     * @param args The command line parameters.
     */
    public static void main( String[] args )
    {
        CalculatorInterface calc = null;
        try
        {
            InitialContext context = new InitialContext();
            Object o = context.lookup ( "Calculator" );
            calc = ( CalculatorInterface )
                  javax.rmi.PortableRemoteObject.narrow( o, CalculatorInterface.class );
        }
        catch ( Exception ex )
        {
            ex.printStackTrace();
            System.exit( 0 );
        }

        try
        {
            System.out.println( "6 + 2 = " + calc.add( 6, 2 ) );
            System.out.println( "6 / 2 = " + calc.div( 6, 2 ) );
            System.out.println( "6 / 0 !!!!" + calc.div( 6, 0 ) );
        }
        catch ( DivisionByZero e )
        {
            System.out.println( "\n==> Error : Division by zero" );
        }
        catch ( Exception ex )
        {
            ex.printStackTrace();
        }
    }
}


--- NEW FILE: Server.java ---
/*
* Copyright (C) The Community OpenORB Project. All rights reserved.
*
* This software is published under the terms of The OpenORB Community Software
* License version 1.0, a copy of which has been included with this distribution
* in the LICENSE.txt file.
*/

package org.openorb.orb.examples.rmi.calculator;

import javax.naming.InitialContext;

/**
 * The server application.
 *
 * @author Chris Wood
 */
public final class Server
    extends javax.rmi.PortableRemoteObject
{
    /**
     * Default constructor.
     *
     * @throws java.rmi.RemoteException When a problem during instantiation occurs.
     */
    public Server()
        throws java.rmi.RemoteException
    {
    }

    /**
     * This method creates the object and registers it to the NamingService.
     */
    public void run()
    {
        try
        {
            java.util.Properties env = new java.util.Properties();
            env.setProperty( "java.naming.factory.initial", "org.openorb.ns.jndi.CtxFactory" );
            InitialContext context = new InitialContext( env );
            CalculatorImpl addObj = new CalculatorImpl();
            javax.rmi.PortableRemoteObject.exportObject( addObj );
            context.bind( "addition", addObj );
            System.out.println( "The calculator server is now ready..." );
        }
        catch ( Exception ex )
        {
            ex.printStackTrace();
            System.out.println( ex.getMessage() );
        }
    }

    /**
     * The entry point for this application.
     *
     * @param args The command line arguments.
     */
    public static void main( String[] args )
    {
        try
        {
            Server srv = new Server();
            srv.run();
        }
        catch ( Exception ex )
        {
            ex.printStackTrace();
        }
    }
}


--- CalculatorClt.java DELETED ---

--- CalculatorServer.java DELETED ---

[openorb-commits] CVS: OpenORB/src/examples/org/openorb/orb/examples/poa/ServantLocator Client.java,1.2,1.3 Server.java,1.2,1.3

[Michael R. <mr...@us...>]

Update of /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/poa/ServantLocator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7788/src/examples/org/openorb/orb/examples/poa/ServantLocator

Modified Files:
	Client.java Server.java 
Log Message:
Fixed the remaining checkstyle warnings

Index: Client.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/poa/ServantLocator/Client.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Client.java	16 Feb 2004 09:41:57 -0000	1.2
+++ Client.java	10 Aug 2004 13:28:40 -0000	1.3
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.poa.ServantLocator;
 
-public class Client
+public final class Client
 {
+    // do not instantiate
+    private Client()
+    {
+    }
+
     public static void main( String[] args )
     {
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );

Index: Server.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/poa/ServantLocator/Server.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Server.java	16 Feb 2004 09:41:57 -0000	1.2
+++ Server.java	10 Aug 2004 13:28:40 -0000	1.3
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.poa.ServantLocator;
 
-public class Server
+public final class Server
 {
+    // do not instantiate
+    private Server()
+    {
+    }
+
     public static void main( String[] args )
     {
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );

[openorb-commits] CVS: OpenORB/src/examples/org/openorb/orb/examples/poa/DefaultServant Client.java,1.2,1.3 FileDescriptor.java,1.2,1.3 FileSystem.java,1.2,1.3 Server.java,1.2,1.3

[Michael R. <mr...@us...>]

Update of /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/poa/DefaultServant
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7788/src/examples/org/openorb/orb/examples/poa/DefaultServant

Modified Files:
	Client.java FileDescriptor.java FileSystem.java Server.java 
Log Message:
Fixed the remaining checkstyle warnings

Index: Client.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/poa/DefaultServant/Client.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Client.java	16 Feb 2004 09:41:56 -0000	1.2
+++ Client.java	10 Aug 2004 13:28:40 -0000	1.3
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.poa.DefaultServant;
 
-public class Client
+public final class Client
 {
+    // do not instantiate
+    private Client()
+    {
+    }
+
     public static void main( String[] args )
     {
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );

Index: FileDescriptor.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/poa/DefaultServant/FileDescriptor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FileDescriptor.java	16 Feb 2004 09:41:56 -0000	1.2
+++ FileDescriptor.java	10 Aug 2004 13:28:40 -0000	1.3
@@ -41,7 +41,7 @@
             System.exit( 1 );
         }
         String id = new String( oid );
-        int num = new Integer( id ).intValue();
+        int num = Integer.parseInt( id );
         return ( DataInputStream ) FileSystem.getList().elementAt( num - 1 );
     }
 

Index: FileSystem.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/poa/DefaultServant/FileSystem.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- FileSystem.java	16 Feb 2004 09:41:56 -0000	1.2
+++ FileSystem.java	10 Aug 2004 13:28:40 -0000	1.3
@@ -56,7 +56,7 @@
             return null;
         }
         s_list.addElement ( file );
-        byte[] oid = ( new String( new Integer( s_list.size() ).toString() ) ).getBytes();
+        byte[] oid = ( new String( "" + s_list.size() ) ).getBytes();
         obj = m_poa.create_reference_with_id( oid, "IDL:IFileDescriptor:1.0" );
         return IFileDescriptorHelper.narrow( obj );
     }

Index: Server.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/poa/DefaultServant/Server.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Server.java	16 Feb 2004 09:41:56 -0000	1.2
+++ Server.java	10 Aug 2004 13:28:40 -0000	1.3
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.poa.DefaultServant;
 
-public class Server
+public final class Server
 {
+    // do not instantiate
+    private Server()
+    {
+    }
+
     public static void main( String[] args )
     {
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );

[openorb-commits] CVS: OpenORB/src/examples/org/openorb/orb/examples/obv/custom Client.java,1.3,1.4 Server.java,1.2,1.3

[Michael R. <mr...@us...>]

Update of /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/obv/custom
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7788/src/examples/org/openorb/orb/examples/obv/custom

Modified Files:
	Client.java Server.java 
Log Message:
Fixed the remaining checkstyle warnings

Index: Client.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/obv/custom/Client.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Client.java	16 Feb 2004 09:41:54 -0000	1.3
+++ Client.java	10 Aug 2004 13:28:39 -0000	1.4
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.obv.custom;
 
-public class Client
+public final class Client
 {
+    // do not instantiate
+    private Client()
+    {
+    }
+
     public static void main( String[] args )
     {
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );

Index: Server.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/obv/custom/Server.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Server.java	16 Feb 2004 09:41:54 -0000	1.2
+++ Server.java	10 Aug 2004 13:28:39 -0000	1.3
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.obv.custom;
 
-public class Server
+public final class Server
 {
+    // do not instantiate
+    private Server()
+    {
+    }
+
     public static void main( String[] args )
     {
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );

[openorb-commits] CVS: OpenORB/src/examples/org/openorb/orb/examples/poa/RootPOA Client.java,1.2,1.3 Server.java,1.2,1.3

[Michael R. <mr...@us...>]

Update of /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/poa/RootPOA
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7788/src/examples/org/openorb/orb/examples/poa/RootPOA

Modified Files:
	Client.java Server.java 
Log Message:
Fixed the remaining checkstyle warnings

Index: Client.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/poa/RootPOA/Client.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Client.java	16 Feb 2004 09:41:56 -0000	1.2
+++ Client.java	10 Aug 2004 13:28:40 -0000	1.3
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.poa.RootPOA;
 
-public class Client
+public final class Client
 {
+    // do not instantiate
+    private Client()
+    {
+    }
+
     public static void main( String[] args )
     {
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );

Index: Server.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/poa/RootPOA/Server.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Server.java	16 Feb 2004 09:41:57 -0000	1.2
+++ Server.java	10 Aug 2004 13:28:40 -0000	1.3
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.poa.RootPOA;
 
-public class Server
+public final class Server
 {
+    // do not instantiate
+    private Server()
+    {
+    }
+
     public static void main( String[] args )
     {
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );

[openorb-commits] CVS: OpenORB/src/examples/org/openorb/orb/examples/poa/ServantActivator Client.java,1.3,1.4 Server.java,1.2,1.3

[Michael R. <mr...@us...>]

Update of /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/poa/ServantActivator
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7788/src/examples/org/openorb/orb/examples/poa/ServantActivator

Modified Files:
	Client.java Server.java 
Log Message:
Fixed the remaining checkstyle warnings

Index: Client.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/poa/ServantActivator/Client.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Client.java	16 Feb 2004 09:41:57 -0000	1.3
+++ Client.java	10 Aug 2004 13:28:40 -0000	1.4
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.poa.ServantActivator;
 
-public class Client
+public final class Client
 {
+    // do not instantiate
+    private Client()
+    {
+    }
+
     public static void main( String[] args )
     {
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );

Index: Server.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/poa/ServantActivator/Server.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Server.java	16 Feb 2004 09:41:57 -0000	1.2
+++ Server.java	10 Aug 2004 13:28:40 -0000	1.3
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.poa.ServantActivator;
 
-public class Server
+public final class Server
 {
+    // do not instantiate
+    private Server()
+    {
+    }
+
     public static void main( String[] args )
     {
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null );

[openorb-commits] CVS: OpenORB/src/examples/org/openorb/orb/examples/messaging Client.java,1.12,1.13 Server.java,1.8,1.9

[Michael R. <mr...@us...>]

Update of /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/messaging
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7788/src/examples/org/openorb/orb/examples/messaging

Modified Files:
	Client.java Server.java 
Log Message:
Fixed the remaining checkstyle warnings

Index: Client.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/messaging/Client.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- Client.java	16 Feb 2004 09:41:54 -0000	1.12
+++ Client.java	10 Aug 2004 13:28:39 -0000	1.13
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.messaging;
 
-public class Client
+public final class Client
 {
+    // do not instantiate
+    private Client()
+    {
+    }
+
     public static void main( String[] args )
     {
         java.util.Properties props = System.getProperties();

Index: Server.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/messaging/Server.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Server.java	16 Feb 2004 09:41:54 -0000	1.8
+++ Server.java	10 Aug 2004 13:28:39 -0000	1.9
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.messaging;
 
-public class Server
+public final class Server
 {
+    // do not instantiate
+    private Server()
+    {
+    }
+
     public static void main( String[] args )
     {
         java.util.Properties props = System.getProperties();
@@ -17,7 +22,6 @@
                 org.openorb.orb.core.ORB.class.getName() );
         props.put( "org.omg.CORBA.ORBSingletonClass",
                 org.openorb.orb.core.ORBSingleton.class.getName() );
-        //props.put( "verbose", "5" );
         org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, props );
         org.omg.CORBA.Object objPoa = null;
         org.omg.PortableServer.POA rootPOA = null;

[openorb-commits] CVS: OpenORB/src/examples/org/openorb/orb/examples/interceptors Client.java,1.2,1.3 Server.java,1.2,1.3

[Michael R. <mr...@us...>]

Update of /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/interceptors
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7788/src/examples/org/openorb/orb/examples/interceptors

Modified Files:
	Client.java Server.java 
Log Message:
Fixed the remaining checkstyle warnings

Index: Client.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/interceptors/Client.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Client.java	3 Oct 2002 18:28:25 -0000	1.2
+++ Client.java	10 Aug 2004 13:28:39 -0000	1.3
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.interceptors;
 
-public class Client
+public final class Client
 {
+    // do not instantiate
+    private Client()
+    {
+    }
+
     public static void main( String[] args )
     {
         java.util.Properties props = new java.util.Properties();

Index: Server.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/interceptors/Server.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Server.java	3 Oct 2002 18:28:25 -0000	1.2
+++ Server.java	10 Aug 2004 13:28:39 -0000	1.3
@@ -8,8 +8,13 @@
 
 package org.openorb.orb.examples.interceptors;
 
-public class Server
+public final class Server
 {
+    // do not instantiate
+    private Server()
+    {
+    }
+
     public static void main( String[] args )
     {
         java.util.Properties props = new java.util.Properties();

[openorb-commits] CVS: OpenORB/src/examples/org/openorb/orb/examples/idl/reflection Reflection.java,1.6,1.7

[Michael R. <mr...@us...>]

Update of /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/idl/reflection
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7788/src/examples/org/openorb/orb/examples/idl/reflection

Modified Files:
	Reflection.java 
Log Message:
Fixed the remaining checkstyle warnings

Index: Reflection.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/examples/org/openorb/orb/examples/idl/reflection/Reflection.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Reflection.java	19 Feb 2004 07:21:30 -0000	1.6
+++ Reflection.java	10 Aug 2004 13:28:38 -0000	1.7
@@ -26,8 +26,9 @@
  *
  * @author Olivier Modica
  */
-public class Reflection
+public final class Reflection
 {
+    // do not instantiate
     private Reflection()
     {
     }

[openorb-commits] CVS: OpenORB/src/test/org/openorb/orb/test/iiop IIOPTest.java,1.7,1.8

[Michael R. <mr...@us...>]

Update of /cvsroot/openorb/OpenORB/src/test/org/openorb/orb/test/iiop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24978/src/test/org/openorb/orb/test/iiop

Modified Files:
	IIOPTest.java 
Log Message:
Need to uncomment import to make checkstyle happy

Index: IIOPTest.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/test/org/openorb/orb/test/iiop/IIOPTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- IIOPTest.java	9 Aug 2004 10:06:09 -0000	1.7
+++ IIOPTest.java	9 Aug 2004 12:43:55 -0000	1.8
@@ -15,7 +15,7 @@
 import org.openorb.orb.test.iiop.bidir.BiDirTest;
 import org.openorb.orb.test.iiop.codec.CodecTest;
 import org.openorb.orb.test.iiop.complex.ComplexTest;
-import org.openorb.orb.test.iiop.fragmentedmessage.FragmentedMessageTest;
+//import org.openorb.orb.test.iiop.fragmentedmessage.FragmentedMessageTest;
 import org.openorb.orb.test.iiop.primitive.PrimitiveTest;
 import org.openorb.orb.test.iiop.state.StateTest;
 import org.openorb.orb.test.iiop.value.ValuetypeTest;

[openorb-commits] CVS: OpenORB/src/idl/test test.idl,1.4,1.5

[Michael R. <mr...@us...>]

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

Modified Files:
	test.idl 
Log Message:
Added the fragmented test case from Michael Macaluso

Index: test.idl
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/idl/test/test.idl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- test.idl	9 Jul 2002 08:51:34 -0000	1.4
+++ test.idl	9 Aug 2004 10:06:35 -0000	1.5
@@ -19,4 +19,6 @@
 #include "state.idl"
 #include "value.idl"
 
+#include "fragmentedmessage.idl"
+
 #include "benchmark.idl"

[openorb-commits] CVS: OpenORB/src/test/org/openorb/orb/test/iiop/fragmentedmessage AttributeData.xml,NONE,1.1 AttributeManagerImpl.java,NONE,1.1 FragmentedMessageTest.java,NONE,1.1 LocalContentHandler.java,NONE,1.1 ObjectIdImpl.java,NONE,1.1 package.html,NONE,1.1

[Michael R. <mr...@us...>]

Update of /cvsroot/openorb/OpenORB/src/test/org/openorb/orb/test/iiop/fragmentedmessage
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31977/src/test/org/openorb/orb/test/iiop/fragmentedmessage

Added Files:
	AttributeData.xml AttributeManagerImpl.java 
	FragmentedMessageTest.java LocalContentHandler.java 
	ObjectIdImpl.java package.html 
Log Message:
Added the fragmented test case from Michael Macaluso

--- NEW FILE: AttributeData.xml ---
<?xml version="1.0" encoding="UTF-8"?>



<!-- This is the test data for the fragmented message test. -->



<AttributeData>

    <AttributeDefinition ID="28" Name="Outline" TSCounter="2">

        <AttributeType ID="1" Code="Ab" Name="Boolean" TSCounter="0" />

    </AttributeDefinition>

    <AttributeDefinition ID="135" Name="UPSable" TSCounter="0">

        <AttributeType ID="1" Code="Ab" Name="Boolean" TSCounter="0" />

    </AttributeDefinition>

    <AttributeDefinition ID="182" Name="Ready for PPF" TSCounter="0">

        <AttributeType ID="1" Code="Ab" Name="Boolean" TSCounter="0" />

    </AttributeDefinition>

    <AttributeDefinition ID="186" Name="Release Route" TSCounter="0">

        <AttributeType ID="1" Code="Ab" Name="Boolean" TSCounter="0" />

    </AttributeDefinition>

    <AttributeDefinition ID="241" Name="Web Ready" TSCounter="0">

        <AttributeType ID="1" Code="Ab" Name="Boolean" TSCounter="0" />

[...19969 lines suppressed...]
    <AttributeDefinition ID="6890" Name="Olympic Uniforms Cost Source" TSCounter="0">

        <AttributeType ID="783" Code="Ae" Name="Ae" TSCounter="1" />

    </AttributeDefinition>

    <AttributeDefinition ID="6891" Name="Waddell Co Inc Cost Source" TSCounter="0">

        <AttributeType ID="784" Code="Ae" Name="Ae" TSCounter="1" />

    </AttributeDefinition>

    <AttributeDefinition ID="6892" Name="Royal Seating Corp Cost Source" TSCounter="0">

        <AttributeType ID="785" Code="Ae" Name="Ae" TSCounter="1" />

    </AttributeDefinition>

    <AttributeDefinition ID="6903" Name="Tee Jay's Apperal Inc Cost Source" TSCounter="0">

        <AttributeType ID="786" Code="Ae" Name="Ae" TSCounter="1" />

    </AttributeDefinition>

    <AttributeDefinition ID="6914" Name="Installnet Int'l Inc Cost Source" TSCounter="0">

        <AttributeType ID="787" Code="Ae" Name="Ae" TSCounter="1" />

    </AttributeDefinition>

    <AttributeDefinition ID="6925" Name="Mirow Int'l Cost Source" TSCounter="0">

        <AttributeType ID="788" Code="Ae" Name="Ae" TSCounter="1" />

    </AttributeDefinition>

</AttributeData>




--- NEW FILE: AttributeManagerImpl.java ---
/*
* Copyright (C) The Community OpenORB Project. All rights reserved.
*
* This software is published under the terms of The OpenORB Community Software
* License version 1.0, a copy of which has been included with this distribution
* in the LICENSE.txt file.
*/

package org.openorb.orb.test.iiop.fragmentedmessage;

import org.omg.PortableServer.POA;
import java.util.List;
import java.util.LinkedList;

import javax.xml.parsers.SAXParserFactory;
import javax.xml.parsers.SAXParser;

/**
 * @author Michael Macaluso
 */
public class AttributeManagerImpl
    extends AttributeManagerPOA
{
    private AttributeDefinition[] m_attributeDefinitions;
    private POA m_poa;

    AttributeManagerImpl( POA aPOA )
    {
        m_poa = aPOA;
    }

    public POA _default_POA()
    {
        return m_poa;
    }

    /**
     * Operation getAttributeDefinitions
     */
    public AttributeDefinition[] getAttributeDefinitions()
    {
        if ( null == m_attributeDefinitions )
        {
            List anAttributeDefinitionsList = new LinkedList();

            // Use an instance of ourselves as the SAX event handler
            LocalContentHandler aLocalContentHandler = new LocalContentHandler(
                  anAttributeDefinitionsList, _orb() );

            // Use the default (non-validating) parser
            SAXParserFactory aSAXParserFactory = SAXParserFactory.newInstance();
            try
            {
                // Parse the input
                SAXParser aSAXParser = aSAXParserFactory.newSAXParser();
                aSAXParser.parse( FragmentedMessageTest.class.getResourceAsStream(
                      "AttributeData.xml" ), aLocalContentHandler );
            }
            catch ( Throwable t )
            {
                t.printStackTrace();
            }

            m_attributeDefinitions = (AttributeDefinition[]) anAttributeDefinitionsList.toArray(
                  new AttributeDefinition[ anAttributeDefinitionsList.size() ] );
        }

        return m_attributeDefinitions;
    }
}

--- NEW FILE: FragmentedMessageTest.java ---
/*

* Copyright (C) The Community OpenORB Project. All rights reserved.

*

* This software is published under the terms of The OpenORB Community Software

* License version 1.0, a copy of which has been included with this distribution

* in the LICENSE.txt file.

*/



package org.openorb.orb.test.iiop.fragmentedmessage;



import junit.framework.TestSuite;



import org.omg.PortableServer.POA;

import org.openorb.orb.test.ORBTestCase;



import org.omg.CORBA.ORB;



import java.util.Properties;



/**

 * Tests marshaling and unmarshaling of various iiop types.

 *

 * @author Michael Macaluso

 */

public class FragmentedMessageTest

    extends ORBTestCase

{

    private AttributeManager m_serverReference;

    private AttributeManager m_clientReference;



    /**

     * Constructor.

     *

     * @param name The name of the test case.

     */

    public FragmentedMessageTest( String name )

    {

        super( name );

    }



    /**

     * Set up the test case.

     */

    protected void setUp()

    {

        Properties aProperties = new Properties();

        aProperties.put( "org.omg.CORBA.ORBClass", "org.openorb.orb.core.ORB" );

        aProperties.put( "org.omg.CORBA.ORBSingletonClass", "org.openorb.orb.core.ORBSingleton" );



        super.setUp( aProperties );



        try

        {

            ORB anORB = getORB();

            POA rootPOA = ( POA ) anORB.resolve_initial_references( "RootPOA" );

            AttributeManager m_ServerReference = ( new AttributeManagerImpl( rootPOA ) )._this(

                  anORB );

            rootPOA.the_POAManager().activate();

            m_clientReference = AttributeManagerHelper.narrow(

                  forceMarshal( m_ServerReference ) );

        }

        catch ( org.omg.CORBA.UserException ex )

        {

            fail( "exception during setup:" + ex.toString() );

        }

    }



    /**

     * Simple struct echo.

     */

    public void testGetAttributeDefinitions()

    {

        System.out.println( "Test: " + this.getClass().getName()

              + ".testGetAttributeDefinitions" );

        AttributeDefinition[] anAttributeDefinitionArray =

              m_clientReference.getAttributeDefinitions();

    }



    /**

     * The entry point of the test case.

     *

     * @param args The command line arguments.

     */

    public static void main( String[] args )

    {

        System.out.println( "Executing the " + FragmentedMessageTest.class.getName() + "..." );

        junit.textui.TestRunner.run( new TestSuite( FragmentedMessageTest.class ) );

    }

}




--- NEW FILE: LocalContentHandler.java ---
/*
* Copyright (C) The Community OpenORB Project. All rights reserved.
*
* This software is published under the terms of The OpenORB Community Software
* License version 1.0, a copy of which has been included with this distribution
* in the LICENSE.txt file.
*/

package org.openorb.orb.test.iiop.fragmentedmessage;

import org.omg.CORBA.ORB;
import org.xml.sax.helpers.DefaultHandler;

/**
 * Class responsible for parsing the XML file correctly and
 * adding the newly created objects to a provided collection.
 *
 * @author  Michael Macaluso
 */
public class LocalContentHandler
    extends DefaultHandler
{
    public static final java.util.Map ATTRIBUTE_TYPECODE2ATTRIBUTE_ENUM_MAP =
          new java.util.HashMap();

    public static final String STRING_ATTRIBUTE = "As";
    public static final String DIMENSION_ATTRIBUTE = "Ai";
    public static final String DOUBLE_ATTRIBUTE = "Ad";
    public static final String BOOLEAN_ATTRIBUTE = "Ab";
    public static final String LONG_ATTRIBUTE = "Al";
    public static final String DATE_ATTRIBUTE = "Aa";
    public static final String DATETIME_ATTRIBUTE = "At";
    public static final String ENUMERATION_ATTRIBUTE = "Ae";
    public static final String USERLIST_ATTRIBUTE = "Aw";
    public static final String SEQUENCE_ATTRIBUTE = "Aq";
    public static final String STRINGBUFFER_ATTRIBUTE = "Au";
    public static final String STYLEDTEXT_ATTRIBUTE = "YT";

    static
    {
        ATTRIBUTE_TYPECODE2ATTRIBUTE_ENUM_MAP.put( STRING_ATTRIBUTE,
              AttributeEnum.StringAttr );
        ATTRIBUTE_TYPECODE2ATTRIBUTE_ENUM_MAP.put( DIMENSION_ATTRIBUTE,
              AttributeEnum.Dimension );
        ATTRIBUTE_TYPECODE2ATTRIBUTE_ENUM_MAP.put( DOUBLE_ATTRIBUTE,
              AttributeEnum.DoubleAttr );
        ATTRIBUTE_TYPECODE2ATTRIBUTE_ENUM_MAP.put( BOOLEAN_ATTRIBUTE,
              AttributeEnum.BooleanAttr );
        ATTRIBUTE_TYPECODE2ATTRIBUTE_ENUM_MAP.put( LONG_ATTRIBUTE,
              AttributeEnum.LongAttr );
        ATTRIBUTE_TYPECODE2ATTRIBUTE_ENUM_MAP.put( DATE_ATTRIBUTE,
              AttributeEnum.DateAttr );
        ATTRIBUTE_TYPECODE2ATTRIBUTE_ENUM_MAP.put( DATETIME_ATTRIBUTE,
              AttributeEnum.DateTime );
        ATTRIBUTE_TYPECODE2ATTRIBUTE_ENUM_MAP.put( ENUMERATION_ATTRIBUTE,
              AttributeEnum.Enumerated );
        ATTRIBUTE_TYPECODE2ATTRIBUTE_ENUM_MAP.put( USERLIST_ATTRIBUTE,
              AttributeEnum.UserList );
        ATTRIBUTE_TYPECODE2ATTRIBUTE_ENUM_MAP.put( SEQUENCE_ATTRIBUTE,
              AttributeEnum.SequenceAttr );
        ATTRIBUTE_TYPECODE2ATTRIBUTE_ENUM_MAP.put( STRINGBUFFER_ATTRIBUTE,
              AttributeEnum.StringBuffer );
        ATTRIBUTE_TYPECODE2ATTRIBUTE_ENUM_MAP.put( STYLEDTEXT_ATTRIBUTE,
              AttributeEnum.StyledText );
    }

    private final java.util.Collection m_collectionOfAttributeDefintions;
    private final ORB m_orb;

    private AttributeDefinition m_attributeDefinition;
    private boolean m_inAttributeData = false;
    private boolean m_inAttributeDefinition = false;

    public LocalContentHandler( java.util.Collection aCollectionOfAttributeDefintions, ORB anORB )
    {
        m_collectionOfAttributeDefintions = aCollectionOfAttributeDefintions;
        m_orb = anORB;
    }

    public void startElement( String namespaceURI, String localName, String qName,
          org.xml.sax.Attributes atts )
        throws org.xml.sax.SAXException
    {
        if ( !m_inAttributeData )
        {
            if ( qName.equalsIgnoreCase( "AttributeData" ) )
            {
                m_inAttributeData = true;
                return;
            }
        }

        if ( m_attributeDefinition == null )
        {
            if ( qName.equalsIgnoreCase( "AttributeDefinition" ) )
            {
                m_inAttributeDefinition = true;
                m_attributeDefinition = new AttributeDefinition();

                int index;

                index = atts.getIndex( "ID" );
                m_attributeDefinition.id = atts.getValue( index );

                index = atts.getIndex( "Name" );
                m_attributeDefinition.name = atts.getValue( index );

                index = atts.getIndex( "TSCounter" );
                try
                {
                    m_attributeDefinition.tsCounter = Integer.parseInt( atts.getValue( index ) );
                }
                catch ( NumberFormatException e )
                {
                    e.printStackTrace();
                }

                m_attributeDefinition.moreInfo = m_orb.create_any();
                index = atts.getIndex( "Value" );
                if ( -1 != index )
                {
                    try
                    {
                        m_attributeDefinition.moreInfo.insert_long(
                              Integer.parseInt( atts.getValue( index ) ) );
                    }
                    catch ( NumberFormatException e )
                    {
                        e.printStackTrace();
                    }
                }

                // hard-coded attributes
                m_attributeDefinition.status = ItemStatus.UNMODIFIED;
                m_attributeDefinition.uiDefinition = new AttributeConstraint[ 0 ];

                m_collectionOfAttributeDefintions.add( m_attributeDefinition );

                return;
            }
        }
        else
        {
            AttributeType anAttributeType = new AttributeType();

            int index;

            index = atts.getIndex( "ID" );
            anAttributeType.id = new ObjectIdImpl( atts.getValue( index ) );

            index = atts.getIndex( "Name" );
            anAttributeType.name = atts.getValue( index );

            index = atts.getIndex( "Code" );
            String anAttributeEnumCode = atts.getValue( index );
            anAttributeType.type = ( AttributeEnum ) ATTRIBUTE_TYPECODE2ATTRIBUTE_ENUM_MAP.get(
                  anAttributeEnumCode );

            index = atts.getIndex( "TSCounter" );
            try
            {
                anAttributeType.tsCounter = Integer.parseInt( atts.getValue( index ) );
            }
            catch ( NumberFormatException e )
            {
                e.printStackTrace();
            }

            // hard-coded attributes
            anAttributeType.constraints = new AttributeConstraint[0];

            m_attributeDefinition.type = anAttributeType;

            m_attributeDefinition = null;
        }
    }
}

--- NEW FILE: ObjectIdImpl.java ---
/*

* Copyright (C) The Community OpenORB Project. All rights reserved.

*

* This software is published under the terms of The OpenORB Community Software

* License version 1.0, a copy of which has been included with this distribution

* in the LICENSE.txt file.

*/



package org.openorb.orb.test.iiop.fragmentedmessage;



/**

 * @author Michael Macaluso

 */

public final class ObjectIdImpl

    extends ObjectId

    implements Comparable

{

    public static final int NULL_HASHCODE = -1;



    public ObjectIdImpl()

    {

    }



    public ObjectIdImpl( String id )

    {

        objectid = id;

    }



    public void marshal( org.omg.CORBA.DataOutputStream os )

    {

        boolean isNull = ( null == objectid );



        os.write_boolean( isNull );



        if ( !isNull )

        {

            os.write_wstring( objectid );

        }

    }



    public void unmarshal( org.omg.CORBA.DataInputStream is )

    {

        boolean isNull = is.read_boolean();



        if ( isNull )

        {

            objectid = null;

        }

        else

        {

            objectid = is.read_wstring();

        }

    }



    public boolean equals( Object anObject )

    {

        if ( null == anObject )

        {

            return false;

        }



        Class aClass = anObject.getClass();



        if ( aClass == ObjectIdImpl.class )

        {

            return equals( ( ObjectIdImpl ) anObject );

        }

        else if ( aClass == String.class )

        {

            return equals( ( String ) anObject );

        }



        return false;

    }



    public boolean equals( ObjectIdImpl anObject )

    {

        if ( null == anObject )

        {

            return false;

        }



        return equals( anObject.objectid );

    }



    public boolean equals( String anObject )

    {

        if ( null == anObject )

        {

            return ( objectid == null );

        }



        return anObject.equals( objectid );

    }



    public int hashCode()

    {

        if ( null == objectid )

        {

            return NULL_HASHCODE;

        }

        else

        {

            return objectid.hashCode();

        }

    }



    public int compare( Object anObject )

    {

        return compareTo( anObject );

    }



    public int compareTo( Object anObject )

    {

        if ( null == anObject )

        {

            return -1;

        }



        Class aClass = anObject.getClass();



        if ( aClass == ObjectIdImpl.class )

        {

            return compareTo( ( ObjectIdImpl ) anObject );

        }

        else if ( aClass == String.class )

        {

            return compareTo( ( String ) anObject );

        }



        return -1;

    }



    public int compareTo( ObjectIdImpl anObject )

    {

        if ( null == anObject )

        {

            return -1;

        }



        return compareTo( anObject.objectid );

    }



    public int compareTo( String anObject )

    {

        if ( null == anObject )

        {

            if ( null == objectid )

            {

                return 0;

            }

            else

            {

                return -1;

            }

        }

        else

        {

            if ( null == objectid )

            {

                return 1;

            }

            else

            {

                return objectid.compareTo( anObject );

            }

        }

    }



    public String toString()

    {

        return objectid;

    }

}


--- NEW FILE: package.html ---
<body>

<p>

IIOP test case to create multiple large fragments.

</p>

</body>

[openorb-commits] CVS: OpenORB/src/idl/test fragmentedmessage.idl,NONE,1.1

[Michael R. <mr...@us...>]

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

Added Files:
	fragmentedmessage.idl 
Log Message:
Added the fragmented test case from Michael Macaluso

--- NEW FILE: fragmentedmessage.idl ---
/*

* Copyright (C) The Community OpenORB Project. All rights reserved.

*

* This software is published under the terms of The OpenORB Community Software

* License version 1.0, a copy of which has been included with this distribution

* in the LICENSE.txt file.

*/



#ifndef _TEST_FRAGMENTEDMESSAGE_IDL_

#define _TEST_FRAGMENTEDMESSAGE_IDL_



#pragma prefix "openorb.org"



module orb

{

    module test

    {

        module iiop

        {

            module fragmentedmessage

            {

                valuetype ValueString wstring;



                custom valuetype ObjectId

                {

                    public wstring objectid;

                };



                enum AttributeEnum

                {

                    StringAttr,

                    Dimension,

                    DoubleAttr,

                    BooleanAttr,

                    LongAttr,

                    DateAttr,

                    DateTime,

                    Enumerated,

                    SequenceAttr,

                    StringBuffer,

                    StyledText,

                    UserList

                };



                enum ItemStatus

                {

                    ADDED,

                    DELETED,

                    MODIFIED,

                    UNMODIFIED

                };



                struct AttributeConstraint

                {

                    ValueString                key;

                    any                        value;

                };

                typedef sequence<AttributeConstraint> AttributeConstraints;



                struct AttributeType

                {

                    ValueString                name;

                    AttributeEnum              type;

                    AttributeConstraints       constraints;

                    ObjectId                   id;

                    long                       tsCounter;

                };

                typedef sequence<AttributeType> AttributeTypes;



                struct AttributeDefinition

                {

                    ValueString                name;

                    AttributeType              type;

                    any                        moreInfo;

                    AttributeConstraints       uiDefinition;

                    ValueString                id;

                    ItemStatus                 status;

                    long                       tsCounter;

                };

                typedef sequence<AttributeDefinition> AttributeDefinitions;



                interface AttributeManager

                {

                    AttributeDefinitions getAttributeDefinitions();

                };

            };

        };

    };

};



#endif

[openorb-commits] CVS: OpenORB/src/test/org/openorb/orb/test/iiop IIOPTest.java,1.6,1.7

[Michael R. <mr...@us...>]

Update of /cvsroot/openorb/OpenORB/src/test/org/openorb/orb/test/iiop
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31977/src/test/org/openorb/orb/test/iiop

Modified Files:
	IIOPTest.java 
Log Message:
Added the fragmented test case from Michael Macaluso

Index: IIOPTest.java
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/test/org/openorb/orb/test/iiop/IIOPTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- IIOPTest.java	22 Jul 2004 19:43:16 -0000	1.6
+++ IIOPTest.java	9 Aug 2004 10:06:09 -0000	1.7
@@ -12,12 +12,13 @@
 import junit.framework.TestSuite;
 import junit.framework.Test;
 
+import org.openorb.orb.test.iiop.bidir.BiDirTest;
 import org.openorb.orb.test.iiop.codec.CodecTest;
+import org.openorb.orb.test.iiop.complex.ComplexTest;
+import org.openorb.orb.test.iiop.fragmentedmessage.FragmentedMessageTest;
 import org.openorb.orb.test.iiop.primitive.PrimitiveTest;
-import org.openorb.orb.test.iiop.value.ValuetypeTest;
-import org.openorb.orb.test.iiop.bidir.BiDirTest;
 import org.openorb.orb.test.iiop.state.StateTest;
-import org.openorb.orb.test.iiop.complex.ComplexTest;
+import org.openorb.orb.test.iiop.value.ValuetypeTest;
 
 /**
  * Tests marshaling and unmarshaling of various iiop types.
@@ -51,6 +52,8 @@
         suite.addTestSuite( BiDirTest.class );
         suite.addTestSuite( StateTest.class );
         suite.addTestSuite( ComplexTest.class );
+        // TODO: Fix the problem before removing the comment
+        //suite.addTestSuite( FragmentedMessageTest.class );
         return suite;
     }
 

[openorb-commits] CVS: OpenORB local.properties,1.10,1.11

[Michael R. <mr...@us...>]

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

Modified Files:
	local.properties 
Log Message:
The fragmented test case is the default now

Index: local.properties
===================================================================
RCS file: /cvsroot/openorb/OpenORB/local.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- local.properties	23 Jul 2004 09:50:38 -0000	1.10
+++ local.properties	9 Aug 2004 10:04:59 -0000	1.11
@@ -16,7 +16,7 @@
 # Use the ant target 'run-single-test' to execute the test case
 # specified by the property.
 #
-junit.test.case=org.openorb.orb.test.iiop.primitive.PrimitiveTest
+junit.test.case=org.openorb.orb.test.iiop.fragmentedmessage.FragmentedMessageTest
 
 #
 # Uncomment the properties to enable debug output for the tests

[openorb-commits] CVS: OpenORB/src build.xml,1.182,1.183

[Michael R. <mr...@us...>]

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

Modified Files:
	build.xml 
Log Message:
Include the XML document in the test jar

Index: build.xml
===================================================================
RCS file: /cvsroot/openorb/OpenORB/src/build.xml,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -d -r1.182 -r1.183
--- build.xml	29 Jul 2004 08:01:03 -0000	1.182
+++ build.xml	9 Aug 2004 10:04:36 -0000	1.183
@@ -991,8 +991,8 @@
     <!-- examples requiring POA -->
     <echo message="Building POA examples"/>
     <idl2java cachefile="${build.dir}/idl2java.cache"
-              includepath="${idl.dir}" 
-              destdir="${gensrc.dir}/examples" 
+              includepath="${idl.dir}"
+              destdir="${gensrc.dir}/examples"
               srcdir="${examples.dir}"
               includeorbidl="false">
       <include name="org/openorb/orb/examples/dsi/poa/Sample.idl" />
@@ -1029,7 +1029,7 @@
     </java2idl>
 
 <!--
-    <idl2java cachefile="${build.dir}/idl2java.cache" 
+    <idl2java cachefile="${build.dir}/idl2java.cache"
               includepath="${idl.dir}" destdir="${gensrc.dir}/examples"
               srcdir="${gensrc.dir}/examples" includeorbidl="false">
       <include name="org/openorb/orb/examples/rmi/hello/RemoteHello.idl" />
@@ -1139,6 +1139,9 @@
   </target>
 
   <target name="create-test-jar">
+    <copy todir="${build.dir}/test">
+      <fileset dir="${test.dir}" includes="**/*.xml" />
+    </copy>
     <delete file="${lib.dir}/${test-jar}" />
     <antcall target="create-test-manifest-file" />
     <jar jarfile="${lib.dir}/${test-jar}" manifest="${build.dir}/test-manifest.mf" basedir="${build.dir}/test" />
@@ -1152,7 +1155,7 @@
     <delete file="${build.dir}/examples-manifest.mf" />
   </target>
 
-  <target name="create-separate-main-jars" 
+  <target name="create-separate-main-jars"
           description="Creates the main jar as two separate jars containing classes and config" >
     <delete failonerror="false" file="${lib.dir}/${main-classes-jar}" />
     <delete failonerror="false" file="${lib.dir}/${main-config-jar}" />
@@ -1252,7 +1255,7 @@
     <replace file="${dist.doc.dir}/rmi.xml" token="@docbook-dtd@" value="${tools.dir}/docbook/xml/docbookx.dtd"/>
     <replace file="${dist.doc.dir}/rmi.xml" token="@intro@" value="${tools.dir}/src/doc/intro.xml"/>
     <!-- looks better but there are still xml parser classpath issues with jdk1.4
-    <xslt in="${dist.doc.dir}/${NAME_SHORT}.xml" 
+    <xslt in="${dist.doc.dir}/${NAME_SHORT}.xml"
           out="${dist.doc.dir}/${NAME_SHORT}.html"
           style="${tools.dir}/docbook/tcoo_html.xsl"
           classpathref="build.class.path"/>-->