svn commit: r1152750 - /uima/sandbox/trunk/TextMarker/

2011-08-01 Thread joern
Author: joern
Date: Mon Aug  1 12:13:46 2011
New Revision: 1152750

URL: http://svn.apache.org/viewvc?rev=1152750view=rev
Log:
UIMA-2172 Created folder for TextMarker contribution

Added:
uima/sandbox/trunk/TextMarker/



svn commit: r1152762 - in /uima/sandbox/trunk/TextMarker: org.apache.uima.tm.cev.feature/ org.apache.uima.tm.cev.html.feature/ org.apache.uima.tm.cev.html/ org.apache.uima.tm.cev/ org.apache.uima.tm.d

2011-08-01 Thread joern
Author: joern
Date: Mon Aug  1 13:23:21 2011
New Revision: 1152762

URL: http://svn.apache.org/viewvc?rev=1152762view=rev
Log:
UIMA-2172 Share TextMarker projects

Added:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.feature/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.cev.html.feature/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug.ui/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debugger/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.formatter/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.launching/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.testing/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.ui/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.cev.extensions/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.feature/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.query/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.testing/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.lp2/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.rapier/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.whisk/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.wien/



svn commit: r1152781 - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr: ./ .classpath .project LICENSE.html META-INF/ META-INF/MANIFEST.MF antlr-3.1.3.jar build.properties

2011-08-01 Thread joern
Author: joern
Date: Mon Aug  1 13:59:08 2011
New Revision: 1152781

URL: http://svn.apache.org/viewvc?rev=1152781view=rev
Log:
UIMA-2172 Initial commit of the TextMarker contribution.

