tm4j-commits — Automatically generated CVS check-in notifications

[Tm4j-commits] CVS: tm4j/src/com/techquila/topicmap/ozone OzoneTopicMapImpl.java,1.2,1.3

[Gerd M. <li...@us...>]

Update of /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone
In directory usw-pr-cvs1:/tmp/cvs-serv32022

Modified Files:
	OzoneTopicMapImpl.java 
Log Message:
- fixed: merged changes from the transient implementation

[Tm4j-commits] CVS: tm4j/src/com/techquila/topicmap/ozone OzoneXTMBuilder.java,1.1,1.2

[Gerd M. <li...@us...>]

Update of /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone
In directory usw-pr-cvs1:/tmp/cvs-serv31663

Modified Files:
	OzoneXTMBuilder.java 
Log Message:
- added: better argument handling

[Tm4j-commits] CVS: tm4j/src/com/techquila/topicmap/ozone OzoneTopicMapObjectImpl.java,1.2,1.3

[Gerd M. <li...@us...>]

Update of /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone
In directory usw-pr-cvs1:/tmp/cvs-serv31450

Modified Files:
	OzoneTopicMapObjectImpl.java 
Log Message:
- fixed: listener stuff did not work

[Tm4j-commits] CVS: tm4j/src/com/techquila/topicmap/ozone OzoneTopicImpl.java,1.2,1.3

[Gerd M. <li...@us...>]

Update of /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone
In directory usw-pr-cvs1:/tmp/cvs-serv31344

Modified Files:
	OzoneTopicImpl.java 
Log Message:
- fixed: getBaseTopic() must return self(), not this !

[Tm4j-commits] CVS: tm4j/src/com/techquila/topicmap TopicMap.java,1.1.1.1,1.2

[Kal A. <kal...@us...>]

Update of /cvsroot/tm4j/tm4j/src/com/techquila/topicmap
In directory usw-pr-cvs1:/tmp/cvs-serv14123

Modified Files:
	TopicMap.java 
Log Message:
Added getObjects() method

[Tm4j-commits] CVS: tm4j/src/com/techquila/topicmap/test ParserTest.java,1.2,1.3

[Kal A. <kal...@us...>]

Update of /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/test
In directory usw-pr-cvs1:/tmp/cvs-serv26081

Modified Files:
	ParserTest.java 
Log Message:
Added test of correct setting and indexing of resourceID property on TopicMapObjects during parse.

[Tm4j-commits] CVS: tm4j/src/com/techquila/topicmap TopicMapImpl.java,1.1.1.1,1.2

[Kal A. <kal...@us...>]

Update of /cvsroot/tm4j/tm4j/src/com/techquila/topicmap
In directory usw-pr-cvs1:/tmp/cvs-serv25801

Modified Files:
	TopicMapImpl.java 
Log Message:
Added indexing of Association objects when added to the topic map.

[Tm4j-commits] CVS: tm4j/src/com/techquila/topicmap/utils XTMBuilder.java,1.3,1.4

[Kal A. <kal...@us...>]

Update of /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/utils
In directory usw-pr-cvs1:/tmp/cvs-serv25548

Modified Files:
	XTMBuilder.java 
Log Message:
Fix to ensure that the URI of the resource which causes the creation of a TopicMapObject is correctly recorded in the resourceID property.

[Tm4j-commits] CVS: tm4j/resource/tests resid-test.xtm,NONE,1.1

[Kal A. <kal...@us...>]

Update of /cvsroot/tm4j/tm4j/resource/tests
In directory usw-pr-cvs1:/tmp/cvs-serv25138

Added Files:
	resid-test.xtm 
Log Message:
Initial version

[Tm4j-commits] CVS: tm4j/src/com/techquila/topicmap/utils XTMBuilder.java,1.2,1.3

[Kal A. <kal...@us...>]

Update of /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/utils
In directory usw-pr-cvs1:/tmp/cvs-serv9251

Modified Files:
	XTMBuilder.java 
Log Message:
Fixed to ensure that a resourceID is assigned to stub topics which cannot be resolved during a build.

[Tm4j-commits] CVS: tm4j/src/com/techquila/topicmap/test ParserTest.java,1.1.1.1,1.2

[Kal A. <kal...@us...>]

Update of /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/test
In directory usw-pr-cvs1:/tmp/cvs-serv9084

Modified Files:
	ParserTest.java 
Log Message:
Added test of creation of resource ID for stub topics.

[Tm4j-commits] CVS: tm4j/src/com/techquila/topicmap/test IndexTest.java,1.2,1.3

[Kal A. <kal...@us...>]

Update of /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/test
In directory usw-pr-cvs1:/tmp/cvs-serv26852

Modified Files:
	IndexTest.java 
Log Message:
Added test of scoped name merging

Index: IndexTest.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/test/IndexTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** IndexTest.java	2001/05/25 13:46:21	1.2
--- IndexTest.java	2001/06/04 22:45:13	1.3
***************
*** 1,2 ****
--- 1,6 ----
+ /*
+  * $Header$
+  */
+ 
  package com.techquila.topicmap.test;
  
***************
*** 117,121 ****
--- 121,183 ----
          assert("Expected to find t1 indexed against " + s2,
                 t.equals(t1));
+ 
+         // Remove subject indicators
+         t1.setSubjectIndicators(null);
+         t2.setSubjectIndicators(null);
+         t = tm.getTopicBySubjectIndicator(s1);
+         assert("Expected to find no topic indexed against subject indicator: " + s1,
+                t == null);
+         t = tm.getTopicBySubjectIndicator(s2);
+         assert("Expected to find no topic indexed against subject indicator: " + s2,
+                t == null);
+     }
+ 
+     public void testNameIndex()
+     {
+         BaseName bn1 = tm.getFactory().createBaseName(null);
+         BaseName bn2 = tm.getFactory().createBaseName(null);
+         bn1.setString("foo");
+         bn2.setString("bar");
+ 
+         // Index
+         t1.addName(bn1);
+         t2.addName(bn2);
+ 
+         assert("Expected t1 to not be merged.", t1.getMergedTopics().size() == 0);
+         assert("Expected t2 to not be merged.", t2.getMergedTopics().size() == 0);
+ 
+         // Force merge
+         t1.addName(bn2);
+         assert("Expected t1 and t2 to be merged.", t1.getBaseTopic().getMergedTopics().size() == 1);
+ 
+         // Force demerge
+         t1.setNames(null);
+         assert("Expected t1 to have no names.",
+                t1.getNames().size() == 0);
+         assert("Expected t1 and t2 to be demerged.",
+                (t1.getMergedTopics().size() == 0) && (t2.getMergedTopics().size() == 0));
+ 
+         t2.setNames(null);
+         assert("Expected t1 to have no names.", t1.getNames().size() == 0);
+         assert("Expected t2 to have no names.", t2.getNames().size() == 0);
+ 
+         // Force merge by name
+         t1.addName(bn1);
+         t2.addName(bn1);
+         // Force additional merge by subject indicator
+         t1.addSubjectIndicator("test");
+         t2.addSubjectIndicator("test");
+         // Remove merge by name:
+         t1.setNames(null);
+         assert("Expected t1 and t2 to remain merged.",
+                (t1.getMergedTopics().size() == 1) || (t2.getMergedTopics().size() == 1));
      }
      
  }
+ 
+ /*
+  * $Log$
+  * Revision 1.3  2001/06/04 22:45:13  kal_ahmed
+  * Added test of scoped name merging
+  *
+  */

[Tm4j-commits] CVS: tm4j build.xml,1.5,1.6

[Gerd M. <li...@us...>]

Update of /cvsroot/tm4j/tm4j
In directory usw-pr-cvs1:/tmp/cvs-serv17903

Modified Files:
	build.xml 
Log Message:
- added: ozone-test target

Index: build.xml
===================================================================
RCS file: /cvsroot/tm4j/tm4j/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** build.xml	2001/05/29 18:08:48	1.5
--- build.xml	2001/06/01 16:56:48	1.6
***************
*** 43,46 ****
--- 43,47 ----
      <echo message="   ozone-install  --> intializes a ozone database"/>
      <echo message="   ozone-run      --> runs a ozone server"/>
+     <echo message="   ozone-test     --> small ozone test, that stores an XTM file"/>
      <echo message="   distrib-all    --> generates the TM4J source and binary distributions"/>
      <echo message="   clean-all      --> cleans up all compiled classes"/>
***************
*** 302,305 ****
--- 303,307 ----
              com.techquila.topicmap.ozone.OzoneAssociationImpl
              com.techquila.topicmap.ozone.OzoneTopicMapUtilsImpl
+             com.techquila.topicmap.ozone.OzoneXTMBuilderHelperImpl
      "/> 
   
***************
*** 355,365 ****
    </target>
  
!   <!--target name="ozoneTest" depends="init">
!     <java classname="com.techquila.topicmap.ozone.XTMReaderImpl"
            classpathref="project.class.path">
        <arg value="ozonedb:local:${ozoneDB.dir}"/> 
!       <arg value="resource/tests/music-xtm.xml"/>
      </java>
!   </target-->
  
  </project>
--- 357,374 ----
    </target>
  
!   <target name="ozone-test-args" unless="ozone.test.file">
!     <echo>
!         #### You have to specify an XTM file with '-Dozone.test.file=filename' !" ####
!     </echo>
!   </target>
! 
!   <target name="ozone-test" if="ozone.test.file" depends="ozone-test-args, init">
!     <java classname="com.techquila.topicmap.ozone.OzoneXTMBuilder"
            classpathref="project.class.path">
        <arg value="ozonedb:local:${ozoneDB.dir}"/> 
!       <!--arg value="ozonedb:remote://localhost:${ozoneDB.port}"/--> 
!       <arg value="${ozone.test.file}"/>
      </java>
!   </target>
  
  </project>

[Tm4j-commits] CVS: tm4j/src/com/techquila/topicmap/ozone OzoneAssociation.java,1.1,1.2 OzoneAssociationImpl.java,1.1,1.2 OzoneBaseName.java,1.1,1.2 OzoneBaseNameImpl.java,1.1,1.2 OzoneMember.java,1.1,1.2 OzoneMemberImpl.java,1.1,1.2 OzoneOccurrence.java,1.1,1.2 OzoneOccurrenceImpl.java,1.1,1.2 OzoneScope.java,1.1,1.2 OzoneScopeImpl.java,1.1,1.2 OzoneScopedObject.java,1.1,1.2 OzoneScopedObjectImpl.java,1.1,1.2 OzoneTopic.java,1.1,1.2 OzoneTopicImpl.java,1.1,1.2 OzoneTopicMap.java,1.1,1.2 OzoneTopicMapFactoryImpl.java,1.1,1.2 OzoneTopicMapImpl.java,1.1,1.2 OzoneTopicMapObject.java,1.1,1.2 OzoneTopicMapObjectImpl.java,1.1,1.2 OzoneTopicMapUtils.java,1.1,1.2 OzoneTopicMapUtilsImpl.java,1.1,1.2 OzoneVariant.java,1.1,1.2 OzoneVariantImpl.java,1.1,1.2 OzoneVariantName.java,1.1,1.2 OzoneVariantNameImpl.java,1.1,1.2

[Gerd M. <li...@us...>]

Update of /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone
In directory usw-pr-cvs1:/tmp/cvs-serv17139

Modified Files:
	OzoneAssociation.java OzoneAssociationImpl.java 
	OzoneBaseName.java OzoneBaseNameImpl.java OzoneMember.java 
	OzoneMemberImpl.java OzoneOccurrence.java 
	OzoneOccurrenceImpl.java OzoneScope.java OzoneScopeImpl.java 
	OzoneScopedObject.java OzoneScopedObjectImpl.java 
	OzoneTopic.java OzoneTopicImpl.java OzoneTopicMap.java 
	OzoneTopicMapFactoryImpl.java OzoneTopicMapImpl.java 
	OzoneTopicMapObject.java OzoneTopicMapObjectImpl.java 
	OzoneTopicMapUtils.java OzoneTopicMapUtilsImpl.java 
	OzoneVariant.java OzoneVariantImpl.java OzoneVariantName.java 
	OzoneVariantNameImpl.java 
Log Message:
- changed: license and author notice

Index: OzoneAssociation.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneAssociation.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneAssociation.java	2001/05/29 17:32:45	1.1
--- OzoneAssociation.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 29,32 ****
--- 28,34 ----
   * @see com.techquila.topicmap.Member
   * @see com.techquila.topicmap.ScopedObject
