Menu
▾
▴
[openorb-commits] CVS: OpenORB/src/test/org/openorb/orb/test/iiop/fragmentedmessage ObjectIdDefaultFactory.java,NONE,1.1 AttributeManagerImpl.java,1.1,1.2 FragmentedMessageTest.java,1.2,1.3 LocalContentHandler.java,1.1,1.2 package.html,1.2,1.3
Update of /cvsroot/openorb/OpenORB/src/test/org/openorb/orb/test/iiop/fragmentedmessage In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26121/src/test/org/openorb/orb/test/iiop/fragmentedmessage Modified Files: AttributeManagerImpl.java FragmentedMessageTest.java LocalContentHandler.java package.html Added Files: ObjectIdDefaultFactory.java Log Message: Added testcase update --- NEW FILE: ObjectIdDefaultFactory.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; /** * The default factory implementation for value type ObjectId. * * @author Michael Macaluso */ public class ObjectIdDefaultFactory implements org.omg.CORBA.portable.ValueFactory { /** * Read the value type from an input stream. * * @param is The input stream to read the value type from. * @return The valut type read from the stream. */ public java.io.Serializable read_value( org.omg.CORBA_2_3.portable.InputStream is ) { ObjectIdImpl ret = new ObjectIdImpl(); is.read_value( ret ); return ret; } } Index: AttributeManagerImpl.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/test/org/openorb/orb/test/iiop/fragmentedmessage/AttributeManagerImpl.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- AttributeManagerImpl.java 9 Aug 2004 10:06:09 -0000 1.1 +++ AttributeManagerImpl.java 12 Aug 2004 14:30:56 -0000 1.2 @@ -8,13 +8,14 @@ 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; +import org.omg.PortableServer.POA; + /** * @author Michael Macaluso */ @@ -34,9 +35,6 @@ return m_poa; } - /** - * Operation getAttributeDefinitions - */ public AttributeDefinition[] getAttributeDefinitions() { if ( null == m_attributeDefinitions ) @@ -61,10 +59,10 @@ t.printStackTrace(); } - m_attributeDefinitions = (AttributeDefinition[]) anAttributeDefinitionsList.toArray( + m_attributeDefinitions = ( AttributeDefinition[] ) anAttributeDefinitionsList.toArray( new AttributeDefinition[ anAttributeDefinitionsList.size() ] ); } - return m_attributeDefinitions; } } + Index: FragmentedMessageTest.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/test/org/openorb/orb/test/iiop/fragmentedmessage/FragmentedMessageTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- FragmentedMessageTest.java 11 Aug 2004 10:23:47 -0000 1.2 +++ FragmentedMessageTest.java 12 Aug 2004 14:30:56 -0000 1.3 @@ -63,11 +63,9 @@ { ORB anORB = getORB(); POA rootPOA = ( POA ) anORB.resolve_initial_references( "RootPOA" ); - m_serverReference = ( new AttributeManagerImpl( rootPOA ) )._this( - anORB ); + m_serverReference = ( new AttributeManagerImpl( rootPOA ) )._this( anORB ); rootPOA.the_POAManager().activate(); - m_clientReference = AttributeManagerHelper.narrow( - forceMarshal( m_serverReference ) ); + m_clientReference = AttributeManagerHelper.narrow( forceMarshal( m_serverReference ) ); } catch ( org.omg.CORBA.UserException ex ) { @@ -95,51 +93,51 @@ { if ( args.length > 0 && args[ 0 ].equals( "server" ) ) { - FragmentedMessageTest test = new FragmentedMessageTest( "standalone" ); - test.setUp(); - String reference = test.getORB().object_to_string( test.getReference() ); - 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" ); - } - test.getORB().run(); + FragmentedMessageTest test = new FragmentedMessageTest( "standalone" ); + test.setUp(); + String reference = test.getORB().object_to_string( test.getReference() ); + 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" ); + } + test.getORB().run(); } else if ( args.length > 0 && args[ 0 ].equals( "client" ) ) { - org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null ); - org.omg.CORBA.Object obj = null; - try - { - java.io.FileInputStream file = new java.io.FileInputStream( "ObjectId" ); - java.io.InputStreamReader myInput = new java.io.InputStreamReader( file ); - java.io.BufferedReader reader = new java.io.BufferedReader( myInput ); - String ref = reader.readLine(); - obj = orb.string_to_object( ref ); - } - catch ( java.io.IOException ex ) - { - ex.printStackTrace(); - } + org.omg.CORBA.ORB orb = org.omg.CORBA.ORB.init( args, null ); + org.omg.CORBA.Object obj = null; + try + { + java.io.FileInputStream file = new java.io.FileInputStream( "ObjectId" ); + java.io.InputStreamReader myInput = new java.io.InputStreamReader( file ); + java.io.BufferedReader reader = new java.io.BufferedReader( myInput ); + String ref = reader.readLine(); + obj = orb.string_to_object( ref ); + } + catch ( java.io.IOException ex ) + { + ex.printStackTrace(); + } - try - { - AttributeManager mgr = AttributeManagerHelper.narrow( obj ); - System.out.println( "Test: AttributeManager.getAttributeDefinitions" ); - AttributeDefinition[] anAttributeDefinitionArray = - mgr.getAttributeDefinitions(); - } - catch ( Exception ex ) - { - System.out.println( "An unknown exception occured!" ); - ex.printStackTrace(); - } + try + { + AttributeManager mgr = AttributeManagerHelper.narrow( obj ); + System.out.println( "Test: AttributeManager.getAttributeDefinitions" ); + AttributeDefinition[] anAttributeDefinitionArray = + mgr.getAttributeDefinitions(); + } + catch ( Exception ex ) + { + System.out.println( "An unknown exception occured!" ); + ex.printStackTrace(); + } } else { @@ -148,3 +146,4 @@ } } } + Index: LocalContentHandler.java =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/test/org/openorb/orb/test/iiop/fragmentedmessage/LocalContentHandler.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- LocalContentHandler.java 9 Aug 2004 10:06:09 -0000 1.1 +++ LocalContentHandler.java 12 Aug 2004 14:30:56 -0000 1.2 @@ -9,6 +9,7 @@ package org.openorb.orb.test.iiop.fragmentedmessage; import org.omg.CORBA.ORB; +import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; /** @@ -20,8 +21,7 @@ public class LocalContentHandler extends DefaultHandler { - public static final java.util.Map ATTRIBUTE_TYPECODE2ATTRIBUTE_ENUM_MAP = - new java.util.HashMap(); + public static final java.util.Map ATTRTYPECODE_2_ATTRENUM_MAP = new java.util.HashMap(); public static final String STRING_ATTRIBUTE = "As"; public static final String DIMENSION_ATTRIBUTE = "Ai"; @@ -38,30 +38,30 @@ 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 ); + ATTRTYPECODE_2_ATTRENUM_MAP.put( + STRING_ATTRIBUTE, AttributeEnum.StringAttr ); + ATTRTYPECODE_2_ATTRENUM_MAP.put( + DIMENSION_ATTRIBUTE, AttributeEnum.Dimension ); + ATTRTYPECODE_2_ATTRENUM_MAP.put( + DOUBLE_ATTRIBUTE, AttributeEnum.DoubleAttr ); + ATTRTYPECODE_2_ATTRENUM_MAP.put( + BOOLEAN_ATTRIBUTE, AttributeEnum.BooleanAttr ); + ATTRTYPECODE_2_ATTRENUM_MAP.put( + LONG_ATTRIBUTE, AttributeEnum.LongAttr ); + ATTRTYPECODE_2_ATTRENUM_MAP.put( + DATE_ATTRIBUTE, AttributeEnum.DateAttr ); + ATTRTYPECODE_2_ATTRENUM_MAP.put( + DATETIME_ATTRIBUTE, AttributeEnum.DateTime ); + ATTRTYPECODE_2_ATTRENUM_MAP.put( + ENUMERATION_ATTRIBUTE, AttributeEnum.Enumerated ); + ATTRTYPECODE_2_ATTRENUM_MAP.put( + USERLIST_ATTRIBUTE, AttributeEnum.UserList ); + ATTRTYPECODE_2_ATTRENUM_MAP.put( + SEQUENCE_ATTRIBUTE, AttributeEnum.SequenceAttr ); + ATTRTYPECODE_2_ATTRENUM_MAP.put( + STRINGBUFFER_ATTRIBUTE, AttributeEnum.StringBuffer ); + ATTRTYPECODE_2_ATTRENUM_MAP.put( + STYLEDTEXT_ATTRIBUTE, AttributeEnum.StyledText ); } private final java.util.Collection m_collectionOfAttributeDefintions; @@ -100,7 +100,7 @@ int index; index = atts.getIndex( "ID" ); - m_attributeDefinition.id = atts.getValue( index ); + m_attributeDefinition.id = new ObjectIdImpl( atts.getValue( index ) ); index = atts.getIndex( "Name" ); m_attributeDefinition.name = atts.getValue( index ); @@ -121,8 +121,7 @@ { try { - m_attributeDefinition.moreInfo.insert_long( - Integer.parseInt( atts.getValue( index ) ) ); + m_attributeDefinition.moreInfo.insert_wstring( atts.getValue( index ) ); } catch ( NumberFormatException e ) { @@ -153,7 +152,7 @@ index = atts.getIndex( "Code" ); String anAttributeEnumCode = atts.getValue( index ); - anAttributeType.type = ( AttributeEnum ) ATTRIBUTE_TYPECODE2ATTRIBUTE_ENUM_MAP.get( + anAttributeType.type = ( AttributeEnum ) ATTRTYPECODE_2_ATTRENUM_MAP.get( anAttributeEnumCode ); index = atts.getIndex( "TSCounter" ); @@ -167,11 +166,17 @@ } // hard-coded attributes - anAttributeType.constraints = new AttributeConstraint[0]; + anAttributeType.constraints = new AttributeConstraint[ 0 ]; m_attributeDefinition.type = anAttributeType; m_attributeDefinition = null; } } + + public void endDocument() + throws SAXException + { + System.out.println( "Got end of document!!!!" ); + } } Index: package.html =================================================================== RCS file: /cvsroot/openorb/OpenORB/src/test/org/openorb/orb/test/iiop/fragmentedmessage/package.html,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- package.html 11 Aug 2004 10:23:47 -0000 1.2 +++ package.html 12 Aug 2004 14:30:56 -0000 1.3 @@ -1,5 +1,5 @@ -<body> -<p> -IIOP test case to create multiple large fragments. -</p> -</body> +<body> +<p> +IIOP test case to create multiple large fragments. +</p> +</body> |
