From: Lars H. <lh...@us...> - 2005-03-08 12:34:27
|
Update of /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17903/src/org/tmapiutils/query/tolog Modified Files: PreparedQuery.java QueryEvaluator.java QueryEvaluatorFactory.java TologFragmentBuilder.java TologFragmentBuilderException.java TologFragmentBuilderImpl.java TologParserException.java TologProcessingException.java TologResultsSet.java todo-log.txt Log Message: Shift to Apache License 2.0 More TMAPI compatible, some classes already compile. ;) Deleted CVS log from files Index: QueryEvaluator.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/QueryEvaluator.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** QueryEvaluator.java 6 Mar 2005 17:27:33 -0000 1.1 --- QueryEvaluator.java 8 Mar 2005 12:33:39 -0000 1.2 *************** *** 1,11 **** /* ! Copyright (c) 2000-2004 The TM4J Project. All rights reserved. ! ! The license for this source code can be found in the file ! LICENSE.TXT with this distribution or at http://tm4j.org/LICENSE.txt ! */ ! /* ! * $Header$ */ package org.tmapiutils.query.tolog; --- 1,19 ---- /* ! * Copyright 2005 TMAPI Utils / Kal Ahmed, Lars Heuer ! * Copyright (c) 2000-2004 The TM4J Project. All rights reserved. ! * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at ! * ! * http://www.apache.org/licenses/LICENSE-2.0 ! * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. */ + package org.tmapiutils.query.tolog; *************** *** 23,26 **** --- 31,37 ---- * This class also supports the registration of extension * predicates. + * + * @author Kal Ahmed (kal[at]techquila.com) + * @author Lars Heuer (heuer[at]semagia.com) */ public interface QueryEvaluator *************** *** 34,40 **** * read but contained syntax errors. */ ! public void addRulesModule(InputStream src, String prefix) throws IOException, TologParserException; ! /** * Adds a new rule to the QueryEvaluator. --- 45,51 ---- * read but contained syntax errors. */ ! public void addRulesModule(InputStream src, String prefix) throws IOException, TologParserException; ! /** * Adds a new rule to the QueryEvaluator. *************** *** 43,51 **** */ public void addRule(String rule) throws TologParserException; ! /** * Parses (and possibly optimizes) the specified tolog query string. * The return value is the parsed query which can then be executed ! * simply by calling {PreparedQuery#execute()}. * @param queryString the tolog query string to be parsed. * @return the PreparedQuery that represents the parsed, optimized tolog query. --- 54,62 ---- */ public void addRule(String rule) throws TologParserException; ! /** * Parses (and possibly optimizes) the specified tolog query string. * The return value is the parsed query which can then be executed ! * simply by calling {PreparedQuery#execute()}. * @param queryString the tolog query string to be parsed. * @return the PreparedQuery that represents the parsed, optimized tolog query. *************** *** 54,58 **** */ public PreparedQuery prepareQuery(String queryString) throws TologParserException, TologProcessingException; ! /** * A convenience method that parses and optimizes the specified --- 65,69 ---- */ public PreparedQuery prepareQuery(String queryString) throws TologParserException, TologProcessingException; ! /** * A convenience method that parses and optimizes the specified *************** *** 73,79 **** * @throws TologParserException if a syntax error or parse-time error is found in <code>queryString</code> * @throws TologProcessingException if an error occurrs during the optimisation or evaluation of the query. ! */ public TologResultsSet execute(String queryString, Object[] queryParams) throws TologParserException, TologProcessingException; ! /** * Registers an extension predicate with the QueryEvaluator. --- 84,90 ---- * @throws TologParserException if a syntax error or parse-time error is found in <code>queryString</code> * @throws TologProcessingException if an error occurrs during the optimisation or evaluation of the query. ! */ public TologResultsSet execute(String queryString, Object[] queryParams) throws TologParserException, TologProcessingException; ! /** * Registers an extension predicate with the QueryEvaluator. *************** *** 87,128 **** public void registerPredicateClass(String predicateName, Class predicateClass) throws IllegalArgumentException; ! /** ! * Returns a Map of the predicates currently registered with the * QueryEvaluator. The Map key is the name of the predicate and * the value is the implementation Class of the predicate. */ public Map getRegisteredPredicates(); ! } - /* - * $Log$ - * Revision 1.1 2005/03/06 17:27:33 lheuer - * Initial tolog import - * - * Revision 1.8 2004/06/20 14:12:30 kal_ahmed - * Copied TologRsultsSet interface and TologFragmentBuilder implementation from org.tm4j.tolog to this package. - * - * Revision 1.7 2004/06/16 21:21:42 kal_ahmed - * Tolog queries may now contain replaceable references specified in an Object array parameter to the QueryEvaluator at evaluation time. - * - * Revision 1.6 2004/06/13 19:44:21 kal_ahmed - * Added a fix and test for handling recursive rules definitions. - * - * Revision 1.5 2004/06/13 17:17:58 kal_ahmed - * Added registration of builtin predicates. Fixed rule expansion code to handle player/role pairs correctly. - * - * Revision 1.4 2004/06/09 22:15:07 kal_ahmed - * Fixed parser to disallow player:role pairs in predicates other than dynamic association predicates. Fixed initialisation of extension predicates. Added DirectInstanceOfPredicate extension to in-memory query evaluator. - * - * Revision 1.3 2004/06/03 19:55:16 kal_ahmed - * Created utils package to hold common utility classes for Tolog implementations. - * - * Revision 1.2 2004/06/03 19:36:21 kal_ahmed - * Added support for 'using' and 'import' directives to parser. - * - * Revision 1.1 2004/06/02 19:54:45 kal_ahmed - * Initial proposal for high-level query interface. - * - */ \ No newline at end of file --- 98,109 ---- public void registerPredicateClass(String predicateName, Class predicateClass) throws IllegalArgumentException; ! /** ! * Returns a Map of the predicates currently registered with the * QueryEvaluator. The Map key is the name of the predicate and * the value is the implementation Class of the predicate. */ public Map getRegisteredPredicates(); ! } Index: QueryEvaluatorFactory.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/QueryEvaluatorFactory.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** QueryEvaluatorFactory.java 6 Mar 2005 17:27:33 -0000 1.1 --- QueryEvaluatorFactory.java 8 Mar 2005 12:33:39 -0000 1.2 *************** *** 1,11 **** /* ! Copyright (c) 2000-2004 The TM4J Project. All rights reserved. ! ! The license for this source code can be found in the file ! LICENSE.TXT with this distribution or at http://tm4j.org/LICENSE.txt ! */ ! /* ! *$Header$ */ package org.tmapiutils.query.tolog; --- 1,19 ---- /* ! * Copyright 2005 TMAPI Utils / Kal Ahmed, Lars Heuer ! * Copyright (c) 2000-2004 The TM4J Project. All rights reserved. ! * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at ! * ! * http://www.apache.org/licenses/LICENSE-2.0 ! * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. */ + package org.tmapiutils.query.tolog; *************** *** 14,22 **** /** ! * @author Kal ! * ! * Describe QueryEvaluatorFactory here. */ ! public class QueryEvaluatorFactory { --- 22,30 ---- /** ! * ! * @author Kal Ahmed (kal[at]techquila.com) ! * @author Lars Heuer (heuer[at]semagia.com) */ ! public class QueryEvaluatorFactory { *************** *** 27,37 **** } - /* - * $Log$ - * Revision 1.1 2005/03/06 17:27:33 lheuer - * Initial tolog import - * - * Revision 1.2 2004/06/09 21:12:18 kal_ahmed - * Added standard source file header and footer. - * - */ \ No newline at end of file --- 35,36 ---- Index: TologParserException.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/TologParserException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TologParserException.java 6 Mar 2005 17:27:33 -0000 1.1 --- TologParserException.java 8 Mar 2005 12:33:39 -0000 1.2 *************** *** 1,17 **** /* ! Copyright (c) 2000-2004 The TM4J Project. All rights reserved. ! ! The license for this source code can be found in the file ! LICENSE.TXT with this distribution or at http://tm4j.org/LICENSE.txt ! */ ! /* ! *$Header$ */ ! package org.tmapiutils.query.tolog; /** ! * ! * @author Kal Ahmed (ka...@te...) */ public class TologParserException extends Exception { --- 1,25 ---- /* ! * Copyright 2005 TMAPI Utils / Kal Ahmed, Lars Heuer ! * Copyright (c) 2000-2004 The TM4J Project. All rights reserved. ! * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at ! * ! * http://www.apache.org/licenses/LICENSE-2.0 ! * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. */ ! package org.tmapiutils.query.tolog; /** ! * ! * @author Kal Ahmed (kal[at]techquila.com) ! * @author Lars Heuer (heuer[at]semagia.com) */ public class TologParserException extends Exception { *************** *** 20,37 **** super(msg); } ! public TologParserException(String msg, Throwable cause) { super(msg, cause); ! } } - - /* - * $Log$ - * Revision 1.1 2005/03/06 17:27:33 lheuer - * Initial tolog import - * - * Revision 1.1 2004/05/30 22:08:25 kal_ahmed - * Initial version of tolog 1.0 engine - * - */ \ No newline at end of file --- 28,35 ---- super(msg); } ! public TologParserException(String msg, Throwable cause) { super(msg, cause); ! } } Index: TologProcessingException.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/TologProcessingException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TologProcessingException.java 6 Mar 2005 17:27:33 -0000 1.1 --- TologProcessingException.java 8 Mar 2005 12:33:39 -0000 1.2 *************** *** 1,17 **** /* ! Copyright (c) 2000-2004 The TM4J Project. All rights reserved. ! ! The license for this source code can be found in the file ! LICENSE.TXT with this distribution or at http://tm4j.org/LICENSE.txt ! */ ! /* ! *$Header$ */ ! package org.tmapiutils.query.tolog; /** ! * ! * @author Kal Ahmed (ka...@te...) */ public class TologProcessingException extends Exception { --- 1,25 ---- /* ! * Copyright 2005 TMAPI Utils / Kal Ahmed, Lars Heuer ! * Copyright (c) 2000-2004 The TM4J Project. All rights reserved. ! * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at ! * ! * http://www.apache.org/licenses/LICENSE-2.0 ! * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. */ ! package org.tmapiutils.query.tolog; /** ! * ! * @author Kal Ahmed (kal[at]techquila.com) ! * @author Lars Heuer (heuer[at]semagia.com) */ public class TologProcessingException extends Exception { *************** *** 20,24 **** super(msg); } ! public TologProcessingException(String msg, Throwable cause) { super(msg, cause); --- 28,32 ---- super(msg); } ! public TologProcessingException(String msg, Throwable cause) { super(msg, cause); *************** *** 26,37 **** } - - /* - * $Log$ - * Revision 1.1 2005/03/06 17:27:33 lheuer - * Initial tolog import - * - * Revision 1.1 2004/05/30 22:08:25 kal_ahmed - * Initial version of tolog 1.0 engine - * - */ \ No newline at end of file --- 34,35 ---- Index: TologFragmentBuilderException.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/TologFragmentBuilderException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TologFragmentBuilderException.java 6 Mar 2005 17:27:33 -0000 1.1 --- TologFragmentBuilderException.java 8 Mar 2005 12:33:39 -0000 1.2 *************** *** 1,12 **** /* ! Copyright (c) 2000-2004 The TM4J Project. All rights reserved. ! ! This software is licensed under a modified version of the ! Apache Software License. The full license text can be found ! at http://tm4j.org/LICENSE.txt ! */ ! /* ! * $Header$ */ package org.tmapiutils.query.tolog; --- 1,19 ---- /* ! * Copyright 2005 TMAPI Utils / Kal Ahmed, Lars Heuer ! * Copyright (c) 2000-2004 The TM4J Project. All rights reserved. ! * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at ! * ! * http://www.apache.org/licenses/LICENSE-2.0 ! * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. */ + package org.tmapiutils.query.tolog; *************** *** 15,18 **** --- 22,28 ---- * Exception raised by the TologFragmentBuilder interface when exporting * a TologResultsSet object into a topic map fragment. + * + * @author Kal Ahmed (kal[at]techquila.com) + * @author Lars Heuer (heuer[at]semagia.com) */ public class TologFragmentBuilderException extends Exception { *************** *** 50,70 **** } - - /* - * $Log$ - * Revision 1.1 2005/03/06 17:27:33 lheuer - * Initial tolog import - * - * Revision 1.1 2004/06/20 14:12:30 kal_ahmed - * Copied TologRsultsSet interface and TologFragmentBuilder implementation from org.tm4j.tolog to this package. - * - * Revision 1.3 2004/02/26 21:33:42 kal_ahmed - * Updated license text and reformatted source with Jalopy. - * - * Revision 1.2 2003/08/31 15:08:39 kal_ahmed - * Reformatted source code to Sun code style. - * - * Revision 1.1 2002/12/02 16:51:12 kal_ahmed - * Initial version - * - */ --- 60,61 ---- Index: TologResultsSet.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/TologResultsSet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TologResultsSet.java 6 Mar 2005 17:27:33 -0000 1.1 --- TologResultsSet.java 8 Mar 2005 12:33:39 -0000 1.2 *************** *** 1,12 **** /* ! Copyright (c) 2000-2004 The TM4J Project. All rights reserved. ! ! This software is licensed under a modified version of the ! Apache Software License. The full license text can be found ! at http://tm4j.org/LICENSE.txt ! */ ! /* ! * $Header$ */ package org.tmapiutils.query.tolog; --- 1,19 ---- /* ! * Copyright 2005 TMAPI Utils / Kal Ahmed, Lars Heuer ! * Copyright (c) 2000-2004 The TM4J Project. All rights reserved. ! * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at ! * ! * http://www.apache.org/licenses/LICENSE-2.0 ! * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. */ + package org.tmapiutils.query.tolog; *************** *** 19,22 **** --- 26,32 ---- * be thought of as a table consisting of a number of named columns with * one row for each distinct match to the Tolog query. + * + * @author Kal Ahmed (kal[at]techquila.com) + * @author Lars Heuer (heuer[at]semagia.com) */ public interface TologResultsSet { *************** *** 48,68 **** } - - /* - * $Log$ - * Revision 1.1 2005/03/06 17:27:33 lheuer - * Initial tolog import - * - * Revision 1.1 2004/06/20 14:12:30 kal_ahmed - * Copied TologRsultsSet interface and TologFragmentBuilder implementation from org.tm4j.tolog to this package. - * - * Revision 1.4 2004/02/26 21:33:42 kal_ahmed - * Updated license text and reformatted source with Jalopy. - * - * Revision 1.3 2003/08/31 15:08:39 kal_ahmed - * Reformatted source code to Sun code style. - * - * Revision 1.2 2002/05/06 11:53:43 kal_ahmed - * Added header and log - * - */ --- 58,59 ---- Index: todo-log.txt =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/todo-log.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** todo-log.txt 7 Mar 2005 13:05:42 -0000 1.8 --- todo-log.txt 8 Mar 2005 12:33:39 -0000 1.9 *************** *** 3,6 **** --- 3,7 ---- There are more ToDos, but this a beginning. :)) + File: query\tolog\TologFragmentBuilderImpl.java line: 25 *************** *** 33,44 **** - - File: query\tolog\predicates\ValueLikePredicate.java - line: 114 - getIndexManager() - Should become getHelperObject(IndexInterface.class) - - - File: query\tolog\predicates\test\DirectInstanceOfPredicateTest.java line: 18 --- 34,37 ---- *************** *** 61,64 **** --- 54,58 ---- Usage of TopicMapProvider cannot be translated 1:1 to TopicMapSystem + File: query\tolog\predicates\test\DynamicAssociationPredicateTest.java line: 28 *************** *** 82,87 **** - - File: query\tolog\predicates\test\ValueLikePredicateTest.java line: 25 --- 76,79 ---- *************** *** 101,104 **** --- 93,97 ---- Should become getHelperObject(IndexInterface.class) + File: query\tolog\predicates\test\ValuePredicateTest.java line: 21 *************** *** 113,137 **** - File: query\tolog\test\AssociationPredicateTest.java - line: 28 - TopicMapProvider - Usage of TopicMapProvider cannot be translated 1:1 to TopicMapSystem - line: 29 - TopicMapProvider - Usage of TopicMapProvider cannot be translated 1:1 to TopicMapSystem - line: 30 - TopicMapProvider - Usage of TopicMapProvider cannot be translated 1:1 to TopicMapSystem - line: 42 - TopicMapProvider - Usage of TopicMapProvider cannot be translated 1:1 to TopicMapSystem - line: 144 - TopicMapProvider - Usage of TopicMapProvider cannot be translated 1:1 to TopicMapSystem - line: 145 - TopicMapProvider - Usage of TopicMapProvider cannot be translated 1:1 to TopicMapSystem - - File: query\tolog\test\MemoryQueryEvaluatorImplTest.java line: 28 --- 106,109 ---- *************** *** 214,217 **** --- 186,190 ---- Must become "createTopicName" + File: query\tolog\test\TologParserTest.java line: 258 *************** *** 222,225 **** --- 195,199 ---- Must become "createAssociationRole" + File: query\tolog\test\TologParserTestBase.java line: 16 *************** *** 247,249 **** IDGeneratorFactory Has become org.tmapi.core.utils.IDGeneratorFactory - --- 221,222 ---- Index: PreparedQuery.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/PreparedQuery.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PreparedQuery.java 6 Mar 2005 17:27:33 -0000 1.1 --- PreparedQuery.java 8 Mar 2005 12:33:39 -0000 1.2 *************** *** 1,11 **** /* ! Copyright (c) 2000-2004 The TM4J Project. All rights reserved. ! ! The license for this source code can be found in the file ! LICENSE.TXT with this distribution or at http://tm4j.org/LICENSE.txt ! */ ! /* ! *$Header$ */ package org.tmapiutils.query.tolog; --- 1,19 ---- /* ! * Copyright 2005 TMAPI Utils / Kal Ahmed, Lars Heuer ! * Copyright (c) 2000-2004 The TM4J Project. All rights reserved. ! * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at ! * ! * http://www.apache.org/licenses/LICENSE-2.0 ! * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. */ + package org.tmapiutils.query.tolog; *************** *** 15,20 **** * Represents a parsed, optimized tolog query which can * be executed as often as required. */ ! public interface PreparedQuery { /** --- 23,31 ---- * Represents a parsed, optimized tolog query which can * be executed as often as required. + * + * @author Kal Ahmed (kal[at]techquila.com) + * @author Lars Heuer (heuer[at]semagia.com) */ ! public interface PreparedQuery { /** *************** *** 26,30 **** */ public String getQueryString(); ! /** * Executes the prepared query. --- 37,41 ---- */ public String getQueryString(); ! /** * Executes the prepared query. *************** *** 33,39 **** */ public TologResultsSet execute() throws TologProcessingException; ! /** ! * Executes a prepared query substituting <i>%n</i> references with the <i>n</i>th value from * the parameter array. * @param params the parameter array for this query evaluation --- 44,50 ---- */ public TologResultsSet execute() throws TologProcessingException; ! /** ! * Executes a prepared query substituting <i>%n</i> references with the <i>n</i>th value from * the parameter array. * @param params the parameter array for this query evaluation *************** *** 43,60 **** public TologResultsSet execute(Object[] params) throws TologProcessingException; } - - /* - * $Log$ - * Revision 1.1 2005/03/06 17:27:33 lheuer - * Initial tolog import - * - * Revision 1.4 2004/06/20 14:12:30 kal_ahmed - * Copied TologRsultsSet interface and TologFragmentBuilder implementation from org.tm4j.tolog to this package. - * - * Revision 1.3 2004/06/16 21:21:42 kal_ahmed - * Tolog queries may now contain replaceable references specified in an Object array parameter to the QueryEvaluator at evaluation time. - * - * Revision 1.2 2004/06/09 21:12:18 kal_ahmed - * Added standard source file header and footer. - * - */ \ No newline at end of file --- 54,55 ---- Index: TologFragmentBuilder.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/TologFragmentBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TologFragmentBuilder.java 6 Mar 2005 17:27:33 -0000 1.1 --- TologFragmentBuilder.java 8 Mar 2005 12:33:39 -0000 1.2 *************** *** 1,12 **** /* ! Copyright (c) 2000-2004 The TM4J Project. All rights reserved. ! ! This software is licensed under a modified version of the ! Apache Software License. The full license text can be found ! at http://tm4j.org/LICENSE.txt ! */ ! /* ! * $Header$ */ package org.tmapiutils.query.tolog; --- 1,19 ---- /* ! * Copyright 2005 TMAPI Utils / Kal Ahmed, Lars Heuer ! * Copyright (c) 2000-2004 The TM4J Project. All rights reserved. ! * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at ! * ! * http://www.apache.org/licenses/LICENSE-2.0 ! * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. */ + package org.tmapiutils.query.tolog; *************** *** 17,20 **** --- 24,30 ---- * The interface for implementations which export a TologResultsSet into * a TopicMapFragment. + * + * @author Kal Ahmed (kal[at]techquila.com) + * @author Lars Heuer (heuer[at]semagia.com) */ public interface TologFragmentBuilder { Index: TologFragmentBuilderImpl.java =================================================================== RCS file: /cvsroot/tmapi-utils/tmapi-utils/src/org/tmapiutils/query/tolog/TologFragmentBuilderImpl.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TologFragmentBuilderImpl.java 6 Mar 2005 21:11:31 -0000 1.2 --- TologFragmentBuilderImpl.java 8 Mar 2005 12:33:39 -0000 1.3 *************** *** 1,12 **** /* ! Copyright (c) 2000-2004 The TM4J Project. All rights reserved. ! ! This software is licensed under a modified version of the ! Apache Software License. The full license text can be found ! at http://tm4j.org/LICENSE.txt ! */ ! /* ! * $Header$ */ package org.tmapiutils.query.tolog; --- 1,19 ---- /* ! * Copyright 2005 TMAPI Utils / Kal Ahmed, Lars Heuer ! * Copyright (c) 2000-2004 The TM4J Project. All rights reserved. ! * ! * Licensed under the Apache License, Version 2.0 (the "License"); ! * you may not use this file except in compliance with the License. ! * You may obtain a copy of the License at ! * ! * http://www.apache.org/licenses/LICENSE-2.0 ! * ! * Unless required by applicable law or agreed to in writing, software ! * distributed under the License is distributed on an "AS IS" BASIS, ! * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ! * See the License for the specific language governing permissions and ! * limitations under the License. */ + package org.tmapiutils.query.tolog; *************** *** 14,18 **** import org.tmapi.core.LocatorFactory; import org.tmapi.core.LocatorFactoryException; ! import org.tmapi.core.Association; import org.tmapi.core.TopicName; --- 21,25 ---- import org.tmapi.core.LocatorFactory; import org.tmapi.core.LocatorFactoryException; ! // TMAPI import org.tmapi.core.Association; import org.tmapi.core.TopicName; *************** *** 224,257 **** } } - - - /* - * $Log$ - * Revision 1.2 2005/03/06 21:11:31 lheuer - * More TM4J -> TMAPI translations - * - * Revision 1.1 2005/03/06 17:27:33 lheuer - * Initial tolog import - * - * Revision 1.1 2004/06/20 14:12:30 kal_ahmed - * Copied TologRsultsSet interface and TologFragmentBuilder implementation from org.tm4j.tolog to this package. - * - * Revision 1.6 2004/02/26 21:33:42 kal_ahmed - * Updated license text and reformatted source with Jalopy. - * - * Revision 1.5 2003/08/31 15:08:39 kal_ahmed - * Reformatted source code to Sun code style. - * - * Revision 1.4 2003/06/19 21:09:57 kal_ahmed - * Updated factory methods to eliminate deprecation warnings. - * - * Revision 1.3 2003/05/01 15:51:56 kal_ahmed - * Reorganised import statements. - * - * Revision 1.2 2002/12/13 21:30:09 kal_ahmed - * Fixed Javadoc bugs - * - * Revision 1.1 2002/12/02 16:51:12 kal_ahmed - * Initial version - * - */ --- 231,232 ---- |