+  * 
+  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
+  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
   */
  public abstract interface OzoneAssociation extends OzoneScopedObject, Association {

Index: OzoneAssociationImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneAssociationImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneAssociationImpl.java	2001/05/29 17:32:45	1.1
--- OzoneAssociationImpl.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 30,33 ****
--- 29,35 ----
   * @see com.techquila.topicmap.Topic
   * @see com.techquila.topicmap.Member
+  *
+  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
+  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
   */
  public class OzoneAssociationImpl extends OzoneScopedObjectImpl 

Index: OzoneBaseName.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneBaseName.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneBaseName.java	2001/05/29 17:32:45	1.1
--- OzoneBaseName.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 18,22 ****
  
  
! /** */
  public interface OzoneBaseName extends OzoneScopedObject, BaseName {
      
--- 17,25 ----
  
  
! /** 
!  *
!  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
!  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
!  */
  public interface OzoneBaseName extends OzoneScopedObject, BaseName {
      

Index: OzoneBaseNameImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneBaseNameImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneBaseNameImpl.java	2001/05/29 17:32:45	1.1
--- OzoneBaseNameImpl.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 23,26 ****
--- 22,28 ----
  
  /**
+  *
+  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
+  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
   */
  public class OzoneBaseNameImpl extends OzoneScopedObjectImpl 

Index: OzoneMember.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneMember.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneMember.java	2001/05/29 17:32:45	1.1
--- OzoneMember.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 18,22 ****
  
  
! /** */
  public interface OzoneMember extends OzoneTopicMapObject, Member {
      
--- 17,25 ----
  
  
! /** 
!  *
!  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
!  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
!  */
  public interface OzoneMember extends OzoneTopicMapObject, Member {
      

Index: OzoneMemberImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneMemberImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneMemberImpl.java	2001/05/29 17:32:45	1.1
--- OzoneMemberImpl.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 22,25 ****
--- 21,27 ----
  
  /** 
+  *
+  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
+  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
   */
  public class OzoneMemberImpl extends OzoneScopedObjectImpl 

Index: OzoneOccurrence.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneOccurrence.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneOccurrence.java	2001/05/29 17:32:45	1.1
--- OzoneOccurrence.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 25,28 ****
--- 24,30 ----
   *
   * @see Topic
+  *
+  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
+  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
   */
  public interface OzoneOccurrence extends OzoneScopedObject, Occurrence {

Index: OzoneOccurrenceImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneOccurrenceImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneOccurrenceImpl.java	2001/05/29 17:32:45	1.1
--- OzoneOccurrenceImpl.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 24,27 ****
--- 23,29 ----
   * An occurrence may be scoped and may contain either an in-line data resource (as a string) or
   * a reference to an external resource (specified as a URI).
+  *
+  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
+  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
   */
  public class OzoneOccurrenceImpl extends OzoneScopedObjectImpl

Index: OzoneScope.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneScope.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneScope.java	2001/05/29 17:32:45	1.1
--- OzoneScope.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 15,18 ****
--- 14,20 ----
  
  /**
+  *
+  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
+  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
   */
  public interface OzoneScope extends OzoneTopicMapObject, Scope {

Index: OzoneScopeImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneScopeImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneScopeImpl.java	2001/05/29 17:32:45	1.1
--- OzoneScopeImpl.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 26,29 ****
--- 25,31 ----
  
  /**
+  *
+  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
+  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
   */
  public class OzoneScopeImpl extends OzoneTopicMapObjectImpl 

Index: OzoneScopedObject.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneScopedObject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneScopedObject.java	2001/05/29 17:32:45	1.1
--- OzoneScopedObject.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 18,22 ****
  
  
! /** */
  public interface OzoneScopedObject extends OzoneTopicMapObject, ScopedObject {
      
--- 17,25 ----
  
  
! /** 
!  *
!  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
!  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
!  */
  public interface OzoneScopedObject extends OzoneTopicMapObject, ScopedObject {
      

Index: OzoneScopedObjectImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneScopedObjectImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneScopedObjectImpl.java	2001/05/29 17:32:45	1.1
--- OzoneScopedObjectImpl.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 20,23 ****
--- 19,25 ----
  /**
   * Base class for all topic map objects which have a validity scope.
+  *
+  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
+  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
   */
  public abstract class OzoneScopedObjectImpl extends OzoneTopicMapObjectImpl 

Index: OzoneTopic.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneTopic.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneTopic.java	2001/05/29 17:32:45	1.1
--- OzoneTopic.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 23,26 ****
--- 22,28 ----
  /**
   * This interface describes a Topic (<code>topic</code>) construct in a Topic Map
+  *
+  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
+  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
   */
  public interface OzoneTopic extends OzoneScopedObject, Topic {

Index: OzoneTopicImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneTopicImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneTopicImpl.java	2001/05/29 17:32:45	1.1
--- OzoneTopicImpl.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 41,44 ****
--- 40,46 ----
  /**
   * Defines a single topic in the TopicMap.
+  *
+  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
+  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
   */
  public class OzoneTopicImpl extends OzoneScopedObjectImpl implements OzoneTopic {

Index: OzoneTopicMap.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneTopicMap.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneTopicMap.java	2001/05/29 17:32:45	1.1
--- OzoneTopicMap.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 26,29 ****
--- 25,31 ----
  /**
   * This interface defines the whole Topic Map construct.
+  *
+  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
+  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
   */
  public interface OzoneTopicMap extends OzoneTopicMapObject, TopicMap {

Index: OzoneTopicMapFactoryImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneTopicMapFactoryImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneTopicMapFactoryImpl.java	2001/05/29 17:32:45	1.1
--- OzoneTopicMapFactoryImpl.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 32,38 ****
  /**
   * Implements the TopicMapFactory interface for creating in-memory Topic Map objects.
   */
  public class OzoneTopicMapFactoryImpl extends Object
!             implements TopicMapFactory {
  
      public final static String DEFAULT_BASE_URL = "http://topicmap.techquila.com/default";
--- 31,40 ----
  /**
   * Implements the TopicMapFactory interface for creating in-memory Topic Map objects.
+  *
+  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
+  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
   */
  public class OzoneTopicMapFactoryImpl extends Object
!             implements TopicMapFactory, java.io.Serializable {
  
      public final static String DEFAULT_BASE_URL = "http://topicmap.techquila.com/default";

Index: OzoneTopicMapImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneTopicMapImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneTopicMapImpl.java	2001/05/29 17:32:45	1.1
--- OzoneTopicMapImpl.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 45,48 ****
--- 44,50 ----
   * The TopicMap is the root container for all of the other topic map objects.
   * This implementation of the TopicMap interface maintains all indices in memory.
+  *
+  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
+  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
   */
  public class OzoneTopicMapImpl extends OzoneTopicMapObjectImpl 

Index: OzoneTopicMapObject.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneTopicMapObject.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneTopicMapObject.java	2001/05/29 17:32:45	1.1
--- OzoneTopicMapObject.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 19,23 ****
  
  
! /** */
  public interface OzoneTopicMapObject extends OzoneRemote, TopicMapObject, 
          PropertyChangeListener {
--- 18,26 ----
  
  
! /** 
!  *
!  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
!  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
!  */
  public interface OzoneTopicMapObject extends OzoneRemote, TopicMapObject, 
          PropertyChangeListener {

Index: OzoneTopicMapObjectImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneTopicMapObjectImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneTopicMapObjectImpl.java	2001/05/29 17:32:45	1.1
--- OzoneTopicMapObjectImpl.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 14,18 ****
  
  import com.techquila.topicmap.TopicMapObject;
! import com.techquila.utils.MultiValuePropertyChangeSupport;
  
  import java.util.HashMap;
--- 13,17 ----
  
  import com.techquila.topicmap.TopicMapObject;
! import com.techquila.utils.MultiValuePropertyChangeEvent;
  
  import java.util.HashMap;
***************
*** 24,27 ****
--- 23,29 ----
  
  /**
+  *
+  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
+  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
   */
  public abstract class OzoneTopicMapObjectImpl extends OzoneObject 
***************
*** 30,41 ****
      final static long serialVersionUID = 1L;
  
-     private static boolean useChangeSupport = true;
-     
- 
      /** */
!     protected HashMap m_namedPropertyListeners;
!     protected ArrayList m_allPropertyListeners;
!     protected transient MultiValuePropertyChangeSupport m_changeSupport;
      
      /** */
      protected String m_id;
--- 32,40 ----
      final static long serialVersionUID = 1L;
  
      /** */
!     private final static String ALL_PROPERTIES = "__ALL__PROPERTIES__";
!     protected HashMap m_propertyListeners = new HashMap();
      
+ 
      /** */
      protected String m_id;
***************
*** 45,51 ****
      /** */
      public OzoneTopicMapObjectImpl() {
-         if (useChangeSupport) {
-             m_changeSupport = new MultiValuePropertyChangeSupport( this );
-         }
      }
      
--- 44,47 ----
***************
*** 78,114 ****
      
      /** */
!     public void addPropertyChangeListener( String propertyName,
!             PropertyChangeListener listener ) {
!         if (useChangeSupport) {
!             m_changeSupport.addPropertyChangeListener( propertyName, listener );
! 
!         } else {
!             if (m_namedPropertyListeners == null) {
!                 m_namedPropertyListeners = new HashMap();
!             }
!             
!             ArrayList propListeners = (ArrayList)m_namedPropertyListeners.get( propertyName );
!             if (propListeners == null) {
!                 propListeners = new ArrayList();
!             }
!             propListeners.add( listener );
!             m_namedPropertyListeners.put( propertyName, propListeners );
!         }
      } 
      
      
      /** */
!     public void addPropertyChangeListener( PropertyChangeListener listener ) {
!         if (useChangeSupport) {
!             m_changeSupport.addPropertyChangeListener( listener );
! 
!         } else {
!             if (m_allPropertyListeners == null) {
!                 m_allPropertyListeners = new ArrayList();
!             }
!             if (!m_allPropertyListeners.contains( listener )) {
!                 m_allPropertyListeners.add( listener );
!             }
          }
      } 
      
--- 74,92 ----
      
      /** */
!     public void addPropertyChangeListener( PropertyChangeListener listener ) {
!         addPropertyChangeListener( ALL_PROPERTIES, listener );
      } 
      
      
      /** */
!     public void addPropertyChangeListener( String propertyName,
!             PropertyChangeListener listener ) {
!         ArrayList listeners = (ArrayList)m_propertyListeners.get( propertyName );
!         if (listeners == null) {
!             listeners = new ArrayList();
!             m_propertyListeners.put( listeners, propertyName );
          }
+         
+         listeners.add( propertyName );
      } 
      
***************
*** 116,123 ****
      /** */
      public void removePropertyChangeListener( PropertyChangeListener listener ) {
!         if (useChangeSupport) {
!             m_changeSupport.removePropertyChangeListener( listener );
!         } else {
!             m_allPropertyListeners.remove( listener );
          }
      } 
--- 94,100 ----
      /** */
      public void removePropertyChangeListener( PropertyChangeListener listener ) {
!         for (Iterator it = m_propertyListeners.values().iterator(); it.hasNext(); ) {
!             ArrayList listeners = (ArrayList)it.next();
!             listeners.remove( listener );
          }
      } 
***************
*** 127,157 ****
      public void firePropertyChange( String propertyName, Object oldVal, 
              Object newVal ) {
!         
!         if (useChangeSupport) {
!             m_changeSupport.firePropertyChange( propertyName, oldVal, newVal );
! 
!         } else {
!             if (m_namedPropertyListeners != null) {
!                 ArrayList propListeners = (ArrayList)m_namedPropertyListeners.get( propertyName );
!                 if (propListeners != null) {
!                     
!                     Iterator i = propListeners.iterator();
!                     while (i.hasNext()) {
!                         PropertyChangeListener l = (PropertyChangeListener)i.next();
!                         l.propertyChange( new PropertyChangeEvent(
!                                 this, propertyName, oldVal, newVal ) );
!                     }
!                 }
!             }
!             
!             if (m_allPropertyListeners != null) {
!                 Iterator i = m_allPropertyListeners.iterator();
!                 while (i.hasNext()) {
!                     PropertyChangeListener l = (PropertyChangeListener)i.next();
!                     l.propertyChange( new PropertyChangeEvent(
!                             this, propertyName, oldVal, newVal ) );
!                 }
!             }
!         }
      }
  
--- 104,111 ----
      public void firePropertyChange( String propertyName, Object oldVal, 
              Object newVal ) {
!         PropertyChangeEvent event = new PropertyChangeEvent( 
!                 this, propertyName, oldVal, newVal );
!         firePropertyChange( propertyName, event );
!         firePropertyChange( ALL_PROPERTIES, event );
      }
  
***************
*** 160,166 ****
      public void firePropertyChange( String propertyName, Object oldValue, 
              int operation, Object operand, Object newValue ) {
!         if (useChangeSupport) {
!             m_changeSupport.firePropertyChange( propertyName, oldValue,
!                 operation, operand, newValue );
          }
      }
--- 114,131 ----
      public void firePropertyChange( String propertyName, Object oldValue, 
              int operation, Object operand, Object newValue ) {
!         MultiValuePropertyChangeEvent event = new MultiValuePropertyChangeEvent( 
!                 this, propertyName, oldValue, operation, operand, newValue );
!         firePropertyChange( propertyName, event );
!         firePropertyChange( ALL_PROPERTIES, event );
!     }
!     
! 
!     /** */
!     private void firePropertyChange( String propertyName, PropertyChangeEvent event ) {
!         ArrayList listeners = (ArrayList)m_propertyListeners.get( propertyName );
!         if (listeners != null) {
!             for (Iterator it = listeners.iterator(); it.hasNext(); ) {
!                 ((PropertyChangeListener)it.next()).propertyChange( event );
!             }
          }
      }
***************
*** 173,176 ****
      public void propertyChange( PropertyChangeEvent ev ) {
      }
!     
  }
--- 138,141 ----
      public void propertyChange( PropertyChangeEvent ev ) {
      }
! 
  }

Index: OzoneTopicMapUtils.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneTopicMapUtils.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneTopicMapUtils.java	2001/05/29 17:32:45	1.1
--- OzoneTopicMapUtils.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 25,28 ****
--- 24,30 ----
   *
   * @see TopicMap
+  *
+  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
+  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
   */
  public interface OzoneTopicMapUtils extends OzoneRemote, TopicMapUtils {

Index: OzoneTopicMapUtilsImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneTopicMapUtilsImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneTopicMapUtilsImpl.java	2001/05/29 17:32:45	1.1
--- OzoneTopicMapUtilsImpl.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 33,36 ****
--- 32,38 ----
   * This means that this class may be used as the TopicMapUtils implementation for
   * any family of Topic Map objects which implement those interfaces.
+  *
+  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
+  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
   */
  public class OzoneTopicMapUtilsImpl extends OzoneObject 

Index: OzoneVariant.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneVariant.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneVariant.java	2001/05/29 17:32:45	1.1
--- OzoneVariant.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 18,21 ****
--- 17,23 ----
  
  /**
+  *
+  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
+  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
   */
  public interface OzoneVariant extends OzoneBaseName, Variant {

Index: OzoneVariantImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneVariantImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneVariantImpl.java	2001/05/29 17:32:45	1.1
--- OzoneVariantImpl.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 23,26 ****
--- 22,28 ----
  
  /**
+  *
+  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
+  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
   */
  public class OzoneVariantImpl extends OzoneBaseNameImpl 

Index: OzoneVariantName.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneVariantName.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneVariantName.java	2001/05/29 17:32:45	1.1
--- OzoneVariantName.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 16,20 ****
  
  
! /** */
  public interface OzoneVariantName extends OzoneTopicMapObject, VariantName {
      
--- 15,23 ----
  
  
! /** 
!  *
!  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
!  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
!  */
  public interface OzoneVariantName extends OzoneTopicMapObject, VariantName {
      

Index: OzoneVariantNameImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone/OzoneVariantNameImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** OzoneVariantNameImpl.java	2001/05/29 17:32:45	1.1
--- OzoneVariantNameImpl.java	2001/06/01 16:56:15	1.2
***************
*** 1,8 ****
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the Infozone Software License version 2 published by the Infozone Group
!  * (http://www.infozone-group.org).
   * 
!  * Copyright (C) @year@ by The Infozone Group. All rights reserved.
   * 
   * $Id$
--- 1,7 ----
  /*
   * You can redistribute this software and/or modify it under the terms of
!  * the TM4J Software License published with this distribution.
   * 
!  * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
   * 
   * $Id$
***************
*** 17,21 ****
  import java.net.URL;
  
! 
  public class OzoneVariantNameImpl extends OzoneTopicMapObjectImpl 
          implements OzoneVariantName {
--- 16,24 ----
  import java.net.URL;
  
! /**
!  *
!  * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
!  * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
!  */
  public class OzoneVariantNameImpl extends OzoneTopicMapObjectImpl 
          implements OzoneVariantName {

[Tm4j-commits] CVS: tm4j/src/com/techquila/topicmap/ozone OzoneXTMBuilder.java,NONE,1.1 OzoneXTMBuilderHelper.java,NONE,1.1 OzoneXTMBuilderHelperImpl.java,NONE,1.1

[Gerd M. <li...@us...>]

Update of /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone
In directory usw-pr-cvs1:/tmp/cvs-serv15598

Added Files:
	OzoneXTMBuilder.java OzoneXTMBuilderHelper.java 
	OzoneXTMBuilderHelperImpl.java 
Log Message:
- initial check in

--- NEW FILE: OzoneXTMBuilder.java ---
/*
 * You can redistribute this software and/or modify it under the terms of
 * the TM4J Software License published with this distribution.
 * 
 * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
 * 
 * $Id: OzoneXTMBuilder.java,v 1.1 2001/06/01 16:55:37 lilli Exp $
 */

package com.techquila.topicmap.ozone;

import org.ozoneDB.OzoneInterface;
import org.ozoneDB.ExternalDatabase;
import org.ozoneDB.xml.util.SAXChunkConsumer;
import org.ozoneDB.xml.util.SAXChunkProducer;
import org.ozoneDB.xml.util.SAXChunkProducerDelegate;

import com.techquila.topicmap.TopicMap;

import org.xml.sax.InputSource;
import org.xml.sax.helpers.ParserAdapter;

import org.apache.xerces.parsers.SAXParser;
//import javax.xml.parsers.SAXParser;
//import javax.xml.parsers.SAXParserFactory;

import java.io.File;


/** 
 *
 * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
 * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
 */
public class OzoneXTMBuilder implements SAXChunkProducerDelegate {

    private OzoneInterface m_database = null;
    private OzoneXTMBuilderHelper m_helper = null;


    /** */
    public OzoneXTMBuilder( OzoneInterface database ) {
        m_database = database;
    }

    
    /** */
    public TopicMap buildTopicMap( InputSource input ) throws Exception {
        return buildTopicMap( input, null );
    }
    
    
    /** */
    public TopicMap buildTopicMap( InputSource input, TopicMap existingTopicMap ) throws Exception {
        m_helper = (OzoneXTMBuilderHelper)m_database
                .createObject( OzoneXTMBuilderHelperImpl.class.getName() );
        
        if (existingTopicMap != null) {
            m_helper.setTopicMap( existingTopicMap );
        }
        
        SAXChunkProducer producer = new SAXChunkProducer( this );

        SAXParser parser = new SAXParser(); //SAXParserFactory.newInstance().newSAXParser();
        //ParserAdapter adapter = new ParserAdapter( parser.getParser() );
        parser.setContentHandler( producer );
        parser.parse( input );
        
        TopicMap result = m_helper.getTopicMap();
        m_database.deleteObject( m_helper );
        
        return result;
    }

    
    /** */
    public void processChunk( SAXChunkProducer producer ) throws Exception {
        m_helper.putChunk( producer.chunkStream().toByteArray() );
    } 


    /** */    
    public static void main( String[] args ) throws Exception {
        
        if (args.length < 2) {
            System.out.println( "usage: java OzoneXTMBuilder <database URL> <XTM file>" );
            System.exit( 0 );
        }
        
        if (!new File( args[1] ).exists()) {
            System.out.println( "File '" + args[1] + "' doesn't exist !" );
            System.exit( 0 );
        }
        
        ExternalDatabase database = ExternalDatabase.openDatabase( args[0] );

        OzoneXTMBuilder builder = new OzoneXTMBuilder( database );
        
        TopicMap tm = (TopicMap)database.objectForName( "topicmap" );
        boolean newTMap = (tm == null);

        tm = builder.buildTopicMap( new InputSource( args[1] ), tm );
        
        if (newTMap) {
            database.nameObject( (OzoneTopicMap)tm, "topicmap" );
        }
        
        System.out.println( "   --> found " + tm.getTopicCount() + " topics" );
        
        database.close();
    }
    
}

--- NEW FILE: OzoneXTMBuilderHelper.java ---
/*
 * You can redistribute this software and/or modify it under the terms of
 * the TM4J Software License published with this distribution.
 * 
 * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
 * 
 * $Id: OzoneXTMBuilderHelper.java,v 1.1 2001/06/01 16:55:37 lilli Exp $
 */

package com.techquila.topicmap.ozone;

import org.ozoneDB.OzoneRemote;

import com.techquila.topicmap.TopicMap;

import org.xml.sax.SAXException;

import java.io.IOException;


/** 
 *
 * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
 * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
 */
public interface OzoneXTMBuilderHelper extends OzoneRemote {

    /** */
    public void putChunk( byte[] chunkData ) throws SAXException, IOException; // update


    /** */
    public void setTopicMap( TopicMap topicMap ); // update


    /** */
    public TopicMap getTopicMap();

}

--- NEW FILE: OzoneXTMBuilderHelperImpl.java ---
/*
 * You can redistribute this software and/or modify it under the terms of
 * the TM4J Software License published with this distribution.
 * 
 * Copyright (C) 2001 Khalil Ahmed, Gerd Mueller. All rights reserved.
 * 
 * $Id: OzoneXTMBuilderHelperImpl.java,v 1.1 2001/06/01 16:55:37 lilli Exp $
 */

package com.techquila.topicmap.ozone;

import org.ozoneDB.OzoneObject;
import org.ozoneDB.xml.util.SAXChunkConsumer;

import com.techquila.topicmap.TopicMap;
import com.techquila.topicmap.utils.XTMParser;
import com.techquila.topicmap.utils.XTMBuilder;

import org.xml.sax.SAXException;

import java.io.IOException;


/** 
 *
 * @author <a href="mailto:ka...@te...">Kal Ahmed</a>
 * @author <a href="mailto:ge...@sm...">Gerd Mueller</a>
 */
public class OzoneXTMBuilderHelperImpl extends OzoneObject 
        implements OzoneXTMBuilderHelper {
     
    private TopicMap m_topicMap = null;

    transient private SAXChunkConsumer m_consumer = null;
    transient private XTMBuilder m_builder = null;
    
    
    /** */   
    public OzoneXTMBuilderHelperImpl() {
    }

    
    /** */
    public void putChunk( byte[] chunkData ) 
            throws SAXException, IOException {

        if (m_consumer == null) {
            m_builder = (m_topicMap == null) ?
                    new XTMBuilder( new OzoneTopicMapFactoryImpl( database() ) ) :
                    new XTMBuilder( m_topicMap );
            m_consumer = new SAXChunkConsumer( new XTMParser( m_builder ) );
        }
        
        m_consumer.processChunk( chunkData );
    } 


    /** */
    public void setTopicMap( TopicMap topicMap ) {
        if (!(topicMap instanceof OzoneTopicMap)) {
            throw new IllegalArgumentException( "setTopicMap(): Can't mix non ozone topicmap with ozone topicmap !" );
        }
        
        m_topicMap = topicMap;
    }


    /** */
    public TopicMap getTopicMap() {
        return m_builder.getTopicMap();
    }
            
}

[Tm4j-commits] CVS: tm4j/lib ozone.jar,1.1,1.2

[Gerd M. <li...@us...>]

Update of /cvsroot/tm4j/tm4j/lib
In directory usw-pr-cvs1:/tmp/cvs-serv21184

Modified Files:
	ozone.jar 
Log Message:
- added jta stuff

Index: ozone.jar
===================================================================
RCS file: /cvsroot/tm4j/tm4j/lib/ozone.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
Binary files /tmp/cvs3uDdMp and /tmp/cvsQc6XZJ differ

[Tm4j-commits] CVS: tm4j build.xml,1.4,1.5

[Gerd M. <li...@us...>]

Update of /cvsroot/tm4j/tm4j
In directory usw-pr-cvs1:/tmp/cvs-serv18716

Modified Files:
	build.xml 
Log Message:
- added: ozone build stuff

Index: build.xml
===================================================================
RCS file: /cvsroot/tm4j/tm4j/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** build.xml	2001/05/26 14:21:59	1.4
--- build.xml	2001/05/29 18:08:48	1.5
***************
*** 1,248 ****
! <?xml version="1.0"?>
! 
! <!--
!   - ANT build file for TM4J
!   -
!   - $Id$
!   -->
!  
! <project name="TM4J" default="usage">
! 
!   <target name="usage">
!     <echo message=""/>
!     <echo message=""/>
!     <echo message="TM4J Build file"/>
!     <echo message="Requires ANT 1.3 or later."/>
!     <echo message="-------------------------------------------------------------"/>
!     <echo message=""/>
!     <echo message=" available targets are:"/>
!     <echo message=""/>
!     <echo message="   all         --> generates tm4j.jar, tmnav.jar, tmp3.jar and the docs"/>
!     <echo message="   tm4j-build  --> compiles the tm4j source code"/>
!     <echo message="   tm4j-jar    --> generates the tm4j JAR file"/>
!     <echo message="   tm4j-clean  --> cleans up compiled classes"/>
!     <echo message="   tmnav-build --> compiles the tmnav source code"/>
!     <echo message="   tmnav-jar   --> generates the tmnav JAR file"/>
!     <echo message="   tmnav-clean --> cleans up compiled classes"/>
!     <echo message="   tmp3-build  --> compiles the tmp3 source code"/>
!     <echo message="   tmp3-jar    --> generates the tmp3 JAR file"/>
!     <echo message="   tmp3-clean  --> cleans up compiled classes"/>
!     <echo message="   distrib-all --> generates the TM4J source and binary distributions"/>
!     <echo message="   clean-all   --> cleans up all compiled classes"/>
!     <echo message="   usage       --> show this message (default)"/>
!     <echo message=""/>
!     <echo message="-------------------------------------------------------------"/>
!     <echo message=""/>
!     <echo message=""/>
!   </target>
! 
!    <target name="init">
!       <property name="std-excludes" value="**/*.old,**/*.scc,**/makefile"/>
!       <property name="dist"    value="./build"/>
!       <property name="classdir" value="${dist}/classes"/>
!       <property name="jre-dir"      value="/usr/local/java/jdk1.3/jre"/>
!       <property name="xerces-jar"   value="lib/xerces.jar"/>
!       <property name="junit-jar"    value="lib/junit.jar"/>
!       <mkdir dir="${dist}"/>
!       <mkdir dir="${dist}/bin"/>
!       <mkdir dir="${dist}/lib"/>
!       <mkdir dir="${dist}/docs"/>
!       <mkdir dir="${dist}/docs/javadoc"/>
!       <mkdir dir="${classdir}"/>
! 
!       <available property="brain.present" classname="com.natrificial.db.core.Knowledge"/>
!     </target>
! 
!   <target name="all" depends="init">
!     <antcall target="tm4j-jar"/>
!     <antcall target="tmnav-jar"/>
!     <antcall target="tmp3-jar"/>
!     <antcall target="doc"/>
!   </target>
! 
!   <target name="clean-all">
!     <antcall target="tm4j-clean"/>
!     <antcall target="tmnav-clean"/>
!     <antcall target="tmp3-clean"/>
!   </target>
! 
!   <patternset id="readmes">
!     <include name="README.txt, LICENSE.txt"/>
!   </patternset>
! 
!   <patternset id="bin-distrib">
!     <include name="${dist}/docs/**"/>
!     <include name="${dist}/lib/*.jar"/>
!   </patternset>
! 
!   <patternset id="src-distrib">
!     <include name="${dist}/bin/**, ${dist}/docs/**, ${dist}/jars/**, build.*"/>
!   </patternset>
! 
!   <target name="distrib-all" depends="init">
!     <antcall target="all"/>
!     <copy todir="${dist}/docs">
!       <fileset dir="docs"/>
!     </copy>
!     <copy todir="${dist}/src">
!       <fileset dir="src"
!         includes="**/*.java"
!         excludes="tests/**, CVS/**"/>
!     </copy>
!     <copy todir="${dist}/bin">
!       <fileset dir="bin"
!         excludes="CVS/**"/>
!     </copy>
!     <copy todir="${dist}/lib">
!       <fileset dir="lib"
!         excludes="CVS/**"/>
!     </copy>
!     <copy todir="${dist}">
!       <fileset dir="." includes="build.xml, README.txt, LICENSE.txt"/>
!     </copy>
!     
!     <tar tarfile="${dist}/tm4j-bin-${version}.tar"
!          basedir="${dist}">
!       <include name="lib/**"/>
!       <include name="docs/**"/>
!       <include name="*.txt"/>
!     </tar>
!     <gzip src="${dist}/tm4j-bin-${version}.tar"
!           zipfile="${dist}/tm4j-bin-${version}.tar.gz"/>
!     <delete file="${dist}/tm4j-bin-${version}.tar"/>
! 
!     <tar tarfile="${dist}/tm4j-src-${version}.tar"
!          basedir="${dist}">
!       <include name="src/**"/>
!       <include name="docs/**"/>
!       <include name="*.txt"/>
!       <include name="build.xml"/>
!      </tar>
!     <gzip src="${dist}/tm4j-src-${version}.tar"
!           zipfile="${dist}/tm4j-src-${version}.tar.gz"/>
!     <delete file="${dist}/tm4j-src-${version}.tar"/>
! 
!   </target>
! 
! 	
!   <target name="doc">
!     <javadoc 
!       sourcepath="src"
!       classpath="${xerces-jar}"
!       destdir="${dist}/docs/javadoc"
!       packagenames="com.techquila.utils,
!                     com.techquila.topicmap,
!                     com.techquila.topicmap.cmd,
!                     com.techquila.topicmap.utils"
!       author="true"
!       version="true"
!       protected="true"
!       windowtitle="TM4J API Documentation"
!       />
!     </target>
! 
!     <!-- TM4J Project -->
!     <patternset id="tm4j.sources">
!       <include name="com/techquila/topicmap/*.java"/>
!       <include name="com/techquila/topicmap/cmd/*.java"/>
!       <include name="com/techquila/topicmap/utils/*.java"/>
!       <include name="com/techquila/utils/*.java"/>
!     </patternset>
!     
!     <patternset id="tm4j.classes">
!       <include name="com/techquila/topicmap/*.class"/>
!       <include name="com/techquila/topicmap/cmd/*.class"/>
!       <include name="com/techquila/topicmap/utils/*.class"/>
!       <include name="com/techquila/utils/*.class"/>
!     </patternset>
!     
!     <target name="tm4j-build" depends="init">
!       <javac srcdir="src"
! 	classpath="${xerces-jar};${junit-jar}"
! 	destdir="${classdir}">
!           <patternset refid="tm4j.sources"/>
!       </javac>
!     </target>
!       
!     <target name="tm4j-clean" depends="init">
!       <delete>
!         <fileset dir="${classdir}">
!           <patternset refid="tm4j.classes"/>
!         </fileset>
!       </delete>
!     </target>
!     
!     <target name="tm4j-jar"
!           depends="tm4j-build">
!       <jar jarfile="${dist}/lib/tm4j.jar">
!         <fileset dir="${classdir}">
!           <patternset refid="tm4j.classes"/>
! 	</fileset>
!       </jar>
!     </target>
! 
!   <target name="build-tests" depends="tm4j-build">
!     <javac srcdir="src" destdir="${classdir}"
!            includes="com/techquila/topicmap/test/**"/>
!   </target>
! 
!   <target name="clean" depends="init">
!     <antcall target="tm4j-clean"/> 
!     <antcall target="tmp3-clean"/>
!     <antcall target="tmnav-clean"/>
!   </target>
! 
!   <!-- TMNAV PROJECT -->
!   <patternset id="tmnav.sources">
!     <include name="com/techquila/tmnav/*.java"/>
!     <include name="com/techquila/tmnav/brain/*.java"/>
!     <exclude name="com/techquila/tmnav/TMNav.java"/>
!   </patternset>
! 
!   <patternset id="tmnav.classes">
!     <include name="com/techquila/tmnav/*.class"/>
!     <include name="com/techquila/tmnav/brain/*.class"/>
!   </patternset>
! 
!   <target name="tmnav-build" depends="tm4j-build" if="brain.present">
!     <javac srcdir="src" destdir="${classdir}">
!       <patternset refid="tmnav.sources"/>
!     </javac>
!   </target>
! 
!   <target name="tmnav-jar" depends="tmnav-build" if="brain.present">
!     <echo>BrainSDK detected. Building TMNav.</echo>
!     <jar jarfile="${dist}/lib/tmnav.jar"
! 	 basedir="${classdir}">
!       <patternset refid="tmnav.classes"/>
!     </jar>
!   </target>
! 
!   <target name="tmnav-clean" depends="init">
!     <delete dir="${classdir}/com/techquila/tmnav"/>
!   </target>
!   
!   <!-- TMP3 PROJECT -->
!   <patternset id="tmp3.classes">
!     <include name="com/techquila/tmp3/*.class"/>
!   </patternset>
! 
!   <target name="tmp3-build" depends="tm4j-build">
!     <javac srcdir="src" destdir="${classdir}"
!  	includes="com/techquila/tmp3/**"/>
!   </target>
! 
!   <target name="tmp3-jar" depends="tmp3-build">
!     <jar jarfile="${dist}/lib/tmp3.jar">
!       <fileset dir="${classdir}">
!   	 <patternset refid="tmp3.classes"/>
!       </fileset>
!     </jar>
!   </target>
! 
!   <target name="tmp3-clean" depends="init">
!     <delete dir="${classdir}/com/techquila/tmp3"/>
!     <delete file="${dist}/lib/tmp3.jar"/>
!   </target>
! 
! </project>
\ No newline at end of file
--- 1,365 ----
! <?xml version="1.0"?>
! 
! <!--
!   - ANT build file for TM4J
!   -
!   - $Id$
!   -->
!  
! <project name="TM4J" default="usage">
!   
!   <!-- classpath that includes the lib dir, needed for java tasks -->
!   <path id="project.class.path">
!     <pathelement path="${java.class.path}"/>
!     <fileset dir="lib">
!       <include name="**/*.jar"/>
!     </fileset>
!     <pathelement location="build/classes"/>
!   </path>
! 
!   <target name="usage">
!     <echo message=""/>
!     <echo message=""/>
!     <echo message="TM4J Build file"/>
!     <echo message="Requires ANT 1.3 or later."/>
!     <echo message="-------------------------------------------------------------"/>
!     <echo message=""/>
!     <echo message=" available targets are:"/>
!     <echo message=""/>
!     <echo message="   all            --> generates tm4j.jar, tmnav.jar, tmp3.jar and the docs"/>
!     <echo message="   tm4j-build     --> compiles the tm4j source code"/>
!     <echo message="   tm4j-jar       --> generates the tm4j JAR file"/>
!     <echo message="   tm4j-clean     --> cleans up compiled classes"/>
!     <echo message="   tmnav-build    --> compiles the tmnav source code"/>
!     <echo message="   tmnav-jar      --> generates the tmnav JAR file"/>
!     <echo message="   tmnav-clean    --> cleans up compiled classes"/>
!     <echo message="   tmp3-build     --> compiles the tmp3 source code"/>
!     <echo message="   tmp3-jar       --> generates the tmp3 JAR file"/>
!     <echo message="   tmp3-clean     --> cleans up compiled classes"/>
!     <echo message="   ozone-base     --> compiles the ozone source code"/>
!     <echo message="   ozone-build    --> compiles the ozone source code including the proxies"/>
!     <echo message="   ozone-jar      --> generates the ozone JAR file"/>
!     <echo message="   ozone-clean    --> cleans up compiled classes"/>
!     <echo message="   ozone-install  --> intializes a ozone database"/>
!     <echo message="   ozone-run      --> runs a ozone server"/>
!     <echo message="   distrib-all    --> generates the TM4J source and binary distributions"/>
!     <echo message="   clean-all      --> cleans up all compiled classes"/>
!     <echo message="   usage          --> show this message (default)"/>
!     <echo message=""/>
!     <echo message="-------------------------------------------------------------"/>
!     <echo message=""/>
!     <echo message=""/>
!   </target>
! 
!   <target name="init">
!      <property name="std-excludes" value="**/*.old,**/*.scc,**/makefile"/>
!      <property name="dist"         value="./build"/>
!      <property name="classdir"     value="${dist}/classes"/>
!      <property name="srcdir"       value="./src"/>
!      <property name="jre-dir"      value="/usr/local/java/jdk1.3/jre"/>
!      <property name="xerces-jar"   value="lib/xerces.jar"/>
!      <property name="junit-jar"    value="lib/junit.jar"/>
! 
!      <property name="ozoneDB.dir" value="db"/>
!      <property name="ozoneDB.port" value="3333"/>
!      <property name="ozoneDB.adminPort" value="3000"/>
! 
!      <mkdir dir="${dist}"/>
!      <mkdir dir="${dist}/bin"/>
!      <mkdir dir="${dist}/lib"/>
!      <mkdir dir="${dist}/docs"/>
!      <mkdir dir="${dist}/docs/javadoc"/>
!      <mkdir dir="${classdir}"/>
! 
!      <available property="brain.present" classname="com.natrificial.db.core.Knowledge"/>
!   </target>
! 
!   <target name="all" depends="init">
!     <antcall target="tm4j-jar"/>
!     <antcall target="tmnav-jar"/>
!     <antcall target="tmp3-jar"/>
!     <antcall target="doc"/>
!   </target>
! 
!   <target name="clean-all">
!     <antcall target="tm4j-clean"/>
!     <antcall target="tmnav-clean"/>
!     <antcall target="tmp3-clean"/>
!   </target>
! 
!   <patternset id="readmes">
!     <include name="README.txt, LICENSE.txt"/>
!   </patternset>
! 
!   <patternset id="bin-distrib">
!     <include name="${dist}/docs/**"/>
!     <include name="${dist}/lib/*.jar"/>
!   </patternset>
! 
!   <patternset id="src-distrib">
!     <include name="${dist}/bin/**, ${dist}/docs/**, ${dist}/jars/**, build.*"/>
!   </patternset>
! 
!   <target name="distrib-all" depends="init">
!     <antcall target="all"/>
!     <copy todir="${dist}/docs">
!       <fileset dir="docs"/>
!     </copy>
!     <copy todir="${dist}/src">
!       <fileset dir="src"
!         includes="**/*.java"
!         excludes="tests/**, CVS/**"/>
!     </copy>
!     <copy todir="${dist}/bin">
!       <fileset dir="bin"
!         excludes="CVS/**"/>
!     </copy>
!     <copy todir="${dist}/lib">
!       <fileset dir="lib"
!         excludes="CVS/**"/>
!     </copy>
!     <copy todir="${dist}">
!       <fileset dir="." includes="build.xml, README.txt, LICENSE.txt"/>
!     </copy>
!     
!     <tar tarfile="${dist}/tm4j-bin-${version}.tar"
!          basedir="${dist}">
!       <include name="lib/**"/>
!       <include name="docs/**"/>
!       <include name="*.txt"/>
!     </tar>
!     <gzip src="${dist}/tm4j-bin-${version}.tar"
!           zipfile="${dist}/tm4j-bin-${version}.tar.gz"/>
!     <delete file="${dist}/tm4j-bin-${version}.tar"/>
! 
!     <tar tarfile="${dist}/tm4j-src-${version}.tar"
!          basedir="${dist}">
!       <include name="src/**"/>
!       <include name="docs/**"/>
!       <include name="*.txt"/>
!       <include name="build.xml"/>
!      </tar>
!     <gzip src="${dist}/tm4j-src-${version}.tar"
!           zipfile="${dist}/tm4j-src-${version}.tar.gz"/>
!     <delete file="${dist}/tm4j-src-${version}.tar"/>
! 
!   </target>
! 
! 	
!   <target name="doc">
!     <javadoc 
!       sourcepath="src"
!       classpath="${xerces-jar}"
!       destdir="${dist}/docs/javadoc"
!       packagenames="com.techquila.utils,
!                     com.techquila.topicmap,
!                     com.techquila.topicmap.cmd,
!                     com.techquila.topicmap.utils"
!       author="true"
!       version="true"
!       protected="true"
!       windowtitle="TM4J API Documentation"
!       />
!     </target>
! 
!     <!-- TM4J Project -->
!     <patternset id="tm4j.sources">
!       <include name="com/techquila/topicmap/*.java"/>
!       <include name="com/techquila/topicmap/cmd/*.java"/>
!       <include name="com/techquila/topicmap/utils/*.java"/>
!       <include name="com/techquila/utils/*.java"/>
!     </patternset>
!     
!     <patternset id="tm4j.classes">
!       <include name="com/techquila/topicmap/*.class"/>
!       <include name="com/techquila/topicmap/cmd/*.class"/>
!       <include name="com/techquila/topicmap/utils/*.class"/>
!       <include name="com/techquila/utils/*.class"/>
!     </patternset>
!     
!     <target name="tm4j-build" depends="init">
!       <javac srcdir="src"
!             classpath="${xerces-jar};${junit-jar}"
!             destdir="${classdir}">
!           <patternset refid="tm4j.sources"/>
!       </javac>
!     </target>
!       
!     <target name="tm4j-clean" depends="init">
!       <delete>
!         <fileset dir="${classdir}">
!           <patternset refid="tm4j.classes"/>
!         </fileset>
!       </delete>
!     </target>
!     
!     <target name="tm4j-jar"
!           depends="tm4j-build">
!       <jar jarfile="${dist}/lib/tm4j.jar">
!         <fileset dir="${classdir}">
!           <patternset refid="tm4j.classes"/>
! 	</fileset>
!       </jar>
!     </target>
! 
!   <target name="build-tests" depends="tm4j-build">
!     <javac srcdir="src" destdir="${classdir}"
!            includes="com/techquila/topicmap/test/**"/>
!   </target>
! 
!   <target name="clean" depends="init">
!     <antcall target="tm4j-clean"/> 
!     <antcall target="tmp3-clean"/>
!     <antcall target="tmnav-clean"/>
!   </target>
! 
!   <!-- TMNAV PROJECT -->
!   <patternset id="tmnav.sources">
!     <include name="com/techquila/tmnav/*.java"/>
!     <include name="com/techquila/tmnav/brain/*.java"/>
!     <exclude name="com/techquila/tmnav/TMNav.java"/>
!   </patternset>
! 
!   <patternset id="tmnav.classes">
!     <include name="com/techquila/tmnav/*.class"/>
!     <include name="com/techquila/tmnav/brain/*.class"/>
!   </patternset>
! 
!   <target name="tmnav-build" depends="tm4j-build" if="brain.present">
!     <javac srcdir="src" destdir="${classdir}">
!       <patternset refid="tmnav.sources"/>
!     </javac>
!   </target>
! 
!   <target name="tmnav-jar" depends="tmnav-build" if="brain.present">
!     <echo>BrainSDK detected. Building TMNav.</echo>
!     <jar jarfile="${dist}/lib/tmnav.jar"
! 	 basedir="${classdir}">
!       <patternset refid="tmnav.classes"/>
!     </jar>
!   </target>
! 
!   <target name="tmnav-clean" depends="init">
!     <delete dir="${classdir}/com/techquila/tmnav"/>
!   </target>
!   
!   <!-- TMP3 PROJECT -->
!   <patternset id="tmp3.classes">
!     <include name="com/techquila/tmp3/*.class"/>
!   </patternset>
! 
!   <target name="tmp3-build" depends="tm4j-build">
!     <javac srcdir="src" destdir="${classdir}"
!       includes="com/techquila/tmp3/**"/>
!   </target>
! 
!   <target name="tmp3-jar" depends="tmp3-build">
!     <jar jarfile="${dist}/lib/tmp3.jar">
!       <fileset dir="${classdir}">
!   	 <patternset refid="tmp3.classes"/>
!       </fileset>
!     </jar>
!   </target>
! 
!   <target name="tmp3-clean" depends="init">
!     <delete dir="${classdir}/com/techquila/tmp3"/>
!     <delete file="${dist}/lib/tmp3.jar"/>
!   </target>
! 
!   <!-- ozone PROJECT -->
!   <patternset id="ozone.sources">
!     <include name="com/techquila/topicmap/ozone/*.java"/>
!   </patternset>
! 
!   <patternset id="ozone.classes">
!     <include name="com/techquila/topicmap/ozone/*.class"/>
!   </patternset>
!   
!   <!-- compile only the implementation -->
!   <target name="ozone-base" depends="tm4j-build">
!     <javac srcdir="src" 
!           classpathref="project.class.path"
!           destdir="${classdir}"
!           >
!       <patternset refid="ozone.sources"/>
!     </javac>
!   </target>
! 
! 
!   <!-- compile also the proxies -->
!   <target name="ozone-build" depends="ozone-base">
!     <property name="proxies" value="
!             com.techquila.topicmap.ozone.OzoneTopicMapObjectImpl
!             com.techquila.topicmap.ozone.OzoneScopedObjectImpl 
!             com.techquila.topicmap.ozone.OzoneScopeImpl
!             com.techquila.topicmap.ozone.OzoneMemberImpl
!             com.techquila.topicmap.ozone.OzoneVariantNameImpl
!             com.techquila.topicmap.ozone.OzoneVariantImpl
!             com.techquila.topicmap.ozone.OzoneBaseNameImpl
!             com.techquila.topicmap.ozone.OzoneOccurrenceImpl
!             com.techquila.topicmap.ozone.OzoneTopicImpl
!             com.techquila.topicmap.ozone.OzoneTopicMapImpl
!             com.techquila.topicmap.ozone.OzoneAssociationImpl
!             com.techquila.topicmap.ozone.OzoneTopicMapUtilsImpl
!     "/> 
!  
!     <!-- generate proxies -->
!     <java classname="org.ozoneDB.tools.OPP.OPP" 
!           classpathref="project.class.path"
!           fork="yes">
!       <jvmarg value="-Dozone.javac=javac"/>
!       <arg line="-KS -st"/> 
!       <arg value="-o${srcdir}/com/techquila/topicmap/ozone"/>
!       <arg line="${proxies}"/>
!     </java>
!   
!     <!-- compile all the previously generated proxies -->
!     <javac srcdir="${srcdir}"
!            classpathref="project.class.path"
!            destdir="${classdir}"
!            includes="com/techquila/topicmap/ozone/*_Proxy.java">
!     </javac>
!   </target>
! 
!   <target name="ozone-jar" depends="ozone-build">
!     <jar jarfile="${dist}/lib/tmozone.jar"
!          basedir="${classdir}">
!       <patternset refid="ozone.classes"/>
!     </jar>
!   </target>
! 
!   <target name="ozone-clean" depends="init">
!     <delete>
!       <fileset dir="${classdir}">
!         <patternset refid="ozone.classes"/>
!       </fileset>
!     </delete>
!   </target>
! 
!   <target name="ozone-install" depends="init">
!     <delete dir="${ozoneDB.dir}"/>
!     <java classname="org.ozoneDB.tools.Install"
!           classpathref="project.class.path"
!           fork="yes">
!       <jvmarg line="-DozoneDB.port=${ozoneDB.port} -DozoneDB.adminPort=${ozoneDB.adminPort}"/>
!       <arg line="-d${ozoneDB.dir}"/> 
!     </java>
!   </target>
! 
!   <target name="ozone-run" depends="init">
!     <java classname="org.ozoneDB.core.Server"
!           classpathref="project.class.path"
!           fork="no">
!       <arg line="-d${ozoneDB.dir} -u${user.name}"/> 
!     </java>
!   </target>
! 
!   <!--target name="ozoneTest" depends="init">
!     <java classname="com.techquila.topicmap.ozone.XTMReaderImpl"
!           classpathref="project.class.path">
!       <arg value="ozonedb:local:${ozoneDB.dir}"/> 
!       <arg value="resource/tests/music-xtm.xml"/>
!     </java>
!   </target-->
! 
! </project>

[Tm4j-commits] CVS: tm4j/lib LICENSE.ozone,NONE,1.1 jakarta-regexp.jar,NONE,1.1 ozone.jar,NONE,1.1 xerces.jar,1.1,1.2

[Gerd M. <li...@us...>]

Update of /cvsroot/tm4j/tm4j/lib
In directory usw-pr-cvs1:/tmp/cvs-serv13811

Modified Files:
	xerces.jar 
Added Files:
	LICENSE.ozone jakarta-regexp.jar ozone.jar 
Log Message:


--- NEW FILE: LICENSE.ozone ---
The Ozone Database Project
http://www.ozone-db.org
mailto:oz...@oz...


Included in the ozone distribution is code and documentation made
available by other copyright holders and under different
licenses. All these licenses allow worldwide, royalty free
distribution, whether alone or as part of a larger product.
License, copyright and disclaimer of these software is included
in this directory.


Ozone Library License, Version 1
================================
     
The original code and portions created by SMB are
Copyright (C) 1997-2000 by SMB GmbH,
Rohrteichstr. 18, 04347 Leipzig, Germany,
http://www.softwarebuero.de.
All rights reserved.

This library is free software; you can redistribute it and/or
modify it provided that the terms of the GNU Library General
Public License as published by the Free Software Foundation
version 2 of the License; and the following terms are met.

You must give prominent notice with each copy of the work that
the Library is used in it and that the Library and its use are
covered by this License. You must supply a copy of this License.
If the work during execution displays copyright notices, you must
include the copyright notice for the Library among them, as well
as a reference directing the user to the copy of this License.

All advertising materials mentioning features or use of this
software must display the following acknowledgment: "This product
includes software developed by the Ozone Database Project
(http://www.ozone-db.org/)."

The name "ozone" must not be used to endorse or promote software
products derived from this software without prior written
permission of SMB.

Software products derived from this software may not be called
"ozone" nor may "ozone" appear in their names. without prior
written permission of SMB.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHAN- TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Library General Public License for more details. 


Ozone Core License, Version 1
================================
     
The original code and portions created by SMB are
Copyright (C) 1997-2000 by SMB GmbH,
Rohrteichstr. 18, 04347 Leipzig, Germany,
http://www.softwarebuero.de.
All rights reserved.

This program is free software; you can redistribute it and/or
modify it provided that the terms of the GNU General Public
License as published by the Free Software Foundation version 2 of
the License; and the following terms are met.

All advertising materials mentioning features or use of this
software must display the following acknowledgment: "This product
includes software developed by the Ozone Database Project
(http://www.ozone-db.org/)."

The name "ozone" must not be used to endorse or promote software
products derived from this software without prior written
permission of SMB.

Software products derived from this software may not be called
"ozone" nor may "ozone" appear in their names. without prior
written permission of SMB.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details


--- NEW FILE: jakarta-regexp.jar ---
PK
NᢂxÁK=
ñ¢/)hÂËŽ+8)Ä	ôú0…ËB¼åÃÞôáF}¸‰4¼îÃûx͇ðŽ¶@²BäpŇû°Š7¼ŠZú0D
ûXL°ygÒÌXzš/¨6OåҚ­ò¼eólV7
µáxµl}Es¸šu4GOª“ÃäE*Xn÷24WA’Kš¸N˜WíSä-wKœ4®v…¶áÈñpdtY[ÑbiÍHŦ[7R½ãU†šp$1ďT…jHOT[xŸq|~™'Þª|Gø°ö08˜[\ä6áªâ¦Ši––\â1êµ*69<a›)[ËôŠT«œ¡›Â‰êw$BÇ\ÔÖE›®<ƒç’nèN?8d.p††Ãᶡ¥UnÛ¦-:X?ª|,—™çö´6Ÿ&(Pô¯›±	rîP^Èèô„æˆÓt	_¥‹—RÎa†Æ1bd;—tèÞ³ʔ™³“ü².œ‡¦ÖGË㫺±DZ¨ºƒÔw"žOrKøi†g²ZŠÇi²JC¦^²ŠÁ-Ãû+OT«G³,n,ÐT•P*Ÿçu‡jMqç`nUJ%îiƒ‡Eže®¨)§Åpô©V46ʼnløïPï‹ê¬>+Ùµ¬Ã3bO/Ùæjñ–<in¤œ%ª-£é”K¨Ú8
@~OþÏ´1œ­f-ÞÔ¾r«ø¨\͟™£Zk-ÑHê}aMÓ©#æ¼(„¡Î1¯ð|¹²c–·ÒŠ–ÎññEœÁiúØø¿"9MO§he´ÖFw >¤
ÃU’ž‚r
^¤1VD]#¨A
w!4»ƒ3£Ñ½P¢{µÖ=Ôÿ‚°ß¿¨{­î¾-v-ꋆjnvÇk!8Û¹‹ó;hñ×oãì6:âµt@èý.ÒkH뗅¨%Âï)’Ûˆœöçâž©G
’º-.»{¼[H¼
ɺ:œ”ދ»8W¶ÐTð^'¼+¥˜ŠØµKOþ*÷•Í~¥mÝËÞ ¼·ñdSø¥ÐÑ2î&¼SÐG*YzËç¢[àce°@j€
ØF1;™
Îš@<Ø¡ÇC]†¾Xgò:K³ö8ëX<¦Ã]‘N#nÌÔ1`”®ë–Ž@{ Ô‹ûõiLùiª_¯¬«ƒQƒýUµg±›*×0å¡¿:5º¡ÐiÉn¨c²é“™ìº4í¦•.½-êLDâØô™LšÞ*ÐcáDg«Þ"¾`ˆÒãbðŒ`tm“ÑpNÖÅJ#Њ…“g聘nôFŒ`ÜÈBñ3
šŠ§Wol
”uºÛËÖÄ£¡îö…&s­	×1¯È*3!ý²D[›Ww­U}‰ÐÈb‹
—-ueĸAڊîH"Ž!F ËdyYµ‰øÙ¼!ÃVcŽxc4ÇÂ5Ȫʧ¨EÅCìªmـÅZ(îÎ(þ¼³_âÂì¬âáh{Y veQ£[QVW¹:nÂÚaS§Ç7)M‡IӲћ³íɂ,’ÿwš‹›ÍjÓ0=;/푵Ñë¾d•rŠ›+Dª¸¸9˪gueLq²è(œ><]æû²}º¾¬|EuC]å$]Ï*àû¢‘_ý!‘J‘Ê3‘ʹ‹BÝ¡øô– §U„[
¦‰¨Nˆè¨ïˆ=(ñ@§nD£á¨äo~EÙ莯
t& î®0+†¤m[¨»UJLáҐEè2˚”³†9*E‰H8+{ƒF$‚*Ô¢ÊÞHԈÅÐӑêùËÊëË«¥êÕ։,Î*¬u«]-F´>Ð҉i‹²fÚPº™Jº'ë>e¦)YK–D{zu uÎWäJ¾U֥Қ{=ÒêÇÁ ÜmKt‚–gÒPê°J^«^x#½F²
Îæ
Û›œ	£0skªõ@wŠUÌt^†ï0ôDw¦¶f¨«”ci¦,ª3ÚC(ïQL:fM0ŠÄ-QV²æñá\NDƒ†>,­ŒÖcCD'1ÍkˆÚ
¿né֋›KCëõfs‘ÖOG·,ˆw”ÅÃerÀ´AÏÌxo|ýt¤YãÁ
 gQÚëé	ĺ§Å±vvóècT[sâw½i›=àkÁÉÀ×b&šÍ¶pXP{ éì“VO x]$5é ‘ˆÑÝ
}B³FrÍ åq_ `ÉævLfN°3ÃJ8‚Vp`úT+Š]&¢8Œãõ¸!Ԅ:;Cy{kB…­á`¬,µúp[њ芤&Î˜4z±%hhhÄMfM"s¥ŽrðsÚ:±XÛnÄkcØðÑ1ï0<ݬ›
4´G–/ޘtâX•ÏhµäçÐsÛ=´›–ñfÉÆ4oT–ŒNµŽ<,É`–šÅ"-gQÒ	ª3¼ŸE²<íÒçŠúÙ²}ö®³æ©ïˆ†{¬2£udmrÌJ†€@{t¶¤G”e#Wd¢`ÒWäø—”ܲq%tNá`NDVk±Öñ]
%.MJ'ŒgLc³!¸•<š¦ê°ÂÆ´JŠC•4qMt—'âa¸o´šwW,h+º±[
Üd¤¨ZÌÌ[¬ÄëŒ!ÖÒÆk¸Xö
È@ɗΫšÁ‹tJt;q¼Dã±ÆP¼Cˆ‰qёªšP7}Vñpz›5`ÌáØ$'Rm¬è-aۋ*¨¥Ÿ¤ëæ͛iÞ8kð&V¸ÄだÏcy–
¥×èMªKmìgt	`ßÿ£Ý‚ß
t˜¶Ñ	à“´ƒ~B»èàŸÓø¾ÞßF¿¦½ô6ü&ù§ƒt1V
N^¬wC“gÆ
&)nIN<“F
5èöf²Áój¯#’¤Ûûé&©S¬Ë÷æ{¦Ã¦}4ÝçÉËÄ\±« I߆2žÖø­~ۅÿ«ð‹Òü¾~šæ/°$.È.!¤]™ÙS²*%Ûå9/c¼· e—Ëç¹XTó1„¶Ï+´¾¨pýÙç!ò=sÌ
º¥´,£tâ }‡˜ß;1\̛qÓâä›A›¤g©ò2ÏÝO›2³´ä\Œn	ÆB	FMÚ×ú12CÁÆϳ†\”2J†Œ”éǟ5Ø36côN7¹MCî?ƒCâ	Ÿg~’býtÐçqZ~û‡ú]œqh}Ù:|yÅÆ
n/5¤•Wû-¹Y"WhEBjÑۅdLKÌNIßiKÌnÅó_Þ=@ý4Úï<@¹^ç)ÿ¡‡ŽHgB´ FéF’:=žLF¤Ù°%ÖeÍF[¾YÚ#3’‡(‡OÛòlrœ	î +lOk¥Ú,ª3q]ÁëµíÚît™æ‡ià4ÒØG#¹„ÆòšÍ¥4ŸgB¶Çá,ڈ‹e.“wð\ú6_Dð<ú>ϧ$/ S|1=Ãé}à?ð:×°“/åI\Á%¼”çr%.šËx=/ǯŠ¯ånåZnç+ð ©ã¯åÍÜÈ;¹™÷Bâ!¾š‚ï×câ§x¿ˆ«îK¸Æ~Œ+íiŽàµåqÄæâM¶㭶É|ƒ­˜o´Uò6Ûå¼Óf€ßÁ7Û6ðÛn¾ÅvïµÝÍ·Ûç;mÇù[¶ó]¶§y~ßµ½È÷Ú^ãloñC¶wø€í~؞Ã슱{øqû>j_Ê'ìU|Ò^ϧì½ü”}7?c?Úsyž_´ÿ’°¿Ì/ÙßäWíïñöOùUø-ÍÉokS§ñ{Z)ïÓfñûÚþ@«âßjµè×ñ‡Z=¤m䏵Mè÷q•¶—kwðiínà{øSmÀFÚ;|>1Ï?ÆùGòÿÿԍPÍPç>„Ãn)s%V³SK•m9Ó%qøÑmÕòU l ó¹ŽŸ¤ÀIڂÙ-«D{)*YŒfBM?åù<¥¢OX8ÆúÏ«±&ÅÝ´}ƐtÙ;#s~߄¿ôù]%§2݃ßwp¥û®÷ãjÓO+é
Gé‡ÔK¸0=-Çi'=‰‘?¢{én¬C<s¯™j=€HÁü3+җ§Iÿ7…߁´)ýì¡Zs]‰Ê|žÜLý/’nƒçŠgLÆ­á׬?á¢q7ŸO@îa[JùZ(îûbœ
–îs¡{¢(F©ë*™8´Xî´ñijн>¨ß#[Ìv¤w.nºv¤¨°¶f\öš¯>‡äš½ƒ‹Õõô{ë&D!$TëWáµpíJŸg.àRHö‘ÃÞOšöƒa>…p¥Ú€öuCQ$0OÿPKB­zlr
$ŒÅr	ôc€„좃ÓLÚ	t}Ìà[ÌëêÒà
jð²§4xEƒßhð[
^ÓàM
þ Á5ø“okðg
ÞÑà}
>Ðà/ü]ƒ4ø‡kð…_jð•_kðÿÖ4D
-öÕЭa¶†ŽÑp¼†35œ¥á…^¤á·áŽ´áy6eÃÑ6̳a¾
½6¼À†Sl8ՆÓl8ÝSa«¦3(b0.³ƒ¶1À³àr;̆ív˜	Wpŕ¾Ï`‡fÀ¸â*Wg¸†Áµ®cp=ƒrí
v˜ÿÃcüˆÉü˜ÁN»ÜÄàfžË-ÜìV·ñv3ØÃäí,r÷r'“w1ØË=·eÈ>w³È~÷0ù¹×@;—îãîïçÙ?À"rÛ.ý”Á
îù!®}Ø
'¡“Ác^`p‚Á‹è¢
p”ÁÓ~å Ýø…r •kmpځì2dÁ»ì¿v`oxʁNxԁ}¸…‹yýi 
7Ðh‰SZUb`ýø´†p$/¦½žaúÌñ=µþÀúXˆ&ŠB}™¨÷Çü
V°@ƒ¿¹¡·Îå²'F“IÉ5D›[b!O´)Dì Bs
	$åVÒ]ÂðGFÇ=µ!O¤¥¡Á_Û@rª$$”U4Çý‘øRCљ¥U%kæÌ.Y°¸t.uÌTIùìª*£¦¤rá¢òÒå´0¦ήZ@ªXÚØßì‰Æ<-š|c8⏇‚É5,mø›BžTM³§YßS{ik ÔÓx¨Ö&:zjˆÐ+UDýC»3x¬X¸®ž–D¶>77Ñ-•N1ÅØèoi卵¡íŠ£,	ÅJx‚!Þæ2žw„¬<‹EcÃh¼²H¢Õ¢Êª²ågŒ‡lä¹%š7GâþVêº<	UèC/I컫'{t'˜-ñpøùþæú8Ëß¹0ÜÜ菓¾¥ö³/±š©•®!}Bgq›ü¤Wƒ“ܤÄ£Iå¡ó¬¨¼°tMEåⅳËITuyùì9å¥IzI%öÒRªïVôBž+‚mqéâ„ÊÙ«¢-±@hn˜×—¿$õ4ú#›“gJ)l³'¯!ÜŽ{Â͞	ãóÉ?UGB©ƒ5O|€©"DóŽ®õ„#M-t¬M5:Ë5úìAîêHz¯LåTwSË3L¬*a@j‘åohˆæ$¦M5iŽ›êiÅVSSH·7,æ߈6m&;òÇ£,SK'ºžv%¥‘v£TÊ-zÄ\ò
Í4ÃtõÂp$MT6QC‡ATÅý1"Y©¶D‚ÜV«MÍÑJÅH ž
¼°Ù$ŸÁÚ{¥V[’X¬-uü–@$k`NâX‰cXŽ
52²†"	IkH·`®hm"’u¼<yË&7£žôU7ª	IçmáH ¡…K&K<Ö`§í
fVÊVÆrÍ&Fì›6‰’ä„iÏÒ\£EŸ4‡M¶Ž¥†¦y	;›‘¤\mà™á¥«ÊpFý{Ž!Ýe77ÇCÉùv·V:æ6ég–ÁÅæÄùÉVÂ^ËÌ»a%F]œ6ÐÒÝÄãd6ú[Óº§e˜—FªkUDwÚvFÔ[Hï_×Ñ~=…&ÒýsE,òb窙2ðìsL„=ÕVéÐt
VÝyeTh¦ÙÓÔmMþ8«mBm9kUSK„HêƞÑŠ—Ûä rE¨5^¹V7(Ks“îø2š[j“ñ$3áu
eÑ£'όGËy“KüͼŸñhòÐ--dÑ$kmÕu†Q6<•.8ýéÞCÙ&߁8ÃÔ1%:kйž¡ãðOÂÿË·%Âá-ˆþ—‰–D¿
¯¦hѯ›h;Ñÿg¢3ˆþ½‰Ö` N0õg¥kR–>³nÛœa`»Ž¢ÃÔN­™hÉQæMå¾4ÆKÐI5¿£5~Ÿjx­ÙòQX†ÂRúªè[B_õ1(ZqJ…ÚƒPë}&¯pn:s;!¾Œ9y:ÇoâäëœZÇ«s&NÎ	š8ctN‰3Nç4˜8ãuN“‰3Aç3q&êœfç|ÓbâLÒ9­&N¡ÎYgâŒÕ9ë
Î#¼?ðW‚KÁM0D›»–6±PNC?ˆÀØ
ñ9¬_Bø7üPZàFiƒ]2r(ö“Ãq°‰¹Ò‹Ãe
æÉBœ('àr"N“>œ%/À9çÊb\-gâ9kÅØ(Kqƒœ‡-r
^.Ëá-ý¸L‡«ÓPšC¤4¤ÃøNúÄŸ½p疽©URýLGzê÷@†×5¶øL'ovay;.èi.ûî>º^&Ó8Ë
:aËQˆU¶ƒ}™×5ˆzMm83 ÁHéîemÐ_F…,‹º•œ{EcörWýÿ›¾…¹ïïڇ2Á–ÿvªÓ›Ø‘ i3õ…wòP}Lèy¡—éBrÐI_7Á­0¯Ç}xL1ôô
 6¦Z!Sm§ºúª-Ð_mƒlu9WÛ!_]	cÔU0Q]SÕaÕש¡Qí„u\ªnƒ+ԞnËî“ôû–äõ
Yɂ#Y°'Z²àÑí0žÊ~ç¥L…¨8Û¹2Y\“ó(2æ·Ãw¦OµÃjc%½ip²Àܜ6°ÉvP¹>ͬ	×ö¬•1—;p¶G£ÀMv+_†[sgìKîÖ ;“úDø|ÉäÍ㸻kØؽ|Rn¥¯Á­ŠÓzÜMo/nûöód•n*£ø\ÌÚÏQý4í¬–¾Ìvðx™jtgî¤|A'bG&º3uÙ}]o¤Ó\
Õü?"p
ô”dRjÐV„êEX/Bá6‘'ÅPxC‡÷ÅøPŒ‚ÏD>‚(ÀAb,p´˜„^1ÇŽàD1'‹©8]LÃb1ç‹"\ J°UÌÅmb^-ÊðF±
ôFЦM `c†[Ykôµó¶ÁÇævÖSË9ÏL²ÜÆîý3Qaíp·QcÏèÂhjûΦuíÔY¥+©~0߈I¬ã
›aèßH¯s\búííuNI–{{EɲänÁ:îS¥ÑJº€ƒ¼,òAȐÀ)AòŒ¤ñGË£¤:ÁòqÊã°^þZä°Mž {˯a§<	{ä)h“¿ýòwð”|~%'ä›ð²ü#ü[¾]ò}”ò̐Åþòo8Hþsˆ-?Á1òSœ$?§{͗X*¿Â2ù5.‘ßН¦•À˜’Ø¢l¸]eâåÀëUÞLômʉw+¶«¾øê‡Õ
JPõҮ֙b?xÞÈ[“Cbƒmò&§ÄýaócD@‘ðÒ¥{¿‘¯Z!-•½”ßÔ¤®{!§ –²‰ž§ç<#ĺ',ìtäXö&ëŽÂ¢c0{ÅØ#°àáT’Z½ibŸƒE}
YêKp©¯`€úrÔ7àQ§!ςPhQ0Õb…¹
Ê-vXlé+,½¡ÎâìæhûÃc©G‹þ>2ÀK
w	ρ}Ö:=¯Ë®N¿vôÒõ¸ƒÄ‚þp?±Ц$:Ù`lÎTnÿT/!»&g´ƒ-ÇRŸdÜÝõYÎYõŽ=kÏxT]”@ÝNØ
}áv@xì…ó 
·}t#º‘Ä£Æýø‹Ä£Š¨2»ßÕg%×ú¶÷K¦Ãѧ“·Ù	£}€ß:uƒÅVÂ<ÑÀçx’'Øgà<ÅÀS
L;/‰áI#1<i$†Œkú A¯¥v-„#„£‰ÇŒ‰#×ljn Ì2¯‰$óy¬W\.­#ÛÙBe)’”öm2GIåVÎñû`
Ïl•ûÝ­rvv¸ì¦g¢ü†Wƒ¯…~xÃÁhÜð&˜‰7£wcoº“ƒÃ!ø
üD|¿èf҃’¹$sà—É!”ƒqʼ³¦B˶=0Ál ym0,}FªÈëÌcrƒ¾øjÎy‘óÛm•ìí–û,¹í)u§ƒ?ϛË)ùFŽ[éSNHUߑªoÝÛõrÎn0eòÝr¦ün9S;ìPýV˜Ïñ0ÂY„Ȳt+Ìu[i$á³år†T gmÚ$çÖ6ºûº5
ùÖÄDˆk©álNsÛj|öt½fºý_	ÚÆvê>Pê~°«èÆßA·ýŸB¡:
•ê,¡i,#¼R=~õÕqˆ¨ŸA‹z¶}«znWÏC§:
Ç	?«NÂóêü†ø¯©Wá-õ:¼§Þ€¨·àõ'´¨70G½×í$=ɇ?ºuJýÜ~|+\ƒÀ¼§S³¶ê5Ÿ¦Z²ó™Ç¢–R÷ÈÖ¤[g\,鏠IÂR#«u¯oe§Ïk0½=ƒõËìŸÈþCè]º¿yð>yCÎD&ÃƐQ’ã 035d®¬ì|×åÙ×3˜Dnj¹Ý‡O‡‚!úCÑ4ðÓ4‰ã~FùÓ3ävŸ¥`ø‰••ü"šN';·f†~ç£C_Q¼§ëƒÈÉîÚiŠhýõøœ¤}:E#„~ð*q‚ªçÂÆ	£ZÇ`Ί‚#Pvæ
|Ûíè楌ðxb7pQ÷W
œ¢‡Òď÷˜×7CâqýH<®ßa$Œ„‘q¡!7Ó ùqýǐxä8
‰Çu~x¸ÄÛbÈñãúÝ=<“Ký1¦Vu°ÝÖtx]ÃÙÐ8`ºrõÔd„=Æ«S¿#u¦‡‘㛢;‹Óä,œ«»EU}3ƒÜëNÝ-åîgûÎÒßa0çˆ\]œïÉþ(NuÝ	ßKëå%”€\;äj¸C®}²Úe~*ëṎÈ<)ãð¬ÜLùíVø@n‡å¨ä(§½ŠÜã58R^‡òz<_îÄ)rΒ7a‰¼È;Lç*àsNÈØÞcc$Þ,:‡Ï
ôQDZŠÃ9³T²J
ÇlÇ:[ÉO[ÅsætŽIm;Çe—--%Å)LŒLpìÎ*ŬuҖH¡Ì¢Sž³ÊvVAÍÎ2‹Es1[XXäÚf¬œUfVÀv²¹Š”×ôïOÝfÊ,–ÊV^A0o^ö³QÞ*
ó¶ã›T§ÂœØNŸ  ±Óu¢ú1µE+_¸Ä‚V²—D/ÏÙ¥Ä!tð.(
êôu&+èæ³!ÎÞÂeŒkC´A„Z±Ÿ¢H²²¥~º×˜-éNsP}uQÁUt¯Gµ™OÐÎZK.¤ÆBžb-º¬(.ûáã<£6³­š.¹šgïFD¥ 4zÉÀ	:‚SÔɬ4b~%	®DeÑhlÁ­Hò"A÷ {®G»ï1È|qO|º!NáÛÜê·¼[x  o Ñ·3ÖÓ÷ØMwø†§Iy—9<EQ‡nãºô .žZECL>5žZƒ¶î×ñ«<™ø&^âõªSGôo§ïÞµú´X•ûµ>mYUâ^o+2ñUœ’67Мlƒ»ýš$QՈ¦
ù.j%˜¡ªÑdo"$;ÃL1GÝiŠ÷Æ7µm|KÜÐS¼HOóò<ƒV:=‹ÃtÇiýôÎÒ2”Á$Ã=“ΣB°Dq…^ÄUz	×8Ƈ”ÅgdáKzßÑ,îÒ~&h¿Ò+øòøüA~½ƒœýXu4]<by!›2š;^÷¢«Ü4·_±5nŽ´oY}¸5‚‘jo<SŸæúÈ%7k¼Å_°§+p¿cÚT3‰Ád
”²"¸MÆ
¯Äc‰Xf3ƒ¶>¯¨]É~‰|Ú–xb	ɛê“Ò¡p_œ¨EN›ÍÄâŽÖðð`F`ZÎçßÛH‡4§·‹bˊ¯Y¶:C¾viMN×ö€»Yvmòyh¥B	8½®VyšËãºe»Û»5¯Ì9ºƒ.§ß-mñ…|ò”vgW“[Žïõ…ZÛ¼-²‡ÏïöʚßÓdX$4_°m—ËãÒõRº¸=®ÓÊ1)™<í9rLY+	¸·J}Ù¨+9”ŠÅ¥t¨­%˜Ì¦#RsL®¨ÛE5¥;í¡ý„S))ÑÏ`Œ†Ó¡¤|€tJýÙ¡”?Œ¦ÃCtŠQ)CQ©Ì¾T$w(űÄp&dbÉòM;ZhŒ¶DFŠ
fº¹Y–î­¹¨7ž0Ã⸔hS&7&hEKW'’	á–Ì­t—$ÓQG8ŽJŽ4-æ@Ê —ÂsõcX]È|C4)±k:‡Ü§%©RYºæ™ù云p<+ùè
h¥§£x
qñ,#MKÚ
5„yxëº. êl8
3¨ì2m¼
tΑAJ•Ä!ÈíJâd©’ô²XIÖ
bV’AJÒ-H±’<!È%q
bT’jAʕÄ&È
%iÄ¢$^A–+I‹ %J²[eJbä6%©Ĥ$kY¤$~AV
òqîXö‘|ËIn‡
^”Á‡ø±; _?‚AGèÈÆ°¢—°ߣ×hæŸèfZzѬÀVV½Ì‹^֋0K£™2DçåâeD£†ÊT½^›ƒÍôOï½¼k}ÑXYjª˜€¾Ôtè4Jf°¶Ë|ÇØ©ÖOáÁs¥ÓØtn>Îbš„‡)Õ(Ñ#´@¹ÏNCCÛ+Q5L2}õ§¸§¬vsnP÷ÖÖ©sš¦·öXÆ&²”M£žò˜ùjª©ki4kHPÖ)ÜoьÁh3W:‰b[™EÓ;…ºÑ"U¹©{i›Y-œÔuZUn¹è£E¬¶Ž/¨z·èÇa²U[(‹#ʚK.ƒi4ˆèÄ
,úœG>û¨ŽYtíÄìY›y]—›œãpØ̪|ÒI”تçɱ-ÚQíìØì6s]ÙÌl
ËÈçމë-œÄA¬"yŠj5NUœ ¶xŸîààÆlÃYj‹3Ô¡çуϨ9¦iÞ¸ˆ¾À!\¦»ü
}«|I#Wð¾&yßâ;üˆð~ÂUüŒßñ+þ¦q¿1
®±bœb˨½ >pòà¡'ƒx6ØÅNJkrÖæ\‰èLîËWHK…)Ï7ÄM½pôeŽ‘~|¾·)®°–æï‰Rº%¦p÷e¬i·­Yßn_dÎ-"Nc’ʱ+1L–§‰á©

Î0`ðâI5r‹'Õnöoó—‡üíåñh°£}6ƒÑ˜Ž¶—û#þÖMòh =Ð)oðÖGÃíQÿÖÙFõåDqõ¤jS`cù(Îk­ªsãÆ@t¶©´ŠDY¥†ªè(RŸ*ßÖTÙ{
µ8¢¸&u#’
POEiõfS«Û°9ПM
ŠÏ¯ž²ÅÒÏ¥8hçԔêÿÚ±zª:Ëÿ|ýÄTù-©Œ‘BÓðOêl{FŠ‚Ï驙Ÿ«jêy›TœÂG՛üQk<­ÁÇGM‹Réù“†7æ_«X.hIÅ)RúW)s3pÌi
;‚ñyvs¬Dv•¿­(Ž»ŠZCþX ­€êp[€Afu¸#÷wėûCÈ³«ÃÑhg$^1íc y×UÖú–-5RUuË|ŒÔ‚šE5MØ¡wÏ*¦¤UNI›Bc}eµ×¨e¥Ò½]­H<ˆ}£5¸4\5Ûü¡`[Q8Ҋvá‘]ìø:·nD›üBh[Nªaÿ\“Å ðÿü¥•MՋ×UW6zk|¼õ^ڟmæ/]VÛTS[ãCãfŽ¯®aie-ŽÊç]aè¾pQƒwÀsEñpQ´³cÎD]ýºJ_3úÂLÔ-ÄZ”lªC·¥cªª²zIƒw¡©ZU‡­¦Q¢¡ÒW½Ø¬V][×è5˽äa#1 èm¬®¬÷š.ªkª3«,­l®òšíûêš×ø™u863U_»¬C€Ru5+«k+‘CÞà­]VÝTék²qÙóÌj	YM•
f›fj˜Ñà:£ÅðIÊ«_\™”WU[é[’”Wíkj¨Mʳ"+!oQCeý⤼Ëê+P/'!ìK®\[·Â›lt}C/Y¯~™¯:9ϊ脼eõõÔ^BÇ+-«‡c„;0.;ü¡¢@4ŽÎ*BÏ5xË(¸d`PÖb“è!÷
âþíl¥ÍÛp½—<•‚±Áö ¶,ƒ1ÄÜ`ì2œˆš6ôWpc0­7:֓³-ƒÁXm ŽmâN1¬‹Zm¦c¾ÀvܐdG¬7Ÿ
Ǝ¦ðÂÎP¨!ÐÞòG½]Øe,f˜-bÆDÈX$DÁªÆ¨©)‰©	\ëN#1¸ÚÍ|Zï±Î
1ŠsCšÁ—׆·¢ÕþÍ}<lºÆàUj]Ÿ!/´ã­ö]º¦£ÌƒÏl\AÞoãF²t87Èu䚍"Ï°qrnã™È…ç#wØx	riã9ÈGØxòa6îDžeãÐ;m¼
îÍ
‡4E@¦sèó‘ÕÀ«ÇÉn—ëdúq¸Ö’-|N/了kó•:-(ºËw¹ö¿3Ôü(Ün€OŸ
.>t>
ø<‹éR^
ŒÍ„Y]¢¤Y‘ØÜG›P)Sوª³àKuZMVÊGÝØ!¸
Æ)OÂ$åi(SÎÀ4å9˜¥üæ)?¯ò"3wЏ53#,c²¡Nh³·mŽý,¶ýKÈU~…mÌû´“†q5Á.‚k‡tmª
݅îÇ
Â
݃ú6è~Ð8 ï‎áḊgRLDçÐܙ±U«à–êvcŸ˜ÿÌÁ5å]ÊçõBaIáÅ}pý,áÎ}°u¤•RÂ×ÍYaÉ©ƒýo•öÁUÃÌYÂÈ_ž'L´W=
õpªB–z
ÕÇa´ú(QŸ„ùêSP‰é%êiôïJxÃ2i´mŸéƒŽ¤U!?5”e)OÀ1‘ýY¸ÃU5—œ€4-œ\ç>£ÎoÍ:xÀà˜pÍõHsçàÔmp—ÇeŒ9CüŒéíV‘}4ún…•ˆ¶G¡M}ýoþ!=_/4”>˜Ì+@U
jz„ðÈ^¸°„ˆY¦ËnÉ*öƒÚ麜Œñð{Ðl]t¢‹¹F?“O­ìê>4”µx:y4ùdÊ' G>ò4Œ–ÏÀDùLÂôù<̒/A•|¼òh¯ÁJyÖÊ7!*
˜Þ)×É?ÁÍòm¸U¾{P÷°ü†Wó`X<c¹5äVŽÃN‚W¬$ØEÐìf´)#´¸Åqˆ¹9n
 h³‡6;UwÕ3º3XŒpëéêz]Z¥B9Ðÿ3åhª
ç+¾ñï(M¶Ó×èš.ê’këšXO›üœsJS¬è¾,”Féî .[[õﵶÆÖZ—ÙÚS†~2š*ó8õ¬Ÿ¦;QQ*è*ݹ_ݪcv›'“¶3]è™ëÍ¥G
t [ærOV/žBna.êG`·‘‘¡g­ÈØOµº³˜ž¥gì©Wu5'&ÖL¬–XçÕ^ù†.öÉ_Pßr—<
P…Ï|àC+¯Ñ’+,¹Á*o³x̒ÛIê[óZ|e¹Òi£4 MÇc¸{Àž}¦FÖ@•£»Mºa?h¼„Ð5׆ô
qV9šÐ„°þcC7m^iټݲy¦eëJËÖíÖ3ÓÖ5u«¹¶ô´ª‡z2Š[±¸m¨x\Rñ,Ž
Ó¼	Ö+JÜƸ_À†—çL6_ÃøRéYöÙÁe™	ørå玲'ƒ›Çi…Š|#ØÃr:÷dž\…¸o91Ž+2“é™z¿Æ¨3&±Î@…Dí7{ùå)çAkœì
×N|-t§£­Æ[î¼wßÀ©€ìÒ3Ö{öA¦qhÀºýÏãÀ¸ùÚÁӌ±L¥Ý@MÜ
t‰Ó~ôUwÎäCwåÀ_
œ7€“7B_y|9Là+ œ7ÃÓ|
œá~x•·ÂY¾>äíð1ï`i<œ|ÍclßÁ.æW±Kø.¶˜_Ã.ãÝl9¿ž­ã7²¿‰]Åoa×ñ=ì¾—}ßÁ¾ÁïdGø]ì
¾Ÿâ‡Ø³ü{‘›å÷±·øìü{Ÿ}ÌûÁQT~RÉäO)¹ü´2žŸQ&ò+SøOAiá/)k0ݎy›ùkJ„ŸUnã¿Tö`úNþ[ånþGå0[y
µÎˆ-ây±U¼#Ââ=LŒyÿ’‰íòB±C`z‚Ø%'‰ëät±[Î7ʇÅMò´¸Ež_‘¯Š¯Ê×ñ]}NÜ)ßägâ
¢W&îU‡‹ï¨ăj±8®6‰SêrñCu“8­nÏ©;ÅOÔ]âEuxYÝ+^S‹×ÕgÄïÔçÄ9õmñŽ–.ÞÕÜ(ËÅ9mªxOóˆ¿h3ćZøX[">ÕV‹~m­Z›LÓÚe†¶Yº´.™£])Gh7È´¯Ë‘Ú7å…Úa9J»WŽÖŽÉ"í¸£”ã´ÉñÚ²Xû¹tkoÈí-Y®ýUNÕþ./Ö>BÏät—3RÎv8ä\G†¬rèÒë):ò¥ÏQ&ëSe“c¶\樒+—ËUŽF¹Ñ±J¶;ÖȐc»Œ8®âŽ/ȸãى÷®¼d]*.².üª;ÿ8\‘üý¨
×d=äÒÿº±ô{¬»iƒõ Öú@0
ÌßÀÚ"KÜxGé…b’+{¡ˆds/ŒLþôQP×|¨odâºË
u)Ö÷Áuô
HÅ·L–‘efèê¼B]ÂYÝÑÓÿÉ/Βy¨2>aÂ7ð½H-ÍSé{‘:4]bU'8ÔlHW]àR‡Ãpu\¨æÁµ
¦lT1mïš.út]‡˜Õᖃh9pÑt°Ž9æ<Â
†r»Ó3qŸ¡Ùîu¶ùGîE<¼’al0¬´ÿE‰n!1‘ÇGÜ?žÈG^¿»¡o+ ¿cX-À{ÿU™-dÓ2Õ§aªg•Íä½`˜ØLâTñXíó(£Úî澩P†©í0/³£¡»|Q»Q´ßx¿»§Âh]·HadÒ[¡æ×üäh‰ü	ÝtyܑâC˜ë–\‰~—aú—è«á¡ðÕÐÏ{Èz$â@0Ì-Í°\>ŊçWK1̱´}†{i¨îp¥„Œw“­,Šú"È".»ùHŠ45
6ý/©Ò7¡öRO³ajb‰^\	
û­SԎ
r†qS\éN’Uà5©
Hmï7}ú;f™åPKc£ì ì

ˆ½  h»G¨U0˜Ú”ÐH)!
1²-K))m³Ý*$>ø@¢‰&&&š )/bDcŒ!<úàRç¬UÄ°É9sæòÍ|3³ß|݇„~D$
ڍÊRZÓ'Õtž¬Þ±ñÉ»#±ÔµXüúDb8ÅÐ2‘׋Y]]¥\©bEÏhÃ9oDª®«+™bi…xÌçÕl™e5#IõJÆÈQewî@eÿïã)µR6´%*ž×
Éa­E=QKjfA‹èZV[.E&þ£Ì
Ú4Š’®Í疉Tù0)tÓz,´V:ЅN0I³„ØÄG+2eCï3u+ÅøqŠî
eÊlP–
µpŸ¼è°ŠQ;
¯Ã¥êDLªÃ©°:<üª5¬ì¸Ê¥¨ü ŠËÜâÁ¨œ¨‚dòôq{TŽUäŽè%«Òfݳ	¬l'N©ÍJ´¤¡MÜ$Ж9È:¢O1ÖA:1:èÌ[­³QÛÂ,Aü¿ñ”•ÛÛpZµM¸W%)ØøY;˜Ü4u<¢^ÓäžÀ‹§hÅ3êñ9ÂxAK|‰‹XCëTÿÆñwð†fü–[õž¢>’§†*>ã¶ñüu¬R…óçèþPK­u–ÏÃ
O‹@¤‘W€ÁŒÃÙ3l¡B[̊QÓîHWèvôë»»(?4ØÕ½	Œ	Ì)Þr|•ÔÊ¡k8¸"§Iç?PKšÀ*7

…ÂÒ`&  …—äe20[gބÅ«UÛº´ÚV¬Vm£UZ@2i	ÖÖ±U¬kÝW´Zµ®µ¶jëÞÌ$3Ég¾9÷ܳÝsî9÷̽½xòa”b‘šå‡]8ìÂG\ø¼_uጏ¹ðu¾áÂY
¿Õð”†ßiø½†§5üAÃ5üIÃ3þ¬á/þªáoþ®ážÕðO
Ïiø—†ç5¼ áßþ£á¿^ԔÒT‰¦J5U¦©rSѧ£R@•€j
µf˜'`€…<jÒ1{u\Œ}:æ
p#¬£NÀ4DtLGTG=b4¹ë$tÌG²‚¦l1š¬_À~‘Ð1ƒb9x½ŽYxƒxpPÀu\‚7‰å7‹ð[¼U¼z›`‡DäíhÀ
bïÞ)ܨãB¼K¦ïá÷¸I¢¼Y<½EÔÞ+FߧÃÀû…û

·Jø·‰Ï·Éôƒ>¤ã¸]V»CÀNâîp¿€Ï	6ðMxŸ1ð-|ÖÀ·ñ°ïà
Ç|Ç
|§
|G<‰/ø€ŠÜð1?ÆG
ü7ðS
?Ã'
üwøî6ðK¡ýJ„-àœ¸ñ<j(à„¡¦àˆÒðEC¹T«t5ÔT|ÅPTÓTâS†ªÂ§
UCÕ͍
U‹û5iCÕq!U/ŒÌÀ†º§5§”®PÚ°¢Ø<bžÆV…zOcÛ^³ßô›ûmK,j›¡¨•X®P›c„ÍhÐß6“IR§P7víµºíIä-v"
.w–ئPçi-ʝUŒ¾:ÕÛ묯yZù}¯'ßÃH<µ¢öòÆbD…K‹
ÓÖ'B=«Í #MÚ	Æj'—˳òÔÚÌÁXʘQ3HO„;;kõÓ «5`¯íwü ¿¡(¿-”´­hÖÄ%“D¶‡¢=±ýB3²B¡˜7ÃޞÙYVí8+ºÀ39E÷º®˜ 
ø<“¥Ï“”%EÅc‰ ßŒ›Ý}–?a­¸óÚM‰X0aF&.ÓÙö2ôR‘“éN4æ3¶ö%bûÍ®°U<^fä|^‰¹2Ïê=;‹û7åêP4d¯¤`K¬Çâ™Y£P¹&f%¢1»!bÚÝ}$ò­Q&Ð9!VR¡ª'¨=é²[ÅA…šñÔ·F“–-©vœ&µÒœ°L9G…Ôu!+Ü#[XXtÒr¶¶¾hdÌ-ÊXcu¥‚r(Ba'›z@‚°’‹u6móچ5V$¦0U$#±Å²&ÝlSa3Ñ@	+™Ţ˨º%–Jt[ëBŸ–Ù5’:wzv.Ťm&ìe»2“¸ƒ{;w)L3MÓ³³7ÛÕHŒ=Âìéá¦æŸn)…G„)1£Ý}1‰Ç­(õ´îL8
®,FîԞT$žM5]í•]dò¥9“Ík™ÕÞP8Lµ e;©creäáÜdFiR'!ÀÙ¨ÉI»±2*›Ì„e09´%–ŠÚ
œgv&£ !)”Ùt²ã —–Âb!§ܙ¤ÇãaËö7;Ã1¿³­š#®s·œîŎvž–ÇʙÈÍ©UM(UnK^c첸e5“*7ߞЊz<VÐù‹d2œïíäþ©pA®ü[úÌDs"afz`.öƒ1‘š“­šðw–“s(kº­¸ÍâV¨žØ)H™ZÏE<©IÊ2‚HÁ:c}‹§Ú¡¦ìPØïü•äs¶lÀŸÜO£þ
ëNѕE˜9–P¶ïL/v¾.*Fn;sþoWàPqi3_Ž5o	ϱS>.çŸÓq±œ¨sШ°Ç!.¹3ÅU\Is0'GTä*“Îñ¯Ñ
re©;ÑZ2w²„¼-”9ûYm“¶Í§,–I4h±ÐjìÜvoåç²ÇЩ©xi[YG\™™ø¢õ‹™½Äö[¡`Ÿ=0†
òª»—pV%¦
tc5zp-,Rzù
búp=B8„½¸‘³›Æ­ˆà¢8ŽFÇ)J<Š“Ÿä#Àæ}?Å«}?^À *Á
^äò	eÓ~y’\6bn‡{Ê.ok…‡Á¼*åÌÚ:IW%ç^'ƒ‰-i÷-b”Û	6RâµMei\7š:ás„Ï£Ž%5S)̧‹T)–ª2\¡Ê±œ/Ux–*|Sd]™~Y—ܲ-´»kܤî0nánÝDÒ´¢*[‹©Ü@•CPò,ɪlȪ,h:Jª¼Zu/*½2¦Ñ–F «´{bÉ?Åršåþ—>G_:Y»³ÙD›kÓ¸6Àq}GûiÌÅžaà27‹`%·me]
ßÑ	Æo§³wò…|¸‹¬ú±8Ofï¥gÛiø5w Ý](]9„¥ùæKizv+Ü%DD–“V¢Îº²æ¡R5[èil¸û¥3^êë†Pïu—9È´€WH{89æ4ƒNV本—³Ná4˜3l9óÙ–oý'˜Æ³hç3uéÛØj:)³›/Ñ=|ƒ†¤ñÈû/Ç#Œ‚}
{ÄþV1–kÒèÅÖÕ‐F1³Ã7‚KÓhgÌ4:Žc3±mCðŠÄvәs´cu“‰Çœ_†+q‘3Æ¢XÉCüÝGìçýX€°G)7Dã¸
'Ќa–Ê5GÝCŒì$£º‡v§n	¾†/8E¦àqZ¬ûPK½u¤¸	
^ÆK
¦…ö:F¼‚«
^Ç°‚‡\T°(¼g¹¬`	#¼ÑXJB(›Y×nk‰’fä¶U4òã
å’5šlÕNU×Öt‹6¾h*–t…ÉŽò$ÔK{SB_4u´Ùɨ³[4)£\µ©Ðµ[ãâh8Úz@ìû¯¢=AßI3§KLodõ²]4Š„®™¢¡ÏUoetkQ˔¨€‘_a`Á¬ZYýzQœ8'’ÍÒ²¶n¥85Û´FÅq	«ókå²nä˜Q†.(gi<i‹EɬèTøu£RµD²yݞÕ+-OÁSdÆmÅÊ´8ÜO3½_Ðá݃ä%t¤žÎ¬ëY»iË©† ] „Øÿ)#§o¤«vzmʬ¹JK
ÛłeÞq@õ—t#o$™V>¡•µlAOXz^ß('ZbÀV«Ç J¹O8dÁ&K%	í•j¦â–tÌ6Œq‘ãwH{ÅãÈÙäÑäǨ¿‚çHŸ§4ÍÎòÄëÄÏï ßEÛJutì 3îÝA÷CH'ícišg¨›8Á–ŠP–D÷¹.o0¸—\«uôÄB§ZC×Öì.ü+Ã5ôÖ¡üJS “Cjr|›sƒ«w©y]xŸ¹±™I…ãyº¹ž£Ïî{ð=T…óB¸Ž«¾UWÌÕÑ·|s?àgþ2»,þ‚ø
!üŽ³,ñj|$$¼ŠgÝ

n\‡ê×hóní—ãìÈÞMø|-eÇÇebTà.:ð
5r~Äù˜Ÿ0þ§,‡_’[Þrù˜S#ª›¤¬!|-rqoc!‘E䳎/ßõî
ÜßûSÈmí<ÊpÀ=†þœ—ô¥/‰çbüÁø§ñ-Îà;sÿ¾?‚G|Žn:cä▂›ŒÛãýK€ÚÈlïïl{o­f›òM˜ò›u1u1턃b?ßÅÉíÖwÑÍÑü.òœE:]§¦„
ח]×â]ˆ4ãjduÿŽúÕH
OlÏ	÷#‡Ý‡8šÝ¯p¾E¸Þ¦æ„±JíD£e^üPKlaÖtè
e¶»ŸáÚ_à875mâsÜkÖ¸‰Ñ”~Âú8™d.‘ývC»7ÔÇÚUjmrñº¶r‹p‡øˆl¡ôPKDmÀ

³ëü¦„îpâp7¸¾š/ÆfM#kÚ£bW |ÐW¬{Â×ã"iõa
'ÊËË!Á{)oå1揳¦ßäzÆ\sòE«$¡m*o™ÓåwÒ¦=o¤4·?
B±Ç֝â+†mdÓN°NÑ;˜k®X¶3敼ˆ,‘¼×X[3­,Á¤‚ówŽ;bP(–L¼¦U*ÛgÎt’f©dä8ñäK“b›ÿ!¸Dj—†„ÖFÈ$±8•^53NÃROâpZ"VÖ\O•ÔòD±leKûrû÷|çWìâz½ÓÊ9+Šv.f¬™3f›9s}-v XLxÐë1…eålZ$¨B
Ìe»¬›KåtÉåvÄ)Ö¡ã_Œ®PvŠ‹PóuP7‰·A}„ö‹x–òyÎ&ù²š¨CÑ*|Ñ3Ûè‰îÀ³Øф*Z¶Ñ•·Ñ~.Qvó
)nšaªYôð]9—ÄësC^er™ZêUtD·ÐªWж™Üwq°‚Î*´ûtZÙ¤†Àeö­ÓòÚð>±ñ1SŠÀ3+°žbÌö[Pîé"xþo8Žêʒ;ÍVѵ°‡¹—¿ð+™û$ÿ;üø]ø'±ƒQZ”	¯à—ÁŠËà¬P¿¼¹K§¾¢ÊP”´Žb€í!­>f>@>¤å&ûG<éñ	óJ:üœ\z7‰Da¼Nõ_<IyLQ¸ÒÁ% |–¨ÂCÙÀñP@Yˆå€RÁхþõƒ¿C›»ÔG˜øŒ >çq}ÉÙmVõ+Bø–Çvýø§±¾Ç0~ ŒM\ƏûÊÒ$þLàjqnþ
Bèÿe®a}ðï^µ;¹Øbý*d½ÅùO
UæÇëV9éVY\½îz]{ySŽÝ=xSÚÙoJŽ=Ï «´Ð
«ú¼ZÜ
£?ª—vO­WVpüî´?´?|[cøEöë,Û[´¼
†D1¬v#
&‘´0‹1‹µ°ŒŒ…Œ+H3hùB¹ƒgÑ|¹PbHQ8¼ä7Ü®sßµOéùîV·\aHçË×Sùþ¬²o{¾ìA©q!F=_µ®ªBžòj2É¿ì̓FK:bßSŒl7]ªqɝ@È2-4ä†R‡
»
CÌkîù‰Ããê¥p‚_©®ÉêÂwƒC®!]›_s§&l)\q{m÷µb(ô³þ¹}ѦtŒf«ÚìP°Isaôh´’j


--- NEW FILE: ozone.jar ---
PK
ŠÙ@¾ßîø2 ÌVå/s’z
âÉ8K.c•sÛm2
ÇzT3_*¿’
è|BÇïÆ2ÐqW4T̉ùì
Öd©áv’Ö£UC?d»Óñk¿+PúÚH|”Gæ¾øñ–@¥2‘ Ì¦
ºN…ßÐ^ä¨7Â^äÉ_IjzD°©²C‰*JqžáL+Y
˜â9«Á¯´Oq·Q®#§æ1æúXîcÕ±¾!¯n¬>Ö_p)þúá109,†Nó¼–
Ã⿺É=͇Ý&´C•^ýŒ[UërGIҊg†Ñ nÓXâ–ÿ`Ò{ˆ¤N·™à¸“ÄÝý
PKDFØç'
˜em™sw¤/°#;aM[ÚS®f##°Þ*ä”ïzíٕcŸ-hmÖWÆ=i	Ä·%Ë)¦m6úZ:빕©jä½A»]ñÄs÷bY·`•F,϶FKòŠzDzÝ1.-YۑÕÉQéé
an€ÀšøãvYààs2©c‘a68òîB.ñx
šËÇQ¾3Ë!fìؼT­P4G‰b—‰=xI`Ý	Û±ý“‡ãÏIsÅx#Qì@›@£WqZW²	p÷–lé°´'ã5µ
ªšXKúÁyfs@ ±f{•\§À±åA×D¹J¯¹­&¹þÕW¶ëPJ`ë
;¬n™¡Xçe±ÉvИä-ž1±
QÕGL¼Š£†]>]²§¥Þ¾®~ÅÄH4•}Ëó•æuþ(”Ü2¢Õ˜e'ÐØnzðBuÇÄIu>RöÝ)uü-§q†ódûÒ³‚yŠ¯Tˆ¾™ÁÐ"åܟ2я
&àŽNÈh­‹Z›ÙˆwÐg`P`ÏjMCZ1|ÎĐòq䌯gM4aâäB—qÎ@ŽXñRh°ùØ»:vÞžœt§åB²Í×ÞuªFy0t¤©€^3pS`w]Ûûö¤¬¿ï	쫍OowÜör¥0Þ^КêMßg‚µ£—ó=Û)꼁Û̲PH½
n›Ø†íêþþšDM¹*8nќ[ñ
rÀV/ X]’‡•›È~iᇦ%&­WÞBzåû‰«âï>[ø+ÍUpmJþŠØC

ØÌç:­<‚M|š
¶¢•«P
ÞÕxºC<û1“A†?}„k
?ô
¥“ÝX¬Î(¿ö×ɔõ
v¢ˆ]ÔuaBC:J‹&T´4ÊÝFÝVc”̞jIzÿPJúR,‹ׄòvXFèý°ñ2l;É'¸œo›Çä,.RvòTz³ð)WTWޛÃó¸?ËÒ&I®?‡ofѳÈïn=.èò w2`û"ΐ‰*·U…šÁ·øNwË÷ÚÇÿ
PK&½¸Å
ôVT“+U‰@$ådŒüºQ°ŒtÞ\“/ÚYt²\N¥,Û\.í¦Í‚h8CŽ@C”!Vä¤Ä,˜Y?BG'$gHÇÞ ‹œYgBàÌäT-IzaŒá¬†sTj`PÇ[h¿)ӟgˆ“­-$§ÖÃě?)0xL¢ð¶Ž.œ”±Nël”nÐf¾Tܒ²
¨l½4\dŠDø
Œ¦^?´ÙéØìi[uü	ÇN˜™ÊW°hÚY¾²Ó¼açʬУŽ%$¨ñMÁrMïT’xGGRÑZ0‹¦:¹+Û<½-›²ÉŒ€V03¦µÏ¾<]aÉÐð“¨/æbqÙq—œ’­6¼ŽO°ÌÙ ÙJ(q|̞rÔ×í}ÃÊ{CÀ)z¨ã
>câFÝqRêpÂ?ûR-Ɗц2y§hêX@w˜<¡ã‘܍á+2aùk~Ößð-&_wêæc¤	^×¼²üô
<WJÝüEÊ&Oª0‹ª=z°¯L÷« âs…ï-;“óØDâO$jhú_N¶ˆ|żÎy,÷õ
E™ƒä=ˆïؽßÓý4ò#Ïòe5TÍÊ@ºœU¼ÌJHfÕHÉÏ>åPU9Ò4+Ç•i©Ì+¡¬|©ª|„ÍZ*aEò$S™:Æ@®‰«-Ê%ßQiŠC6¶>‚EŠHÞŸÝš}¯¹f¨}žVf©Äs¾æŠV[*
ŽòŞj&éÿë&ÿë<‘QG”ÿØkü^¦Ö–è*/•k´r½Úrð+~#( ¬è)*}÷?PK,Àlé®

ÄòQ°- Öy*З=Gð¢­P:DΞ@¯è;j«Ã‚ÏÕL¯*ƒ çx«N誨+¥ÐóÁ·º¬ëË…7ë2Ô
5HՀNšÑ"eNº;4m2Ó§"-­¿’¹(“b՚´¡] ~Ëñ7<YLúáó<é]2•ðéÕ®¡5‰ë=ç
[...2143 lines suppressed...]



	


5ÇnÕ



ų–

©@




¶Õbõ


z=·
Index: xerces.jar
===================================================================
RCS file: /cvsroot/tm4j/tm4j/lib/xerces.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
Binary files /tmp/cvsmzxJuX and /tmp/cvsqsE3z4 differ

[Tm4j-commits] CVS: tm4j/src/com/techquila/topicmap/utils XTMBuilder.java,1.1.1.1,1.2

[Gerd M. <li...@us...>]

Update of /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/utils
In directory usw-pr-cvs1:/tmp/cvs-serv11042

Modified Files:
	XTMBuilder.java 
Log Message:
- fixed: uses factory everywhere now

Index: XTMBuilder.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/utils/XTMBuilder.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** XTMBuilder.java	2001/05/23 21:37:28	1.1.1.1
--- XTMBuilder.java	2001/05/29 17:35:38	1.2
***************
*** 357,361 ****
          throws TopicMapProcessingException
      {
!         m_currScope = new ScopeImpl();
          pushPurpose(SCOPE);
      }
--- 357,361 ----
          throws TopicMapProcessingException
      {
!         m_currScope = m_factory.createScope( id );
          pushPurpose(SCOPE);
      }
***************
*** 418,422 ****
      public void startVariantName(String id)
      {
!         m_currVariantName = new VariantNameImpl(id);
          pushPurpose(VARIANTNAME);
      }
--- 418,422 ----
      public void startVariantName(String id)
      {
!         m_currVariantName = m_factory.createVariantName(id);
          pushPurpose(VARIANTNAME);
      }

[Tm4j-commits] CVS: tm4j/src/com/techquila/topicmap TopicMapObjectImpl.java,1.1.1.1,1.2

[Gerd M. <li...@us...>]

Update of /cvsroot/tm4j/tm4j/src/com/techquila/topicmap
In directory usw-pr-cvs1:/tmp/cvs-serv10802

Modified Files:
	TopicMapObjectImpl.java 
Log Message:
- changed: implements Serializable now

Index: TopicMapObjectImpl.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/TopicMapObjectImpl.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** TopicMapObjectImpl.java	2001/05/23 21:37:17	1.1.1.1
--- TopicMapObjectImpl.java	2001/05/29 17:34:23	1.2
***************
*** 4,11 ****
  import java.util.*;
  import java.lang.ref.*;
  
  import com.techquila.utils.*;
  
! public abstract class TopicMapObjectImpl implements TopicMapObject
  {
      HashMap m_namedPropertyListeners;
--- 4,12 ----
  import java.util.*;
  import java.lang.ref.*;
+ import java.io.Serializable;
  
  import com.techquila.utils.*;
  
! public abstract class TopicMapObjectImpl implements TopicMapObject, Serializable
  {
      HashMap m_namedPropertyListeners;

[Tm4j-commits] CVS: tm4j/src/com/techquila/topicmap DuplicateTopicException.java,1.1.1.1,1.2 TopicNotFoundException.java,1.1.1.1,1.2

[Gerd M. <li...@us...>]

Update of /cvsroot/tm4j/tm4j/src/com/techquila/topicmap
In directory usw-pr-cvs1:/tmp/cvs-serv10628

Modified Files:
	DuplicateTopicException.java TopicNotFoundException.java 
Log Message:
- fixed: made constructors public

Index: DuplicateTopicException.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/DuplicateTopicException.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** DuplicateTopicException.java	2001/05/23 21:37:06	1.1.1.1
--- DuplicateTopicException.java	2001/05/29 17:33:42	1.2
***************
*** 60,68 ****
  public class DuplicateTopicException extends TopicMapProcessingException 
  {
! 	DuplicateTopicException() {
  		super();
    }
  
!   DuplicateTopicException(String info) {
  		super(info);
    }
--- 60,68 ----
  public class DuplicateTopicException extends TopicMapProcessingException 
  {
! 	public DuplicateTopicException() {
  		super();
    }
  
!   public DuplicateTopicException(String info) {
  		super(info);
    }

Index: TopicNotFoundException.java
===================================================================
RCS file: /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/TopicNotFoundException.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** TopicNotFoundException.java	2001/05/23 21:37:20	1.1.1.1
--- TopicNotFoundException.java	2001/05/29 17:33:42	1.2
***************
*** 57,66 ****
  public class TopicNotFoundException extends TopicMapProcessingException
  {
!     TopicNotFoundException() {
          super();
      }
  
      protected String m_id;
!     TopicNotFoundException(String id) {
          super("Topic not found: " + id);
      }
--- 57,66 ----
  public class TopicNotFoundException extends TopicMapProcessingException
  {
!     public TopicNotFoundException() {
          super();
      }
  
      protected String m_id;
!     public TopicNotFoundException(String id) {
          super("Topic not found: " + id);
      }

[Tm4j-commits] CVS: tm4j/src/com/techquila/topicmap/ozone OzoneAssociation.java,NONE,1.1 OzoneAssociationImpl.java,NONE,1.1 OzoneBaseName.java,NONE,1.1 OzoneBaseNameImpl.java,NONE,1.1 OzoneMember.java,NONE,1.1 OzoneMemberImpl.java,NONE,1.1 OzoneOccurrence.java,NONE,1.1 OzoneOccurrenceImpl.java,NONE,1.1 OzoneScope.java,NONE,1.1 OzoneScopeImpl.java,NONE,1.1 OzoneScopedObject.java,NONE,1.1 OzoneScopedObjectImpl.java,NONE,1.1 OzoneTopic.java,NONE,1.1 OzoneTopicImpl.java,NONE,1.1 OzoneTopicMap.java,NONE,1.1 OzoneTopicMapFactoryImpl.java,NONE,1.1 OzoneTopicMapImpl.java,NONE,1.1 OzoneTopicMapObject.java,NONE,1.1 OzoneTopicMapObjectImpl.java,NONE,1.1 OzoneTopicMapUtils.java,NONE,1.1 OzoneTopicMapUtilsImpl.java,NONE,1.1 OzoneVariant.java,NONE,1.1 OzoneVariantImpl.java,NONE,1.1 OzoneVariantName.java,NONE,1.1 OzoneVariantNameImpl.java,NONE,1.1

[Gerd M. <li...@us...>]

Update of /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone
In directory usw-pr-cvs1:/tmp/cvs-serv10403

Added Files:
	OzoneAssociation.java OzoneAssociationImpl.java 
	OzoneBaseName.java OzoneBaseNameImpl.java OzoneMember.java 
	OzoneMemberImpl.java OzoneOccurrence.java 
	OzoneOccurrenceImpl.java OzoneScope.java OzoneScopeImpl.java 
	OzoneScopedObject.java OzoneScopedObjectImpl.java 
	OzoneTopic.java OzoneTopicImpl.java OzoneTopicMap.java 
	OzoneTopicMapFactoryImpl.java OzoneTopicMapImpl.java 
	OzoneTopicMapObject.java OzoneTopicMapObjectImpl.java 
	OzoneTopicMapUtils.java OzoneTopicMapUtilsImpl.java 
	OzoneVariant.java OzoneVariantImpl.java OzoneVariantName.java 
	OzoneVariantNameImpl.java 
Log Message:
- initial checkin

--- NEW FILE: OzoneAssociation.java ---
/*
 * You can redistribute this software and/or modify it under the terms of
 * the Infozone Software License version 2 published by the Infozone Group
 * (http://www.infozone-group.org).
 * 
 * Copyright (C) @year@ by The Infozone Group. All rights reserved.
 * 
 * $Id: OzoneAssociation.java,v 1.1 2001/05/29 17:32:45 lilli Exp $
 */

package com.techquila.topicmap.ozone;

import com.techquila.topicmap.Association;
import com.techquila.topicmap.Topic;
import com.techquila.topicmap.Member;

import org.ozoneDB.OzoneRemote;


/**
 * This interface describes a single topic association link.
 *
 * The type of the Association is defined by an optional string and/or an optional Topic
 * An Association contains of one or more Member objects
 * which define the members of the association link and may include
 * a Scope object whichs define the scope of validity of the Association.
 *
 * @see com.techquila.topicmap.Topic
 * @see com.techquila.topicmap.Member
 * @see com.techquila.topicmap.ScopedObject
 */
public abstract interface OzoneAssociation extends OzoneScopedObject, Association {
    
    
    public void dispose(); // update
    
    
    /**
     * Defines the member constructs which are members of this association.
     *
     * @param roles An array of Member objects to be set as members of the link.
     * @return An unmodifiable Collection of Member objects.
     * @see Member
     */
    public void setMembers( Member[] roles ); // update
    
    
    /**
     * Adds a Member as a member role of the association.
     *
     * @param role The Member to be added.
     * @see Member
     */
    public void addMember( Member member ); // update
    
    
    /**
     * Removes a member from the roles of this association.
     *
     * @param member The member to be removed.
     */
    public void removeMember( Member member ); // update
    
    
    /**
     * Sets the Topic defining the type of this Association.
     *
     * @param type The Topic to define the type of the association.
     */
    public void setType( Topic type ); // update
    
}

--- NEW FILE: OzoneAssociationImpl.java ---
/*
 * You can redistribute this software and/or modify it under the terms of
 * the Infozone Software License version 2 published by the Infozone Group
 * (http://www.infozone-group.org).
 * 
 * Copyright (C) @year@ by The Infozone Group. All rights reserved.
 * 
 * $Id: OzoneAssociationImpl.java,v 1.1 2001/05/29 17:32:45 lilli Exp $
 */

package com.techquila.topicmap.ozone;

import com.techquila.topicmap.Topic;
import com.techquila.topicmap.Member;
import com.techquila.topicmap.TMTypes;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.Collection;
import java.util.Collections;


/**
 * Instances of this class represent a single topic association link.
 * Each Association is defined by a single Topic describing the type of
 * the association and consists of one or more Member objects which define
 * the members of the association link and may include one or more scoping
 * Topics which define the scope of validity of the Association.
 *
 * @see com.techquila.topicmap.Topic
 * @see com.techquila.topicmap.Member
 */
public class OzoneAssociationImpl extends OzoneScopedObjectImpl 
        implements OzoneAssociation {

    final static long serialVersionUID = 1L;

    protected Topic m_type;
    protected ArrayList m_members;
    
    
    /**
     * Constructs a new AssociationImpl with an assigned ID.
     *
     * @param id The unique identifier assigned to the AssociationImpl object.
     */
    public OzoneAssociationImpl() {
        m_type = null;
        m_members = null;
    }
    
    
    /**
     * Cleans up the Association by notifying all of its contained
     * Member objects to drop their back-pointers.
     */
    public void dispose() {
// FIXME:
//        m_type = null;
//        if (m_members != null) {
//            Iterator it = m_members.iterator();
//            while (it.hasNext()) {
//                try {
//                    MemberImpl ar = (MemberImpl)it.next();
//                    ar.dispose();
//                } catch (ClassCastException ex) {
//                } 
//            } 
//        } 
    } 
    
    
    /**
     * Constructor for creating an Association object.
     *
     * @param id      A unique identifier to be assigned to the Association.
     * @param type    A Topic object defining the type of the Association.
     *                This parameter may be null if there is no Topic defining
     *                the type of the link.
     * @param members An array of Member objects each defining one of the roles
     *                of the link. This parameter may be null if there are no
     *                Members defined for the Association yet.
     * @param scope   The scope of validity of the association. This parameter
     *                may be null if the scope of the Association is currently
     *                the unconstrained scope.
     */
//    public AssociationImpl( String id, Topic type, Member[] members,
//            Scope scope ) {
//        super( scope );
//        setID( id );
//        m_type = type;
//        m_members = null;
//        if (members != null) {
//            setMembers( members );
//        } 
//    }
    
    
    /** */    
    public Collection getMembers() {
        Collection ret = m_members;
        if (ret == null) {
            ret = new ArrayList();
        } 
        return Collections.unmodifiableCollection( ret );
    } 
    
    
    /** */    
    public void setMembers( Member[] members ) {
        ArrayList oldMembers = null;
        if (m_members != null) {
            new ArrayList( m_members );
        }
        
        m_members = new ArrayList();
        for (int i = 0; i < members.length; i++) {
            members[i].setParent( this );
            m_members.add( members[i] );
        } 
        
        firePropertyChange( "members", oldMembers, m_members );
    } 
    
    
    /** */    
    public void addMember( Member member ) {
        ArrayList oldMembers = null;
        if (m_members != null) {
            new ArrayList( m_members );
        }
        
        if (m_members == null) {
            m_members = new ArrayList();
        } 
        m_members.add( member );
        member.setParent( this );

        firePropertyChange( "members", oldMembers, m_members );
    } 
    
    
    /** */    
    public void removeMember( Member member ) {
        if (m_members != null) {

            ArrayList oldMembers = new ArrayList( m_members );
            
            if (m_members.contains( member )) {
                m_members.remove( member );
                if (m_members.isEmpty()) {
                    m_members = null;
                } 
                member.setParent( null );
            } 
    
            firePropertyChange( "members", oldMembers, m_members );
        } 
    } 
    

    /**
     * @return The Topic defining the type of this Association. If there is no such Topic,
     * null is returned.
     */
    public Topic getType() {
        return m_type;
    } 
    
    
    /**
     * Sets the Topic defining the type of this Association.
     * @param type The Topic to define the type of the association.
     */
    public void setType( Topic type ) {
        Topic oldType = m_type;
        m_type = type;
        firePropertyChange( "type", oldType, m_type );
    } 
    
    
    /**
     * @return True if the type of this Association is defined by the topic <i>type</i>
     */
    public boolean ofType( Topic type ) {
        if (m_type == null) {
            return false;
        } 
        return m_type == type;
    } 
    
    
    /** */
    public int getObjectType() {
        return TMTypes.TM_ASSOC;
    } 
    
    
    /** */
    public Member getMemberOfRole( Topic roleSpec ) {
        Iterator it = m_members.iterator();
        while (it.hasNext()) {
            Member m = (Member)it.next();
            Topic rs = m.getRoleSpec();
            if (rs != null && rs.getBaseTopic().equals(
                    roleSpec.getBaseTopic() )) {
                return m;
            } 
        } 

        return null;
    } 
}

--- NEW FILE: OzoneBaseName.java ---
/*
 * You can redistribute this software and/or modify it under the terms of
 * the Infozone Software License version 2 published by the Infozone Group
 * (http://www.infozone-group.org).
 * 
 * Copyright (C) @year@ by The Infozone Group. All rights reserved.
 * 
 * $Id: OzoneBaseName.java,v 1.1 2001/05/29 17:32:45 lilli Exp $
 */

package com.techquila.topicmap.ozone;

import com.techquila.topicmap.BaseName;
import com.techquila.topicmap.Variant;
import com.techquila.topicmap.NamedObject;

import org.ozoneDB.OzoneRemote;


/** */
public interface OzoneBaseName extends OzoneScopedObject, BaseName {
    
    
    public void setString( String data ); // update
    
    
    public void setVariants( Variant[] variants );  // update
    
    
    public void addVariant( Variant variant ); // update
    
    
    public void setParent( NamedObject parent ); // update
    
}

--- NEW FILE: OzoneBaseNameImpl.java ---
/*
 * You can redistribute this software and/or modify it under the terms of
 * the Infozone Software License version 2 published by the Infozone Group
 * (http://www.infozone-group.org).
 * 
 * Copyright (C) @year@ by The Infozone Group. All rights reserved.
 * 
 * $Id: OzoneBaseNameImpl.java,v 1.1 2001/05/29 17:32:45 lilli Exp $
 */

package com.techquila.topicmap.ozone;

import com.techquila.topicmap.TMTypes;
import com.techquila.topicmap.NamedObject;
import com.techquila.topicmap.Variant;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;

import java.beans.PropertyChangeEvent;


/**
 */
public class OzoneBaseNameImpl extends OzoneScopedObjectImpl 
        implements OzoneBaseName {

    final static long serialVersionUID = 1L;

    private NamedObject m_parent;
    protected String m_string;
    private ArrayList m_variants;
    
    
    public OzoneBaseNameImpl() {
        m_parent = null;
        m_string = null;
        m_variants = null;
    }
    
    
    public void setParent( NamedObject parent ) {
        m_parent = parent;
    } 
    
    
    public NamedObject getParent() {
        return m_parent;
    } 
    
    
    public void setString( String str ) {
        String oldString = m_string;
        m_string = str;
        firePropertyChange( "string", oldString, m_string );
    } 
    
    
    public String getString() {
        return m_string;
    } 
    
    
    public void setVariants( Variant[] variants ) {
        ArrayList oldVariants = null;
        if (m_variants != null) {
            oldVariants = new ArrayList( m_variants );
        }
        
        if (variants == null || variants.length == 0) {
            m_variants = null;
        } else {
            m_variants = new ArrayList();
            for (int i = 0; i < variants.length; i++) {
                m_variants.add( variants[i] );
            } 
        } 

        firePropertyChange( "variants", oldVariants, m_variants );
    } 
    
    
    public void addVariant( Variant v ) {
        ArrayList oldVariants = null;
        if (m_variants != null) {
            oldVariants = new ArrayList( m_variants );
        }

        if (m_variants == null) {
            m_variants = new ArrayList();
        } 
        m_variants.add( v );

        firePropertyChange( "variants", oldVariants, m_variants );
    } 
    
    
    public Collection getVariants() {
        if (m_variants == null) {
            return Collections.unmodifiableCollection( new ArrayList() );
        } else {
            return Collections.unmodifiableCollection( m_variants );
        } 
    } 
    
    
    public int getObjectType() {
        return TMTypes.TM_BASENAME;
    } 


    /**
     * Handles property change events received from the contained
     * Scope object. In particular, handles change in the scopeString property
     * by notifying listeners of a change of scoped name
     */
    public void propertyChange( PropertyChangeEvent ev ) {
        if (ev.getPropertyName().equals( "scopeString" )) {
            String oldScopedName = (String)ev.getOldValue() + "." + getID();
            String newScopedName = getScope().toString() + "." + getID();
            firePropertyChange( "scopeString", oldScopedName, newScopedName );
        }

        super.propertyChange( ev );
    }
    
}

--- NEW FILE: OzoneMember.java ---
/*
 * You can redistribute this software and/or modify it under the terms of
 * the Infozone Software License version 2 published by the Infozone Group
 * (http://www.infozone-group.org).
 * 
 * Copyright (C) @year@ by The Infozone Group. All rights reserved.
 * 
 * $Id: OzoneMember.java,v 1.1 2001/05/29 17:32:45 lilli Exp $
 */

package com.techquila.topicmap.ozone;

import com.techquila.topicmap.Member;
import com.techquila.topicmap.Association;
import com.techquila.topicmap.Topic;

import org.ozoneDB.OzoneRemote;


/** */
public interface OzoneMember extends OzoneTopicMapObject, Member {
    
    
    public void setParent( Association parent ); // update
    
    
    public void setRoleSpec( Topic roleSpec ); // update
    
    
    public void addPlayer( Topic player ); // update
    
    
    public void setPlayers( Topic[] players ); // update

}

--- NEW FILE: OzoneMemberImpl.java ---
/*
 * You can redistribute this software and/or modify it under the terms of
 * the Infozone Software License version 2 published by the Infozone Group
 * (http://www.infozone-group.org).
 * 
 * Copyright (C) @year@ by The Infozone Group. All rights reserved.
 * 
 * $Id: OzoneMemberImpl.java,v 1.1 2001/05/29 17:32:45 lilli Exp $
 */

package com.techquila.topicmap.ozone;

import com.techquila.topicmap.Member;
import com.techquila.topicmap.Association;
import com.techquila.topicmap.Topic;
import com.techquila.topicmap.TMTypes;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;


/** 
 */
public class OzoneMemberImpl extends OzoneScopedObjectImpl 
        implements OzoneMember {
    
    final static long serialVersionUID = 1L;

    /** */
    protected Association m_parent;
    protected Topic m_roleSpec;
    protected ArrayList m_players;
    
    
    /** */    
    public OzoneMemberImpl() {
    }
    
        
    /**
     * Applications should not call this function directly.
     * It is called indirectly from Association.addMember(), Association.removeMember() and Association.setMembers()
     */
    public void setParent( Association parent ) {
        Association oldParent = m_parent;

        m_parent = parent;

        firePropertyChange( "parent", oldParent, m_parent );
    } 
    
    
    public Association getParent() {
        return m_parent;
    } 
    
    
    public void setRoleSpec( Topic roleSpec ) {
        Topic oldRoleSpec = m_roleSpec;

        m_roleSpec = roleSpec;

        firePropertyChange("roleSpec", oldRoleSpec, m_roleSpec);
    } 
    
    
    public Topic getRoleSpec() {
        return m_roleSpec;
    } 
    
    
    public void addPlayer( Topic player ) {
        ArrayList oldPlayers = null;
        if (m_players != null) {
            oldPlayers = new ArrayList( m_players );
        } 
        
        if (m_players == null) {
            m_players = new ArrayList();
        } 

        m_players.add( player );
        player.addRolePlayed( this );

        firePropertyChange( "players", oldPlayers, m_players );
    } 
    
    
    public void setPlayers( Topic[] players ) {
        ArrayList oldPlayers = null;
        if (m_players != null) {
            oldPlayers = new ArrayList( m_players );
        } 
        
        if (players == null || players.length == 0) {
            m_players = null;

        } else {
            m_players = new ArrayList();
            for (int i = 0; i < players.length; i++) {
                m_players.add( players[i] );
                players[i].addRolePlayed( this );
            } 
        } 
    } 
    
    
    public Collection getPlayers() {
        if (m_players == null) {
            return Collections.unmodifiableCollection( new ArrayList() );
        } 
        return Collections.unmodifiableCollection( m_players );
    } 
    
    
    public int getObjectType() {
        return TMTypes.TM_MEMBER;
    } 

}

--- NEW FILE: OzoneOccurrence.java ---
/*
 * You can redistribute this software and/or modify it under the terms of
 * the Infozone Software License version 2 published by the Infozone Group
 * (http://www.infozone-group.org).
 * 
 * Copyright (C) @year@ by The Infozone Group. All rights reserved.
 * 
 * $Id: OzoneOccurrence.java,v 1.1 2001/05/29 17:32:45 lilli Exp $
 */

package com.techquila.topicmap.ozone;

import com.techquila.topicmap.Occurrence;
import com.techquila.topicmap.BaseName;
import com.techquila.topicmap.Topic;

import org.ozoneDB.OzoneRemote;


/**
 * This interface defines a single occurence (<code>occurs</code>) construct in a Topic Map.
 *
 * An occurrence is defined by a string rolename and an optional type Topic.
 * An occurrence contains a reference to a resource or in-line resource data.
 *
 * @see Topic
 */
public interface OzoneOccurrence extends OzoneScopedObject, Occurrence {
    
    
    /**
     * Sets the Topic defining the type of this Occurrence.
     */
    public void setType( Topic type ); // update
    
    
    /**
     * Sets the resource reference associatedc with this occurrence. The new value overwrites
     * any previous resource reference of resource data string.
     */
    public void setResourceRef( String resourceRef ); // update
    
    
    /**
     * Sets the resource data string associated with this occurrence. The new value overwrites
     * and previous resource data or resource reference strings.
     */
    public void setResourceData( String resourceData ); // update
    
    
    /**
     * Sets the name of this occurrence
     */
    public void setName( BaseName bn ); // update
    
}

--- NEW FILE: OzoneOccurrenceImpl.java ---
/*
 * You can redistribute this software and/or modify it under the terms of
 * the Infozone Software License version 2 published by the Infozone Group
 * (http://www.infozone-group.org).
 * 
 * Copyright (C) @year@ by The Infozone Group. All rights reserved.
 * 
 * $Id: OzoneOccurrenceImpl.java,v 1.1 2001/05/29 17:32:45 lilli Exp $
 */

package com.techquila.topicmap.ozone;

import com.techquila.topicmap.TMTypes;
import com.techquila.topicmap.BaseName;
import com.techquila.topicmap.Topic;
import com.techquila.utils.URLS;

import java.net.URL;


/**
 * Defines an occurrence instance of a Topic.
 * The type of an Occurrence is defined either by a Topic defining the type.
 * An occurrence may be scoped and may contain either an in-line data resource (as a string) or
 * a reference to an external resource (specified as a URI).
 */
public class OzoneOccurrenceImpl extends OzoneScopedObjectImpl
        implements OzoneOccurrence {
    
    final static long serialVersionUID = 1L;

    /** */
    protected BaseName m_name;
    protected Topic m_type;
    protected String m_data;
    protected boolean m_isResourceReference;
    

    /** */    
    public OzoneOccurrenceImpl() {
        m_name = null;
        m_type = null;
        m_data = null;
        m_isResourceReference = false;
    }
    
    
    /**
     * Gets the base name of this occurrence.
     * Returns null if no base name is defined for the occurrence.
     */
    public BaseName getName() {
        return m_name;
    } 
    
    
    /**
     * Sets the base name of this occurrence
     */
    public void setName( BaseName name ) {
        BaseName oldName = m_name;

        if (m_name != null) {
            m_name.setParent( null );
        } 

        m_name = name;
        if (m_name != null) {
            m_name.setParent( this );
        } 

        firePropertyChange( "name", oldName, m_name );
    } 
    
    
    /**
     * @return The Topic defining the type of this Occurrence, or null if no such Topic has been specified.
     */
    public Topic getType() {
        return m_type;
    } 
    
    
    /**
     * Sets the Topic defining the type of this Occurrence.
     */
    public void setType( Topic type ) {
        Topic oldType = m_type;
        m_type = type;
        firePropertyChange( "type", oldType, m_type );
    } 
    
    
    /**
     * Returns the resource reference associated with this occurrence. This may be null.
     */
    public String getResourceRef() {
        if (!m_isResourceReference) {
            return null;
        } 
        return m_data;
    } 
    
    
    /**
     * Sets the resource reference associatedc with this occurrence. The new value overwrites
     * any previous resource reference of resource data string.
     * If the reference is recognised as an HTTP protocol URL, it will be normalised.
     */
    public void setResourceRef( String resourceRef ) {
        String oldRef = getResourceRef();

        try {
            URL du = URLS.normalize( new URL( resourceRef ) );
            m_data = du.toString();
        } catch (Exception ex) {
            m_data = resourceRef;
        } 
        m_isResourceReference = true;

        firePropertyChange("resourceRef", oldRef, m_data);
    } 
    
    
    /**
     * Sets the resource data string associated with this occurrence. The new value overwrites
     * and previous resource data or resource reference strings.
     */
    public void setResourceData( String resourceData ) {
        String oldData = getResourceData();

        m_isResourceReference = false;
        m_data = resourceData;

        firePropertyChange("resource", oldData, m_data);
    } 
    
    
    /**
     * Gets the resource data string associated with this occurrence. This function returns
     * null if there is no resource data string associated with this occurrence.
     */
    public String getResourceData() {
        if (m_isResourceReference) {
            return null;
        } 

        return m_data;
    } 
    
    
    public int getObjectType() {
        return TMTypes.TM_OCCURRENCE;
    } 

}

--- NEW FILE: OzoneScope.java ---
/*
 * You can redistribute this software and/or modify it under the terms of
 * the Infozone Software License version 2 published by the Infozone Group
 * (http://www.infozone-group.org).
 * 
 * Copyright (C) @year@ by The Infozone Group. All rights reserved.
 * 
 * $Id: OzoneScope.java,v 1.1 2001/05/29 17:32:45 lilli Exp $
 */

package com.techquila.topicmap.ozone;

import com.techquila.topicmap.Scope;
import com.techquila.topicmap.Topic;

/**
 */
public interface OzoneScope extends OzoneTopicMapObject, Scope {
   
    public void setThemes( Topic[] themes ); // update
    
    public void addTheme( Topic theme ); // update
    
    public void addScope( Scope scope ); // update
    
    public void removeThemes(); // update
    
    public void removeTheme( Topic theme ); // update

    public void setID( String id ); // update
    
    public void setResourceID( String id ); // update

    public String toString();
}

--- NEW FILE: OzoneScopeImpl.java ---
/*
 * You can redistribute this software and/or modify it under the terms of
 * the Infozone Software License version 2 published by the Infozone Group
 * (http://www.infozone-group.org).
 * 
 * Copyright (C) @year@ by The Infozone Group. All rights reserved.
 * 
 * $Id: OzoneScopeImpl.java,v 1.1 2001/05/29 17:32:45 lilli Exp $
 */

package com.techquila.topicmap.ozone;

import com.techquila.topicmap.TMTypes;
import com.techquila.topicmap.Scope;
import com.techquila.topicmap.Topic;
import com.techquila.topicmap.TopicMapObject;

import java.util.Collection;
import java.util.Collections;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.TreeSet;
import java.util.Iterator;
import java.beans.PropertyChangeEvent;


/**
 */
public class OzoneScopeImpl extends OzoneTopicMapObjectImpl 
        implements OzoneScope {

    final static long serialVersionUID = 1L;
   
    private HashSet m_themes;
    private String m_stringified;
    
    
    public OzoneScopeImpl() {
        m_themes = null;
        m_stringified = UNCONSTRAINED;
    }
    
    
    public void setThemes( Topic[] themes ) {
        removeThemes();
        m_themes = new HashSet();
        for (int i = 0; i < themes.length; i++) {
            m_themes.add( themes[i] );
        } 
        stringify();
    } 
    
    
    public void addTheme( Topic theme ) {
        if (m_themes == null) {
            m_themes = new HashSet();
        } 
        m_themes.add( theme );

        stringify();
    } 
    
    
    public void addScope( Scope scope ) {
        Collection c = scope.getThemes();
        if (c.isEmpty()) {
            return;
        } 

        if (m_themes == null) {
            m_themes = new HashSet();
        } 

        Iterator it = c.iterator();
        while (it.hasNext()) {
            Topic t = (Topic)it.next();
            m_themes.add( t );
        } 
        stringify();
    } 
    
    
    public void removeThemes() {
        if (m_themes != null) {
            Iterator themesIt = m_themes.iterator();
            while (themesIt.hasNext()) {
                Topic theme = (Topic)themesIt.next();
                unregister( theme );
            } 
        } 
        
        m_themes = null;
        m_stringified = UNCONSTRAINED;
    } 
    
    
    public void removeTheme( Topic theme ) {
        m_themes.remove( theme );
        if (m_themes.isEmpty()) {
            m_themes = null;
        } 
        stringify();

        // No longer need to listen for changes to this theme Topic
        unregister( theme );
    } 
    
    
    public Collection getThemes() {
        if (m_themes == null) {
            return Collections.unmodifiableCollection( new ArrayList() );
        } else {
            return Collections.unmodifiableCollection( m_themes );
        } 
    } 
    
    
    public boolean inScope( Topic theme ) {
        if (m_themes == null) {
            return false;
        } 
        Iterator it = m_themes.iterator();
        while (it.hasNext()) {
            Topic t = (Topic)it.next();
            if (t.getID().equals( theme.getID() )) {
                return true;
            } 
            Iterator mit = t.getMergedTopics().iterator();
            while (mit.hasNext()) {
                Topic mt = (Topic)mit.next();
                if (mt.getID().equals( theme.getID() )) {
                    return true;
                } 
            } 
        } 
        return false;
    } 
    
    
    public boolean inScope( Topic[] themes ) {
        for (int i = 0; i < themes.length; i++) {
            if (!inScope( themes[i] )) {
                return false;
            } 
        } 
        return true;
    } 
    
    
    public boolean inScope( Scope sc ) {
        Iterator themes = sc.getThemes().iterator();
        while (themes.hasNext()) {
            if (!inScope( (Topic)themes.next() )) {
                return false;
            } 
        } 
        return true;
    } 
    

    public void propertyChange( PropertyChangeEvent e ) {
        if (e.getPropertyName().equals( "baseTopic" )) {
            // Some topic in scope has changed its base topic id.
            // Need to regenerate the stringified scope id.
            System.out.println("base topic in scope altered");
            stringify();
        }
    }

    public void register( Topic t ) {
        ((TopicMapObject)t).addPropertyChangeListener( "baseTopic", this );
    }


    public void unregister( Topic t ) {
        ((TopicMapObject)t).removePropertyChangeListener( this );
    }

    
    protected void stringify() {
        String oldString = m_stringified;

        if (m_themes == null) {
            m_stringified = UNCONSTRAINED;

        } else {
            TreeSet sortedIds = new TreeSet();
            Iterator it = m_themes.iterator();
            while (it.hasNext()) {
                Topic t = (Topic)it.next();
                register( t );
                sortedIds.add( t.getBaseTopic().getID() );
            } 

            it = sortedIds.iterator();
            StringBuffer s = new StringBuffer();
            while (it.hasNext()) {
                s.append( (String)it.next() );
                if (it.hasNext()) {
                    s.append( "|" );
                } 
            } 
            m_stringified = s.toString();
        } 
        
        // Finally notify listeners if the scope string has changed
        if (!m_stringified.equals( oldString )) {
            firePropertyChange( "scopeString", oldString, m_stringified );
        }            
    } 
    
    
    public int getObjectType() {
        return TMTypes.TM_SCOPE;
    } 
    

    public int hashCode() {
        return m_stringified.hashCode();
    } 
    
    
    public String toString() {
        return m_stringified;
    } 
    
}

--- NEW FILE: OzoneScopedObject.java ---
/*
 * You can redistribute this software and/or modify it under the terms of
 * the Infozone Software License version 2 published by the Infozone Group
 * (http://www.infozone-group.org).
 * 
 * Copyright (C) @year@ by The Infozone Group. All rights reserved.
 * 
 * $Id: OzoneScopedObject.java,v 1.1 2001/05/29 17:32:45 lilli Exp $
 */
 
package com.techquila.topicmap.ozone;

import com.techquila.topicmap.ScopedObject;
import com.techquila.topicmap.Topic;
import com.techquila.topicmap.Scope;

import org.ozoneDB.OzoneRemote;


/** */
public interface OzoneScopedObject extends OzoneTopicMapObject, ScopedObject {
    
    public void addTheme( Topic theme ); // update

    public void removeTheme( Topic theme ); // update

    public void dispose(); // update
    
    public void setScope( Scope newScope );  // update

}

--- NEW FILE: OzoneScopedObjectImpl.java ---
/*
 * You can redistribute this software and/or modify it under the terms of
 * the Infozone Software License version 2 published by the Infozone Group
 * (http://www.infozone-group.org).
 * 
 * Copyright (C) @year@ by The Infozone Group. All rights reserved.
 * 
 * $Id: OzoneScopedObjectImpl.java,v 1.1 2001/05/29 17:32:45 lilli Exp $
 */

package com.techquila.topicmap.ozone;

import com.techquila.topicmap.TopicMapObject;
import com.techquila.topicmap.Scope;
import com.techquila.topicmap.Topic;

import java.beans.PropertyChangeEvent;


/**
 * Base class for all topic map objects which have a validity scope.
 */
public abstract class OzoneScopedObjectImpl extends OzoneTopicMapObjectImpl 
        implements OzoneScopedObject {

    final static long serialVersionUID = 1L;

    private Scope m_scope;
    
    /** */
    public OzoneScopedObjectImpl() {
        m_scope = null;
    }


    /**
     * Clears contained scope references.
     */
    public void dispose() {
        m_scope = null;
    } 
    
    
    /**
     * Defines the scope of validity of this scoped object.
     * @param themes An array of Topics defining the scope for this scoped object.
     */
    public void setScope( Scope newScope ) {
        Scope oldScope = m_scope;
        m_scope = newScope;
        firePropertyChange( "scope", oldScope, m_scope );
        m_scope.addPropertyChangeListener( this );
    } 
    
    
    public Scope getScope() {
        return m_scope;
    } 
    
    
    // Add/Remove themes from scope:
    public void addTheme( Topic theme ) {
        m_scope.addTheme( theme );
    } 
    
    
    public void removeTheme( Topic theme ) {
        m_scope.removeTheme( theme );
    } 
    
    
    /**
     * @deprecated Use getScope().inScope() instead
     * @return True if the specified theme is in the scope of this object.
     */
    public boolean inScope( Topic theme ) {
        return m_scope.inScope( theme );
    } 
    
    
    /**
     * @deprecated Use getScope().inScope() instead.
     * @return True if the one or more of the specified themes are in the scope of this object.
     */
    public boolean inScope( Topic[] themes ) {
        return m_scope.inScope( themes );
    } 

}

--- NEW FILE: OzoneTopic.java ---
/*
 * You can redistribute this software and/or modify it under the terms of
 * the Infozone Software License version 2 published by the Infozone Group
 * (http://www.infozone-group.org).
 * 
 * Copyright (C) @year@ by The Infozone Group. All rights reserved.
 * 
 * $Id: OzoneTopic.java,v 1.1 2001/05/29 17:32:45 lilli Exp $
 */

package com.techquila.topicmap.ozone;

import com.techquila.topicmap.Topic;
import com.techquila.topicmap.TopicMap;
import com.techquila.topicmap.Occurrence;
import com.techquila.topicmap.BaseName;
import com.techquila.topicmap.Member;
import com.techquila.topicmap.MergedTopicSubjectClashException;

import org.ozoneDB.OzoneRemote;


/**
 * This interface describes a Topic (<code>topic</code>) construct in a Topic Map
 */
public interface OzoneTopic extends OzoneScopedObject, Topic {
    
    
    /** */
    public void setParent( TopicMap parent ); // update
    
    
    /** */
    public TopicMap getParent(); // update
    
    
    /**
     * Sets the reference to the subject of this topic.
     * @param resourceRef The URI reference to the resource which is the subject of this topic.
     */
    public void setSubject( String resourceRef ); // update
    
    
    /**
     * Adds a subject indicator to this topic
     */
    public void addSubjectIndicator( String subjectIdentity ); // update
    
    
    /**
     * Sets the collection of subject indicators for this topic.
     */
    public void setSubjectIndicators( String[] indicators ); // update
    
    
    /**
     * @deprecated
     * Sets the compound link type of this topic.
     */
    public void setLinktype( String linktype ); // update
    
    
    /**
     * Defines the type of this topic.
     * @param types An array of Topics defining the type of this topic.
     */
    public void setTypes( Topic[] types ); // update
    
    
    /**
     * Adds a new topic into the list of those defining the type of this topic.
     * @param type The typing topic to be added.
     */
    public void addType( Topic type ); // update
    
    
    /**
     * Sets the names of this Topic
     * @param names The names to be assigned to this topic.
     */
    public void setNames( BaseName[] names ); // update
    
    
    /**
     * Adds another name or set of names to the list of names of this Topic
     * @param name The scoped name(s) to be added
     */
    public void addName( BaseName name ); // update
    
    
    /**
     * Sets the list of occurrences for this Topic.
     * @param occurs The Occurrences to be associated with this Topic.
     */
    public void setOccurrences( Occurrence[] occurs ); // update
    
    
    /**
     * Adds an occurrence to this Topic.
     * @param occurs The Occurrence to be added.
     */
    public void addOccurrence( Occurrence occurs ); // update
    
    
    /**
     * Sets the list of roles which this Topic is playing.
     */
    public void setRolesPlayed( Member[] rolesPlayed ); // update
    
    
    /**
     * Adds a Member object to the list of roles played by this topic.
     */
    public void addRolePlayed( Member rolePlayed ); // update
    
    
    /**
     * Adds another Topic to the list of merged topics.
     */
    public void addMergedTopic( Topic mergedTopic ) throws MergedTopicSubjectClashException; // update
    
    
    /**
     * Removes all merged topics from this topic.
     */
    public void removeMergedTopics(); // update
    
    
    /**
     * Sets a reference to the topic that this topic is merged with.
     */
    public void setBaseTopic( Topic baseTopic ); // update
    
}

--- NEW FILE: OzoneTopicImpl.java ---
/*
 * You can redistribute this software and/or modify it under the terms of
 * the Infozone Software License version 2 published by the Infozone Group
 * (http://www.infozone-group.org).
 * 
 * Copyright (C) @year@ by The Infozone Group. All rights reserved.
 * 
 * $Id: OzoneTopicImpl.java,v 1.1 2001/05/29 17:32:45 lilli Exp $
 */

package com.techquila.topicmap.ozone;

import com.techquila.topicmap.Topic;
import com.techquila.topicmap.TopicMap;
import com.techquila.topicmap.TopicMapUtils;
import com.techquila.topicmap.Association;
import com.techquila.topicmap.Occurrence;
import com.techquila.topicmap.TMTypes;
import com.techquila.topicmap.PSI;
[...1057 lines suppressed...]
     */
    public void propertyChange( PropertyChangeEvent ev ) {
        // Changes to themes of the scope should get propagated as a change
        // to this topic's scope.
        if (ev.getPropertyName().equals( "themes" )) {
            firePropertyChange( "scope", null, getScope() );

        } else if ((ev.getPropertyName().equals( "scope" )) ||
            (ev.getPropertyName().equals( "scopeString" )) ||
            (ev.getPropertyName().equals( "string" ))) {
            if (m_names.contains( ev.getSource() )) {
                System.out.println("Scope string of topic (" + getID() + ") base name changed");
                makeScopedNames();
            } else {
                System.out.println("Property change received from an object which is not in m_names.");
            }
        }
    }
    
}

--- NEW FILE: OzoneTopicMap.java ---
/*
 * You can redistribute this software and/or modify it under the terms of
 * the Infozone Software License version 2 published by the Infozone Group
 * (http://www.infozone-group.org).
 * 
 * Copyright (C) @year@ by The Infozone Group. All rights reserved.
 * 
 * $Id: OzoneTopicMap.java,v 1.1 2001/05/29 17:32:45 lilli Exp $
 */

package com.techquila.topicmap.ozone;

import com.techquila.topicmap.TopicMap;
import com.techquila.topicmap.TopicMapUtils;
import com.techquila.topicmap.Topic;
import com.techquila.topicmap.Association;
import com.techquila.topicmap.TopicNotFoundException;
import com.techquila.topicmap.MergedTopicSubjectClashException;
import com.techquila.topicmap.DuplicateTopicException;

import org.ozoneDB.OzoneRemote;

import java.net.URL;


/**
 * This interface defines the whole Topic Map construct.
 */
public interface OzoneTopicMap extends OzoneTopicMapObject, TopicMap {
    
    
    /**
     * Adds an added theme to the topic map.
     */
    public void addAddedTheme( Topic theme ); // update
    
    
    /**
     * Adds the association to this topic map.
     */
    public void addAssociation( Association association ); // update
    
    
    /**
     * Add the topic to this topic map.
     * Automatically determines if the topic should be merged.
     * @param topic The topic to be added to the map
     * @throws DuplicateTopicException
     */
    public Topic addTopic( Topic topic ) throws DuplicateTopicException, MergedTopicSubjectClashException; // update
    
    
    /**
     * Delete a topic from the topic map.
     * @param topic The topic to be removed from the map
     * @throws TopicNotFoundException
     */
    public void removeTopic( Topic topic ) throws TopicNotFoundException; // update
    
    
    /**
     * Delete an association from the topic map.
     * @param assoc The association to be removed from the map
     */
    public void removeAssociation( Association assoc ); // update
    
    
    /**
     * setName
     * Set the name of the topic map.
     * @param name The name to be assigned to the topic map.
     */
    public void setName( String name ); // update
    
    
    /**
     * Sets the topic map's base URL
     */
    public void setBase( URL base ); // update

    
    /** 
     * Returns a TopicMapUtils object and creates a new one if
     * necessary.
     */
    public TopicMapUtils getUtils(); // update
    
}

--- NEW FILE: OzoneTopicMapFactoryImpl.java ---
/*
 * You can redistribute this software and/or modify it under the terms of
 * the Infozone Software License version 2 published by the Infozone Group
 * (http://www.infozone-group.org).
 * 
 * Copyright (C) @year@ by The Infozone Group. All rights reserved.
 * 
 * $Id: OzoneTopicMapFactoryImpl.java,v 1.1 2001/05/29 17:32:45 lilli Exp $
 */

package com.techquila.topicmap.ozone;

import org.ozoneDB.OzoneInterface;

import com.techquila.topicmap.TopicMapFactory;
import com.techquila.topicmap.Topic;
import com.techquila.topicmap.TopicMap;
import com.techquila.topicmap.Association;
import com.techquila.topicmap.Occurrence;
import com.techquila.topicmap.BaseName;
import com.techquila.topicmap.Variant;
import com.techquila.topicmap.VariantName;
import com.techquila.topicmap.Member;
import com.techquila.topicmap.Scope;
import com.techquila.topicmap.TopicMapProcessingException;
import com.techquila.topicmap.TopicMapRuntimeException;

import java.net.URL;
import java.net.MalformedURLException;


/**
 * Implements the TopicMapFactory interface for creating in-memory Topic Map objects.
 */
public class OzoneTopicMapFactoryImpl extends Object
            implements TopicMapFactory {

    public final static String DEFAULT_BASE_URL = "http://topicmap.techquila.com/default";
    
    private OzoneInterface m_database;
    private TopicMap m_topicMap;
    private URL m_defaultBaseURL;
    private URL m_baseURL;


    /** */
    public OzoneTopicMapFactoryImpl( OzoneInterface database ) {
        this( database, null );
    }


    /** */
    public OzoneTopicMapFactoryImpl( OzoneInterface database, TopicMap tm ) {
        m_topicMap = tm;
        m_database = database;
        try {
            String urlString = System.getProperty( "com.techquila.topicmap.baseURL",
                    DEFAULT_BASE_URL );
            m_defaultBaseURL = new URL( urlString );
        } catch (MalformedURLException ex) {
            throw new TopicMapRuntimeException(
                    "Cannot initialise base URL for TopicMapFactoryImpl.", ex );
        }
    }


    /** */
    public void setBase( URL base ) {
        m_baseURL = base;
    }


    /** */
    public TopicMap createTopicMap() {
        //System.out.println( "   --> createTopicMap" );
        return createTopicMap( m_defaultBaseURL );
    }


    /** */
    public TopicMap createTopicMap( URL baseURL ) {
        //System.out.println( "   --> createTopicMap" );
        try {
            m_topicMap = (OzoneTopicMap)m_database.createObject( OzoneTopicMapImpl.class.getName() );
            m_topicMap.setBase( baseURL );
            return m_topicMap;

        } catch (Exception e) {
            e.printStackTrace();
            return null;
        }
    }


    /** */
    public Topic createTopic( String id ) throws TopicMapProcessingException {
        //System.out.println( "   --> createTopic: " + id );
        try {
            OzoneTopic ret = (OzoneTopic)m_database.createObject( OzoneTopicImpl.class.getName() );
            ret.setID( normaliseID( id ) );
            ret.setParent( m_topicMap );
            ret.setScope( createScope( null ) );
            m_topicMap.addTopic( ret );
            ret.getScope().addPropertyChangeListener( ret );
            return ret;

        } catch (Exception e) {
            e.printStackTrace();
            return null;
        }
    }


    /** */
    public Scope createScope( String id ) {
        //System.out.println( "   --> createScope" );
        try {
            Scope ret = (Scope)m_database.createObject( OzoneScopeImpl.class.getName() );
            ret.setID( normaliseID( id ) );
            return ret;

        } catch (Exception e) {
            e.printStackTrace();
            return null;
        }
    }


    /** */
    public Association createAssociation( String id ) {
        return createAssociation( id, null );
    }


    /** */
    public Association createAssociation( String id, Topic type ) {
        //System.out.println( "   --> createAssociation: " + id );
        try {
            Association ret = (Association)m_database.createObject( OzoneAssociationImpl.class.getName() );
            ret.setID( normaliseID( id ) );
            ret.setScope( createScope( null ) );
            ret.setType( type );
            return ret;

        } catch (Exception e) {
            e.printStackTrace();
            return null;
        }
    }


    /** */
    public Member createMember( Association parent, String id ) {
        //System.out.println( "   --> createMember" );
        try {
            Member ret = (Member)m_database.createObject( OzoneMemberImpl.class.getName() );
            ret.setID( normaliseID( id ) );
            parent.addMember( ret );
            return ret;

        } catch (Exception e) {
            e.printStackTrace();
            return null;
        }
    }


    /** */
    public BaseName createBaseName( String id ) {
        //System.out.println( "   --> createBaseName" );
        try {
            BaseName ret = (BaseName)m_database.createObject( OzoneBaseNameImpl.class.getName() );
            ret.setID( normaliseID( id ) );
            ret.setScope( createScope( null ) );
            return ret;

        } catch (Exception e) {
            e.printStackTrace();
            return null;
        }
    }


    /** */
    public Variant createVariant( String id ) {
        //System.out.println( "   --> createVariant" );
        try {
            Variant ret = (Variant)m_database.createObject( OzoneVariantImpl.class.getName() );
            ret.setID( normaliseID( id ) );
            ret.setScope( createScope( null ) );
            return ret;

        } catch (Exception e) {
            e.printStackTrace();
            return null;
        }
    }


    /** */
    public VariantName createVariantName( String id ) {
        //System.out.println( "   --> createVariantName" );
        try {
            VariantName ret = (VariantName)m_database.createObject( OzoneVariantNameImpl.class.getName() );
            ret.setID( normaliseID( id ) );
            return ret;

        } catch (Exception e) {
            e.printStackTrace();
            return null;
        }
    }


    /** */
    public Occurrence createOccurrence( String id ) {
        //System.out.println( "   --> createOccurrence" );
        try {
            Occurrence ret = (Occurrence)m_database.createObject( OzoneOccurrenceImpl.class.getName() );
            ret.setID( normaliseID( id ) );
            ret.setScope( createScope( null ) );
            return ret;

        } catch (Exception e) {
            e.printStackTrace();
            return null;
        }
    }


    /** */
    protected String normaliseID( String id ) {
        return id;
    }
    
}

--- NEW FILE: OzoneTopicMapImpl.java ---
/*
 * You can redistribute this software and/or modify it under the terms of
 * the Infozone Software License version 2 published by the Infozone Group
 * (http://www.infozone-group.org).
 * 
 * Copyright (C) @year@ by The Infozone Group. All rights reserved.
 * 
 * $Id: OzoneTopicMapImpl.java,v 1.1 2001/05/29 17:32:45 lilli Exp $
 */

package com.techquila.topicmap.ozone;

import com.techquila.topicmap.TopicMap;
import com.techquila.topicmap.TopicMapObject;
import com.techquila.topicmap.Topic;
import com.techquila.topicmap.TMTypes;
import com.techquila.topicmap.TopicMapUtils;
import com.techquila.topicmap.TopicMapUtilsImpl;
import com.techquila.topicmap.TopicMapFactory;
import com.techquila.topicmap.Association;
import com.techquila.topicmap.BaseName;
import com.techquila.topicmap.ScopedObject;

import com.techquila.topicmap.TopicNotFoundException;
import com.techquila.topicmap.MergedTopicSubjectClashException;
import com.techquila.topicmap.DuplicateTopicException;
import com.techquila.topicmap.TopicMapProcessingException;
import com.techquila.topicmap.TopicMapRuntimeException;

import com.techquila.utils.URLS;

import java.beans.PropertyChangeEvent;
import java.net.URL;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.ArrayList;
import java.util.Set;
import java.util.HashSet;
import java.util.Hashtable;
import java.beans.PropertyChangeEvent;


/**
 * The TopicMap is the root container for all of the other topic map objects.
 * This implementation of the TopicMap interface maintains all indices in memory.
 */
public class OzoneTopicMapImpl extends OzoneTopicMapObjectImpl 
        implements OzoneTopicMap {

    final static long serialVersionUID = 1L;

    // Protected Memeber Variables
    protected String m_name;
    protected String m_id;

    protected ArrayList m_addthemes;
    protected HashSet m_topics;
    protected Hashtable m_objectsByID;
    protected Hashtable m_objectsByResourceID;
    protected Hashtable m_topicsBySubject;
    protected Hashtable m_topicsBySubjectIndicator;
    protected Hashtable m_topicsByScopedName;
    protected ArrayList m_associations;

    protected URL m_baseURL;
    
    transient protected TopicMapFactory m_factory;
    transient protected TopicMapUtils m_utils;
    
    
    /**
     * Creates a new, empty TopicMap
     */
    public OzoneTopicMapImpl() {
        m_addthemes = new ArrayList();
        m_topics = new HashSet();
        m_objectsByID = new Hashtable();
        m_objectsByResourceID = new Hashtable();
        m_associations = new ArrayList();
        m_topicsBySubject = new Hashtable();
        m_topicsBySubjectIndicator = new Hashtable();
        m_topicsByScopedName = new Hashtable();
        m_factory = null;
    }
    
    ////////////////////////////////////////////////////
    // Public Member Functions
    ////////////////////////////////////////////////////
    
    
    /**
     * Adds an added theme to the topic map.
     */
    public void addAddedTheme( Topic theme ) {
        m_addthemes.add( theme );
    } 
    
    
    /**
     * Adds the association to this topic map.
     */
    public void addAssociation( Association association ) {
        m_associations.add( association );
    } 
    
    
    /**
     * Add the topic to this topic map.
     * Automatically determines if the topic should be merged.
     * @param topic The topic to be added to the map
     * @returns The topic added or the Topic that the added topic was merged into.
     * @throws DuplicateTopicException
     */
    public Topic addTopic( Topic topic ) 
            throws DuplicateTopicException, MergedTopicSubjectClashException {
        Topic ret = topic;
        boolean didMerge = false;
        
        // Check for merge by matching subject
        String subject = topic.getSubject();
        if (subject != null && subject.length() > 0) {
            if (m_topicsBySubject.containsKey( subject )) {
                //System.out.println("Merge by subject: " + subject);
                Topic t = (Topic)m_topicsBySubject.get( subject );
                t.addMergedTopic( topic );
                indexTopic( t, topic );
                didMerge = true;
            } 
        } 
        
        
        // Check for merge by matching subject indicator
        Collection subjectIndicators = ret.getSubjectIndicators();
        Iterator it = subjectIndicators.iterator();
        while (it.hasNext()) {
            String subjectIndicator = (String)it.next();
            if (subjectIndicator != null && subjectIndicator.length() > 0) {
                
                if (m_topicsBySubjectIndicator.containsKey(
                        subjectIndicator )) {
                    // Merge the new topic with the topic with a matching identity
                    Topic t = 
                            (Topic)m_topicsBySubjectIndicator.get(
                            subjectIndicator );
                    // It is possible to get the topic currently being added at this point
                    // This will happen if the topic being added has multiple subject indicators
                    // which cause merges. To avoid merging the topic with itself, check the returned
                    // topic id.
                    //System.out.println("Subject Indicator Merge: " + topic.getID() + " into " + t.getID());
                    if (t.getID().equals( topic.getID() )) {
                        continue;
                    } 
                    t.addMergedTopic( topic );
                    // Record the merged topic under the ID of this topic.
                    indexTopic( t, topic );
                    didMerge = true;
                } 
            } 
        } 
        
        // Check for merge by matching scoped name
        Iterator scopedNames = ret.getScopedNames().iterator();
        while (scopedNames.hasNext()) {
            String scName = (String)scopedNames.next();
            if (m_topicsByScopedName.containsKey( scName )) {
                Topic t = (Topic)m_topicsByScopedName.get( scName );
                //System.out.println("Name Merge: " + topic.getID() + " into " + t.getID() + ": " + scName);
                if (t.getBaseTopic().getID().equals(
                        topic.getBaseTopic().getID() )) {
                    continue;
                } 
                t.addMergedTopic( ret );
                // Record the merged topic under the ID of this topic.
                indexTopic( t, ret );
                ret = t;
                didMerge = true;
            } 
        } 
        
        if (!didMerge) {
            // Topic is not merged. Check that its SGML Id is not a duplicate
            if (m_objectsByID.containsKey( topic.getID() )) {
                throw new DuplicateTopicException( 
                        "Duplicate topic ID: " + topic.getID() );
            } 
            m_topics.add( ret );
            indexTopic( ret, null );
        } 
        
        return ret;
    } 
    
    
    private void indexObject( TopicMapObject tmo ) {
        m_objectsByID.put( tmo.getID(), tmo );
        if (tmo.getResourceID() != null) {
            m_objectsByResourceID.put( tmo.getResourceID(), tmo );
        } 
    } 
    
    
    private void unindexObject( TopicMapObject tmo ) {
        m_objectsByID.remove( tmo.getID() );
        if (tmo.getResourceID() != null) {
            m_objectsByResourceID.remove( tmo.getResourceID() );
        } 
    } 
    
    
    /**
     * Adds entries in all internal indices for the specified topic.
     *
     */
    private void indexTopic( Topic t, Topic mt ) {
        // Unique ID & Resource ID
        if (mt != null) {
            indexObject( mt );
            /*
             * For a merged topic, record the containing
             * topic under the merged topic's id
             * NOTE: this overwrites the indexing done by indexObject()
             */
            m_objectsByID.put( mt.getID(), t );
        } else {
            indexObject( t );
            m_objectsByID.put( t.getID(), t );
            if (t.getResourceID() != null) {
                m_objectsByResourceID.put( t.getResourceID(), t );
            } 
        } 
        
        // Scoped names index
        Iterator scopedNames = t.getScopedNames().iterator();
        while (scopedNames.hasNext()) {
            String scName = (String)scopedNames.next();
            m_topicsByScopedName.put( scName, t );
        } 
        
        // Topic identity index
        Iterator subjectIDs = t.getSubjectIndicators().iterator();
        while (subjectIDs.hasNext()) {
            String topicId = (String)subjectIDs.next();
            if (topicId != null) {
                if (topicId.length() > 0) {
                    m_topicsBySubjectIndicator.put( topicId, t );
                } 
            } 
        } 
        
        // Topic subject index
        String subject = t.getSubject();
        if (subject != null && subject.length() > 0) {
            m_topicsBySubject.put( subject, t );
        } 
        
        // Register as listener to topic and its base names:
        if (mt != null) {
            register( mt );
        } else {
            register( t );
        } 
    
    } 
    
    
    /**
     * Registers this TopicMapImpl as a property change listener for the specified topic
     * and its base names.
     */
    public void register( Topic t ) {
        t.addPropertyChangeListener( this );
        Iterator it = t.getNames().iterator();
        while (it.hasNext()) {
            BaseName bn = (BaseName)it.next();
            bn.addPropertyChangeListener( this );
        }
    } 
    
    
    public void unregister( Topic t ) {
        t.removePropertyChangeListener( this );
        Iterator it = t.getNames().iterator();
        while (it.hasNext()) {
            BaseName bn = (BaseName)it.next();
            bn.removePropertyChangeListener( this );
        }
    } 
    
    
    protected void unindexTopic( Topic topic, boolean unindexMergedTopics ) {
        m_topics.remove( topic );
        unindexObject( topic );
        if (unindexMergedTopics) {
            Iterator it = topic.getMergedTopics().iterator();
            while (it.hasNext()) {
                Topic mt = (Topic)it.next();
                m_topics.remove( mt );
                m_objectsByID.remove( mt.getID() );
            } 
        } 
    } 
    
    
    protected void unindexSubject( Topic topic, String oldSubject ) {
        if (oldSubject != null && m_topicsBySubject.containsKey( oldSubject )) {
            Topic t = (Topic)m_topicsBySubject.get( oldSubject );
            if (t.getID() == topic.getID()) {
                m_topicsBySubject.remove( oldSubject );
            } 
        } 
    } 
    
    
    /**
     * Remove all entries in m_topicsByScopedName for this topic.
     * @param topic Topic to remove entries for
     * @param scopedNames Collection of keys under which the topic may be found
     */
    protected void unindexScopedNames( Topic topic, Collection scopedNames ) {
        if (scopedNames == null) {
            return;
        } 
        Iterator it = scopedNames.iterator();
        while (it.hasNext()) {
            String scopedName = (String)it.next();
            Topic t = (Topic)m_topicsByScopedName.get( scopedName );
            if (t != null && t.getID().equals( topic.getID() )) {
                m_topicsByScopedName.remove( scopedName );
            } 
        } 
    } 
    
    
    protected void unindexSubjectIndicators( Topic topic,
            Collection indicators ) {
        if (indicators == null) {
            return;
        } 
        Iterator it = indicators.iterator();
        while (it.hasNext()) {
            String indicator = (String)it.next();
            Topic t = (Topic)m_topicsBySubjectIndicator.get( indicator );
            if (t != null && t.getID().equals( topic.getID() )) {
                m_topicsBySubjectIndicator.remove( indicator );
            } 
        } 
    } 
    
    
    /**
     * removeTopic
     * Delete a topic from the topic map.
     * @param topic The topic to be removed from the map
     * @throws TopicNotFoundException
     */
    public void removeTopic( Topic topic ) throws TopicNotFoundException {
        if (!m_objectsByID.containsKey( topic.getID() )) {
            throw new TopicNotFoundException( topic.getID() );
        } 
        
        unindexTopic( topic, false );
        unindexSubject( topic, topic.getSubject() );
        
        // Subject Indicators
        Iterator it = topic.getSubjectIndicators().iterator();
        while (it.hasNext()) {
            String subjectIndicator = (String)it.next();
            m_topicsBySubjectIndicator.remove( subjectIndicator );
        } 
        // Scoped Names
        Iterator scopedNames = topic.getScopedNames().iterator();
        while (scopedNames.hasNext()) {
            String scName = (String)scopedNames.next();
            m_topicsByScopedName.remove( scName );
        } 
    } 
    
    
    public void removeAssociation( Association assoc ) {
        m_associations.remov...
 
[truncated message content]

[Tm4j-commits] CVS: tm4j/src/com/techquila/topicmap/ozone - New directory

[Gerd M. <li...@us...>]

Update of /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone
In directory usw-pr-cvs1:/tmp/cvs-serv9654/ozone

Log Message:
Directory /cvsroot/tm4j/tm4j/src/com/techquila/topicmap/ozone added to the repository

[Tm4j-commits] CVS: tm4j build.xml,1.3,1.4

[Kal A. <kal...@us...>]

Update of /cvsroot/tm4j/tm4j
In directory usw-pr-cvs1:/tmp/cvs-serv28754

Modified Files:
	build.xml 
Log Message:
Made compilation of TMNav dependant on locating BrainSDK.

Index: build.xml
===================================================================
RCS file: /cvsroot/tm4j/tm4j/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** build.xml	2001/05/25 13:51:45	1.3
--- build.xml	2001/05/26 14:21:59	1.4
***************
*** 1,4 ****
--- 1,10 ----
  <?xml version="1.0"?>
  
+ <!--
+   - ANT build file for TM4J
+   -
+   - $Id$
+   -->
+  
  <project name="TM4J" default="usage">
  
***************
*** 24,28 ****
      <echo message="   distrib-all --> generates the TM4J source and binary distributions"/>
      <echo message="   clean-all   --> cleans up all compiled classes"/>
!     <echo message="   usage     --> show this message (default)"/>
      <echo message=""/>
      <echo message="-------------------------------------------------------------"/>
--- 30,34 ----
      <echo message="   distrib-all --> generates the TM4J source and binary distributions"/>
      <echo message="   clean-all   --> cleans up all compiled classes"/>
!     <echo message="   usage       --> show this message (default)"/>
      <echo message=""/>
      <echo message="-------------------------------------------------------------"/>
***************
*** 44,47 ****
--- 50,55 ----
        <mkdir dir="${dist}/docs/javadoc"/>
        <mkdir dir="${classdir}"/>
+ 
+       <available property="brain.present" classname="com.natrificial.db.core.Knowledge"/>
      </target>
  
***************
*** 157,161 ****
      </target>
        
!     <target name="tm4j-clean">
        <delete>
          <fileset dir="${classdir}">
--- 165,169 ----
      </target>
        
!     <target name="tm4j-clean" depends="init">
        <delete>
          <fileset dir="${classdir}">
***************
*** 197,201 ****
    </patternset>
  
!   <target name="tmnav-build" depends="tm4j-build">
      <javac srcdir="src" destdir="${classdir}">
        <patternset refid="tmnav.sources"/>
--- 205,209 ----
    </patternset>
  
!   <target name="tmnav-build" depends="tm4j-build" if="brain.present">
      <javac srcdir="src" destdir="${classdir}">
        <patternset refid="tmnav.sources"/>
***************
*** 203,207 ****
    </target>
  
!   <target name="tmnav-jar" depends="tmnav-build">
      <jar jarfile="${dist}/lib/tmnav.jar"
  	 basedir="${classdir}">
--- 211,216 ----
    </target>
  
!   <target name="tmnav-jar" depends="tmnav-build" if="brain.present">
!     <echo>BrainSDK detected. Building TMNav.</echo>
      <jar jarfile="${dist}/lib/tmnav.jar"
  	 basedir="${classdir}">
***************
*** 211,219 ****
  
    <target name="tmnav-clean" depends="init">
!     <delete>
!       <fileset dir="${classdir}">
!         <patternset refid="tmnav.classes"/>
!       </fileset>
!     </delete>
    </target>
    
--- 220,224 ----
  
    <target name="tmnav-clean" depends="init">
!     <delete dir="${classdir}/com/techquila/tmnav"/>
    </target>
    
***************
*** 236,248 ****
    </target>
  
!   <target name="tmp3-clean">
!     <delete>
!       <fileset dir=".">
!         <patternset>
! 	  <include name="${classdir}/com/techquila/tmp3/*.class"/>
!           <include name="${dist}/lib/tmp3.jar"/>
!         </patternset>
!       </fileset> 
!     </delete>
    </target>
  
--- 241,247 ----
    </target>
  
!   <target name="tmp3-clean" depends="init">
!     <delete dir="${classdir}/com/techquila/tmp3"/>
!     <delete file="${dist}/lib/tmp3.jar"/>
    </target>
  

[Tm4j-commits] CVS: tm4j build.sh,NONE,1.1

[Kal A. <kal...@us...>]

Update of /cvsroot/tm4j/tm4j
In directory usw-pr-cvs1:/tmp/cvs-serv28300

Added Files:
	build.sh 
Log Message:
Script to invoke Ant to build the 'all' target

--- NEW FILE: build.sh ---
#! /bin/sh

# $Id: build.sh,v 1.1 2001/05/26 14:20:00 kal_ahmed Exp $

export ANT_HOME=`dirname $0`
. $ANT_HOME/bin/ant all