svn commit: r1230804 - /uima/uimacpp/trunk/createRelease.txt
Author: bhavani Date: Thu Jan 12 21:58:03 2012 New Revision: 1230804 URL: http://svn.apache.org/viewvc?rev=1230804&view=rev Log: UIMA-2333 updated createRelease.txt for how to create source tar ball. Modified: uima/uimacpp/trunk/createRelease.txt Modified: uima/uimacpp/trunk/createRelease.txt URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/createRelease.txt?rev=1230804&r1=1230803&r2=1230804&view=diff == --- uima/uimacpp/trunk/createRelease.txt (original) +++ uima/uimacpp/trunk/createRelease.txt Thu Jan 12 21:58:03 2012 @@ -12,8 +12,8 @@ For a new release For a new build on Linux 1. create new directory for release candidate and cd there - mkdir uimacpp-2.4.0 - cd uimacpp-2.4.0 + mkdir uimacpp-2.4.0-build + cd uimacpp-2.4.0-build 2. checkout source from current tag svn co https://svn.apache.org/repos/asf/uima/uimacpp/tag/uimacpp-2.4.0 @@ -24,15 +24,14 @@ For a new build on Linux libtool version numbering convention. This is summarized on the wiki page https://cwiki.apache.org/UIMA/proposed-changes-to-uima-c-build-and-packaging.html. -4 Create configure script - cd uimacpp-2.4.0 - ./autogen.sh - -5. Run configure +4. Run configure define environment variable ICU_HOME, APR_HOME, XERCES_HOME, ACTIVEMQ_HOME, JAVA_INCLUDE ./configure --with-jdk=$JAVA_HOME/include --with-apr=$APR_HOME --with-icu=$ICU_HOME --with-xerces=$XERCES_HOME --with-activemq=$ACTIVEMQ_HOME + + NOTE: if you need to regenerate the configure script, run autogen.sh and + check into svn the generated output files. -6. build, test and create sdk tree +5. build, test and create sdk tree cd uimacpp-2.4.0 [setup env for the build] make @@ -40,13 +39,13 @@ For a new build on Linux make check make sdk ARGS=`pwd` -7. create bin tarball +6. create bin tarball tar -czf uimacpp-2.4.0-bin.tgz uimacpp -8. rat scan of bin +7. rat scan of bin java -jar apache-rat-0.6.jar uimacpp > uimacpp-bin-linux-report.txt -9. sniff test of base sdk +8. sniff test of base sdk cd uimacpp export UIMACPP_HOME=`pwd` PATH=$PATH:`pwd`/bin @@ -56,7 +55,7 @@ For a new build on Linux cd .. ./runall.sh -10. sniff test of scriptators (following base sniff test) +9. sniff test of scriptators (following base sniff test) cd ../scriptators/perl make PATH=$PATH:`pwd` @@ -74,7 +73,7 @@ For a new build on Linux LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd` runAECpp TclSample.xml ../../examples/data/ -11. sniff test of uimacpp service wrapper +10. sniff test of uimacpp service wrapper in a "Uima AS window", run: startBroker.sh back in the UimaCpp test window: @@ -147,4 +146,13 @@ Create Source Tar ball The source tar ball is created by zipping up the files from svn extract of uimacpp. The source tar ball contains all the files needed to build the Windows and/or -Linux binaries. +Linux binaries. + +1. checkout source from current release branch +svn co https://svn.apache.org/repos/asf/uima/uimacpp/branches/uimacpp-2.4.0 +2. create the tar ball + On Windows zip up uimacpp-2.4.0 and create uimacpp-2.4.0-src.zip + On Linux tar -zcvf uimacpp-2.4.0-src.tgz uimacpp-2.4.0 +3. rat scan the source directory + java -jar apache-rat-0.6.jar uimacpp-2.4.0 > uimacpp-2.4.0-src-report.txt +
svn commit: r1230785 - /uima/uimacpp/uimacpp-2.4.0-rc2/
Author: bhavani Date: Thu Jan 12 21:08:14 2012 New Revision: 1230785 URL: http://svn.apache.org/viewvc?rev=1230785&view=rev Log: updated uimacpp 2.4.0 release candidate 2 Added: uima/uimacpp/uimacpp-2.4.0-rc2/ - copied from r1230784, uima/uimacpp/trunk/
svn commit: r1230784 - /uima/uimacpp/trunk/createRelease.txt
Author: bhavani Date: Thu Jan 12 21:05:38 2012 New Revision: 1230784 URL: http://svn.apache.org/viewvc?rev=1230784&view=rev Log: UIMA-2333 updated createRelease.txt for how to create source tar ball. Modified: uima/uimacpp/trunk/createRelease.txt Modified: uima/uimacpp/trunk/createRelease.txt URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/createRelease.txt?rev=1230784&r1=1230783&r2=1230784&view=diff == --- uima/uimacpp/trunk/createRelease.txt (original) +++ uima/uimacpp/trunk/createRelease.txt Thu Jan 12 21:05:38 2012 @@ -144,17 +144,7 @@ For a new build on Windows Create Source Tar ball -The source tar ball contains sources needed to build the Windows and Linux -binaries. -The source packaging should be done on Linux as it requires running the autoconf tool to generate the configure script required for a Linux build. - -1. update srcName in the buildSrcTree.sh -2. create source directory - ./buildSrcTree.sh target_directory - This will create the uimacpp-X.Y.Z-src directory in the target_directory -3. create src tarball - From target_directory - tar -zcvf uimacpp-X.Y.X-src.tgz uimacpp-X.Y.Z-src -4. Rat scan of source - java -jar apache-rat-0.6.jar uimacpp-X.Y.Z-src > -uimacpp-X.Y.Z-src-linux-report.txt +The source tar ball is created by zipping up the files from svn extract of +uimacpp. +The source tar ball contains all the files needed to build the Windows and/or +Linux binaries.
svn commit: r1230773 [11/11] - in /uima/uimacpp/trunk: ./ config/ src/ src/framework/ src/test/ src/utils/
Added: uima/uimacpp/trunk/src/utils/Makefile.in
URL:
http://svn.apache.org/viewvc/uima/uimacpp/trunk/src/utils/Makefile.in?rev=1230773&view=auto
==
--- uima/uimacpp/trunk/src/utils/Makefile.in (added)
+++ uima/uimacpp/trunk/src/utils/Makefile.in Thu Jan 12 20:42:21 2012
@@ -0,0 +1,590 @@
+# Makefile.in generated by automake 1.10 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# -*- makefile -*-
+
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+bin_PROGRAMS = $(am__EXEEXT_1)
+subdir = src/utils
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/find_activemq.m4 \
+ $(top_srcdir)/m4/find_apr.m4 $(top_srcdir)/m4/find_icu.m4 \
+ $(top_srcdir)/m4/find_xerces.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+@ACTIVEMQ_FOUND_FALSE@am__EXEEXT_1 = runAECpp$(EXEEXT)
+@ACTIVEMQ_FOUND_TRUE@am__EXEEXT_1 = runAECpp$(EXEEXT) \
+@ACTIVEMQ_FOUND_TRUE@ deployCppService$(EXEEXT)
+am__installdirs = "$(DESTDIR)$(bindir)"
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
+PROGRAMS = $(bin_PROGRAMS)
+am_deployCppService_OBJECTS = \
+ deployCppService-deployCppService.$(OBJEXT) \
+ deployCppService-ActiveMQAnalysisEngineService.$(OBJEXT)
+deployCppService_OBJECTS = $(am_deployCppService_OBJECTS)
+deployCppService_LDADD = $(LDADD)
+am__DEPENDENCIES_1 =
+deployCppService_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+am_runAECpp_OBJECTS = runAECpp-runAECpp.$(OBJEXT)
+runAECpp_OBJECTS = $(am_runAECpp_OBJECTS)
+runAECpp_LDADD = $(LDADD)
+runAECpp_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+DEFAULT_INCLUDES = -I.@am__isrc@
+depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+am__depfiles_maybe = depfiles
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
+SOURCES = $(deployCppService_SOURCES) $(runAECpp_SOURCES)
+DIST_SOURCES = $(deployCppService_SOURCES) $(runAECpp_SOURCES)
+ETAGS = etags
+CTAGS = ctags
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACTIVEMQ_CXXFLAGS = @ACTIVEMQ_CXXFLAGS@
+ACTIVEMQ_LDFLAGS = @ACTIVEMQ_LDFLAGS@
+ACTIVEMQ_VERSION = @ACTIVEMQ_VERSION@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_
svn commit: r1230773 [8/11] - in /uima/uimacpp/trunk: ./ config/ src/ src/framework/ src/test/ src/utils/
Propchange: uima/uimacpp/trunk/configure
--
svn:executable = *
Added: uima/uimacpp/trunk/src/Makefile.in
URL:
http://svn.apache.org/viewvc/uima/uimacpp/trunk/src/Makefile.in?rev=1230773&view=auto
==
--- uima/uimacpp/trunk/src/Makefile.in (added)
+++ uima/uimacpp/trunk/src/Makefile.in Thu Jan 12 20:42:21 2012
@@ -0,0 +1,527 @@
+# Makefile.in generated by automake 1.10 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# ---
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+# ---
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = src
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/find_activemq.m4 \
+ $(top_srcdir)/m4/find_apr.m4 $(top_srcdir)/m4/find_icu.m4 \
+ $(top_srcdir)/m4/find_xerces.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive\
+ distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACTIVEMQ_CXXFLAGS = @ACTIVEMQ_CXXFLAGS@
+ACTIVEMQ_LDFLAGS = @ACTIVEMQ_LDFLAGS@
+ACTIVEMQ_VERSION = @ACTIVEMQ_VERSION@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GREP = @GREP@
+ICU_CPPFLAGS = @ICU_CPPFLAGS@
+ICU_LDFLAGS = @ICU_LDFLAGS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_VERSION_NUMBER = @LT_VERSION_NUMBER@
+MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @P
svn commit: r1230773 [6/11] - in /uima/uimacpp/trunk: ./ config/ src/ src/framework/ src/test/ src/utils/
Added: uima/uimacpp/trunk/config/missing
URL:
http://svn.apache.org/viewvc/uima/uimacpp/trunk/config/missing?rev=1230773&view=auto
==
--- uima/uimacpp/trunk/config/missing (added)
+++ uima/uimacpp/trunk/config/missing Thu Jan 12 20:42:21 2012
@@ -0,0 +1,367 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+
+scriptversion=2006-05-10.23
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard , 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# 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.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+ echo 1>&2 "Try \`$0 --help' for more information"
+ exit 1
+fi
+
+run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+ configure_ac=configure.ac
+else
+ configure_ac=configure.in
+fi
+
+msg="missing on your system"
+
+case $1 in
+--run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+ shift
+ "$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+run=:
+msg="probably too old"
+ fi
+ ;;
+
+ -h|--h|--he|--hel|--help)
+echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+ -h, --help display this help and exit
+ -v, --version output version information and exit
+ --run try to run the given command, and emulate it if it fails
+
+Supported PROGRAM values:
+ aclocal touch file \`aclocal.m4'
+ autoconf touch file \`configure'
+ autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
+ automake touch all \`Makefile.in' files
+ bisoncreate \`y.tab.[ch]', if possible, from existing .[ch]
+ flex create \`lex.yy.c', if possible, from existing .c
+ help2man touch the output file
+ lex create \`lex.yy.c', if possible, from existing .c
+ makeinfo touch the output file
+ tar try tar, gnutar, gtar, then tar without non-portable flags
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Send bug reports to ."
+exit $?
+;;
+
+ -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+echo "missing $scriptversion (GNU Automake)"
+exit $?
+;;
+
+ -*)
+echo 1>&2 "$0: Unknown \`$1' option"
+echo 1>&2 "Try \`$0 --help' for more information"
+exit 1
+;;
+
+esac
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case $1 in
+ lex|yacc)
+# Not GNU programs, they don't have --version.
+;;
+
+ tar)
+if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+fi
+;;
+
+ *)
+if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
+fi
+;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $1 in
+ aclocal*)
+echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acinclude.m4' or \`${configure_ac}'. You might want
svn commit: r1230773 [4/11] - in /uima/uimacpp/trunk: ./ config/ src/ src/framework/ src/test/ src/utils/
Added: uima/uimacpp/trunk/config/depcomp
URL:
http://svn.apache.org/viewvc/uima/uimacpp/trunk/config/depcomp?rev=1230773&view=auto
==
--- uima/uimacpp/trunk/config/depcomp (added)
+++ uima/uimacpp/trunk/config/depcomp Thu Jan 12 20:42:21 2012
@@ -0,0 +1,584 @@
+#! /bin/sh
+# depcomp - compile a program generating dependencies as side-effects
+
+scriptversion=2006-10-15.18
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
+# Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# 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.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Alexandre Oliva .
+
+case $1 in
+ '')
+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+cat <<\EOF
+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
+
+Run PROGRAMS ARGS to compile a file, generating dependencies
+as side-effects.
+
+Environment variables:
+ depmode Dependency tracking mode.
+ source Source file read by `PROGRAMS ARGS'.
+ object Object file output by `PROGRAMS ARGS'.
+ DEPDIR directory where to store dependencies.
+ depfile Dependency file to output.
+ tmpdepfile Temporary file to use when outputing dependencies.
+ libtool Whether libtool is used (yes/no).
+
+Report bugs to .
+EOF
+exit $?
+;;
+ -v | --v*)
+echo "depcomp $scriptversion"
+exit $?
+;;
+esac
+
+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
+ echo "depcomp: Variables source, object and depmode must be set" 1>&2
+ exit 1
+fi
+
+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
+depfile=${depfile-`echo "$object" |
+ sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
+
+rm -f "$tmpdepfile"
+
+# Some modes work just like other modes, but use different flags. We
+# parameterize here, but still list the modes in the big case below,
+# to make depend.m4 easier to write. Note that we *cannot* use a case
+# here, because this file can only contain one case statement.
+if test "$depmode" = hp; then
+ # HP compiler uses -M and no extra arg.
+ gccflag=-M
+ depmode=gcc
+fi
+
+if test "$depmode" = dashXmstdout; then
+ # This is just like dashmstdout with a different argument.
+ dashmflag=-xM
+ depmode=dashmstdout
+fi
+
+case "$depmode" in
+gcc3)
+## gcc 3 implements dependency tracking that does exactly what
+## we want. Yay! Note: for some reason libtool 1.4 doesn't like
+## it if -MD -MP comes after the -MF stuff. Hmm.
+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+## the command line argument order; so add the flags where they
+## appear in depend2.am. Note that the slowdown incurred here
+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
+ for arg
+ do
+case $arg in
+-c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
+*) set fnord "$@" "$arg" ;;
+esac
+shift # fnord
+shift # $arg
+ done
+ "$@"
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+rm -f "$tmpdepfile"
+exit $stat
+ fi
+ mv "$tmpdepfile" "$depfile"
+ ;;
+
+gcc)
+## There are various ways to get dependency output from gcc. Here's
+## why we pick this rather obscure method:
+## - Don't want to use -MD because we'd like the dependencies to end
+## up in a subdir. Having to rename by hand is ugly.
+## (We might end up doing this anyway to support other compilers.)
+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
+## -MM, not -M (despite what the docs say).
+## - Using -M directly means running the compiler twice (even worse
+## than renaming).
+ if test -z "$gccflag"; then
+gccflag=-MD,
+ fi
+ "$@" -Wp,"$gccflag$tmpdepfile"
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+rm -f "$tmpdepfile"
+exit $stat
+ fi
+ rm -f "$depfile"
+ echo "$object : \\" > "$depfile"
+ alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
+## The second -e ex
svn commit: r1230773 [1/11] - in /uima/uimacpp/trunk: ./ config/ src/ src/framework/ src/test/ src/utils/
Author: bhavani
Date: Thu Jan 12 20:42:21 2012
New Revision: 1230773
URL: http://svn.apache.org/viewvc?rev=1230773&view=rev
Log:
UIMA-2333 check in configure script and outputs of autoconf
Added:
uima/uimacpp/trunk/Makefile.in
uima/uimacpp/trunk/aclocal.m4
uima/uimacpp/trunk/config/
uima/uimacpp/trunk/config/config.guess (with props)
uima/uimacpp/trunk/config/config.sub (with props)
uima/uimacpp/trunk/config/depcomp (with props)
uima/uimacpp/trunk/config/install-sh (with props)
uima/uimacpp/trunk/config/ltmain.sh
uima/uimacpp/trunk/config/missing (with props)
uima/uimacpp/trunk/configure (with props)
uima/uimacpp/trunk/src/Makefile.in
uima/uimacpp/trunk/src/framework/Makefile.in
uima/uimacpp/trunk/src/test/Makefile.in
uima/uimacpp/trunk/src/utils/Makefile.in
Added: uima/uimacpp/trunk/Makefile.in
URL:
http://svn.apache.org/viewvc/uima/uimacpp/trunk/Makefile.in?rev=1230773&view=auto
==
--- uima/uimacpp/trunk/Makefile.in (added)
+++ uima/uimacpp/trunk/Makefile.in Thu Jan 12 20:42:21 2012
@@ -0,0 +1,678 @@
+# Makefile.in generated by automake 1.10 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+# ---
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+# ---
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = .
+DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in $(top_srcdir)/configure \
+ config/config.guess config/config.sub config/depcomp \
+ config/install-sh config/ltmain.sh config/missing
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/find_activemq.m4 \
+ $(top_srcdir)/m4/find_apr.m4 $(top_srcdir)/m4/find_icu.m4 \
+ $(top_srcdir)/m4/find_xerces.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ html-recursive info-recursive install-data-recursive \
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive\
+ distclean-recursive maintainer-clean-recursive
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+ { test ! -d $(distdir) \
+|| { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+ && rm -fr $(distdir); }; }
+DIST_ARCHIVES = $(dis
svn commit: r1230694 - /uima/uimacpp/tags/uimacpp-2.4.0-rc2/
Author: bhavani Date: Thu Jan 12 18:39:12 2012 New Revision: 1230694 URL: http://svn.apache.org/viewvc?rev=1230694&view=rev Log: create tag for 2.4.0 release candidate 2 Added: uima/uimacpp/tags/uimacpp-2.4.0-rc2/ (props changed) - copied from r1230693, uima/uimacpp/trunk/ Propchange: uima/uimacpp/tags/uimacpp-2.4.0-rc2/ -- --- svn:ignore (added) +++ svn:ignore Thu Jan 12 18:39:12 2012 @@ -0,0 +1,4 @@ +install +Release +Debug +.project Propchange: uima/uimacpp/tags/uimacpp-2.4.0-rc2/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jan 12 18:39:12 2012 @@ -0,0 +1,2 @@ +/incubator/uima/uimacpp/branches/uimacpp-2.3.0:831288-933272 +/uima/uimacpp/branches/uimacpp-2.3.0:933273-997790
svn commit: r1230693 - /uima/uimacpp/trunk/createRelease.txt
Author: bhavani Date: Thu Jan 12 18:38:12 2012 New Revision: 1230693 URL: http://svn.apache.org/viewvc?rev=1230693&view=rev Log: UIMA-2333 fixed error in svn command to create a tag Modified: uima/uimacpp/trunk/createRelease.txt Modified: uima/uimacpp/trunk/createRelease.txt URL: http://svn.apache.org/viewvc/uima/uimacpp/trunk/createRelease.txt?rev=1230693&r1=1230692&r2=1230693&view=diff == --- uima/uimacpp/trunk/createRelease.txt (original) +++ uima/uimacpp/trunk/createRelease.txt Thu Jan 12 18:38:12 2012 @@ -4,7 +4,7 @@ Instructions for creating a uimacpp rele For a new release 1. create a tag for the new release, e.g. - svn copy https://svn.apache.org/repos/asf/uima/uimacpp/trunk https://svn.apache.org/repos/asf/uima/uimacpp/tags/uimacpp-2.4.0 1 -m"create tag for 2.4.0 release" + svn copy https://svn.apache.org/repos/asf/uima/uimacpp/trunk https://svn.apache.org/repos/asf/uima/uimacpp/tags/uimacpp-2.4.0-rcN -m"create tag for 2.4.0 release" 2. if changes are needed, update trunk. Create a new tag when ready to release.
svn commit: r1230677 - in /uima/uimacpp/trunk: buildSrcTree.sh createRelease.txt
Author: bhavani
Date: Thu Jan 12 18:10:06 2012
New Revision: 1230677
URL: http://svn.apache.org/viewvc?rev=1230677&view=rev
Log:
UIMA-2333 changes to the build source script to include linux and windows build
artifacts.
Modified:
uima/uimacpp/trunk/buildSrcTree.sh
uima/uimacpp/trunk/createRelease.txt
Modified: uima/uimacpp/trunk/buildSrcTree.sh
URL:
http://svn.apache.org/viewvc/uima/uimacpp/trunk/buildSrcTree.sh?rev=1230677&r1=1230676&r2=1230677&view=diff
==
--- uima/uimacpp/trunk/buildSrcTree.sh (original)
+++ uima/uimacpp/trunk/buildSrcTree.sh Thu Jan 12 18:10:06 2012
@@ -18,7 +18,7 @@
# under the License.
# for now, change versionnumber in line below
-srcName=uimacpp-2.4.0
+srcName=uimacpp-2.4.0-src
if [ "$1" = 'TRACE' ]
then set -vx ;shift
@@ -67,7 +67,24 @@ else
LIBEXT=so
fi
+
+# No Configure script means we have to run autogen
+if [ -x "./configure" ] ; then
+# even if we have a configure script, if the template has been updated
we should
+# run it again to account for the changes, which also means we need to
run a autogen
+# to create the actual script and associated autoconf artifacts.
+if [ "./configure.ac" -ot "./configure" ] ; then
+ echo "configure is up to date"
+else
+./autogen.sh
+fi
+else
+ ./autogen.sh
+fi
+
+
mkdir $target_dir
+mkdir $target_dir/m4
mkdir $target_dir/data
mkdir $target_dir/docs
mkdir $target_dir/src
@@ -88,6 +105,17 @@ cp $CPL $UIMACPP_SOURCE/RELEASE_NOTES*
cp $CPL $UIMACPP_SOURCE/README.4src $target_dir/README
cp $CPL $UIMACPP_SOURCE/README.4sdk $target_dir/
cp $CPL $UIMACPP_SOURCE/NOTICE.4sdk $target_dir/
+cp $CPL $UIMACPP_SOURCE/configure $target_dir/
+cp $CPLR $UIMACPP_SOURCE/config $target_dir
+cp $CPL $UIMACPP_SOURCE/Makefile.in $target_dir
+cp $CPL $UIMACPP_SOURCE/configure.ac $target_dir
+cp $CPL $UIMACPP_SOURCE/autogen.sh $target_dir
+cp $CPL $UIMACPP_SOURCE/Makefile.am $target_dir
+cp $CPL $UIMACPP_SOURCE/m4/find_icu.m4 $target_dir/m4
+cp $CPL $UIMACPP_SOURCE/m4/find_xerces.m4 $target_dir/m4
+cp $CPL $UIMACPP_SOURCE/m4/find_apr.m4 $target_dir/m4
+cp $CPL $UIMACPP_SOURCE/m4/find_activemq.m4 $target_dir/m4
+cp $CPL $UIMACPP_SOURCE/aclocal.m4 $target_dir
print -u2 "copying from $UIMACPP_SOURCE/data"
cp $CPL $UIMACPP_SOURCE/data/*.xsd $target_dir/data/
@@ -100,17 +128,8 @@ cp $CPL $UIMACPP_SOURCE/docs/doxyheader.
cp $CPL $UIMACPP_SOURCE/docs/overview_and_setup.html $target_dir/docs
print -u2 "copying from $UIMACPP_SOURCE/src"
-cp $CPL $UIMACPP_SOURCE/src/Makefile.in $target_dir/src/
-cp $CP $UIMACPP_SOURCE/src/aclocal.m4 $target_dir/src/
-cp $CP $UIMACPP_SOURCE/src/install-sh $target_dir/src/
-cp $CP $UIMACPP_SOURCE/src/config.guess $target_dir/src/
-cp $CP $UIMACPP_SOURCE/src/config.sub $target_dir/src/
-cp $CP $UIMACPP_SOURCE/src/ltmain.sh $target_dir/src/
-cp $CPL $UIMACPP_SOURCE/src/Makefile.unix $target_dir/src/
-cp $CPL $UIMACPP_SOURCE/src/configure $target_dir/src/
cp $CPL $UIMACPP_SOURCE/src/base.mak $target_dir/src/
-
-cp $CPL $UIMACPP_SOURCE/src/configure.in $target_dir/src/
+cp $CPL $UIMACPP_SOURCE/src/Makefile.in $target_dir/src/
cp $CPL $UIMACPP_SOURCE/src/Makefile.am $target_dir/src/
print -u2 "copying from $UIMACPP_SOURCE/src/cas"
@@ -152,12 +171,29 @@ cp $CPL $UIMACPP_SOURCE/src/test/fvtTest
find $target_dir/src/test -type f -iname '*.l?' -exec rm -f {} \;
find $target_dir/src/test -type f -iname '*.o' -exec rm -f {} \;
+print -u2 "copying files required for a Windows build"
+cp $CPL $UIMACPP_SOURCE/buildsdk.cmd $target_dir
+cp $CPL $UIMACPP_SOURCE/docs/builddocs.cmd $target_dir/docs
+cp $CPL $UIMACPP_SOURCE/src/*.cmd $target_dir/src
+cp $CPL $UIMACPP_SOURCE/examples/*.cmd $target_dir/examples
+cp $CPL $UIMACPP_SOURCE/src/*.bat $target_dir/src
+cp $CPL $UIMACPP_SOURCE/src/test/*.bat $target_dir/src/test
+cp $CPL $UIMACPP_SOURCE/src/*.vcproj $target_dir/src
+cp $CPL $UIMACPP_SOURCE/src/test/src/*.vcproj $target_dir/src/test/src
+cp $CPL $UIMACPP_SOURCE/src/test/fvtTestfile.debug $target_dir/src/test
+cp $CPL $UIMACPP_SOURCE/examples/src/*.vcproj $target_dir/examples/src
+cp $CPL $UIMACPP_SOURCE/examples/tutorial/src/*.vcproj
$target_dir/examples/tutorial\src
+cp $CPL $UIMACPP_SOURCE/src/*.sln $target_dir/src
+cp $CPL $UIMACPP_SOURCE/src/test/*.sln $target_dir/src/test
+cp $CLP $UIMACPP_SOURCE/examples/src/*.sln $target_dir/examples/src
+
+
print -u2 "removing unused files from $UIMACPP_SOURCE"
find $target_dir -depth -type d -name .svn -exec rm -rf {} \;
-find $target_dir -type f -iname '*.sln' -exec rm -f {} \;
-find $target_dir -type f -iname '*.vcproj' -exec rm -f {} \;
-find $target_dir -type f -iname '*.cmd' -exec rm -f {} \;
-find $target_dir -type f -iname '*.bat' -exec rm -f {} \;
+#find $target_dir -type f -iname '*.sln' -exec rm -f {} \;
+#find $target_dir -type f -iname '*.vcproj' -exec rm -f {} \;
+#find $target_dir -type f -i
svn commit: r1230625 - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/constraint/ uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textm
Author: pkluegl
Date: Thu Jan 12 16:32:47 2012
New Revision: 1230625
URL: http://svn.apache.org/viewvc?rev=1230625&view=rev
Log:
UIMA-2330
Added greedy filtering behavior for rule inference. Added unit tests for basic
filtering functionality.
Added:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/java/org/apache/uima/textmarker/AllTests.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/java/org/apache/uima/textmarker/FilteringTest.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/resources/org/apache/uima/textmarker/FilteringTest.tm
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/test/resources/org/apache/uima/textmarker/FilteringTest.txt
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/constraint/BasicTypeConstraint.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerTypeMatcher.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/quantifier/PlusGreedy.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/validator/TextMarkerTypeChecker.java
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/constraint/BasicTypeConstraint.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/constraint/BasicTypeConstraint.java?rev=1230625&r1=1230624&r2=1230625&view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/constraint/BasicTypeConstraint.java
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/constraint/BasicTypeConstraint.java
Thu Jan 12 16:32:47 2012
@@ -64,7 +64,7 @@ public class BasicTypeConstraint impleme
TextMarkerBasic tmb = (TextMarkerBasic) fs;
if (types != null) {
for (Type each : types) {
- result |= tmb.beginsWith(each) && tmb.endsWith(each);
+ result |= tmb.isPartOf(each)|| tmb.beginsWith(each) ||
tmb.endsWith(each);
if (result)
break;
}
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerTypeMatcher.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerTypeMatcher.java?rev=1230625&r1=1230624&r2=1230625&view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerTypeMatcher.java
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerTypeMatcher.java
Thu Jan 12 16:32:47 2012
@@ -26,7 +26,6 @@ import java.util.List;
import java.util.TreeSet;
import org.apache.uima.cas.ConstraintFactory;
-import org.apache.uima.cas.FSIterator;
import org.apache.uima.cas.FSMatchConstraint;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
@@ -51,7 +50,8 @@ public class TextMarkerTypeMatcher imple
public Collection getMatchingAnnotations(TextMarkerStream
stream,
TextMarkerBlock parent) {
-
+// TODO what about the matching direction?
+// TODO this comparator can ignore some annotations?! same offset same type
Collection result = new TreeSet(comparator);
List types = getTypes(parent, stream);
for (Type type : types) {
@@ -64,19 +64,18 @@ public class TextMarkerTypeMatcher imple
result.add(stream.getDocumentAnnotation());
} else {
-FSIterator iterator =
stream.getFilter().createFilteredIterator(
-stream.getCas(), type);
-
-// AnnotationIndex annotationIndex =
stream.getCas().getAnnotationIndex(type);
-// stream.getCas().createFilteredIterator(annotationIndex.iterator(),
-// stream.getFilter().createFilteredIterator(null, stream, type));
-// FSMatchConstraint anchorConstraint =
createAnchorConstraints(parent, stream);
-// FSIterator iterator =
stream.getFilteredBasicIterator(anchorConstraint);
-// iterator.moveToFirst();
-while (iterator.isValid()) {
- AnnotationFS annotation = iterator.get();
- result.add(annotation);
- iterator.moveToNext();
+stream.moveToFirst();
+while (stream.isValid()) {
+ TextMarkerBasic nextBasic = (TextMarkerBasic) stream.get();
+ List allTypes =
stream.getCas().getTypeSystem().getProperlySubsumedTypes(type);
+ allTypes
svn commit: r1230537 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker: TextMarkerStream.java engine/TextMarkerEngine.java seed/DefaultSeeder.java
Author: pkluegl
Date: Thu Jan 12 13:45:58 2012
New Revision: 1230537
URL: http://svn.apache.org/viewvc?rev=1230537&view=rev
Log:
UIMA-2233
only add inference annotations if there are none yet. They will be initialized
anyway. Let seeder return their seeding type in order to be able to remove the
seeding annotations with the inference annotations if needed.
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/seed/DefaultSeeder.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/seed/TextMarkerAnnotationSeeder.java
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java?rev=1230537&r1=1230536&r2=1230537&view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java
Thu Jan 12 13:45:58 2012
@@ -132,20 +132,23 @@ public class TextMarkerStream extends FS
}
public void initalizeBasics() {
+AnnotationIndex basicIndex =
cas.getAnnotationIndex(basicType);
AnnotationIndex annotationIndex = cas.getAnnotationIndex();
-TreeSet anchors = new TreeSet();
-for (AnnotationFS a : annotationIndex) {
- anchors.add(a.getBegin());
- anchors.add(a.getEnd());
-}
-while (anchors.size() >= 2) {
- Integer first = anchors.pollFirst();
- Integer second = anchors.first();
- TextMarkerBasic newTMB = new TextMarkerBasic(getJCas(), first, second);
- beginAnchors.put(first, newTMB);
- endAnchors.put(second, newTMB);
- basics.add(newTMB);
- cas.addFsToIndexes(newTMB);
+if (basicIndex.size() == 0) {
+ TreeSet anchors = new TreeSet();
+ for (AnnotationFS a : annotationIndex) {
+anchors.add(a.getBegin());
+anchors.add(a.getEnd());
+ }
+ while (anchors.size() >= 2) {
+Integer first = anchors.pollFirst();
+Integer second = anchors.first();
+TextMarkerBasic newTMB = new TextMarkerBasic(getJCas(), first, second);
+beginAnchors.put(first, newTMB);
+endAnchors.put(second, newTMB);
+basics.add(newTMB);
+cas.addFsToIndexes(newTMB);
+ }
}
for (AnnotationFS a : annotationIndex) {
if (!a.getType().equals(basicType)) {
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java?rev=1230537&r1=1230536&r2=1230537&view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java
Thu Jan 12 13:45:58 2012
@@ -39,7 +39,6 @@ import org.apache.uima.analysis_componen
import org.apache.uima.analysis_engine.AnalysisEngine;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.FSIterator;
import org.apache.uima.cas.Feature;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.TypeSystem;
@@ -168,7 +167,7 @@ public class TextMarkerEngine extends JC
private boolean initialized = false;
-
+ private List seedTypes;
@Override
public void initialize(UimaContext aContext) throws
ResourceInitializationException {
@@ -259,12 +258,16 @@ public class TextMarkerEngine extends JC
if (removeBasics) {
List toRemove = new ArrayList();
- Type type = cas.getTypeSystem().getType(BASIC_TYPE);
- FSIterator iterator =
cas.getAnnotationIndex(type).iterator();
- while (iterator.isValid()) {
-AnnotationFS fs = iterator.get();
+ Type basicType = cas.getTypeSystem().getType(BASIC_TYPE);
+ AnnotationIndex basicIndex =
cas.getAnnotationIndex(basicType);
+ for (AnnotationFS fs : basicIndex) {
toRemove.add(fs);
-iterator.moveToNext();
+ }
+ for (Type seedType : seedTypes) {
+AnnotationIndex seedIndex =
svn commit: r1230510 [3/3] - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser: TextMarkerParser.java TextMarkerParser.tokens
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens?rev=1230510&r1=1230509&r2=1230510&view=diff == --- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens Thu Jan 12 13:11:11 2012 @@ -50,105 +50,102 @@ Exponent=52 FALSE=53 FEATURE=54 FILL=55 -FILTERMARKUP=56 -FILTERTYPE=57 -FLOATLIST=58 -FloatString=59 -FloatTypeSuffix=60 -FloatingPointLiteral=61 -GATHER=62 -GET=63 -GETFEATURE=64 -GETLIST=65 -GREATER=66 -GREATEREQUAL=67 -HexDigit=68 -HexLiteral=69 -IF=70 -INLIST=71 -INTLIST=72 -IS=73 -ISINTAG=74 -Identifier=75 -IntString=76 -IntegerTypeSuffix=77 -JavaIDDigit=78 -LAST=79 -LBRACK=80 -LCURLY=81 -LESS=82 -LESSEQUAL=83 -LINE_COMMENT=84 -LOG=85 -LOGN=86 -LPAREN=87 -Letter=88 -ListIdentifier=89 -LogLevel=90 -MARK=91 -MARKFAST=92 -MARKLAST=93 -MARKONCE=94 -MARKSCORE=95 -MARKTABLE=96 -MATCHEDTEXT=97 -MERGE=98 -MINUS=99 -MOFN=100 -NEAR=101 -NOT=102 -NOTEQUAL=103 -OR=104 -OctalEscape=105 -OctalLiteral=106 -OldColor=107 -PARSE=108 -PARTOF=109 -PARTOFNEQ=110 -PERCENT=111 -PLUS=112 -POSITION=113 -PackageString=114 -QUESTION=115 -RBRACK=116 -RCURLY=117 -REGEXP=118 -REMOVE=119 -REMOVEDUPLICATE=120 -REMOVESTRING=121 -REPLACE=122 -RETAINMARKUP=123 -RETAINTYPE=124 -RPAREN=125 -RessourceLiteral=126 -SCORE=127 -SEMI=128 -SETFEATURE=129 -SIN=130 -SIZE=131 -SLASH=132 -STAR=133 -STARTSWITH=134 -STRINGLIST=135 -ScriptString=136 -StringLiteral=137 -StringString=138 -SymbolString=139 -TAN=140 -THEN=141 -TOTALCOUNT=142 -TRANSFER=143 -TRIE=144 -TRUE=145 -TYPELIST=146 -TypeString=147 -TypeSystemString=148 -UNMARK=149 -UNMARKALL=150 -UnicodeEscape=151 -VBAR=152 -VOTE=153 -WORDLIST=154 -WORDTABLE=155 -WS=156 -XOR=157 +FILTERTYPE=56 +FLOATLIST=57 +FloatString=58 +FloatTypeSuffix=59 +FloatingPointLiteral=60 +GATHER=61 +GET=62 +GETFEATURE=63 +GETLIST=64 +GREATER=65 +GREATEREQUAL=66 +HexDigit=67 +HexLiteral=68 +IF=69 +INLIST=70 +INTLIST=71 +IS=72 +Identifier=73 +IntString=74 +IntegerTypeSuffix=75 +JavaIDDigit=76 +LAST=77 +LBRACK=78 +LCURLY=79 +LESS=80 +LESSEQUAL=81 +LINE_COMMENT=82 +LOG=83 +LOGN=84 +LPAREN=85 +Letter=86 +ListIdentifier=87 +LogLevel=88 +MARK=89 +MARKFAST=90 +MARKLAST=91 +MARKONCE=92 +MARKSCORE=93 +MARKTABLE=94 +MATCHEDTEXT=95 +MERGE=96 +MINUS=97 +MOFN=98 +NEAR=99 +NOT=100 +NOTEQUAL=101 +OR=102 +OctalEscape=103 +OctalLiteral=104 +OldColor=105 +PARSE=106 +PARTOF=107 +PARTOFNEQ=108 +PERCENT=109 +PLUS=110 +POSITION=111 +PackageString=112 +QUESTION=113 +RBRACK=114 +RCURLY=115 +REGEXP=116 +REMOVE=117 +REMOVEDUPLICATE=118 +REMOVESTRING=119 +REPLACE=120 +RETAINTYPE=121 +RPAREN=122 +RessourceLiteral=123 +SCORE=124 +SEMI=125 +SETFEATURE=126 +SIN=127 +SIZE=128 +SLASH=129 +STAR=130 +STARTSWITH=131 +STRINGLIST=132 +ScriptString=133 +StringLiteral=134 +StringString=135 +SymbolString=136 +TAN=137 +THEN=138 +TOTALCOUNT=139 +TRANSFER=140 +TRIE=141 +TRUE=142 +TYPELIST=143 +TypeString=144 +TypeSystemString=145 +UNMARK=146 +UNMARKALL=147 +UnicodeEscape=148 +VBAR=149 +VOTE=150 +WORDLIST=151 +WORDTABLE=152 +WS=153 +XOR=154
svn commit: r1230510 [1/3] - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser: TextMarkerParser.java TextMarkerParser.tokens
Author: pkluegl Date: Thu Jan 12 13:11:11 2012 New Revision: 1230510 URL: http://svn.apache.org/viewvc?rev=1230510&view=rev Log: UIMA-2233 adapted engine parser to changed lexer tokens Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.java uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.tokens
svn commit: r1230508 - /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicEngine.xml
Author: pkluegl Date: Thu Jan 12 12:50:34 2012 New Revision: 1230508 URL: http://svn.apache.org/viewvc?rev=1230508&view=rev Log: UIMA-2233 removed default markup filter parameter in engine descriptor Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicEngine.xml Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicEngine.xml URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicEngine.xml?rev=1230508&r1=1230507&r2=1230508&view=diff == --- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicEngine.xml (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/BasicEngine.xml Thu Jan 12 12:50:34 2012 @@ -107,12 +107,6 @@ false -defaultFilteredMarkups -String -true -false - - mainScript String false
svn commit: r1230506 [3/5] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/ uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textma
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens?rev=1230506&r1=1230505&r2=1230506&view=diff == --- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens Thu Jan 12 12:44:39 2012 @@ -50,105 +50,102 @@ Exponent=52 FALSE=53 FEATURE=54 FILL=55 -FILTERMARKUP=56 -FILTERTYPE=57 -FLOATLIST=58 -FloatString=59 -FloatTypeSuffix=60 -FloatingPointLiteral=61 -GATHER=62 -GET=63 -GETFEATURE=64 -GETLIST=65 -GREATER=66 -GREATEREQUAL=67 -HexDigit=68 -HexLiteral=69 -IF=70 -INLIST=71 -INTLIST=72 -IS=73 -ISINTAG=74 -Identifier=75 -IntString=76 -IntegerTypeSuffix=77 -JavaIDDigit=78 -LAST=79 -LBRACK=80 -LCURLY=81 -LESS=82 -LESSEQUAL=83 -LINE_COMMENT=84 -LOG=85 -LOGN=86 -LPAREN=87 -Letter=88 -ListIdentifier=89 -LogLevel=90 -MARK=91 -MARKFAST=92 -MARKLAST=93 -MARKONCE=94 -MARKSCORE=95 -MARKTABLE=96 -MATCHEDTEXT=97 -MERGE=98 -MINUS=99 -MOFN=100 -NEAR=101 -NOT=102 -NOTEQUAL=103 -OR=104 -OctalEscape=105 -OctalLiteral=106 -OldColor=107 -PARSE=108 -PARTOF=109 -PARTOFNEQ=110 -PERCENT=111 -PLUS=112 -POSITION=113 -PackageString=114 -QUESTION=115 -RBRACK=116 -RCURLY=117 -REGEXP=118 -REMOVE=119 -REMOVEDUPLICATE=120 -REMOVESTRING=121 -REPLACE=122 -RETAINMARKUP=123 -RETAINTYPE=124 -RPAREN=125 -RessourceLiteral=126 -SCORE=127 -SEMI=128 -SETFEATURE=129 -SIN=130 -SIZE=131 -SLASH=132 -STAR=133 -STARTSWITH=134 -STRINGLIST=135 -ScriptString=136 -StringLiteral=137 -StringString=138 -SymbolString=139 -TAN=140 -THEN=141 -TOTALCOUNT=142 -TRANSFER=143 -TRIE=144 -TRUE=145 -TYPELIST=146 -TypeString=147 -TypeSystemString=148 -UNMARK=149 -UNMARKALL=150 -UnicodeEscape=151 -VBAR=152 -VOTE=153 -WORDLIST=154 -WORDTABLE=155 -WS=156 -XOR=157 +FILTERTYPE=56 +FLOATLIST=57 +FloatString=58 +FloatTypeSuffix=59 +FloatingPointLiteral=60 +GATHER=61 +GET=62 +GETFEATURE=63 +GETLIST=64 +GREATER=65 +GREATEREQUAL=66 +HexDigit=67 +HexLiteral=68 +IF=69 +INLIST=70 +INTLIST=71 +IS=72 +Identifier=73 +IntString=74 +IntegerTypeSuffix=75 +JavaIDDigit=76 +LAST=77 +LBRACK=78 +LCURLY=79 +LESS=80 +LESSEQUAL=81 +LINE_COMMENT=82 +LOG=83 +LOGN=84 +LPAREN=85 +Letter=86 +ListIdentifier=87 +LogLevel=88 +MARK=89 +MARKFAST=90 +MARKLAST=91 +MARKONCE=92 +MARKSCORE=93 +MARKTABLE=94 +MATCHEDTEXT=95 +MERGE=96 +MINUS=97 +MOFN=98 +NEAR=99 +NOT=100 +NOTEQUAL=101 +OR=102 +OctalEscape=103 +OctalLiteral=104 +OldColor=105 +PARSE=106 +PARTOF=107 +PARTOFNEQ=108 +PERCENT=109 +PLUS=110 +POSITION=111 +PackageString=112 +QUESTION=113 +RBRACK=114 +RCURLY=115 +REGEXP=116 +REMOVE=117 +REMOVEDUPLICATE=118 +REMOVESTRING=119 +REPLACE=120 +RETAINTYPE=121 +RPAREN=122 +RessourceLiteral=123 +SCORE=124 +SEMI=125 +SETFEATURE=126 +SIN=127 +SIZE=128 +SLASH=129 +STAR=130 +STARTSWITH=131 +STRINGLIST=132 +ScriptString=133 +StringLiteral=134 +StringString=135 +SymbolString=136 +TAN=137 +THEN=138 +TOTALCOUNT=139 +TRANSFER=140 +TRIE=141 +TRUE=142 +TYPELIST=143 +TypeString=144 +TypeSystemString=145 +UNMARK=146 +UNMARKALL=147 +UnicodeEscape=148 +VBAR=149 +VOTE=150 +WORDLIST=151 +WORDTABLE=152 +WS=153 +XOR=154 Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g?rev=1230506&r1=1230505&r2=1230506&view=diff == --- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g Thu Jan 12 12:44:39 2012 @@ -85,9 +85,6 @@ INLIST : 'INLIST' ; -ISINTAG - : 'ISINTAG' - ; LAST : 'LAST' @@ -197,18 +194,10 @@ REPLACE : 'REPLACE' ; -RETAINMARKUP - : 'RETAINMARKUP' - ; - RETAINTYPE : 'RETAINTYPE' ; -FILTERMARKUP - : 'FILTERMARKUP' - ; - FILTERTYPE : 'FILTERTYPE' ; Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens?rev=1230506&r1=1230505&r2=1230506&view=diff == --- uima/sandbox/trunk/TextMarker/uima
svn commit: r1230506 [5/5] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/ uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textma
Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens?rev=1230506&r1=1230505&r2=1230506&view=diff == --- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens Thu Jan 12 12:44:39 2012 @@ -50,105 +50,102 @@ Exponent=52 FALSE=53 FEATURE=54 FILL=55 -FILTERMARKUP=56 -FILTERTYPE=57 -FLOATLIST=58 -FloatString=59 -FloatTypeSuffix=60 -FloatingPointLiteral=61 -GATHER=62 -GET=63 -GETFEATURE=64 -GETLIST=65 -GREATER=66 -GREATEREQUAL=67 -HexDigit=68 -HexLiteral=69 -IF=70 -INLIST=71 -INTLIST=72 -IS=73 -ISINTAG=74 -Identifier=75 -IntString=76 -IntegerTypeSuffix=77 -JavaIDDigit=78 -LAST=79 -LBRACK=80 -LCURLY=81 -LESS=82 -LESSEQUAL=83 -LINE_COMMENT=84 -LOG=85 -LOGN=86 -LPAREN=87 -Letter=88 -ListIdentifier=89 -LogLevel=90 -MARK=91 -MARKFAST=92 -MARKLAST=93 -MARKONCE=94 -MARKSCORE=95 -MARKTABLE=96 -MATCHEDTEXT=97 -MERGE=98 -MINUS=99 -MOFN=100 -NEAR=101 -NOT=102 -NOTEQUAL=103 -OR=104 -OctalEscape=105 -OctalLiteral=106 -OldColor=107 -PARSE=108 -PARTOF=109 -PARTOFNEQ=110 -PERCENT=111 -PLUS=112 -POSITION=113 -PackageString=114 -QUESTION=115 -RBRACK=116 -RCURLY=117 -REGEXP=118 -REMOVE=119 -REMOVEDUPLICATE=120 -REMOVESTRING=121 -REPLACE=122 -RETAINMARKUP=123 -RETAINTYPE=124 -RPAREN=125 -RessourceLiteral=126 -SCORE=127 -SEMI=128 -SETFEATURE=129 -SIN=130 -SIZE=131 -SLASH=132 -STAR=133 -STARTSWITH=134 -STRINGLIST=135 -ScriptString=136 -StringLiteral=137 -StringString=138 -SymbolString=139 -TAN=140 -THEN=141 -TOTALCOUNT=142 -TRANSFER=143 -TRIE=144 -TRUE=145 -TYPELIST=146 -TypeString=147 -TypeSystemString=148 -UNMARK=149 -UNMARKALL=150 -UnicodeEscape=151 -VBAR=152 -VOTE=153 -WORDLIST=154 -WORDTABLE=155 -WS=156 -XOR=157 +FILTERTYPE=56 +FLOATLIST=57 +FloatString=58 +FloatTypeSuffix=59 +FloatingPointLiteral=60 +GATHER=61 +GET=62 +GETFEATURE=63 +GETLIST=64 +GREATER=65 +GREATEREQUAL=66 +HexDigit=67 +HexLiteral=68 +IF=69 +INLIST=70 +INTLIST=71 +IS=72 +Identifier=73 +IntString=74 +IntegerTypeSuffix=75 +JavaIDDigit=76 +LAST=77 +LBRACK=78 +LCURLY=79 +LESS=80 +LESSEQUAL=81 +LINE_COMMENT=82 +LOG=83 +LOGN=84 +LPAREN=85 +Letter=86 +ListIdentifier=87 +LogLevel=88 +MARK=89 +MARKFAST=90 +MARKLAST=91 +MARKONCE=92 +MARKSCORE=93 +MARKTABLE=94 +MATCHEDTEXT=95 +MERGE=96 +MINUS=97 +MOFN=98 +NEAR=99 +NOT=100 +NOTEQUAL=101 +OR=102 +OctalEscape=103 +OctalLiteral=104 +OldColor=105 +PARSE=106 +PARTOF=107 +PARTOFNEQ=108 +PERCENT=109 +PLUS=110 +POSITION=111 +PackageString=112 +QUESTION=113 +RBRACK=114 +RCURLY=115 +REGEXP=116 +REMOVE=117 +REMOVEDUPLICATE=118 +REMOVESTRING=119 +REPLACE=120 +RETAINTYPE=121 +RPAREN=122 +RessourceLiteral=123 +SCORE=124 +SEMI=125 +SETFEATURE=126 +SIN=127 +SIZE=128 +SLASH=129 +STAR=130 +STARTSWITH=131 +STRINGLIST=132 +ScriptString=133 +StringLiteral=134 +StringString=135 +SymbolString=136 +TAN=137 +THEN=138 +TOTALCOUNT=139 +TRANSFER=140 +TRIE=141 +TRUE=142 +TYPELIST=143 +TypeString=144 +TypeSystemString=145 +UNMARK=146 +UNMARKALL=147 +UnicodeEscape=148 +VBAR=149 +VOTE=150 +WORDLIST=151 +WORDTABLE=152 +WS=153 +XOR=154
svn commit: r1230506 [1/5] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/ uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textma
Author: pkluegl Date: Thu Jan 12 12:44:39 2012 New Revision: 1230506 URL: http://svn.apache.org/viewvc?rev=1230506&view=rev Log: UIMA-2233 removed language support (ide parser and lexer) for RETAINMARKUP, FILTERMARKUP and ISINTAG Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.g uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.java uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.tokens uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.g uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerLexer.tokens uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.g uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.java uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/parser/TextMarkerParser.tokens Modified: uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.g URL: http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.g?rev=1230506&r1=1230505&r2=1230506&view=diff == --- uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.g (original) +++ uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerLexer.g Thu Jan 12 12:44:39 2012 @@ -85,9 +85,6 @@ INLIST : 'INLIST' ; -ISINTAG - : 'ISINTAG' - ; LAST : 'LAST' @@ -197,18 +194,10 @@ REPLACE : 'REPLACE' ; -RETAINMARKUP - : 'RETAINMARKUP' - ; - RETAINTYPE : 'RETAINTYPE' ; -FILTERMARKUP - : 'FILTERMARKUP' - ; - FILTERTYPE : 'FILTERTYPE' ;
svn commit: r1230504 [1/3] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/ uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker
Author: pkluegl
Date: Thu Jan 12 12:36:08 2012
New Revision: 1230504
URL: http://svn.apache.org/viewvc?rev=1230504&view=rev
Log:
UIMA-2233
removed RETAINMARKUP, FILTERMARKUP, ISINTAG since their functionality is not
supported anymore. Html handling will be introduced by additional seeders in
future.
Removed:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/FilterMarkupAction.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/RetainMarkupAction.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/condition/IsInTagCondition.java
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/FilterManager.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/TextMarkerStream.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/action/ActionFactory.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/condition/ConditionFactory.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/engine/TextMarkerEngine.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.g
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/parser/TextMarkerParser.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerBasic.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ActionVerbalizer.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ConditionVerbalizer.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-ide/src/main/java/org/apache/uima/textmarker/ide/core/TextMarkerKeywords.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/src/main/java/org/apache/uima/textmarker/textruler/core/TextRulerBasicLearner.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-textruler/src/main/java/org/apache/uima/textmarker/textruler/tools/BatchRuleEvaluator.java
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/FilterManager.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/FilterManager.java?rev=1230504&r1=1230503&r2=1230504&view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/FilterManager.java
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/FilterManager.java
Thu Jan 12 12:36:08 2012
@@ -26,26 +26,20 @@ import java.util.List;
import java.util.Set;
import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.CASException;
import org.apache.uima.cas.ConstraintFactory;
import org.apache.uima.cas.FSIntConstraint;
import org.apache.uima.cas.FSIterator;
import org.apache.uima.cas.FSMatchConstraint;
-import org.apache.uima.cas.FSTypeConstraint;
import org.apache.uima.cas.FeaturePath;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.textmarker.constraint.BasicTypeConstraint;
-import org.apache.uima.textmarker.constraint.MarkupConstraint;
import org.apache.uima.textmarker.constraint.NotConstraint;
-import org.apache.uima.textmarker.type.MARKUP;
public class FilterManager {
private final Collection defaultFilterTypes;
- private final Collection defaultRetainTags;
-
private final FSMatchConstraint additionalWindow;
private final AnnotationFS windowAnnotation;
@@ -56,59 +50,35 @@ public class FilterManager {
private Collection currentRetainTypes;
- private Collection currentFilterTags;
-
- private Collection currentRetainTags;
-
private ConstraintFactory cf;
- private Type markupType;
-
- public FilterManager(Collection filterTypes, Collection
filterTags, CAS cas) {
+ public FilterManager(Collection filterTypes, CAS cas) {
super();
this.defaultFilterTypes = filterTypes;
-this.defaultRetainTags = filterTags;
currentFilterTypes = new ArrayList();
currentRetainTypes = new ArrayList();
-currentFilterTags = new ArrayList();
-currentRetainTags = new ArrayList();
cf = cas.getConstraintFactory();
this.windowAnnotation = null;
this.windowType = null;
this.additionalWindow = null;
-try {
- markupType = cas.getJCas().getCasType(MARKUP.type);
-} catch (C
svn commit: r1230504 [3/3] - in /uima/sandbox/trunk/TextMarker: uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/ uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerBasic.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerBasic.java?rev=1230504&r1=1230503&r2=1230504&view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerBasic.java
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/type/TextMarkerBasic.java
Thu Jan 12 12:36:08 2012
@@ -25,16 +25,6 @@ public class TextMarkerBasic extends Ann
private final Map> endMap = new HashMap>(10);
- public Map tags = new HashMap(20);
-
- public void setTags(Map tags) {
-this.tags = new HashMap(tags);
- }
-
- public Map getTags() {
-return tags;
- }
-
public void addPartOf(Type type) {
partOf.add(type);
}
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ActionVerbalizer.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ActionVerbalizer.java?rev=1230504&r1=1230503&r2=1230504&view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ActionVerbalizer.java
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ActionVerbalizer.java
Thu Jan 12 12:36:08 2012
@@ -30,7 +30,6 @@ import org.apache.uima.textmarker.action
import org.apache.uima.textmarker.action.DelAction;
import org.apache.uima.textmarker.action.ExpandAction;
import org.apache.uima.textmarker.action.FillAction;
-import org.apache.uima.textmarker.action.FilterMarkupAction;
import org.apache.uima.textmarker.action.FilterTypeAction;
import org.apache.uima.textmarker.action.GatherAction;
import org.apache.uima.textmarker.action.GetAction;
@@ -44,7 +43,6 @@ import org.apache.uima.textmarker.action
import org.apache.uima.textmarker.action.RemoveAction;
import org.apache.uima.textmarker.action.RemoveDuplicateAction;
import org.apache.uima.textmarker.action.ReplaceAction;
-import org.apache.uima.textmarker.action.RetainMarkupAction;
import org.apache.uima.textmarker.action.RetainTypeAction;
import org.apache.uima.textmarker.action.SetFeatureAction;
import org.apache.uima.textmarker.action.TransferAction;
@@ -78,8 +76,6 @@ public class ActionVerbalizer {
return "DEL";
} else if (action instanceof FillAction) {
return "FILL";
-} else if (action instanceof FilterMarkupAction) {
- return "FILTERMARKUP";
} else if (action instanceof FilterTypeAction) {
return "FILTERTYPE";
} else if (action instanceof LogAction) {
@@ -100,8 +96,6 @@ public class ActionVerbalizer {
return "MARKLAST";
} else if (action instanceof ReplaceAction) {
return "REPLACE";
-} else if (action instanceof RetainMarkupAction) {
- return "RETAINMARKUP";
} else if (action instanceof RetainTypeAction) {
return "RETAINTYPE";
} else if (action instanceof SetFeatureAction) {
@@ -207,10 +201,6 @@ public class ActionVerbalizer {
features = features.substring(0, features.length() - 1);
}
return "FILL(" + verbalizer.verbalize(a.getStructureType()) + features +
")";
-} else if (action instanceof FilterMarkupAction) {
- FilterMarkupAction a = (FilterMarkupAction) action;
- return a.getMarkup().isEmpty() ? "FILTERMARKUP" : "FILTERMARKUP("
- + verbalizer.verbalizeExpressionList(a.getMarkup()) + ")";
} else if (action instanceof FilterTypeAction) {
FilterTypeAction a = (FilterTypeAction) action;
return a.getList().isEmpty() ? "FILTERTYPE" : "FILTERTYPE("
@@ -265,10 +255,6 @@ public class ActionVerbalizer {
} else if (action instanceof ReplaceAction) {
ReplaceAction a = (ReplaceAction) action;
return "REPLACE(" + verbalizer.verbalize(a.getReplacement()) + ")";
-} else if (action instanceof RetainMarkupAction) {
- RetainMarkupAction a = (RetainMarkupAction) action;
- return a.getMarkup().isEmpty() ? "RETAINMARKUP" : "RETAINMARKUP("
- + verbalizer.verbalizeExpressionList(a.getMarkup()) + ")";
} else if (action instanceof RetainTypeAction) {
RetainTypeAction a = (RetainTypeAction) action;
return a.getList().isEmpty() ? "RETAINTYPE" : "RETAINTYPE("
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/verbalize/ConditionVerbalizer.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-te
svn commit: r1230503 - in /uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule: ComposedRuleElementMatch.java RuleMatch.java TextMarkerRuleElement.ja
Author: pkluegl
Date: Thu Jan 12 12:04:47 2012
New Revision: 1230503
URL: http://svn.apache.org/viewvc?rev=1230503&view=rev
Log:
UIMA-2233
restricted creation of alternative "matching realities" to situations where
parallel realities are needed, e.g., multiple anchors for rule elements.
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/ComposedRuleElementMatch.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/ComposedRuleElementMatch.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/ComposedRuleElementMatch.java?rev=1230503&r1=1230502&r2=1230503&view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/ComposedRuleElementMatch.java
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/ComposedRuleElementMatch.java
Thu Jan 12 12:04:47 2012
@@ -168,6 +168,29 @@ public class ComposedRuleElementMatch ex
return copy;
}
+ public void update(ComposedRuleElementMatch extendedContainerMatch) {
+for (Entry> entry :
innerMatches.entrySet()) {
+ RuleElement key = entry.getKey();
+ List value = entry.getValue();
+ if (key.equals(extendedContainerMatch.getRuleElement())) {
+extendedContainerMatch.setContainerMatch(this);
+if (value != null) {
+ value.set(value.size() - 1, extendedContainerMatch);
+}
+ } else {
+if (value != null) {
+ for (RuleElementMatch each : value) {
+if (each instanceof ComposedRuleElementMatch) {
+ ((ComposedRuleElementMatch)each).update(extendedContainerMatch);
+}
+ }
+}
+ }
+}
+ }
+
+
+
public String toString() {
return "CREM" + innerMatches.toString();
}
@@ -194,4 +217,5 @@ public class ComposedRuleElementMatch ex
}
+
}
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java?rev=1230503&r1=1230502&r2=1230503&view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/RuleMatch.java
Thu Jan 12 12:04:47 2012
@@ -206,6 +206,14 @@ public class RuleMatch {
copy.setDelegateApply(newDelegateApply);
return copy;
}
+
+ public void update(ComposedRuleElementMatch extendedContainerMatch) {
+if (extendedContainerMatch.getContainerMatch() == null) {
+ setRootMatch(extendedContainerMatch);
+} else {
+ rootMatch.update(extendedContainerMatch);
+}
+ }
public void setDelegateApply(Map
delegateApply) {
this.delegateApply = delegateApply;
Modified:
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java?rev=1230503&r1=1230502&r2=1230503&view=diff
==
---
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java
(original)
+++
uima/sandbox/trunk/TextMarker/uimaj-ep-textmarker-engine/src/main/java/org/apache/uima/textmarker/rule/TextMarkerRuleElement.java
Thu Jan 12 12:04:47 2012
@@ -56,13 +56,15 @@ public class TextMarkerRuleElement exten
InferenceCrowd crowd) {
Collection anchors = getAnchors(stream);
-boolean useAlternatives = entryPoint == null; // anchors.size() > 1;
+boolean useAlternatives = entryPoint == null && !(anchors.size() == 1);
for (AnnotationFS eachAnchor : anchors) {
ComposedRuleElementMatch extendedContainerMatch = containerMatch;
RuleMatch extendedMatch = ruleMatch;
if (useAlternatives) {
extendedContainerMatch = containerMatch.copy();
extendedMatch = ruleMatch.copy(extendedContainerMatch);
+ } else {
+extendedMatch.update(extendedCon