Added:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.classpath   
(with props)
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.project   
(with props)
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/LICENSE.html   
(with props)
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/META-INF/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/META-INF/MANIFEST.MF
   (with props)
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/antlr-3.1.3.jar 
  (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/build.properties   
(with props)
Modified:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/   (props 
changed)

Propchange: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/
--
--- svn:ignore (added)
+++ svn:ignore Mon Aug  1 13:59:08 2011
@@ -0,0 +1 @@
+.settings

Added: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.classpath
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.classpath?rev=1152781view=auto
==
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.classpath 
(added)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.classpath Mon 
Aug  1 13:59:08 2011
@@ -0,0 +1,7 @@
+?xml version=1.0 encoding=UTF-8?
+classpath
+   classpathentry kind=con 
path=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6/
+   classpathentry kind=con path=org.eclipse.pde.core.requiredPlugins/
+   classpathentry exported=true kind=lib path=antlr-3.1.3.jar 
sourcepath=D:/work/ANTLR/antlr-3.1.3/
+   classpathentry kind=output path=bin/
+/classpath

Propchange: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.classpath
--
svn:executable = *

Propchange: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.classpath
--
svn:mime-type = text/plain

Added: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.project
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.project?rev=1152781view=auto
==
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.project (added)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.project Mon 
Aug  1 13:59:08 2011
@@ -0,0 +1,28 @@
+?xml version=1.0 encoding=UTF-8?
+projectDescription
+   nameorg.apache.uima.tm.dltk.antlr/name
+   comment/comment
+   projects
+   /projects
+   buildSpec
+   buildCommand
+   nameorg.eclipse.jdt.core.javabuilder/name
+   arguments
+   /arguments
+   /buildCommand
+   buildCommand
+   nameorg.eclipse.pde.ManifestBuilder/name
+   arguments
+   /arguments
+   /buildCommand
+   buildCommand
+   nameorg.eclipse.pde.SchemaBuilder/name
+   arguments
+   /arguments
+   /buildCommand
+   /buildSpec
+   natures
+   natureorg.eclipse.pde.PluginNature/nature
+   natureorg.eclipse.jdt.core.javanature/nature
+   /natures
+/projectDescription

Propchange: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.project
--
svn:executable = *

Propchange: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/.project
--
svn:mime-type = text/plain

Added: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/LICENSE.html
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/LICENSE.html?rev=1152781view=auto
==
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/LICENSE.html 
(added)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.antlr/LICENSE.html 
Mon Aug  1 13:59:08 2011
@@ -0,0 +1,18 @@
+html
+body
+bfont size=+1ANTLR 3 License/font/bbrbr
+i[The BSD License]/ibr
+Copyright (c) 2003-2007, Terence Parrbr
+All rights reserved.
+
+p
+Redistribution and use in source and binary forms, with or without 
modification, are 

svn commit: r1152783 [12/12] - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core: ./ META-INF/ bin/ schema/ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/

2011-08-01 Thread joern
Added: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerVariableReference.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerVariableReference.java?rev=1152783view=auto
==
--- 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerVariableReference.java
 (added)
+++ 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerVariableReference.java
 Mon Aug  1 14:06:27 2011
@@ -0,0 +1,36 @@
+/**
+ * 
+ */
+package org.apache.uima.tm.dltk.parser.ast.expressions;
+
+import org.apache.uima.tm.dltk.parser.ast.TMTypeConstants;
+import org.eclipse.dltk.ast.references.VariableReference;
+
+
+/**
+ * @author Martin Toepfer
+ * 
+ */
+public class TextMarkerVariableReference extends VariableReference {
+  private int typeId;
+
+  /**
+   * @param start
+   * @param end
+   * @param name
+   * @param typedId
+   *  raw type id from {@link TMTypeConstants}
+   */
+  public TextMarkerVariableReference(int start, int end, String name, int 
typedId) {
+super(start, end, name);
+this.typeId = typedId;
+  }
+
+  public int getType() {
+return this.typeId;
+  }
+
+  public void setType(int type) {
+this.typeId = type;
+  }
+}

Propchange: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerVariableReference.java
--
svn:executable = *

Propchange: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.core/src/main/java/org/apache/uima/tm/dltk/parser/ast/expressions/TextMarkerVariableReference.java
--
svn:mime-type = text/plain




svn commit: r1152785 - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug: ./ META-INF/ bin/ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/a

2011-08-01 Thread joern
Author: joern
Date: Mon Aug  1 14:09:56 2011
New Revision: 1152785

URL: http://svn.apache.org/viewvc?rev=1152785view=rev
Log:
UIMA-2172 Initial commit of the TextMarker contribution.

Added:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.classpath   
(with props)
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.project   
(with props)
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/META-INF/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/META-INF/MANIFEST.MF
   (with props)
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/bin/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/build.properties   
(with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/plugin.properties   
(with props)
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/plugin.xml   
(with props)
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/tm/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/tm/dltk/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/tm/dltk/internal/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/tm/dltk/internal/debug/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/tm/dltk/internal/debug/TextMarkerDebugConstants.java
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/tm/dltk/internal/debug/TextMarkerDebugPlugin.java
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/tm/dltk/internal/debug/TextMarkerDebugPreferenceInitializer.java
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/tm/dltk/internal/debug/TextMarkerDebugPreferences.java
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/src/main/java/org/apache/uima/tm/dltk/internal/debug/TextMarkerTypeFactory.java
   (with props)
Modified:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/   (props 
changed)

Propchange: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/
--
--- svn:ignore (added)
+++ svn:ignore Mon Aug  1 14:09:56 2011
@@ -0,0 +1 @@
+.settings

Added: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.classpath
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.classpath?rev=1152785view=auto
==
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.classpath 
(added)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.classpath Mon 
Aug  1 14:09:56 2011
@@ -0,0 +1,7 @@
+?xml version=1.0 encoding=UTF-8?
+classpath
+   classpathentry kind=src path=src/main/java/
+   classpathentry kind=con 
path=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6/
+   classpathentry kind=con path=org.eclipse.pde.core.requiredPlugins/
+   classpathentry kind=output path=bin/
+/classpath

Propchange: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.classpath
--
svn:executable = *

Propchange: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.classpath
--
svn:mime-type = text/plain

Added: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.project
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.project?rev=1152785view=auto
==
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.project (added)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.debug/.project Mon 
Aug  1 14:09:56 2011
@@ -0,0 +1,28 @@
+?xml version=1.0 encoding=UTF-8?
+projectDescription
+   nameorg.apache.uima.tm.dltk.debug/name
+   comment/comment
+   projects
+   /projects
+   buildSpec
+   buildCommand
+   nameorg.eclipse.jdt.core.javabuilder/name
+  

svn commit: r1152792 [10/10] - in /uima/sandbox/trunk/TextMarker: org.apache.uima.tm.textruler.lp2/ org.apache.uima.tm.textruler.lp2/META-INF/ org.apache.uima.tm.textruler.lp2/bin/ org.apache.uima.tm.

2011-08-01 Thread joern
Added: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/src/main/java/org/apache/uima/tm/textruler/ui/TextRulerViewComposite.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/src/main/java/org/apache/uima/tm/textruler/ui/TextRulerViewComposite.java?rev=1152792view=auto
==
--- 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/src/main/java/org/apache/uima/tm/textruler/ui/TextRulerViewComposite.java
 (added)
+++ 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler/src/main/java/org/apache/uima/tm/textruler/ui/TextRulerViewComposite.java
 Mon Aug  1 14:21:12 2011
@@ -0,0 +1,856 @@
+package org.apache.uima.tm.textruler.ui;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.uima.UIMAFramework;
+import org.apache.uima.resource.metadata.TypeDescription;
+import org.apache.uima.resource.metadata.TypeSystemDescription;
+import org.apache.uima.tm.textruler.TextRulerPlugin;
+import org.apache.uima.tm.textruler.core.TextRulerToolkit;
+import org.apache.uima.tm.textruler.extension.TextRulerController;
+import org.apache.uima.tm.textruler.extension.TextRulerLearnerController;
+import org.apache.uima.util.FileUtils;
+import org.apache.uima.util.InvalidXMLException;
+import org.apache.uima.util.XMLInputSource;
+import org.apache.uima.util.XMLizable;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.jface.viewers.CheckboxTableViewer;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerSorter;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.ScrolledComposite;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.DropTarget;
+import org.eclipse.swt.dnd.DropTargetAdapter;
+import org.eclipse.swt.dnd.DropTargetEvent;
+import org.eclipse.swt.dnd.FileTransfer;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.SelectionAdapter;
+import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.layout.FormAttachment;
+import org.eclipse.swt.layout.FormData;
+import org.eclipse.swt.layout.FormLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.DirectoryDialog;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.IMemento;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+
+
+public class TextRulerViewComposite extends org.eclipse.swt.widgets.Composite {
+
+  public class DefaultLabelProvider extends LabelProvider implements 
ITableLabelProvider {
+
+private final String type;
+
+public DefaultLabelProvider(String type) {
+  super();
+  this.type = type;
+}
+
+public String getColumnText(Object obj, int index) {
+  return getText(obj);
+}
+
+public Image getColumnImage(Object obj, int index) {
+  return getImage(obj);
+}
+
+@Override
+public Image getImage(Object obj) {
+  if (type.equals(SlotTypes)) {
+return images.get(information);
+  } else if (type.equals(FilterTypes)) {
+return images.get(feature);
+  } else if (type.equals(learner)) {
+return images.get(learner);
+  }
+  return 
PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJ_ELEMENT);
+}
+  }
+
+  private CheckboxTableViewer algListViewer;
+
+  private AddRemoveList slotTypes;
+
+  private AddRemoveList filterTypes;
+
+  private Button skipPreButton;
+
+  private Button dirButton;
+
+  // private Composite configArea;
+
+  private ArrayListLearnerConfigurator configurators;
+
+  private Label globalStatusLabel;
+
+  private Label label2;
+
+  private Label label1;
+
+  private Text inputDirectoryText;
+
+  private Label methodsLabel;
+
+  private Label filtersLabel;
+
+  private TextRulerView textRulerView;
+
+  private Button fileChooseButton;
+
+  private static Text preFileText;
+
+  private Label label3;
+
+  private HashMapString, Image images;
+
+  private Text additionalDirectoryText;
+
+  private Button additionalButton;
+
+  private Label label4;
+
+  private Label label5;
+
+  private Text testDirectoryText;
+
+  private Button testButton;
+
+  private Button showTestsButton;
+
+  public class ListContentProvider implements IStructuredContentProvider {
+public void inputChanged(Viewer v, Object oldInput, Object newInput) {
+}
+
+public void dispose() {
+}
+
+public Object[] getElements(Object parent) {
+  return 

svn commit: r1152798 - /uima/addons/trunk/addons-osgi-runtime/

2011-08-01 Thread schor
Author: schor
Date: Mon Aug  1 14:29:29 2011
New Revision: 1152798

URL: http://svn.apache.org/viewvc?rev=1152798view=rev
Log:
[UIMA-2184] removing seperate projects for osgi.  osgi bundles now built as 
part of normal build, if wanted.

Removed:
uima/addons/trunk/addons-osgi-runtime/



svn commit: r1152804 [15/15] - in /uima/sandbox/trunk/TextMarker: org.apache.uima.tm.dltk.debug.ui/ org.apache.uima.tm.dltk.debug.ui/META-INF/ org.apache.uima.tm.dltk.debug.ui/bin/ org.apache.uima.tm.

2011-08-01 Thread joern
Added: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerTypeChecker.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerTypeChecker.java?rev=1152804view=auto
==
--- 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerTypeChecker.java
 (added)
+++ 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.dltk.validator/src/main/java/org/apache/uima/tm/dltk/validator/TextMarkerTypeChecker.java
 Mon Aug  1 14:37:34 2011
@@ -0,0 +1,594 @@
+package org.apache.uima.tm.dltk.validator;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.Stack;
+
+import org.apache.uima.UIMAFramework;
+import org.apache.uima.resource.ResourceManager;
+import org.apache.uima.resource.metadata.TypeDescription;
+import org.apache.uima.resource.metadata.TypeSystemDescription;
+import org.apache.uima.tm.dltk.core.TextMarkerCorePreferences;
+import org.apache.uima.tm.dltk.core.TextMarkerPlugin;
+import org.apache.uima.tm.dltk.internal.core.builder.TextMarkerProjectUtils;
+import org.apache.uima.tm.dltk.parser.ast.TMStatementConstants;
+import org.apache.uima.tm.dltk.parser.ast.TMTypeConstants;
+import org.apache.uima.tm.dltk.parser.ast.TextMarkerBlock;
+import org.apache.uima.tm.dltk.parser.ast.TextMarkerImportStatement;
+import 
org.apache.uima.tm.dltk.parser.ast.declarations.TextMarkerDeclareDeclarationsStatement;
+import 
org.apache.uima.tm.dltk.parser.ast.declarations.TextMarkerFeatureDeclaration;
+import 
org.apache.uima.tm.dltk.parser.ast.declarations.TextMarkerPackageDeclaration;
+import 
org.apache.uima.tm.dltk.parser.ast.declarations.TextMarkerTypeDeclaration;
+import 
org.apache.uima.tm.dltk.parser.ast.declarations.TextMarkerVariableDeclaration;
+import 
org.apache.uima.tm.dltk.parser.ast.expressions.TextMarkerVariableReference;
+import org.apache.uima.util.InvalidXMLException;
+import org.apache.uima.util.XMLInputSource;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.Preferences;
+import org.eclipse.dltk.ast.ASTNode;
+import org.eclipse.dltk.ast.ASTVisitor;
+import org.eclipse.dltk.ast.declarations.MethodDeclaration;
+import org.eclipse.dltk.ast.declarations.ModuleDeclaration;
+import org.eclipse.dltk.ast.expressions.Expression;
+import org.eclipse.dltk.ast.references.SimpleReference;
+import org.eclipse.dltk.ast.statements.Statement;
+import org.eclipse.dltk.compiler.problem.IProblem;
+import org.eclipse.dltk.compiler.problem.IProblemReporter;
+import org.eclipse.dltk.core.IModelElement;
+import org.eclipse.dltk.core.IScriptProject;
+import org.eclipse.dltk.core.ISourceModule;
+import org.eclipse.dltk.core.builder.IBuildContext;
+import org.eclipse.dltk.core.builder.IBuildParticipant;
+import org.eclipse.dltk.core.builder.IBuildParticipantExtension;
+import org.eclipse.dltk.core.builder.ISourceLineTracker;
+
+
+public class TextMarkerTypeChecker implements IBuildParticipant, 
IBuildParticipantExtension {
+
+  /**
+   * @author Martin Toepfer
+   * 
+   */
+  private class TypeCheckerVisitor extends ASTVisitor {
+private final StackString blocks;
+
+private final SetString typeVariables;
+
+private final SetString otherVariables;
+
+private IProblemReporter rep;
+
+private ISourceModule currentFile;
+
+private ISourceLineTracker linetracker;
+
+private SetString completeTypes;
+
+private SetString shortTypes;
+
+private TextMarkerCheckerProblemFactory problemFactory;
+
+private String packageName;
+
+private TypeSystemDescription description;
+
+// private TypeSystem ts;
+
+private SetString otherTypes;
+
+private SetString finalTypes;
+
+private boolean reportWarningOnShortNames;
+
+public TypeCheckerVisitor(IProblemReporter rep, ISourceLineTracker 
linetracker,
+ISourceModule curFile, SetString completeTypes, SetString 
shortTypes) {
+  this.problemFactory = new 
TextMarkerCheckerProblemFactory(curFile.getElementName(),
+  linetracker);
+  this.linetracker = linetracker;
+  this.rep = rep;
+  this.typeVariables = new HashSetString();
+  this.otherVariables = new HashSetString();
+  this.blocks = new StackString();
+  this.packageName = ;
+  this.currentFile = curFile;
+  this.completeTypes = completeTypes;
+  this.shortTypes = shortTypes;
+  this.otherTypes = new HashSetString();
+  

svn commit: r1152812 - /uima/addons/trunk/uima-addons-parent/pom.xml

2011-08-01 Thread schor
Author: schor
Date: Mon Aug  1 14:58:40 2011
New Revision: 1152812

URL: http://svn.apache.org/viewvc?rev=1152812view=rev
Log:
[UIMA-2185] change the binary build to create in base-bin the binary build to 
be zipped/tarred, with dependencies, docs, javadocs, and LICENSE/NOTICE files.  
Use this for binary assemblies (both individual - not yet done - and overall 
addons binary), and as the base for PEAR and OSGi packagings.

Modified:
uima/addons/trunk/uima-addons-parent/pom.xml

Modified: uima/addons/trunk/uima-addons-parent/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/uima-addons-parent/pom.xml?rev=1152812r1=1152811r2=1152812view=diff
==
--- uima/addons/trunk/uima-addons-parent/pom.xml (original)
+++ uima/addons/trunk/uima-addons-parent/pom.xml Mon Aug  1 14:58:40 2011
@@ -43,6 +43,14 @@
   descriptionThe common parent pom for uima-addons/description
   url${uimaWebsiteUrl}/url
 
+  issueManagement
+systemJira/system
+!-- the form of the url is from 
http://maven.apache.org/plugins/maven-changes-plugin/usage.html --
+
!--urlhttps://issues.apache.org/jira/BrowseProject.jspa?projectId=12310570/url--
+urlhttps://issues.apache.org/jira/browse/UIMA?projectId=12310570/url
+
+  /issueManagement
+
   scm
 connection
   
scm:svn:http://svn.apache.org/repos/asf/uima/addons/trunk/uima-addons-parent
@@ -179,166 +187,365 @@
 
tagBasehttps://svn.apache.org/repos/asf/uima/sandbox/tags//tagBase
   /configuration
 /plugin
+
   /plugins
 /pluginManagement
+
+!-- * --
+!-- * Common Build--
+!-- *   Base Jar is built,-- 
+!-- * has no dependencies included--
+!-- * has basic LICENSE/NOTICE files  --
+!-- *   Base augmented dir built  --
+!-- * has Base Jar in lib/--
+!-- * has dependencies in lib/--
+!-- * has other things that go into PEAR  --
+!-- *   except the pear install.xml   --
+!-- * has augmented LICENSE/NOTICE files  --
+!-- * --
+!-- * This base is reused to make packages:   --
+!-- *   PEAR - adds the install.xml   --
+!-- *- actually, the PEAR builder --
+!-- *  will redo the copies, itself   --
+!-- *   OSGi - adds the OSGi manifest --
+!-- *- removes the doc, javadocs  --
+!-- *   individual zip/tar--
+!-- *   addons aggregate binary zip/tar   --
+!-- * --
+plugins
+  
+  !-- Build  base --
+!-- populate the lib dir with all needed dependencies
+ that will be distributed with this component
+ 
+ NOTE: TRANSITIVE DEPENDENIES ARE NOT INCLUDED
+   ANYTHING YOU WANT INCLUDED IN THE JAR 
+   PLEASE LIST EXPLICITLY AND MODIFY THE LICENSE/NOTICE
+   APPROPRIATELY
+  
+ Runs during process-resources --
+ 
+   plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-dependency-plugin/artifactId
+ executions
+   !-- Copy the dependencies to the target/base-bin/lib folder --
+   execution
+ idcopy dependencies to base-bin/lib/id
+ goalsgoalcopy-dependencies/goal/goals
+ phaseprocess-resources/phase
+ configuration
+   
outputDirectory${project.build.directory}/base-bin/lib/outputDirectory
+   includeScoperuntime/includeScope
+   excludeTransitivetrue/excludeTransitive
+ /configuration
+   /execution
+ /executions
+   /plugin
+   
+   plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-resources-plugin/artifactId
+ executions
+   
+   !-- add directories if they exist --
+   execution
+ idcopy standard dirs and files to base-bin/id
+ goalsgoalcopy-resources/goal/goals
+ phaseprocess-resources/phase  !-- required --
+ configuration
+   
outputDirectory${project.build.directory}/base-bin/outputDirectory
+   resources
+ resource
+   directory./directory
+   includes
+ includedesc/**/include
+ includeconf/**/include
+includedata/**/include
+

svn commit: r1152815 - in /uima/addons/trunk: AlchemyAPIAnnotator/ BSFAnnotator/ ConceptMapper/ ConfigurableFeatureExtractor/ DictionaryAnnotator/ FsVariables/ Lucas/ OpenCalaisAnnotator/ RegularExpre

2011-08-01 Thread schor
Author: schor
Date: Mon Aug  1 15:04:02 2011
New Revision: 1152815

URL: http://svn.apache.org/viewvc?rev=1152815view=rev
Log:
[UIMA-2185] Update marker files for new build process.  Rename a few 
LICENSE.txt etc. to drop the .txt to allow proper overriding.

Added:
uima/addons/trunk/AlchemyAPIAnnotator/marker-file-identifying-osgi-project
uima/addons/trunk/AlchemyAPIAnnotator/marker-file-identifying-single-project
uima/addons/trunk/BSFAnnotator/LICENSE
  - copied unchanged from r1148804, 
uima/addons/trunk/BSFAnnotator/LICENSE.txt
uima/addons/trunk/BSFAnnotator/NOTICE
  - copied unchanged from r1148804, 
uima/addons/trunk/BSFAnnotator/NOTICE.txt
uima/addons/trunk/BSFAnnotator/marker-file-identifying-osgi-project
uima/addons/trunk/BSFAnnotator/marker-file-identifying-single-project
uima/addons/trunk/ConceptMapper/marker-file-identifying-osgi-project
uima/addons/trunk/ConceptMapper/marker-file-identifying-single-project

uima/addons/trunk/ConfigurableFeatureExtractor/marker-file-identifying-osgi-project

uima/addons/trunk/ConfigurableFeatureExtractor/marker-file-identifying-single-project
uima/addons/trunk/DictionaryAnnotator/marker-file-identifying-osgi-project
uima/addons/trunk/DictionaryAnnotator/marker-file-identifying-single-project
uima/addons/trunk/FsVariables/marker-file-identifying-single-project
  - copied unchanged from r1148804, 
uima/addons/trunk/FsVariables/marker-file-identifying-standard-pear
uima/addons/trunk/Lucas/marker-file-identifying-osgi-project
uima/addons/trunk/Lucas/marker-file-identifying-single-project
uima/addons/trunk/OpenCalaisAnnotator/marker-file-identifying-osgi-project
uima/addons/trunk/OpenCalaisAnnotator/marker-file-identifying-single-project

uima/addons/trunk/RegularExpressionAnnotator/marker-file-identifying-osgi-project

uima/addons/trunk/RegularExpressionAnnotator/marker-file-identifying-single-project
uima/addons/trunk/SnowballAnnotator/marker-file-identifying-osgi-project
uima/addons/trunk/SnowballAnnotator/marker-file-identifying-single-project
uima/addons/trunk/Solrcas/marker-file-identifying-osgi-project
uima/addons/trunk/Solrcas/marker-file-identifying-single-project
uima/addons/trunk/Tagger/marker-file-identifying-osgi-project
uima/addons/trunk/Tagger/marker-file-identifying-single-project
uima/addons/trunk/TikaAnnotator/marker-file-identifying-osgi-project
uima/addons/trunk/TikaAnnotator/marker-file-identifying-single-project
uima/addons/trunk/WhitespaceTokenizer/marker-file-identifying-osgi-project
uima/addons/trunk/WhitespaceTokenizer/marker-file-identifying-single-project
Removed:
uima/addons/trunk/BSFAnnotator/LICENSE.txt
uima/addons/trunk/BSFAnnotator/NOTICE.txt
uima/addons/trunk/FsVariables/marker-file-identifying-standard-pear
Modified:
uima/addons/trunk/BSFAnnotator/pom.xml

Added: 
uima/addons/trunk/AlchemyAPIAnnotator/marker-file-identifying-osgi-project
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/AlchemyAPIAnnotator/marker-file-identifying-osgi-project?rev=1152815view=auto
==
(empty)

Added: 
uima/addons/trunk/AlchemyAPIAnnotator/marker-file-identifying-single-project
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/AlchemyAPIAnnotator/marker-file-identifying-single-project?rev=1152815view=auto
==
(empty)

Added: uima/addons/trunk/BSFAnnotator/marker-file-identifying-osgi-project
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/BSFAnnotator/marker-file-identifying-osgi-project?rev=1152815view=auto
==
(empty)

Added: uima/addons/trunk/BSFAnnotator/marker-file-identifying-single-project
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/BSFAnnotator/marker-file-identifying-single-project?rev=1152815view=auto
==
(empty)

Modified: uima/addons/trunk/BSFAnnotator/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/BSFAnnotator/pom.xml?rev=1152815r1=1152814r2=1152815view=diff
==
--- uima/addons/trunk/BSFAnnotator/pom.xml (original)
+++ uima/addons/trunk/BSFAnnotator/pom.xml Mon Aug  1 15:04:02 2011
@@ -146,6 +146,29 @@
   /executions
 /plugin 
   /plugins
-/pluginManagement 
+/pluginManagement
+
+plugins
+  plugin
+groupIdorg.apache.felix/groupId
+artifactIdmaven-bundle-plugin/artifactId
+executions
+  execution
+iduima-bundle/id
+configuration
+  instructions
+!-- These imports are in case some included scripting thing 
needs them, I think 7-2011 MIS --
+   

svn commit: r1152816 - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine: ./ META-INF/ desc/ lib/ metadata/

2011-08-01 Thread joern
Author: joern
Date: Mon Aug  1 15:05:54 2011
New Revision: 1152816

URL: http://svn.apache.org/viewvc?rev=1152816view=rev
Log:
UIMA-2172 Initial commit of the TextMarker contribution.

Added:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/META-INF/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/META-INF/MANIFEST.MF
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/build.properties
   (with props)
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/BasicEngine.xml
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/BasicTypeSystem.xml
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/InternalTypeSystem.xml
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/Modifier.xml
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/SourceDocumentInformation.xml
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/desc/TypePrioritites.xml
   (with props)
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/lib/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/lib/commons-collections-3.2.1.jar
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/lib/uima-document-annotation.jar
   (with props)
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/metadata/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/metadata/install.xml
   (with props)

Added: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/META-INF/MANIFEST.MF
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/META-INF/MANIFEST.MF?rev=1152816view=auto
==
--- 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/META-INF/MANIFEST.MF
 (added)
+++ 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/META-INF/MANIFEST.MF
 Mon Aug  1 15:05:54 2011
@@ -0,0 +1,38 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: TextMarker Engine Plugin
+Bundle-SymbolicName: org.apache.uima.tm.textmarker.engine
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .,
+ lib/uima-document-annotation.jar,
+ lib/commons-collections-3.2.1.jar
+Export-Package: org.apache.uima.tm.textmarker.action,
+ org.apache.uima.tm.textmarker.batch,
+ org.apache.uima.tm.textmarker.condition,
+ org.apache.uima.tm.textmarker.engine,
+ org.apache.uima.tm.textmarker.kernel,
+ org.apache.uima.tm.textmarker.kernel.constraint,
+ org.apache.uima.tm.textmarker.kernel.expression,
+ org.apache.uima.tm.textmarker.kernel.expression.bool,
+ org.apache.uima.tm.textmarker.kernel.expression.list,
+ org.apache.uima.tm.textmarker.kernel.expression.number,
+ org.apache.uima.tm.textmarker.kernel.expression.string,
+ org.apache.uima.tm.textmarker.kernel.expression.type,
+ org.apache.uima.tm.textmarker.kernel.extensions,
+ org.apache.uima.tm.textmarker.kernel.rule,
+ org.apache.uima.tm.textmarker.kernel.rule.quantifier,
+ org.apache.uima.tm.textmarker.kernel.type,
+ org.apache.uima.tm.textmarker.kernel.visitor,
+ org.apache.uima.tm.textmarker.parser,
+ org.apache.uima.tm.textmarker.resource,
+ org.apache.uima.tm.textmarker.resource.trie,
+ org.apache.uima.tm.textmarker.seed,
+ org.apache.uima.tm.textmarker.utils,
+ org.apache.uima.tm.textmarker.verbalize,
+ org.apache.uima.tm.type
+Require-Bundle: org.apache.uima.tm.dltk.antlr,
+ org.apache.uima.runtime;bundle-version=2.3.0
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-Vendor: University of Würzburg
+Eclipse-BuddyPolicy: registered
+Eclipse-RegisterBuddy: org.apache.uima.runtime

Propchange: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/META-INF/MANIFEST.MF
--
svn:executable = *

Propchange: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/META-INF/MANIFEST.MF
--
svn:mime-type = text/plain

Added: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/build.properties
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/build.properties?rev=1152816view=auto
==
--- 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/build.properties
 (added)
+++ 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/build.properties
 Mon Aug  1 15:05:54 2011
@@ -0,0 +1,6 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ 

svn commit: r1152819 [2/2] - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src: ./ main/ main/java/ main/java/org/ main/java/org/apache/ main/java/org/apache/uima/ main/java/o

2011-08-01 Thread joern
Added: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/type/PERIOD_Type.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/type/PERIOD_Type.java?rev=1152819view=auto
==
--- 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/type/PERIOD_Type.java
 (added)
+++ 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/type/PERIOD_Type.java
 Mon Aug  1 15:08:26 2011
@@ -0,0 +1,60 @@
+/* First created by JCasGen Tue Apr 08 18:30:34 CEST 2008 */
+package org.apache.uima.tm.type;
+
+import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.cas.Type;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.FSGenerator;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCasRegistry;
+
+/**
+ * Updated by JCasGen Thu Apr 24 17:12:22 CEST 2008
+ * 
+ * @generated
+ */
+public class PERIOD_Type extends SENTENCEEND_Type {
+  /** @generated */
+  @Override
+  protected FSGenerator getFSGenerator() {
+return fsGenerator;
+  }
+
+  /** @generated */
+  private final FSGenerator fsGenerator = new FSGenerator() {
+public FeatureStructure createFS(int addr, CASImpl cas) {
+  if (PERIOD_Type.this.useExistingInstance) {
+// Return eq fs instance if already created
+FeatureStructure fs = PERIOD_Type.this.jcas.getJfsFromCaddr(addr);
+if (null == fs) {
+  fs = new PERIOD(addr, PERIOD_Type.this);
+  PERIOD_Type.this.jcas.putJfsFromCaddr(addr, fs);
+  return fs;
+}
+return fs;
+  } else
+return new PERIOD(addr, PERIOD_Type.this);
+}
+  };
+
+  /** @generated */
+  public final static int typeIndexID = PERIOD.typeIndexID;
+
+  /**
+   * @generated
+   * @modifiable
+   */
+  public final static boolean featOkTst = 
JCasRegistry.getFeatOkTst(org.apache.uima.tm.type.PERIOD);
+
+  /**
+   * initialize variables to correspond with Cas Type and Features
+   * 
+   * @generated
+   */
+  public PERIOD_Type(JCas jcas, Type casType) {
+super(jcas, casType);
+casImpl.getFSClassRegistry().addGeneratorForType((TypeImpl) this.casType, 
getFSGenerator());
+
+  }
+}

Propchange: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/type/PERIOD_Type.java
--
svn:executable = *

Propchange: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/type/PERIOD_Type.java
--
svn:mime-type = text/plain

Added: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/type/PM.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/type/PM.java?rev=1152819view=auto
==
--- 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/type/PM.java
 (added)
+++ 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/type/PM.java
 Mon Aug  1 15:08:26 2011
@@ -0,0 +1,73 @@
+/* First created by JCasGen Tue Apr 08 18:30:34 CEST 2008 */
+package org.apache.uima.tm.type;
+
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.jcas.cas.TOP_Type;
+
+/**
+ * Updated by JCasGen Thu Apr 24 17:12:22 CEST 2008 XML source:
+ * 
C:/work/workspace-tm/org.apache.uima.tm.textmarker.engine/desc/BasicTypeSystem.xml
+ * 
+ * @generated
+ */
+public class PM extends ANY {
+  /**
+   * @generated
+   * @ordered
+   */
+  public final static int typeIndexID = JCasRegistry.register(PM.class);
+
+  /**
+   * @generated
+   * @ordered
+   */
+  public final static int type = typeIndexID;
+
+  /** @generated */
+  @Override
+  public int getTypeIndexID() {
+return typeIndexID;
+  }
+
+  /**
+   * Never called. Disable default constructor
+   * 
+   * @generated
+   */
+  protected PM() {
+  }
+
+  /**
+   * Internal - constructor used by generator
+   * 
+   * @generated
+   */
+  public PM(int addr, TOP_Type type) {
+super(addr, type);
+readObject();
+  }
+
+  /** @generated */
+  public PM(JCas jcas) {
+super(jcas);
+readObject();
+  }
+
+  /** @generated */
+  public PM(JCas jcas, int begin, int end) {
+super(jcas);
+setBegin(begin);
+setEnd(end);
+readObject();
+  }
+
+  /**
+   * !-- begin-user-doc -- Write your own initialization here !-- 
end-user-doc --
+   * 
+   * @generated 

svn commit: r1152823 - in /uima/addons/trunk: pom.xml src/main/assembly/bin.xml src/main/assembly/src.xml

2011-08-01 Thread schor
Author: schor
Date: Mon Aug  1 15:23:47 2011
New Revision: 1152823

URL: http://svn.apache.org/viewvc?rev=1152823view=rev
Log:
[UIMA-2185] remove osgi projects; remove dependencies, update bin.xml assembly 
to build by just copying the filesets of the sub-projects, change src.xml 
assembly to be identical to default one except for the addition of exclude for 
issuesFixed

Modified:
uima/addons/trunk/pom.xml
uima/addons/trunk/src/main/assembly/bin.xml
uima/addons/trunk/src/main/assembly/src.xml

Modified: uima/addons/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/pom.xml?rev=1152823r1=1152822r2=1152823view=diff
==
--- uima/addons/trunk/pom.xml (original)
+++ uima/addons/trunk/pom.xml Mon Aug  1 15:23:47 2011
@@ -76,7 +76,6 @@
 moduleTagger/module
 moduleTikaAnnotator/module
 moduleWhitespaceTokenizer/module
-moduleaddons-osgi-runtime/module
   /modules
 
   profiles
@@ -91,156 +90,6 @@
 assemblyFinalNameuima-addons-${project.version}/assemblyFinalName
   /properties
 
-  dependencies
-dependency
-  groupIdorg.apache.uima/groupId
-  artifactIdAlchemyAPIAnnotator/artifactId
-  version${project.version}/version
-/dependency
-dependency
-  groupIdorg.apache.uima/groupId
-  artifactIdBSFAnnotator/artifactId
-  version${project.version}/version
-/dependency
-dependency
-  groupIdorg.apache.uima/groupId
-  artifactIdConceptMapper/artifactId
-  version${project.version}/version
-/dependency
-dependency
-  groupIdorg.apache.uima/groupId
-  artifactIdConfigurableFeatureExtractor/artifactId
-  version${project.version}/version
-/dependency
-dependency
-  groupIdorg.apache.uima/groupId
-  artifactIdDictionaryAnnotator/artifactId
-  version${project.version}/version
-/dependency
-dependency
-  groupIdorg.apache.uima/groupId
-  artifactIdFsVariables/artifactId
-  version${project.version}/version
-/dependency
-dependency
-  groupIdorg.apache.uima/groupId
-  artifactIdLucas/artifactId
-  version${project.version}/version
-/dependency
-dependency
-  groupIdorg.apache.uima/groupId
-  artifactIdOpenCalaisAnnotator/artifactId
-  version${project.version}/version
-/dependency
-dependency
-  groupIdorg.apache.uima/groupId
-  artifactIdPearPackagingAntTask/artifactId
-  version${project.version}/version
-/dependency
-dependency
-  groupIdorg.apache.uima/groupId
-  artifactIdRegularExpressionAnnotator/artifactId
-  version${project.version}/version
-/dependency
-dependency
-  groupIdorg.apache.uima/groupId
-  artifactIdSimpleServer/artifactId
-  version${project.version}/version
-/dependency
-dependency
-  groupIdorg.apache.uima/groupId
-  artifactIdSnowballAnnotator/artifactId
-  version${project.version}/version
-/dependency
-dependency
-  groupIdorg.apache.uima/groupId
-  artifactIdSolrcas/artifactId
-  version${project.version}/version
-/dependency
-dependency
-  groupIdorg.apache.uima/groupId
-  artifactIdTagger/artifactId
-  version${project.version}/version
-/dependency
-dependency
-  groupIdorg.apache.uima/groupId
-  artifactIdTikaAnnotator/artifactId
-  version${project.version}/version
-/dependency
-dependency
-  groupIdorg.apache.uima/groupId
-  artifactIdWhitespaceTokenizer/artifactId
-  version${project.version}/version
-/dependency
-
-!-- addons-osgi-runtime dependencies --
-dependency
-  groupIdorg.apache.uima/groupId
-  artifactIdAlchemyAPIAnnotator-osgi/artifactId
-  version${project.version}/version
-/dependency
-dependency
-  groupIdorg.apache.uima/groupId
-  artifactIdBSFAnnotator-osgi/artifactId
-  version${project.version}/version
-/dependency
-dependency
-  groupIdorg.apache.uima/groupId
-  artifactIdConceptMapper-osgi/artifactId
-  version${project.version}/version
-/dependency
-dependency
-  groupIdorg.apache.uima/groupId
-  artifactIdConfigurableFeatureExtractor-osgi/artifactId
-  version${project.version}/version
-/dependency
-dependency
-  groupIdorg.apache.uima/groupId
-  artifactIdDictionaryAnnotator-osgi/artifactId
-  version${project.version}/version
-/dependency
-dependency
-  groupIdorg.apache.uima/groupId
-

svn commit: r1152824 [12/21] - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/textmarker: ./ action/ batch/ condition/ engine/ kernel/ kernel/c

2011-08-01 Thread joern
Added: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/textmarker/parser/Copy
 of TextMarker.g
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/textmarker/parser/Copy%20of%20TextMarker.g?rev=1152824view=auto
==
--- 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/textmarker/parser/Copy
 of TextMarker.g (added)
+++ 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/textmarker/parser/Copy
 of TextMarker.g Mon Aug  1 15:24:44 2011
@@ -0,0 +1,1772 @@
+grammar TextMarker;
+
+options {
+   language = Java;
+}
+
+tokens {
+   DocComment;
+   Annotation;
+   ListIdentifier;
+}
+
+@lexer::header {
+   package org.apache.uima.tm.textmarker.parser;
+}
+
+@parser::header {
+package org.apache.uima.tm.textmarker.parser;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+
+import org.antlr.runtime.BaseRecognizer;
+import org.antlr.runtime.BitSet;
+import org.antlr.runtime.DFA;
+import org.antlr.runtime.EarlyExitException;
+import org.antlr.runtime.FailedPredicateException;
+import org.antlr.runtime.IntStream;
+import org.antlr.runtime.MismatchedSetException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.Parser;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.RecognizerSharedState;
+import org.antlr.runtime.Token;
+import org.antlr.runtime.TokenStream;
+import org.apache.uima.cas.CAS;
+import org.apache.uima.cas.CASException;
+import org.apache.uima.cas.Type;
+import org.apache.uima.jcas.tcas.DocumentAnnotation;
+
+import org.apache.uima.tm.textmarker.action.AbstractTextMarkerAction;
+import org.apache.uima.tm.textmarker.action.ActionFactory;
+import org.apache.uima.tm.textmarker.condition.AbstractTextMarkerCondition;
+import org.apache.uima.tm.textmarker.condition.ConditionFactory;
+import org.apache.uima.tm.textmarker.kernel.TextMarkerBlock;
+import org.apache.uima.tm.textmarker.kernel.TextMarkerModule;
+import org.apache.uima.tm.textmarker.kernel.TextMarkerScriptBlock;
+import org.apache.uima.tm.textmarker.kernel.TextMarkerScriptFactory;
+import org.apache.uima.tm.textmarker.kernel.TextMarkerStatement;
+import org.apache.uima.tm.textmarker.kernel.expression.bool.BooleanExpression;
+import org.apache.uima.tm.textmarker.kernel.expression.ExpressionFactory;
+import 
org.apache.uima.tm.textmarker.kernel.expression.resource.WordListExpression;
+import org.apache.uima.tm.textmarker.kernel.expression.number.NumberExpression;
+import org.apache.uima.tm.textmarker.kernel.expression.string.StringExpression;
+import 
org.apache.uima.tm.textmarker.kernel.expression.resource.WordTableExpression;
+import org.apache.uima.tm.textmarker.kernel.expression.TextMarkerExpression;
+import org.apache.uima.tm.textmarker.kernel.expression.type.TypeExpression;
+import 
org.apache.uima.tm.textmarker.kernel.extensions.TextMarkerExternalFactory;
+import org.apache.uima.tm.textmarker.kernel.rule.ComposedRuleElement;
+import org.apache.uima.tm.textmarker.kernel.rule.RuleElement;
+import org.apache.uima.tm.textmarker.kernel.rule.TextMarkerRule;
+import org.apache.uima.tm.textmarker.kernel.rule.TextMarkerRuleElement;
+import 
org.apache.uima.tm.textmarker.kernel.rule.quantifier.RuleElementQuantifier;
+}
+@lexer::members {
+   public int implicitLineJoiningLevel = 0;
+   public int startPos=-1;
+   public void emitErrorMessage(String msg) {
+   }
+}
+@parser::members {
+private List vars = new ArrayList();   
+private int level = 0;
+private TextMarkerScriptFactory factory = new TextMarkerScriptFactory();
+private TextMarkerExternalFactory external;
+
+
+public void setExternalFactory(TextMarkerExternalFactory factory) {
+   external = factory;
+}
+
+public void emitErrorMessage(String msg) {
+   System.out.println(msg);
+   }
+   public void reportError(RecognitionException e) {
+   System.out.println(e);
+   }
+
+   //public void addVariable(String var, IntStream input) throws 
NoViableAltException {
+   //  if(!vars.contains(var)) {
+   //  vars.add(var);
+   //  } else {
+   //  throw new NoViableAltException(already declared \ + 
var + \, 3, 0, input);
+   //  }
+   //}
+   public void addVariable(TextMarkerBlock parent, String name, String 
type) {
+   parent.getEnvironment().addVariable(name, type);
+   }
+   
+   public boolean ownsVariable(TextMarkerBlock parent, String name) {
+   return parent.getEnvironment().ownsVariable(name);
+   }
+   public boolean isVariable(TextMarkerBlock parent, String name) {
+   

svn commit: r1152824 [13/21] - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/textmarker: ./ action/ batch/ condition/ engine/ kernel/ kernel/c

2011-08-01 Thread joern
Added: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/textmarker/parser/TextMarker.g
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/textmarker/parser/TextMarker.g?rev=1152824view=auto
==
--- 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/textmarker/parser/TextMarker.g
 (added)
+++ 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/textmarker/parser/TextMarker.g
 Mon Aug  1 15:24:44 2011
@@ -0,0 +1,1772 @@
+grammar TextMarker;
+
+options {
+   language = Java;
+}
+
+tokens {
+   DocComment;
+   Annotation;
+   ListIdentifier;
+}
+
+@lexer::header {
+   package org.apache.uima.tm.textmarker.parser;
+}
+
+@parser::header {
+package org.apache.uima.tm.textmarker.parser;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+
+import org.antlr.runtime.BaseRecognizer;
+import org.antlr.runtime.BitSet;
+import org.antlr.runtime.DFA;
+import org.antlr.runtime.EarlyExitException;
+import org.antlr.runtime.FailedPredicateException;
+import org.antlr.runtime.IntStream;
+import org.antlr.runtime.MismatchedSetException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.Parser;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.RecognizerSharedState;
+import org.antlr.runtime.Token;
+import org.antlr.runtime.TokenStream;
+import org.apache.uima.cas.CAS;
+import org.apache.uima.cas.CASException;
+import org.apache.uima.cas.Type;
+import org.apache.uima.jcas.tcas.DocumentAnnotation;
+
+import org.apache.uima.tm.textmarker.action.AbstractTextMarkerAction;
+import org.apache.uima.tm.textmarker.action.ActionFactory;
+import org.apache.uima.tm.textmarker.condition.AbstractTextMarkerCondition;
+import org.apache.uima.tm.textmarker.condition.ConditionFactory;
+import org.apache.uima.tm.textmarker.kernel.TextMarkerBlock;
+import org.apache.uima.tm.textmarker.kernel.TextMarkerModule;
+import org.apache.uima.tm.textmarker.kernel.TextMarkerScriptBlock;
+import org.apache.uima.tm.textmarker.kernel.TextMarkerScriptFactory;
+import org.apache.uima.tm.textmarker.kernel.TextMarkerStatement;
+import org.apache.uima.tm.textmarker.kernel.expression.bool.BooleanExpression;
+import org.apache.uima.tm.textmarker.kernel.expression.ExpressionFactory;
+import 
org.apache.uima.tm.textmarker.kernel.expression.resource.WordListExpression;
+import org.apache.uima.tm.textmarker.kernel.expression.number.NumberExpression;
+import org.apache.uima.tm.textmarker.kernel.expression.string.StringExpression;
+import 
org.apache.uima.tm.textmarker.kernel.expression.resource.WordTableExpression;
+import org.apache.uima.tm.textmarker.kernel.expression.TextMarkerExpression;
+import org.apache.uima.tm.textmarker.kernel.expression.type.TypeExpression;
+import 
org.apache.uima.tm.textmarker.kernel.extensions.TextMarkerExternalFactory;
+import org.apache.uima.tm.textmarker.kernel.rule.ComposedRuleElement;
+import org.apache.uima.tm.textmarker.kernel.rule.RuleElement;
+import org.apache.uima.tm.textmarker.kernel.rule.TextMarkerRule;
+import org.apache.uima.tm.textmarker.kernel.rule.TextMarkerRuleElement;
+import 
org.apache.uima.tm.textmarker.kernel.rule.quantifier.RuleElementQuantifier;
+}
+@lexer::members {
+   public int implicitLineJoiningLevel = 0;
+   public int startPos=-1;
+   public void emitErrorMessage(String msg) {
+   }
+}
+@parser::members {
+private List vars = new ArrayList();   
+private int level = 0;
+private TextMarkerScriptFactory factory = new TextMarkerScriptFactory();
+private TextMarkerExternalFactory external;
+
+
+public void setExternalFactory(TextMarkerExternalFactory factory) {
+   external = factory;
+}
+
+public void emitErrorMessage(String msg) {
+   System.out.println(msg);
+   }
+   public void reportError(RecognitionException e) {
+   System.out.println(e);
+   }
+
+   //public void addVariable(String var, IntStream input) throws 
NoViableAltException {
+   //  if(!vars.contains(var)) {
+   //  vars.add(var);
+   //  } else {
+   //  throw new NoViableAltException(already declared \ + 
var + \, 3, 0, input);
+   //  }
+   //}
+   public void addVariable(TextMarkerBlock parent, String name, String 
type) {
+   parent.getEnvironment().addVariable(name, type);
+   }
+   
+   public boolean ownsVariable(TextMarkerBlock parent, String name) {
+   return parent.getEnvironment().ownsVariable(name);
+   }
+   public boolean isVariable(TextMarkerBlock parent, String name) {
+   return 

svn commit: r1152824 [21/21] - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/textmarker: ./ action/ batch/ condition/ engine/ kernel/ kernel/c

2011-08-01 Thread joern
Added: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/textmarker/verbalize/ConditionVerbalizer.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/textmarker/verbalize/ConditionVerbalizer.java?rev=1152824view=auto
==
--- 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/textmarker/verbalize/ConditionVerbalizer.java
 (added)
+++ 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/src/main/java/org/apache/uima/tm/textmarker/verbalize/ConditionVerbalizer.java
 Mon Aug  1 15:24:44 2011
@@ -0,0 +1,420 @@
+package org.apache.uima.tm.textmarker.verbalize;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.uima.tm.textmarker.condition.AbstractTextMarkerCondition;
+import org.apache.uima.tm.textmarker.condition.AfterCondition;
+import org.apache.uima.tm.textmarker.condition.AndCondition;
+import org.apache.uima.tm.textmarker.condition.BeforeCondition;
+import org.apache.uima.tm.textmarker.condition.ContainsCondition;
+import org.apache.uima.tm.textmarker.condition.ContextCountCondition;
+import org.apache.uima.tm.textmarker.condition.CountCondition;
+import org.apache.uima.tm.textmarker.condition.CurrentCountCondition;
+import org.apache.uima.tm.textmarker.condition.EndsWithCondition;
+import org.apache.uima.tm.textmarker.condition.FeatureCondition;
+import org.apache.uima.tm.textmarker.condition.IfCondition;
+import org.apache.uima.tm.textmarker.condition.InListCondition;
+import org.apache.uima.tm.textmarker.condition.IsCondition;
+import org.apache.uima.tm.textmarker.condition.IsInTagCondition;
+import org.apache.uima.tm.textmarker.condition.LastCondition;
+import org.apache.uima.tm.textmarker.condition.MOfNCondition;
+import org.apache.uima.tm.textmarker.condition.NearCondition;
+import org.apache.uima.tm.textmarker.condition.NotCondition;
+import org.apache.uima.tm.textmarker.condition.OrCondition;
+import org.apache.uima.tm.textmarker.condition.ParseCondition;
+import org.apache.uima.tm.textmarker.condition.PartOfCondition;
+import org.apache.uima.tm.textmarker.condition.PartOfNeqCondition;
+import org.apache.uima.tm.textmarker.condition.PositionCondition;
+import org.apache.uima.tm.textmarker.condition.RegExpCondition;
+import org.apache.uima.tm.textmarker.condition.ScoreCondition;
+import org.apache.uima.tm.textmarker.condition.SizeCondition;
+import org.apache.uima.tm.textmarker.condition.StartsWithCondition;
+import org.apache.uima.tm.textmarker.condition.TotalCountCondition;
+import org.apache.uima.tm.textmarker.condition.VoteCondition;
+import org.apache.uima.tm.textmarker.kernel.expression.number.NumberExpression;
+import 
org.apache.uima.tm.textmarker.kernel.expression.number.SimpleNumberExpression;
+
+
+public class ConditionVerbalizer {
+
+  private TextMarkerVerbalizer verbalizer;
+
+  public ConditionVerbalizer(TextMarkerVerbalizer verbalizer) {
+super();
+this.verbalizer = verbalizer;
+  }
+
+  public String verbalizeName(AbstractTextMarkerCondition condition) {
+if (condition instanceof AndCondition) {
+  return AND;
+} else if (condition instanceof ContainsCondition) {
+  String name = CONTAINS;
+  return name;
+} else if (condition instanceof ContextCountCondition) {
+  String name = CONTEXTCOUNT;
+  return name;
+} else if (condition instanceof CountCondition) {
+  String name = COUNT;
+  return name;
+} else if (condition instanceof CurrentCountCondition) {
+  String name = CURRENTCOUNT;
+  return name;
+} else if (condition instanceof IfCondition) {
+  String name = IF;
+  return name;
+} else if (condition instanceof InListCondition) {
+  return INLIST;
+} else if (condition instanceof IsInTagCondition) {
+  return ISINTAG;
+} else if (condition instanceof LastCondition) {
+  return LAST;
+} else if (condition instanceof MOfNCondition) {
+  return MOFN;
+} else if (condition instanceof NearCondition) {
+  String name = NEAR;
+  return name;
+} else if (condition instanceof NotCondition) {
+  return NOT;
+} else if (condition instanceof OrCondition) {
+  return OR;
+} else if (condition instanceof PartOfCondition) {
+  return PARTOF;
+} else if (condition instanceof PartOfNeqCondition) {
+  return PARTOFNEQ;
+} else if (condition instanceof PositionCondition) {
+  return POSITION;
+} else if (condition instanceof RegExpCondition) {
+  return REGEXP;
+} else if (condition instanceof ScoreCondition) {
+  String name = SCORE;
+  return name;
+} else if (condition instanceof TotalCountCondition) {
+  String name = TOTALCOUNT;
+  return name;
+} else if (condition instanceof VoteCondition) {
+  

svn commit: r1152828 [4/6] - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils: ./ META-INF/ bin/ icons/ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apach

2011-08-01 Thread joern
Propchange: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/convert/ConvertSyntaxLexer.java
--
svn:executable = *

Propchange: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/convert/ConvertSyntaxLexer.java
--
svn:mime-type = text/plain




svn commit: r1152828 [1/6] - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils: ./ META-INF/ bin/ icons/ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apach

2011-08-01 Thread joern
Author: joern
Date: Mon Aug  1 15:28:46 2011
New Revision: 1152828

URL: http://svn.apache.org/viewvc?rev=1152828view=rev
Log:
UIMA-2172 Initial commit of the TextMarker contribution.

Added:

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/.classpath 
  (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/.project   
(with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/META-INF/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/META-INF/MANIFEST.MF
   (with props)
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/bin/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/build.properties
   (with props)
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/icons/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/icons/text_signature.png
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/icons/tm_obj.png
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/plugin.xml 
  (with props)
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/apply/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/apply/AbstarctApplyScriptHandler.java
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/apply/AbstractApplyScriptHandlerJob.java
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/apply/ApplyScriptKeepBasicsHandler.java
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/apply/ApplyScriptKeepBasicsJob.java
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/apply/ApplyScriptNoXMIHandler.java
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/apply/ApplyScriptNoXMIJob.java
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/apply/ApplyScriptRemoveBasicsHandler.java
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/apply/ApplyScriptRemoveBasicsJob.java
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/convert/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/convert/ConvertSyntax.g
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/convert/ConvertSyntax.tokens
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/convert/ConvertSyntaxAction.java
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/convert/ConvertSyntaxLexer.java
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/convert/ConvertSyntaxParser.java
   (with props)

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/twl/

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/twl/MultiTWLConverterHandler.java
   (with props)


svn commit: r1152828 [6/6] - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils: ./ META-INF/ bin/ icons/ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apach

2011-08-01 Thread joern
Propchange: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/convert/ConvertSyntaxParser.java
--
svn:executable = *

Propchange: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/convert/ConvertSyntaxParser.java
--
svn:mime-type = text/plain

Added: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/twl/MultiTWLConverterHandler.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/twl/MultiTWLConverterHandler.java?rev=1152828view=auto
==
--- 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/twl/MultiTWLConverterHandler.java
 (added)
+++ 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.ui.utils/src/main/java/org/apache/uima/tm/textmarker/ui/twl/MultiTWLConverterHandler.java
 Mon Aug  1 15:28:46 2011
@@ -0,0 +1,143 @@
+package org.apache.uima.tm.textmarker.ui.twl;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.uima.tm.textmarker.resource.trie.MultiTreeWordList;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.commands.IHandler;
+import org.eclipse.core.commands.IHandlerListener;
+import org.eclipse.core.resources.IContainer;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IFolder;
+import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspaceRoot;
+import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+
+public class MultiTWLConverterHandler implements IHandler {
+  private class ConverterHandlerJob extends Job {
+ExecutionEvent event;
+
+ConverterHandlerJob(ExecutionEvent event) {
+  super(Converting...);
+  this.event = event;
+  setUser(true);
+}
+
+@Override
+public IStatus run(IProgressMonitor monitor) {
+  monitor.beginTask(Collecting files..., 1);
+
+  if (HandlerUtil.getCurrentSelection(event) instanceof 
IStructuredSelection) {
+StructuredSelection selection = (StructuredSelection) HandlerUtil
+.getCurrentSelection(event);
+Iterator? iter = selection.iterator();
+IResource first = null;
+
+ListString paths = new ArrayListString();
+while (iter.hasNext()) {
+  Object object = iter.next();
+  if (object instanceof IResource) {
+IResource resource = (IResource) object;
+if (first == null) {
+  first = resource;
+}
+paths.addAll(getPaths(resource));
+  }
+}
+monitor.beginTask(Compiling generated.mtwl..., 1);
+if (!paths.isEmpty()) {
+  MultiTreeWordList trie = new MultiTreeWordList(paths.toArray(new 
String[0]));
+
+  IPath parent = first.getLocation().removeLastSegments(1);
+  IPath newPath = parent.append(generated.mtwl);
+
+  File file = newPath.toFile();
+  final String absolutePath = file.getAbsolutePath();
+
+  trie.createMTWLFile(absolutePath);
+
+  IWorkspaceRoot myWorkspaceRoot = 
ResourcesPlugin.getWorkspace().getRoot();
+  IContainer container = 
myWorkspaceRoot.getContainerForLocation(parent);
+  final String localPath = container.getProjectRelativePath() + / + 
container.getName()
+  + / + generated.mtwl;
+  try {
+container.getParent().refreshLocal(IResource.DEPTH_INFINITE, new 
NullProgressMonitor());
+  } catch (CoreException e) {
+  }
+  // event.getShell().getDisplay().asyncExec(new Runnable() {
+  // public void run() {
+  // MessageDialog.openInformation(window.getShell(), Multi TWL 
created,
+  // A multi TWL was created:\n + localPath);
+  // }
+  // });
+}
+
+  }
+
+  monitor.done();
+  return Status.OK_STATUS;
+
+}
+  }
+
+  public void addHandlerListener(IHandlerListener handlerListener) {
+  }
+
+  

svn commit: r1152830 - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine: ./ .classpath .project bin/

2011-08-01 Thread joern
Author: joern
Date: Mon Aug  1 15:31:51 2011
New Revision: 1152830

URL: http://svn.apache.org/viewvc?rev=1152830view=rev
Log:
UIMA-2172 Initial commit of the TextMarker contribution.

Added:

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/.classpath   
(with props)
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/.project 
  (with props)
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/bin/
Modified:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/   
(props changed)

Propchange: uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/
--
--- svn:ignore (added)
+++ svn:ignore Mon Aug  1 15:31:51 2011
@@ -0,0 +1 @@
+.settings

Added: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/.classpath
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/.classpath?rev=1152830view=auto
==
--- 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/.classpath 
(added)
+++ 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/.classpath 
Mon Aug  1 15:31:51 2011
@@ -0,0 +1,10 @@
+?xml version=1.0 encoding=UTF-8?
+classpath
+   classpathentry exported=true kind=lib 
path=lib/commons-collections-3.2.1.jar/
+   classpathentry exported=true kind=lib 
path=lib/uima-document-annotation.jar/
+   classpathentry kind=con 
path=org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6/
+   classpathentry kind=con path=org.eclipse.pde.core.requiredPlugins/
+   classpathentry kind=src path=desc/
+   classpathentry kind=src path=src/main/java/
+   classpathentry kind=output path=bin/
+/classpath

Propchange: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/.classpath
--
svn:executable = *

Propchange: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/.classpath
--
svn:mime-type = text/plain

Added: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/.project
URL: 
http://svn.apache.org/viewvc/uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/.project?rev=1152830view=auto
==
--- uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/.project 
(added)
+++ uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/.project 
Mon Aug  1 15:31:51 2011
@@ -0,0 +1,28 @@
+?xml version=1.0 encoding=UTF-8?
+projectDescription
+   nameorg.apache.uima.tm.textmarker.engine/name
+   comment/comment
+   projects
+   /projects
+   buildSpec
+   buildCommand
+   nameorg.eclipse.jdt.core.javabuilder/name
+   arguments
+   /arguments
+   /buildCommand
+   buildCommand
+   nameorg.eclipse.pde.ManifestBuilder/name
+   arguments
+   /arguments
+   /buildCommand
+   buildCommand
+   nameorg.eclipse.pde.SchemaBuilder/name
+   arguments
+   /arguments
+   /buildCommand
+   /buildSpec
+   natures
+   natureorg.eclipse.pde.PluginNature/nature
+   natureorg.eclipse.jdt.core.javanature/nature
+   /natures
+/projectDescription

Propchange: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/.project
--
svn:executable = *

Propchange: 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textmarker.engine/.project
--
svn:mime-type = text/plain




svn commit: r1152839 - in /uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.wien/src: main/ src/main/

2011-08-01 Thread joern
Author: joern
Date: Mon Aug  1 15:48:01 2011
New Revision: 1152839

URL: http://svn.apache.org/viewvc?rev=1152839view=rev
Log:
UIMA-2172 Moved source folder to correct location.

Added:
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.wien/src/main/
  - copied from r1152838, 
uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.wien/src/src/main/
Removed:

uima/sandbox/trunk/TextMarker/org.apache.uima.tm.textruler.wien/src/src/main/



svn commit: r1152881 - /uima/addons/trunk/uima-addons-parent/pom.xml

2011-08-01 Thread schor
Author: schor
Date: Mon Aug  1 18:12:25 2011
New Revision: 1152881

URL: http://svn.apache.org/viewvc?rev=1152881view=rev
Log:
[UIMA-2185] fix to use standard uimaBuildResourcesVersion

Modified:
uima/addons/trunk/uima-addons-parent/pom.xml

Modified: uima/addons/trunk/uima-addons-parent/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/addons/trunk/uima-addons-parent/pom.xml?rev=1152881r1=1152880r2=1152881view=diff
==
--- uima/addons/trunk/uima-addons-parent/pom.xml (original)
+++ uima/addons/trunk/uima-addons-parent/pom.xml Mon Aug  1 18:12:25 2011
@@ -193,6 +193,8 @@
 
 !-- * --
 !-- * Common Build--
+!-- *   *** FOR addons only ***   --
+!-- * --
 !-- *   Base Jar is built,-- 
 !-- * has no dependencies included--
 !-- * has basic LICENSE/NOTICE files  --
@@ -373,7 +375,7 @@
 /plugins
   /build
   properties
-uimaBuildResourcesVersion2-SNAPSHOT/uimaBuildResourcesVersion
+uimaBuildResourcesVersion1/uimaBuildResourcesVersion
   /properties
 /profile
 




svn propchange: r1152935 - svn:log

2011-08-01 Thread schor
Author: schor
Revision: 1152935
Modified property: svn:log

Modified: svn:log at Mon Aug  1 21:33:33 2011
--
--- svn:log (original)
+++ svn:log Mon Aug  1 21:33:33 2011
@@ -1 +1 @@
-[UIMA-2185] base on apache-9 to get later updates of maven plugins, and add 
uima-single-project-bin2 used by addons
+[UIMA-2193] base on apache-9 to get later updates of maven plugins, and add 
uima-single-project-bin2 used by addons



svn commit: r1152961 - /uima/build/trunk/uima-build-resources/pom.xml

2011-08-01 Thread schor
Author: schor
Date: Mon Aug  1 22:51:02 2011
New Revision: 1152961

URL: http://svn.apache.org/viewvc?rev=1152961view=rev
Log:
[maven-release-plugin] prepare release uima-build-resources-2-rc1

Modified:
uima/build/trunk/uima-build-resources/pom.xml

Modified: uima/build/trunk/uima-build-resources/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/build/trunk/uima-build-resources/pom.xml?rev=1152961r1=1152960r2=1152961view=diff
==
--- uima/build/trunk/uima-build-resources/pom.xml (original)
+++ uima/build/trunk/uima-build-resources/pom.xml Mon Aug  1 22:51:02 2011
@@ -29,7 +29,7 @@
   
   groupIdorg.apache.uima/groupId
   artifactIduima-build-resources/artifactId
-  version2-SNAPSHOT/version
+  version2/version
   
   nameUIMA ${project.artifactId}/name
   descriptionThis Jar contains resources
@@ -39,13 +39,13 @@
  
   scm
 connection
-  
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/uima-build-resources
+  
scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/uima-build-resources-2-rc1
 /connection
 developerConnection
-  
scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/uima-build-resources
+  
scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/uima-build-resources-2-rc1
 /developerConnection
 url
-  http://svn.apache.org/viewvc/uima/build/trunk/uima-build-resources
+  http://svn.apache.org/viewvc/uima/build/tags/uima-build-resources-2-rc1
 /url
   /scm
   




svn commit: r1152962 - /uima/build/tags/uima-build-resources-2-rc1/

2011-08-01 Thread schor
Author: schor
Date: Mon Aug  1 22:51:08 2011
New Revision: 1152962

URL: http://svn.apache.org/viewvc?rev=1152962view=rev
Log:
[maven-release-plugin]  copy for tag uima-build-resources-2-rc1

Added:
uima/build/tags/uima-build-resources-2-rc1/   (props changed)
  - copied from r1152961, uima/build/trunk/uima-build-resources/

Propchange: uima/build/tags/uima-build-resources-2-rc1/
--
--- svn:ignore (added)
+++ svn:ignore Mon Aug  1 22:51:08 2011
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project

Propchange: uima/build/tags/uima-build-resources-2-rc1/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Aug  1 22:51:08 2011
@@ -0,0 +1 @@
+/uima/build/branches/depend-on-july-9-build-tools/uima-build-resources:963164-964460




svn commit: r1152963 - /uima/build/trunk/uima-build-resources/pom.xml

2011-08-01 Thread schor
Author: schor
Date: Mon Aug  1 22:51:11 2011
New Revision: 1152963

URL: http://svn.apache.org/viewvc?rev=1152963view=rev
Log:
[maven-release-plugin] prepare for next development iteration

Modified:
uima/build/trunk/uima-build-resources/pom.xml

Modified: uima/build/trunk/uima-build-resources/pom.xml
URL: 
http://svn.apache.org/viewvc/uima/build/trunk/uima-build-resources/pom.xml?rev=1152963r1=1152962r2=1152963view=diff
==
--- uima/build/trunk/uima-build-resources/pom.xml (original)
+++ uima/build/trunk/uima-build-resources/pom.xml Mon Aug  1 22:51:11 2011
@@ -29,7 +29,7 @@
   
   groupIdorg.apache.uima/groupId
   artifactIduima-build-resources/artifactId
-  version2/version
+  version3-SNAPSHOT/version
   
   nameUIMA ${project.artifactId}/name
   descriptionThis Jar contains resources
@@ -39,13 +39,13 @@
  
   scm
 connection
-  
scm:svn:http://svn.apache.org/repos/asf/uima/build/tags/uima-build-resources-2-rc1
+  
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/uima-build-resources
 /connection
 developerConnection
-  
scm:svn:https://svn.apache.org/repos/asf/uima/build/tags/uima-build-resources-2-rc1
+  
scm:svn:https://svn.apache.org/repos/asf/uima/build/trunk/uima-build-resources
 /developerConnection
 url
-  http://svn.apache.org/viewvc/uima/build/tags/uima-build-resources-2-rc1
+  http://svn.apache.org/viewvc/uima/build/trunk/uima-build-resources
 /url
   /scm