gate-cvs — List for CVS commit messages

[gate-cvs] SF.net SVN: gate:[14108] gate/trunk/src/gate/gui/PRViewer.java

[<va...@us...>]

Revision: 14108
          http://gate.svn.sourceforge.net/gate/?rev=14108&view=rev
Author:   valyt
Date:     2011-06-30 12:28:30 +0000 (Thu, 30 Jun 2011)

Log Message:
-----------
Rolled-back the last change as it didn't actually change anything (the required functionality was already there).

Modified Paths:
--------------
    gate/trunk/src/gate/gui/PRViewer.java

Modified: gate/trunk/src/gate/gui/PRViewer.java
===================================================================
--- gate/trunk/src/gate/gui/PRViewer.java	2011-06-30 10:58:57 UTC (rev 14107)
+++ gate/trunk/src/gate/gui/PRViewer.java	2011-06-30 12:28:30 UTC (rev 14108)
@@ -61,7 +61,7 @@
     setLayout(new BorderLayout());
     editor = new ResourceParametersEditor();
     editor.setEditable(false);
-    editor.setAutoResizeMode(XJTable.AUTO_RESIZE_OFF);
+    editor.setAutoResizeMode(XJTable.AUTO_RESIZE_LAST_COLUMN);
     JScrollPane scroller = new JScrollPane(editor);
     scroller.setAlignmentX(Component.LEFT_ALIGNMENT);
     scroller.setAlignmentY(Component.TOP_ALIGNMENT);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14107] gate/trunk/src/gate/gui/PRViewer.java

[<va...@us...>]

Revision: 14107
          http://gate.svn.sourceforge.net/gate/?rev=14107&view=rev
Author:   valyt
Date:     2011-06-30 10:58:57 +0000 (Thu, 30 Jun 2011)

Log Message:
-----------
Force the parameter viewer display the whole value (and thus allow the scroller do to its job).

Modified Paths:
--------------
    gate/trunk/src/gate/gui/PRViewer.java

Modified: gate/trunk/src/gate/gui/PRViewer.java
===================================================================
--- gate/trunk/src/gate/gui/PRViewer.java	2011-06-30 10:21:16 UTC (rev 14106)
+++ gate/trunk/src/gate/gui/PRViewer.java	2011-06-30 10:58:57 UTC (rev 14107)
@@ -61,7 +61,7 @@
     setLayout(new BorderLayout());
     editor = new ResourceParametersEditor();
     editor.setEditable(false);
-    editor.setAutoResizeMode(XJTable.AUTO_RESIZE_LAST_COLUMN);
+    editor.setAutoResizeMode(XJTable.AUTO_RESIZE_OFF);
     JScrollPane scroller = new JScrollPane(editor);
     scroller.setAlignmentX(Component.LEFT_ALIGNMENT);
     scroller.setAlignmentY(Component.TOP_ALIGNMENT);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14106] mimir/branches/4.x/

[<va...@us...>]

Revision: 14106
          http://gate.svn.sourceforge.net/gate/?rev=14106&view=rev
Author:   valyt
Date:     2011-06-30 10:21:16 +0000 (Thu, 30 Jun 2011)

Log Message:
-----------
creating branch for new Mimir developments

Added Paths:
-----------
    mimir/branches/4.x/


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14105] gate/trunk/src/gate/gui/docview/ AnnotationStackView.java

[<tho...@us...>]

Revision: 14105
          http://gate.svn.sourceforge.net/gate/?rev=14105&view=rev
Author:   thomas_heitz
Date:     2011-06-30 01:24:18 +0000 (Thu, 30 Jun 2011)

Log Message:
-----------
Annotation Stack View: changes some shortcuts, adds a checkbox for skipping non overlapping annotations.

Modified Paths:
--------------
    gate/trunk/src/gate/gui/docview/AnnotationStackView.java

Modified: gate/trunk/src/gate/gui/docview/AnnotationStackView.java
===================================================================
--- gate/trunk/src/gate/gui/docview/AnnotationStackView.java	2011-06-30 01:18:34 UTC (rev 14104)
+++ gate/trunk/src/gate/gui/docview/AnnotationStackView.java	2011-06-30 01:24:18 UTC (rev 14105)
@@ -94,6 +94,9 @@
     toolBar.addSeparator();
     toolBar.add(previousAnnotationAction = new PreviousAnnotationAction());
     toolBar.add(nextAnnotationAction = new NextAnnotationAction());
+    overlappingCheckBox = new JCheckBox("Overlapping");
+    overlappingCheckBox.setToolTipText("Skip non overlapping annotations.");
+    toolBar.add(overlappingCheckBox);
     toolBar.addSeparator();
     toolBar.add(targetSetLabel = new JLabel("Target set: Undefined"));
     targetSetLabel.addMouseListener(new MouseAdapter() {
@@ -147,19 +150,41 @@
     }
     public void actionPerformed(ActionEvent e) {
       nextAnnotationAction.setEnabled(true);
-      SortedSet<Annotation> set =
-        new TreeSet<Annotation>(new OffsetComparator());
+      List<Annotation> list = new ArrayList<Annotation>();
       for(SetHandler setHandler : annotationSetsView.setHandlers) {
         for(TypeHandler typeHandler: setHandler.typeHandlers) {
           if (typeHandler.isSelected()) {
-            set.addAll(setHandler.set.get(typeHandler.name).getContained(
+            // adds all the annotations from the selected type contained
+            // between the beginning of the document and the caret position - 1
+            list.addAll(setHandler.set.get(typeHandler.name).getContained(
               0l, (long)textView.getTextView().getCaretPosition()-1));
           }
         }
       }
-      if (set.size() > 0) {
-        textView.getTextView().setCaretPosition(
-          set.last().getEndNode().getOffset().intValue());
+      boolean enabled = false;
+      if (list.size() > 0) {
+        if (overlappingCheckBox.isSelected()) {
+          Collections.sort(list, new OffsetComparator());
+          boolean found = false;
+          for (int i = list.size()-1; i > 0; i--) {
+            if (list.get(i).overlaps(list.get(i-1))) {
+              if (found) { enabled = true; break; }
+              // set the caret on the previous overlapping annotation found
+              textView.getTextView().setCaretPosition(
+                list.get(i).getEndNode().getOffset().intValue());
+              found = true;
+            }
+          }
+        } else {
+          SortedSet<Annotation> set =
+            new TreeSet<Annotation>(new OffsetComparator());
+          set.addAll(list); // remove same offsets annotations
+          list = new ArrayList<Annotation>(set);
+          // set the caret on the previous annotation found
+          textView.getTextView().setCaretPosition(
+            list.get(list.size()-1).getEndNode().getOffset().intValue());
+          enabled = (list.size() > 1);
+        }
         try {
           textView.getTextView().scrollRectToVisible(
           textView.getTextView().modelToView(
@@ -168,7 +193,7 @@
           exception.printStackTrace();
         }
       }
-      setEnabled(set.size() > 1);
+      setEnabled(enabled);
       textView.getTextView().requestFocusInWindow();
     }
   }
@@ -182,20 +207,42 @@
     }
     public void actionPerformed(ActionEvent e) {
       previousAnnotationAction.setEnabled(true);
-      SortedSet<Annotation> set = new TreeSet<Annotation>(
-        Collections.reverseOrder(new OffsetComparator()));
+      List<Annotation> list = new ArrayList<Annotation>();
       for(SetHandler setHandler : annotationSetsView.setHandlers) {
         for(TypeHandler typeHandler: setHandler.typeHandlers) {
           if (typeHandler.isSelected()) {
-            set.addAll(setHandler.set.get(typeHandler.name).getContained(
+            // adds all the annotations from the selected type contained
+            // between the caret position and the end of the document
+            list.addAll(setHandler.set.get(typeHandler.name).getContained(
               (long)textView.getTextView().getCaretPosition(),
               document.getContent().size()-1));
           }
         }
       }
-      if (set.size() > 0) {
-        textView.getTextView().setCaretPosition(
-          set.last().getEndNode().getOffset().intValue());
+      boolean enabled = false;
+      if (list.size() > 0) {
+        if (overlappingCheckBox.isSelected()) {
+          Collections.sort(list, new OffsetComparator());
+          boolean found = false;
+          for (int i = 0; i < list.size()-1; i++) {
+            if (list.get(i).overlaps(list.get(i+1))) {
+              if (found) { enabled = true; break; }
+              // set the caret on the next overlapping annotation found
+              textView.getTextView().setCaretPosition(
+                list.get(i).getEndNode().getOffset().intValue());
+              found = true;
+            }
+          }
+        } else {
+          SortedSet<Annotation> set =
+            new TreeSet<Annotation>(new OffsetComparator());
+          set.addAll(list); // remove same offsets annotations
+          list = new ArrayList<Annotation>(set);
+          // set the caret on the next annotation found
+          textView.getTextView().setCaretPosition(
+            list.get(0).getEndNode().getOffset().intValue());
+          enabled = (list.size() > 1);
+        }
         try {
           textView.getTextView().scrollRectToVisible(
           textView.getTextView().modelToView(
@@ -204,7 +251,7 @@
           exception.printStackTrace();
         }
       }
-      setEnabled(set.size() > 1);
+      setEnabled(enabled);
       textView.getTextView().requestFocusInWindow();
     }
   }
@@ -358,7 +405,7 @@
     public void processMouseEvent(MouseEvent me) {
 
       if(me.isPopupTrigger()) { // context menu
-        // add annotation editors context menu
+        // add annotation editors to the context menu
         JPopupMenu popup = new JPopupMenu();
         List<Action> specificEditorActions =
           annotationListView.getSpecificEditorActions(
@@ -385,6 +432,30 @@
 
       } else if (me.getID() == MouseEvent.MOUSE_CLICKED
               && me.getButton() == MouseEvent.BUTTON1
+              && me.getClickCount() == 1
+              && (me.getModifiersEx() & MouseEvent.CTRL_DOWN_MASK) != 0
+              && (me.getModifiersEx() & MouseEvent.SHIFT_DOWN_MASK) != 0) {
+              // control + shift + click -> delete the annotation
+        annotationData.getAnnotationSet().remove(annotation);
+
+      } else if (me.getID() == MouseEvent.MOUSE_CLICKED
+              && me.getButton() == MouseEvent.BUTTON1
+              && me.getClickCount() == 1
+              && (me.getModifiersEx() & MouseEvent.CTRL_DOWN_MASK) != 0) {
+               // control + click
+        String feature = typesFeatures.get(annotation.getType());
+        if (feature == null) { return; }
+        String value = (String) annotation.getFeatures().get(feature);
+        Pattern pattern = Pattern.compile("(https?://[^\\s,;]+)");
+        Matcher matcher = pattern.matcher(value);
+        if (matcher.find()) {
+          // if the feature value contains a url then display it in a browser
+          MainFrame.getInstance().showHelpFrame(
+            matcher.group(), "Annotation Stack View");
+        }
+
+      } else if (me.getID() == MouseEvent.MOUSE_CLICKED
+              && me.getButton() == MouseEvent.BUTTON1
               && me.getClickCount() == 2) { // double click
         if (targetSetName == null) {
           if (!askTargetSet()) { return; }
@@ -400,7 +471,7 @@
           e.printStackTrace();
         }
         // wait some time
-        Date timeToRun = new Date(System.currentTimeMillis() + 1000);
+        Date timeToRun = new Date(System.currentTimeMillis() + 500);
         Timer timer = new Timer("Annotation stack view select type", true);
         timer.schedule(new TimerTask() {
           public void run() {
@@ -411,27 +482,6 @@
             }});
           }
         }, timeToRun);
-
-      } else if (me.getID() == MouseEvent.MOUSE_CLICKED
-              && me.getButton() == MouseEvent.BUTTON1
-              && me.getClickCount() == 1
-              && (me.getModifiersEx() & MouseEvent.CTRL_DOWN_MASK) != 0) {
-              // control + click -> delete the annotation
-        annotationData.getAnnotationSet().remove(annotation);
-
-      } else if (me.getID() == MouseEvent.MOUSE_CLICKED
-              && me.getButton() == MouseEvent.BUTTON1
-              && me.getClickCount() == 1) { // simple click
-        String feature = typesFeatures.get(annotation.getType());
-        if (feature == null) { return; }
-        String value = (String) annotation.getFeatures().get(feature);
-        Pattern pattern = Pattern.compile("(https?://[^\\s,;]+)");
-        Matcher matcher = pattern.matcher(value);
-        if (matcher.find()) {
-          // if the feature value contains a url then display it in a browser
-          MainFrame.getInstance().showHelpFrame(
-            matcher.group(), "Annotation Stack View");
-        }
       }
       textView.getTextView().requestFocusInWindow();
     }
@@ -448,10 +498,10 @@
         String toolTip = (label.getToolTipText() == null) ?
           "" : label.getToolTipText();
         toolTip = toolTip.replaceAll("</?html>", "");
-        toolTip = "<html>" + (toolTip.length() == 0 ? "" : toolTip + "<br>")
-          + "Double click to copy this annotation.<br>"
-          + "Right click to edit<br>"
-          + "Control + click to delete</html>";
+        toolTip = "<html>"
+          + "<b>" + (toolTip.length() == 0 ? "" : toolTip + "</b><br><br>")
+          + "Double click to copy, right click to edit,<br>"
+          + "control click to show url, control shift click to delete</html>";
         label.setToolTipText(toolTip);
       }
       // make the tooltip indefinitely shown when the mouse is over
@@ -606,17 +656,25 @@
     JWindow popupWindow;
   }
 
+  // external objects
+  TextualDocumentView textView;
+  AnnotationSetsView annotationSetsView;
+  AnnotationListView annotationListView;
+  Document document;
+
+  // user interface elements
   JLabel targetSetLabel;
+  String targetSetName;
+  JCheckBox overlappingCheckBox;
   AnnotationStack stackPanel;
   JScrollPane scroller;
   JPanel mainPanel;
-  TextualDocumentView textView;
-  AnnotationSetsView annotationSetsView;
-  AnnotationListView annotationListView;
-  String targetSetName;
-  Document document;
+
+  // actions
   PreviousAnnotationAction previousAnnotationAction;
   NextAnnotationAction nextAnnotationAction;
+
+  // local objects
   /** optionally map a type to a feature when the feature value
    *  must be displayed in the rectangle annotation */
   Map<String,String> typesFeatures;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14104] gate/trunk/build

[<gat...@us...>]

Revision: 14104
          http://gate.svn.sourceforge.net/gate/?rev=14104&view=rev
Author:   gate-project
Date:     2011-06-30 01:18:34 +0000 (Thu, 30 Jun 2011)

Log Message:
-----------
Build number update (build 3980)

Modified Paths:
--------------
    gate/trunk/build/build.properties
    gate/trunk/build/build.txt

Modified: gate/trunk/build/build.properties
===================================================================
--- gate/trunk/build/build.properties	2011-06-29 22:06:24 UTC (rev 14103)
+++ gate/trunk/build/build.properties	2011-06-30 01:18:34 UTC (rev 14104)
@@ -1,4 +1,4 @@
 #Build Number for ANT. Do not edit!
-#Wed Jun 29 02:09:27 BST 2011
+#Thu Jun 30 02:10:09 BST 2011
 cvs.version=$Id\: build.properties 7542 2006-07-17 14\:26\:51Z ian_roberts $
-build.number=3980
+build.number=3981

Modified: gate/trunk/build/build.txt
===================================================================
--- gate/trunk/build/build.txt	2011-06-29 22:06:24 UTC (rev 14103)
+++ gate/trunk/build/build.txt	2011-06-30 01:18:34 UTC (rev 14104)
@@ -1 +1 @@
-3979
\ No newline at end of file
+3980
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14103] gate/branches/plugin-Ontology-post-6.1

[<joh...@us...>]

Revision: 14103
          http://gate.svn.sourceforge.net/gate/?rev=14103&view=rev
Author:   johann_p
Date:     2011-06-29 22:06:24 +0000 (Wed, 29 Jun 2011)

Log Message:
-----------
Upgrade to owlim lite 4.0

Modified Paths:
--------------
    gate/branches/plugin-Ontology-post-6.1/creole.xml

Added Paths:
-----------
    gate/branches/plugin-Ontology-post-6.1/lib/owlim-lite-4.0.jar

Removed Paths:
-------------
    gate/branches/plugin-Ontology-post-6.1/lib/owlim-3.5.jar
    gate/branches/plugin-Ontology-post-6.1/lib/trree-3.5.jar

Modified: gate/branches/plugin-Ontology-post-6.1/creole.xml
===================================================================
--- gate/branches/plugin-Ontology-post-6.1/creole.xml	2011-06-29 21:30:16 UTC (rev 14102)
+++ gate/branches/plugin-Ontology-post-6.1/creole.xml	2011-06-29 22:06:24 UTC (rev 14103)
@@ -4,8 +4,7 @@
       <JAR>lib/commons-codec-1.3.jar</JAR> 
       <JAR>lib/commons-httpclient-3.1.jar</JAR>
       <JAR>lib/commons-logging-1.1.1.jar</JAR>
-      <JAR>lib/owlim-3.5.jar</JAR>
-      <JAR>lib/trree-3.5.jar</JAR>
+      <JAR>lib/owlim-lite-4.0.jar</JAR>
       <JAR>lib/slf4j-api-1.5.6.jar</JAR>
       <JAR>lib/slf4j-jdk14-1.5.6.jar</JAR>
       <JAR>lib/commons-io-1.4.jar</JAR>

Deleted: gate/branches/plugin-Ontology-post-6.1/lib/owlim-3.5.jar
===================================================================
(Binary files differ)

Added: gate/branches/plugin-Ontology-post-6.1/lib/owlim-lite-4.0.jar
===================================================================
(Binary files differ)


Property changes on: gate/branches/plugin-Ontology-post-6.1/lib/owlim-lite-4.0.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: gate/branches/plugin-Ontology-post-6.1/lib/trree-3.5.jar
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14102] userguide/trunk/jape.tex

[<joh...@us...>]

Revision: 14102
          http://gate.svn.sourceforge.net/gate/?rev=14102&view=rev
Author:   johann_p
Date:     2011-06-29 21:30:16 +0000 (Wed, 29 Jun 2011)

Log Message:
-----------
Document the ctx.isPREnabled() use for Controller... blocks.

Modified Paths:
--------------
    userguide/trunk/jape.tex

Modified: userguide/trunk/jape.tex
===================================================================
--- userguide/trunk/jape.tex	2011-06-29 21:07:30 UTC (rev 14101)
+++ userguide/trunk/jape.tex	2011-06-29 21:30:16 UTC (rev 14102)
@@ -1709,7 +1709,7 @@
 processing resource
 starts processing, finishes processing, or processing is aborted 
 (see the JavaDoc for \texttt{ControllerAwarePR} for more information and
-warnings about using this feature).
+warnings about using this feature). 
 These code blocks have to be defined after any \texttt{Import:} block
 but before the first phase in the file using the \texttt{ControllerStarted:},
  \texttt{ControllerFinished:} and \texttt{ControllerAborted:} keywords:
@@ -1745,6 +1745,11 @@
      which signalled the aborting exception
 \end{itemize}
 
+Note that these blocks are invoked even when the JAPE processing resource is
+disabled in a conditional pipeline. If you want to adapt or avoid the processing
+inside a block in case the processing resource is disabled, use the method
+\verb=ctx.isPREnabled()= to check if the processing resource is not disabled.
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \sect[sec:jape:speed]{Optimising for Speed}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14101] gate/trunk/src/gate/creole/ControllerAwarePR.java

[<joh...@us...>]

Revision: 14101
          http://gate.svn.sourceforge.net/gate/?rev=14101&view=rev
Author:   johann_p
Date:     2011-06-29 21:07:30 +0000 (Wed, 29 Jun 2011)

Log Message:
-----------
Document that the running strategy does not influence the
invocation of the controller aware pr methods.

Modified Paths:
--------------
    gate/trunk/src/gate/creole/ControllerAwarePR.java

Modified: gate/trunk/src/gate/creole/ControllerAwarePR.java
===================================================================
--- gate/trunk/src/gate/creole/ControllerAwarePR.java	2011-06-29 19:37:17 UTC (rev 14100)
+++ gate/trunk/src/gate/creole/ControllerAwarePR.java	2011-06-29 21:07:30 UTC (rev 14101)
@@ -23,7 +23,6 @@
  * execution, for example to initialise internal data structures or to
  * do some aggregate processing of data gathered from a whole corpus.
  * </p>
- * 
  * <p>
  * If a controller contains several PRs that implement this interface,
  * the order in which their <code>controllerExecutionStarted</code> (<code>Finished</code>
@@ -34,8 +33,17 @@
  * methods may not be called at all for this run. PRs should be robust
  * to this possibility.
  * </p>
- * 
  * <p>
+ * If the processing resource implementing this interface is contained in
+ * a conditional controller the methods defined by this interface are invoked
+ * independently of the RunningStrategy for the processing resource: even if
+ * the PR is disabled, the methods will get invoked. The method
+ * {@see gate.Utils#isEnabled(Controller, ProcessingResource)} can be used
+ * inside the implementation of the methods defined in this interface 
+ * if necessary to find out if the processing resource has a chance to run
+ * in the controller.
+ * </p>
+ * <p>
  * The controller should call this PRs started and finished (or aborted)
  * methods at most once per run, even if the controller allows the same
  * PR to be added multiple times.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14100] gate/trunk

[<joh...@us...>]

Revision: 14100
          http://gate.svn.sourceforge.net/gate/?rev=14100&view=rev
Author:   johann_p
Date:     2011-06-29 19:37:17 +0000 (Wed, 29 Jun 2011)

Log Message:
-----------
Add isPREnabled() to the ActionContext and implement the behavior for
JAPE and JAPE_Plus.

Modified Paths:
--------------
    gate/trunk/plugins/JAPE_Plus/src/gate/jape/plus/Transducer.java
    gate/trunk/src/gate/creole/Transducer.java
    gate/trunk/src/gate/jape/ActionContext.java
    gate/trunk/src/gate/jape/DefaultActionContext.java

Modified: gate/trunk/plugins/JAPE_Plus/src/gate/jape/plus/Transducer.java
===================================================================
--- gate/trunk/plugins/JAPE_Plus/src/gate/jape/plus/Transducer.java	2011-06-29 19:07:53 UTC (rev 14099)
+++ gate/trunk/plugins/JAPE_Plus/src/gate/jape/plus/Transducer.java	2011-06-29 19:37:17 UTC (rev 14100)
@@ -253,6 +253,7 @@
         aSpt.setOutputASName(outputASName);
         aSpt.setOwner(this);
         actionContext.setCorpus(corpus);
+        actionContext.setPR(this);
         actionContext.setPRFeatures(features);
         aSpt.setActionContext(actionContext);
         aSpt.setOntology(ontology);
@@ -365,6 +366,7 @@
     actionContext.setCorpus(corpus);
     actionContext.setPRFeatures(features);
     actionContext.setPRName(this.getName());
+    actionContext.setPR(this);
     for(SPTBase aSpt : singlePhaseTransducers){
       aSpt.runControllerExecutionStartedBlock(actionContext,c,ontology);
     }
@@ -380,6 +382,7 @@
     }
     actionContext.setCorpus(null);
     actionContext.setController(null);
+    actionContext.setPR(null);
   }
 
   @Override
@@ -392,6 +395,7 @@
     }
     actionContext.setCorpus(null);
     actionContext.setController(null);
+    actionContext.setPR(null);
   }
 
   

Modified: gate/trunk/src/gate/creole/Transducer.java
===================================================================
--- gate/trunk/src/gate/creole/Transducer.java	2011-06-29 19:07:53 UTC (rev 14099)
+++ gate/trunk/src/gate/creole/Transducer.java	2011-06-29 19:37:17 UTC (rev 14100)
@@ -144,6 +144,7 @@
     // the current PR features and the corpus, if present
     actionContext.setCorpus(corpus);
     actionContext.setPRFeatures(features);
+    actionContext.setPR(this);
     try {
       batch.transduce(document, inputASName == null
               ? document.getAnnotations()
@@ -560,6 +561,7 @@
     actionContext.setCorpus(corpus);
     actionContext.setPRFeatures(features);
     actionContext.setPRName(this.getName());
+    actionContext.setPR(this);
     batch.runControllerExecutionStartedBlock(actionContext,c,ontology);
   }
 
@@ -568,6 +570,7 @@
     batch.runControllerExecutionFinishedBlock(actionContext,c,ontology);
     actionContext.setCorpus(null);
     actionContext.setController(null);
+    actionContext.setPR(null);
   }
 
   public void controllerExecutionAborted(Controller c, Throwable t)
@@ -575,6 +578,7 @@
     batch.runControllerExecutionAbortedBlock(actionContext,c,t,ontology);
     actionContext.setCorpus(null);
     actionContext.setController(null);
+    actionContext.setPR(null);
   }
 
 

Modified: gate/trunk/src/gate/jape/ActionContext.java
===================================================================
--- gate/trunk/src/gate/jape/ActionContext.java	2011-06-29 19:07:53 UTC (rev 14099)
+++ gate/trunk/src/gate/jape/ActionContext.java	2011-06-29 19:37:17 UTC (rev 14100)
@@ -53,6 +53,18 @@
    */
   public String getPRName();
   
+  /**
+   * Returns true if the PR this transducer is running in has a chance to
+   * be run at all in its controller. This can be false if the PR is set
+   * to never run in a conditional controller. In such a case any controllerStarted,
+   * and controllerFinished blocks of the JAPE grammer are still run when
+   * the controller is starting or finishing. This method can be used in the
+   * controllerStarted or controllerFinished  blocks to prevent any unwanted
+   * processing if the PR is disabled.
+   * 
+   * @return
+   */
+  public boolean isPREnabled();
   
   public Controller getController();
   /**

Modified: gate/trunk/src/gate/jape/DefaultActionContext.java
===================================================================
--- gate/trunk/src/gate/jape/DefaultActionContext.java	2011-06-29 19:07:53 UTC (rev 14099)
+++ gate/trunk/src/gate/jape/DefaultActionContext.java	2011-06-29 19:37:17 UTC (rev 14100)
@@ -18,6 +18,7 @@
 import gate.Controller;
 import gate.Corpus;
 import gate.FeatureMap;
+import gate.ProcessingResource;
 
 /**
  * Default implementation for an action context.<br>
@@ -34,6 +35,7 @@
   protected Controller controller;
   protected boolean endPhaseSupported;
   protected boolean phaseEnded = false;
+  protected ProcessingResource pr;
 
   public DefaultActionContext() {}
 
@@ -48,6 +50,10 @@
     this.prname = name;
   }
   
+  public void setPR(ProcessingResource pr) {
+    this.pr = pr;
+  }
+  
   public Corpus getCorpus() {
     return corpus;
   }
@@ -85,5 +91,9 @@
   public void setPhaseEnded(boolean isended) {
     phaseEnded = isended;
   }
+  
+  public boolean isPREnabled() {
+    return gate.Utils.isEnabled(controller, pr);
+  }
 
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14099] gate/trunk/src/gate/Utils.java

[<joh...@us...>]

Revision: 14099
          http://gate.svn.sourceforge.net/gate/?rev=14099&view=rev
Author:   johann_p
Date:     2011-06-29 19:07:53 +0000 (Wed, 29 Jun 2011)

Log Message:
-----------
Added methods isEnabled(Controller,ProcessingResource) and getRunningStrategy(Controller,ProcessingResource)

Modified Paths:
--------------
    gate/trunk/src/gate/Utils.java

Modified: gate/trunk/src/gate/Utils.java
===================================================================
--- gate/trunk/src/gate/Utils.java	2011-06-29 01:17:34 UTC (rev 14098)
+++ gate/trunk/src/gate/Utils.java	2011-06-29 19:07:53 UTC (rev 14099)
@@ -18,9 +18,12 @@
 
 import gate.annotation.AnnotationSetImpl;
 import gate.annotation.ImmutableAnnotationSetImpl;
+import gate.creole.ConditionalSerialController;
+import gate.creole.RunningStrategy;
 import gate.util.GateRuntimeException;
 import gate.util.OffsetComparator;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -504,7 +507,68 @@
     return fm;
   }
   
+  /** 
+   * This method can be used to check if a ProcessingResource has 
+   * a chance to be run in the given controller with the current settings.
+   * <p>
+   * That means that for a non-conditional controller, the method will return
+   * true if the PR is part of the controller. For a conditional controller,
+   * the method will return true if it is part of the controller and at least
+   * once (if the same PR is contained multiple times) it is not disabled.
+   * 
+   * @param controller 
+   * @param pr
+   * @return true or false depending on the conditions explained above.
+   */
+  public static boolean isEnabled(Controller controller, ProcessingResource pr) {
+    Collection<ProcessingResource> prs = controller.getPRs();
+    if(!prs.contains(pr)) {
+      return false;
+    }
+    if(controller instanceof ConditionalSerialController) {
+      Collection<RunningStrategy> rss = 
+        ((ConditionalSerialController)controller).getRunningStrategies();
+      for(RunningStrategy rs : rss) {
+        // if we find at least one occurrence of the PR that is not disabled
+        // return true
+        if(rs.getPR().equals(pr) && 
+           rs.getRunMode() != RunningStrategy.RUN_NEVER) {
+          return true;
+        }
+      }
+      // if we get here, no occurrence of the PR has found or none that
+      // is not disabled, so return false
+      return false;
+    }
+    return true;
+  }
+  
   /**
+   * Return the running strategy of the PR in the controller, if the controller
+   * is a conditional controller. If the controller is not a conditional 
+   * controller, null is returned. If the controller is a conditional controller
+   * and the PR is contained multiple times, the running strategy for the 
+   * first occurrence the is found is returned.
+   * 
+   * @param controller
+   * @param pr
+   * @return A RunningStrategy object or null
+   */
+  public static RunningStrategy getRunningStrategy(Controller controller,
+          ProcessingResource pr) {
+    if(controller instanceof ConditionalSerialController) {
+      Collection<RunningStrategy> rss = 
+        ((ConditionalSerialController)controller).getRunningStrategies();
+      for(RunningStrategy rs : rss) {
+        if(rs.getPR() == pr) {
+          return rs;
+        }
+      } 
+    }
+    return null;
+  }
+  
+  /**
    * Issue a message to the log but only if the same message has not
    * been logged already in the same GATE session.
    * This is intended for explanations or warnings that should not be 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14098] gate/trunk/build

[<gat...@us...>]

Revision: 14098
          http://gate.svn.sourceforge.net/gate/?rev=14098&view=rev
Author:   gate-project
Date:     2011-06-29 01:17:34 +0000 (Wed, 29 Jun 2011)

Log Message:
-----------
Build number update (build 3979)

Modified Paths:
--------------
    gate/trunk/build/build.properties
    gate/trunk/build/build.txt

Modified: gate/trunk/build/build.properties
===================================================================
--- gate/trunk/build/build.properties	2011-06-28 17:29:59 UTC (rev 14097)
+++ gate/trunk/build/build.properties	2011-06-29 01:17:34 UTC (rev 14098)
@@ -1,4 +1,4 @@
 #Build Number for ANT. Do not edit!
-#Tue Jun 28 02:09:36 BST 2011
+#Wed Jun 29 02:09:27 BST 2011
 cvs.version=$Id\: build.properties 7542 2006-07-17 14\:26\:51Z ian_roberts $
-build.number=3979
+build.number=3980

Modified: gate/trunk/build/build.txt
===================================================================
--- gate/trunk/build/build.txt	2011-06-28 17:29:59 UTC (rev 14097)
+++ gate/trunk/build/build.txt	2011-06-29 01:17:34 UTC (rev 14098)
@@ -1 +1 @@
-3978
\ No newline at end of file
+3979
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14097] userguide/trunk

[<tho...@us...>]

Revision: 14097
          http://gate.svn.sourceforge.net/gate/?rev=14097&view=rev
Author:   thomas_heitz
Date:     2011-06-28 17:29:59 +0000 (Tue, 28 Jun 2011)

Log Message:
-----------
Corrected some missing references.

Modified Paths:
--------------
    userguide/trunk/misc-creole.tex
    userguide/trunk/recent-changes.tex
    userguide/trunk/shortcuts.tex

Modified: userguide/trunk/misc-creole.tex
===================================================================
--- userguide/trunk/misc-creole.tex	2011-06-28 16:13:21 UTC (rev 14096)
+++ userguide/trunk/misc-creole.tex	2011-06-28 17:29:59 UTC (rev 14097)
@@ -2422,11 +2422,10 @@
 Section~\ref{sec:misc-creole:opennlp:opennlpprs}.
 
 Note also that some of the OpenNLP tools use quite large machine learning
-models, which the PRs need to load into memory. You may find that you have to
-give additional memory to GATE in order to use the OpenNLP PRs
-comfortably. See
-Section~\ref{sec:gettingstarted:troubleshooting:javaheapspace} for an example
-of how to do this.
+models, which the PRs need to load into memory. You may find that you have
+to give additional memory to GATE in order to use the OpenNLP PRs
+comfortably. See the \htlink{http://gate.ac.uk/wiki/gate-user-faq.html}{FAQ
+on the GATE Wiki} for an example of how to do this.
 
 Below, we describe the parameters common to all of the OpenNLP
 PRs. This is followed by a section which gives brief details of each

Modified: userguide/trunk/recent-changes.tex
===================================================================
--- userguide/trunk/recent-changes.tex	2011-06-28 16:13:21 UTC (rev 14096)
+++ userguide/trunk/recent-changes.tex	2011-06-28 17:29:59 UTC (rev 14097)
@@ -28,7 +28,7 @@
 
 The layout is now saved to the user preferences file, gate.xml. It means
 that you can give this file to a new user so s/he will have a preconfigured
-document editor. See section~\ref{sec:developer:documenteditor}.
+document editor. See section~\ref{sec:developer:documents}.
 
 \rcSect[6.1]{Version 6.1 (April 2011)}
 

Modified: userguide/trunk/shortcuts.tex
===================================================================
--- userguide/trunk/shortcuts.tex	2011-06-28 16:13:21 UTC (rev 14096)
+++ userguide/trunk/shortcuts.tex	2011-06-28 17:29:59 UTC (rev 14097)
@@ -49,7 +49,7 @@
 Ctrl+F4 & Close the selected resource\\
 \hline
 \multicolumn{2}{c}{\ }\\
-\multicolumn{2}{c}{\bf{Document editor} (Section \ref{sec:developer:documenteditor})}\\
+\multicolumn{2}{c}{\bf{Document editor} (Section \ref{sec:developer:documents})}\\
 \hline
 Ctrl+F & Show the search dialog for the document\\
 \hline


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14096] userguide/trunk

[<tho...@us...>]

Revision: 14096
          http://gate.svn.sourceforge.net/gate/?rev=14096&view=rev
Author:   thomas_heitz
Date:     2011-06-28 16:13:21 +0000 (Tue, 28 Jun 2011)

Log Message:
-----------
Document editor layout is now saved to the user preferences. Updates the recent changes.

Modified Paths:
--------------
    userguide/trunk/developer.tex
    userguide/trunk/recent-changes.tex

Modified: userguide/trunk/developer.tex
===================================================================
--- userguide/trunk/developer.tex	2011-06-28 13:18:38 UTC (rev 14095)
+++ userguide/trunk/developer.tex	2011-06-28 16:13:21 UTC (rev 14096)
@@ -195,23 +195,29 @@
 
 The document editor is contained in the central tabbed pane in GATE Developer.
 Double-click on your document in the resources pane to view the document editor.
+
 The document editor consists of a top panel with buttons and icons that control
 the display of different views and the search box. Initially, you will see just
 the text of your document, as shown in figure~\ref{fig:document-editor}. Click on
 `Annotation Sets' and `Annotations List' to view the annotation sets to the right
-and the annotations list at the bottom. You will see a view similar to
-figure~\ref{fig:document-editor-with-annotations}. In place of the annotations
-list, you can also choose to see the annotations stack. In place of the
-annotation sets, you can also choose to view the co-reference editor. More
-information about this functionality is given in
+and the annotations list at the bottom.
+
+You will see a view similar to
+figure~\ref{fig:document-editor-with-annotations}. In place of the
+annotations list, you can also choose to see the annotations stack. In place
+of the annotation sets, you can also choose to view the co-reference
+editor. More information about this functionality is given in
 Section~\ref{sec:developer:annotations}.
 
-Several options can be set from the triangle icon at the top right corner.
+Several options can be set from the small triangle icon at the top right
+corner.
 
 With `Save Current Layout' you store the way the different views are shown
 and the annotation types highlighted in the document. Then if you set
 `Restore Layout Automatically' you will get the same views and annotation
-types each time you open a document.
+types each time you open a document. The layout is saved to the user
+preferences file, gate.xml. It means that you can give this file to a new
+user so s/he will have a preconfigured document editor.
 
 Another setting make the document editor `Read-only'. If enabled, you won't
 be able to edit the text but you will still be able to edit annotations. It
@@ -445,27 +451,26 @@
 overlapping.
 
 As the view is centred on the document caret, you can use the conventional
-keypresses to move it and update the view: notably the keys left and
-right to skip one letter; control + left/right to skip one word; up and down to
-go one line up or down; and use the document scrollbar then click in the document
-to move further. There are also two buttons at the top of the view that centre
-the view on the closest previous/next annotation boundary among all displayed.
-This is useful when you want to skip a region without annotation or when you want
-to reach the beginning or end of a very long annotation.
+key to move it and update the view: notably the keys left and right to skip
+one letter; control + left/right to skip one word; up and down to go one
+line up or down; and use the document scrollbar then click in the document
+to move further.
 
-The annotation types displayed correspond to those selected in the annotation
-sets view. You can display feature values for an annotation rectangle by
-hovering the mouse on it or select only one feature to display by
-double-clicking on the annotation type in the first column.
+There are two buttons at the top of the view that centre the view on the
+closest previous/next annotation boundary among all displayed. This is
+useful when you want to skip a region without annotation or when you want to
+reach the beginning or end of a very long annotation.
 
-Right-clicking on an annotation in the annotations stack view gives the option
-to edit that annotation.
+The annotation types displayed correspond to those selected in the
+annotation sets view. You can display feature values for an annotation
+rectangle by hovering the mouse on it or select only one feature to display
+by double-clicking on the annotation type in the first column. By clicking
+on a feature value that contains an URL you will display it in your browser.
 
-%There is the possibility to create a gold standard annotation set with this
-%view. If you double-click on an annotation rectangle, you will be asked for
-%a target set and then all the annotation rectangles you double-click will be
-%copied to this set. To change again the target set click on its name at the
-%top of the view.
+Right-click on an annotation in the annotations stack view to edit
+it. Shift-click to delete it. Double-click to copy it to another annotation
+set. The latter being particularly useful to create a gold standard
+annotation set.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \subsect[sec:developer:coreferenceeditor]{The Co-reference Editor}

Modified: userguide/trunk/recent-changes.tex
===================================================================
--- userguide/trunk/recent-changes.tex	2011-06-28 13:18:38 UTC (rev 14095)
+++ userguide/trunk/recent-changes.tex	2011-06-28 16:13:21 UTC (rev 14096)
@@ -19,6 +19,17 @@
   \def\rcSubsubsect#1{\subsubsect{#1}}
 \fi
 
+\rcSect[next-release]{Next Release}
+
+\rcSubsect{June 2011}
+
+Added support for reading UIMA CAS document format. See
+section~\ref{sec:corpora:uima}.
+
+The layout is now saved to the user preferences file, gate.xml. It means
+that you can give this file to a new user so s/he will have a preconfigured
+document editor. See section~\ref{sec:developer:documenteditor}.
+
 \rcSect[6.1]{Version 6.1 (April 2011)}
 
 \rcSubsect{New CREOLE Plugins}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14095] userguide/trunk/corpora.tex

[<tho...@us...>]

Revision: 14095
          http://gate.svn.sourceforge.net/gate/?rev=14095&view=rev
Author:   thomas_heitz
Date:     2011-06-28 13:18:38 +0000 (Tue, 28 Jun 2011)

Log Message:
-----------
Add a section on UIMA CAS document format.

Modified Paths:
--------------
    userguide/trunk/corpora.tex

Modified: userguide/trunk/corpora.tex
===================================================================
--- userguide/trunk/corpora.tex	2011-06-28 11:00:26 UTC (rev 14094)
+++ userguide/trunk/corpora.tex	2011-06-28 13:18:38 UTC (rev 14095)
@@ -474,6 +474,8 @@
 Microsoft Office (some formats)
 \item
 OpenOffice (some formats)
+\item
+UIMA CAS
 \end{itemize}
 
 By default GATE will try and identify the type of the document, then strip
@@ -1302,6 +1304,35 @@
 resources and JAPE grammars designed for use with HTML files should also
 work well with PDF and Office documents.
 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\subsect[sec:corpora:uima]{UIMA CAS Documents}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+GATE can read UIMA CAS documents. The CAS stands for Common Analysis
+Structure. It provides a common representation to the artifact being
+analyzed, here a text.
+
+The subject of analysis (SOFA), here a string, is used as the document
+content. Multiple sofa are concatenated. The analysis results or metadata
+are added as annotations when having begin and end offsets and otherwise are
+added as document features. The views are added as GATE annotation sets.
+The type system (a hierarchical annotation schema) is not currently
+supported.
+
+The web server content type associate with UIMA documents
+is: {\em text/xmi+xml.}
+
+The extensions are: xcas, xmicas, xmi.
+
+The magic numbers are:
+\begin{verbatim}
+<CAS version="2">
+\end{verbatim}
+and
+\begin{verbatim}
+xmlns:cas=
+\end{verbatim}
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \sect[sec:corpora:xmlinout]{XML Input/Output}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14094] mimir/trunk/grails-plugin-mimir/grails-app/domain/ gate/mimir/web/IndexTemplate.groovy

[<va...@us...>]

Revision: 14094
          http://gate.svn.sourceforge.net/gate/?rev=14094&view=rev
Author:   valyt
Date:     2011-06-28 11:00:26 +0000 (Tue, 28 Jun 2011)

Log Message:
-----------
Increased the size of index templates from 10kB to 100kB.

Modified Paths:
--------------
    mimir/trunk/grails-plugin-mimir/grails-app/domain/gate/mimir/web/IndexTemplate.groovy

Modified: mimir/trunk/grails-plugin-mimir/grails-app/domain/gate/mimir/web/IndexTemplate.groovy
===================================================================
--- mimir/trunk/grails-plugin-mimir/grails-app/domain/gate/mimir/web/IndexTemplate.groovy	2011-06-28 10:58:35 UTC (rev 14093)
+++ mimir/trunk/grails-plugin-mimir/grails-app/domain/gate/mimir/web/IndexTemplate.groovy	2011-06-28 11:00:26 UTC (rev 14094)
@@ -39,7 +39,7 @@
   static constraints = {
     name(nullable:false, blank:false)
     comment(nullable:true, blank:true)
-    configuration(nullable:false, maxSize:10240)
+    configuration(nullable:false, maxSize:102400)
   }
 
   /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14093] mimir/trunk/plugins/sparql

[<va...@us...>]

Revision: 14093
          http://gate.svn.sourceforge.net/gate/?rev=14093&view=rev
Author:   valyt
Date:     2011-06-28 10:58:35 +0000 (Tue, 28 Jun 2011)

Log Message:
-----------
Ignore creole.xml (now generated).

Modified Paths:
--------------
    mimir/trunk/plugins/sparql/build.xml

Property Changed:
----------------
    mimir/trunk/plugins/sparql/


Property changes on: mimir/trunk/plugins/sparql
___________________________________________________________________
Modified: svn:ignore
   - classes
mimir-plugin-sparql-*.jar

   + classes
mimir-plugin-sparql-*.jar
creole.xml


Modified: mimir/trunk/plugins/sparql/build.xml
===================================================================
--- mimir/trunk/plugins/sparql/build.xml	2011-06-28 10:57:23 UTC (rev 14092)
+++ mimir/trunk/plugins/sparql/build.xml	2011-06-28 10:58:35 UTC (rev 14093)
@@ -38,7 +38,7 @@
            classpathref="compile.classpath" />
   </target>
   
-  <target name="jar" depends="clean, compile">
+  <target name="jar" depends="clean, compile, creole.xml">
     <jar file="${jar.file}" basedir="${classes.dir}" update="false">
   	</jar>
   </target>  


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14092] mimir/trunk/plugins/sparql

[<va...@us...>]

Revision: 14092
          http://gate.svn.sourceforge.net/gate/?rev=14092&view=rev
Author:   valyt
Date:     2011-06-28 10:57:23 +0000 (Tue, 28 Jun 2011)

Log Message:
-----------
Generate the creole.xml content from ANT.

Modified Paths:
--------------
    mimir/trunk/plugins/sparql/build.xml

Added Paths:
-----------
    mimir/trunk/plugins/sparql/creole.xml.template

Removed Paths:
-------------
    mimir/trunk/plugins/sparql/creole.xml

Modified: mimir/trunk/plugins/sparql/build.xml
===================================================================
--- mimir/trunk/plugins/sparql/build.xml	2011-06-28 10:55:49 UTC (rev 14091)
+++ mimir/trunk/plugins/sparql/build.xml	2011-06-28 10:57:23 UTC (rev 14092)
@@ -17,7 +17,8 @@
   <property name="src.dir" location="src" />
   <property name="doc.dir" location="doc" />
   
-  <property name="jar.file" location="${app.name}-${app.version}.jar" />
+  <property name="jar.name" value="${app.name}-${app.version}.jar" />
+  <property name="jar.file" location="${jar.name}" />
   <path id="compile.classpath">
     <path refid="core-libs" />
   </path>
@@ -42,6 +43,14 @@
   	</jar>
   </target>  
   
+  <target name="creole.xml">
+      <copy file="creole.xml.template" tofile="creole.xml">
+        <filterset>
+          <filter token="jar" value="${jar.name}" />
+        </filterset>
+      </copy>
+    </target>  
+  
   <target name="distro" depends="jar, javadoc" />
   
   <!-- Docs -->

Deleted: mimir/trunk/plugins/sparql/creole.xml
===================================================================
--- mimir/trunk/plugins/sparql/creole.xml	2011-06-28 10:55:49 UTC (rev 14091)
+++ mimir/trunk/plugins/sparql/creole.xml	2011-06-28 10:57:23 UTC (rev 14092)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- This plugin does not provide any GATE resources, but uses the CREOLE 
-mechanism to supply a set of jar files to be added to the classpath of the caller.-->
-<CREOLE-DIRECTORY>
-  <JAR>mimir-plugin-sparql-3.2.1-snapshot.jar</JAR>
-</CREOLE-DIRECTORY>

Copied: mimir/trunk/plugins/sparql/creole.xml.template (from rev 14078, mimir/trunk/plugins/sparql/creole.xml)
===================================================================
--- mimir/trunk/plugins/sparql/creole.xml.template	                        (rev 0)
+++ mimir/trunk/plugins/sparql/creole.xml.template	2011-06-28 10:57:23 UTC (rev 14092)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- This plugin does not provide any GATE resources, but uses the CREOLE 
+mechanism to supply a set of jar files to be added to the classpath of the caller.-->
+<CREOLE-DIRECTORY>
+  <JAR>@jar@</JAR>
+</CREOLE-DIRECTORY>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14091] mimir/trunk/plugins/sesame/

[<va...@us...>]

Revision: 14091
          http://gate.svn.sourceforge.net/gate/?rev=14091&view=rev
Author:   valyt
Date:     2011-06-28 10:55:49 +0000 (Tue, 28 Jun 2011)

Log Message:
-----------
Ignore creole.xml (now generated).

Property Changed:
----------------
    mimir/trunk/plugins/sesame/


Property changes on: mimir/trunk/plugins/sesame
___________________________________________________________________
Modified: svn:ignore
   - mimir-plugin-sesame-*.jar
classes

   + mimir-plugin-sesame-*.jar
classes
creole.xml



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14090] mimir/trunk/plugins/sesame

[<va...@us...>]

Revision: 14090
          http://gate.svn.sourceforge.net/gate/?rev=14090&view=rev
Author:   valyt
Date:     2011-06-28 10:55:01 +0000 (Tue, 28 Jun 2011)

Log Message:
-----------
Generate the creole.xml content from ANT.

Modified Paths:
--------------
    mimir/trunk/plugins/sesame/build.xml

Added Paths:
-----------
    mimir/trunk/plugins/sesame/creole.xml.template

Removed Paths:
-------------
    mimir/trunk/plugins/sesame/creole.xml

Modified: mimir/trunk/plugins/sesame/build.xml
===================================================================
--- mimir/trunk/plugins/sesame/build.xml	2011-06-28 10:53:03 UTC (rev 14089)
+++ mimir/trunk/plugins/sesame/build.xml	2011-06-28 10:55:01 UTC (rev 14090)
@@ -23,7 +23,8 @@
   <property name="sesame.dir" location=""/>
 
   
-  <property name="jar.file" location="${app.name}-${app.version}.jar" />
+  <property name="jar.name" value="${app.name}-${app.version}.jar" />
+  <property name="jar.file" location="${jar.name}" />
   <path id="compile.classpath">
     <path refid="core-libs" />
     <path refid="local-libs" />
@@ -48,15 +49,24 @@
            classpathref="compile.classpath" />
   </target>
   
-  <target name="jar" depends="clean, compile">
+  <target name="jar" depends="clean, compile, creole.xml">
     <jar file="${jar.file}" basedir="${classes.dir}" update="false">
     <fileset dir="${sesame.dir}" includes="*.ttl" />
       <manifest>
         <attribute name="Class-Path" value="${manifest.runtime.classpath}" />
       </manifest>
     </jar>
-  </target>  
+  </target>
   
+  <target name="creole.xml">
+      <copy file="creole.xml.template" tofile="creole.xml">
+        <filterset>
+          <filter token="jar" value="${jar.name}" />
+        </filterset>
+      </copy>
+    </target>
+  
+  
   <target name="distro" depends="jar, javadoc" />
   
   <!-- Docs -->

Deleted: mimir/trunk/plugins/sesame/creole.xml
===================================================================
--- mimir/trunk/plugins/sesame/creole.xml	2011-06-28 10:53:03 UTC (rev 14089)
+++ mimir/trunk/plugins/sesame/creole.xml	2011-06-28 10:55:01 UTC (rev 14090)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- This plugin does not provide any GATE resources, but uses the CREOLE 
-mechanism to supply a set of jar files to be added to the classpath of the caller.-->
-<CREOLE-DIRECTORY>
-  <!-- Most of the dependencies are referenced by the manifest Class-Path entry
-  in the plugin JAR -->
-  <JAR SCAN="true">mimir-plugin-sesame-3.2.1-snapshot.jar</JAR>
-
-  <!-- This plugin requires BigOWLIM 3.5, you need to obtain a suitably
-  licenced copy of this from Ontotext and place it in the owlim directory -->
-  <JAR>owlim/big-owlim-3.5.jar</JAR>
-</CREOLE-DIRECTORY>

Copied: mimir/trunk/plugins/sesame/creole.xml.template (from rev 14078, mimir/trunk/plugins/sesame/creole.xml)
===================================================================
--- mimir/trunk/plugins/sesame/creole.xml.template	                        (rev 0)
+++ mimir/trunk/plugins/sesame/creole.xml.template	2011-06-28 10:55:01 UTC (rev 14090)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- This plugin does not provide any GATE resources, but uses the CREOLE 
+mechanism to supply a set of jar files to be added to the classpath of the caller.-->
+<CREOLE-DIRECTORY>
+  <!-- Most of the dependencies are referenced by the manifest Class-Path entry
+  in the plugin JAR -->
+  <JAR SCAN="true">@jar@</JAR>
+
+  <!-- This plugin requires BigOWLIM 3.5, you need to obtain a suitably
+  licenced copy of this from Ontotext and place it in the owlim directory -->
+  <JAR>owlim/big-owlim-3.5.jar</JAR>
+</CREOLE-DIRECTORY>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14089] mimir/trunk/plugins/ordi/creole.xml.template

[<va...@us...>]

Revision: 14089
          http://gate.svn.sourceforge.net/gate/?rev=14089&view=rev
Author:   valyt
Date:     2011-06-28 10:53:03 +0000 (Tue, 28 Jun 2011)

Log Message:
-----------
Variable for the jar name.

Modified Paths:
--------------
    mimir/trunk/plugins/ordi/creole.xml.template

Modified: mimir/trunk/plugins/ordi/creole.xml.template
===================================================================
--- mimir/trunk/plugins/ordi/creole.xml.template	2011-06-28 10:52:32 UTC (rev 14088)
+++ mimir/trunk/plugins/ordi/creole.xml.template	2011-06-28 10:53:03 UTC (rev 14089)
@@ -4,7 +4,7 @@
 <CREOLE-DIRECTORY>
   <!-- Most of the dependencies are referenced by the manifest Class-Path entry
   in the plugin JAR -->
-  <JAR>mimir-plugin-ordi-3.2.1-snapshot.jar</JAR>
+  <JAR>@jar@</JAR>
 
   <!-- This plugin requires BigOWLIM 3.3, you need to obtain a suitably
   licenced copy of this from Ontotext and place it in the owlim directory -->


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14088] mimir/trunk/plugins/measurements/creole.xml. template

[<va...@us...>]

Revision: 14088
          http://gate.svn.sourceforge.net/gate/?rev=14088&view=rev
Author:   valyt
Date:     2011-06-28 10:52:32 +0000 (Tue, 28 Jun 2011)

Log Message:
-----------
Variable for the jar name.

Modified Paths:
--------------
    mimir/trunk/plugins/measurements/creole.xml.template

Modified: mimir/trunk/plugins/measurements/creole.xml.template
===================================================================
--- mimir/trunk/plugins/measurements/creole.xml.template	2011-06-28 10:51:14 UTC (rev 14087)
+++ mimir/trunk/plugins/measurements/creole.xml.template	2011-06-28 10:52:32 UTC (rev 14088)
@@ -2,6 +2,6 @@
 <!-- This plugin does not provide any GATE resources, but uses the CREOLE 
 mechanism to supply a set of jar files to be added to the classpath of the caller.-->
 <CREOLE-DIRECTORY>
-  <JAR SCAN="true">mimir-plugin-measurements-3.2.1-snapshot.jar</JAR>
+  <JAR SCAN="true">@jar@</JAR>
   <JAR>lib/MeasurementTagger.jar</JAR>
 </CREOLE-DIRECTORY>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14087] mimir/trunk/plugins/ordi/

[<va...@us...>]

Revision: 14087
          http://gate.svn.sourceforge.net/gate/?rev=14087&view=rev
Author:   valyt
Date:     2011-06-28 10:51:14 +0000 (Tue, 28 Jun 2011)

Log Message:
-----------
Ignore creole.xml (now generated).

Property Changed:
----------------
    mimir/trunk/plugins/ordi/


Property changes on: mimir/trunk/plugins/ordi
___________________________________________________________________
Modified: svn:ignore
   - mimir-plugin-ordi-*.jar
classes

   + mimir-plugin-ordi-*.jar
classes
creole.xml



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14086] mimir/trunk/plugins/ordi

[<va...@us...>]

Revision: 14086
          http://gate.svn.sourceforge.net/gate/?rev=14086&view=rev
Author:   valyt
Date:     2011-06-28 10:50:33 +0000 (Tue, 28 Jun 2011)

Log Message:
-----------
Generate the creole.xml content from ANT.

Modified Paths:
--------------
    mimir/trunk/plugins/ordi/build.xml

Added Paths:
-----------
    mimir/trunk/plugins/ordi/creole.xml.template

Removed Paths:
-------------
    mimir/trunk/plugins/ordi/creole.xml

Modified: mimir/trunk/plugins/ordi/build.xml
===================================================================
--- mimir/trunk/plugins/ordi/build.xml	2011-06-28 10:48:43 UTC (rev 14085)
+++ mimir/trunk/plugins/ordi/build.xml	2011-06-28 10:50:33 UTC (rev 14086)
@@ -21,7 +21,8 @@
   <property name="src.dir" location="src" />
   <property name="doc.dir" location="doc" />
   
-  <property name="jar.file" location="${app.name}-${app.version}.jar" />
+  <property name="jar.name" value="${app.name}-${app.version}.jar" />
+  <property name="jar.file" location="${jar.name}" />
   <path id="compile.classpath">
     <path refid="core-libs" />
     <path refid="local-libs" />
@@ -46,13 +47,22 @@
            classpathref="compile.classpath" />
   </target>
   
-  <target name="jar" depends="clean, compile">
+  <target name="jar" depends="clean, compile, creole.xml">
     <jar file="${jar.file}" basedir="${classes.dir}" update="false">
       <manifest>
         <attribute name="Class-Path" value="${manifest.runtime.classpath}" />
       </manifest>
     </jar>
   </target>  
+
+  <target name="creole.xml">
+    <copy file="creole.xml.template" tofile="creole.xml">
+      <filterset>
+        <filter token="jar" value="${jar.name}" />
+      </filterset>
+    </copy>
+  </target>
+
   
   <target name="distro" depends="jar, javadoc" />
   

Deleted: mimir/trunk/plugins/ordi/creole.xml
===================================================================
--- mimir/trunk/plugins/ordi/creole.xml	2011-06-28 10:48:43 UTC (rev 14085)
+++ mimir/trunk/plugins/ordi/creole.xml	2011-06-28 10:50:33 UTC (rev 14086)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- This plugin does not provide any GATE resources, but uses the CREOLE 
-mechanism to supply a set of jar files to be added to the classpath of the caller.-->
-<CREOLE-DIRECTORY>
-  <!-- Most of the dependencies are referenced by the manifest Class-Path entry
-  in the plugin JAR -->
-  <JAR>mimir-plugin-ordi-3.2.1-snapshot.jar</JAR>
-
-  <!-- This plugin requires BigOWLIM 3.3, you need to obtain a suitably
-  licenced copy of this from Ontotext and place it in the owlim directory -->
-  <JAR>owlim/owlim-big-3.3.jar</JAR>
-</CREOLE-DIRECTORY>

Copied: mimir/trunk/plugins/ordi/creole.xml.template (from rev 14078, mimir/trunk/plugins/ordi/creole.xml)
===================================================================
--- mimir/trunk/plugins/ordi/creole.xml.template	                        (rev 0)
+++ mimir/trunk/plugins/ordi/creole.xml.template	2011-06-28 10:50:33 UTC (rev 14086)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!-- This plugin does not provide any GATE resources, but uses the CREOLE 
+mechanism to supply a set of jar files to be added to the classpath of the caller.-->
+<CREOLE-DIRECTORY>
+  <!-- Most of the dependencies are referenced by the manifest Class-Path entry
+  in the plugin JAR -->
+  <JAR>mimir-plugin-ordi-3.2.1-snapshot.jar</JAR>
+
+  <!-- This plugin requires BigOWLIM 3.3, you need to obtain a suitably
+  licenced copy of this from Ontotext and place it in the owlim directory -->
+  <JAR>owlim/owlim-big-3.3.jar</JAR>
+</CREOLE-DIRECTORY>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14085] mimir/trunk/plugins/ordi/src/gate/mimir/ordi/ ORDISemanticAnnotationHelper.java

[<va...@us...>]

Revision: 14085
          http://gate.svn.sourceforge.net/gate/?rev=14085&view=rev
Author:   valyt
Date:     2011-06-28 10:48:43 +0000 (Tue, 28 Jun 2011)

Log Message:
-----------
Log a warning message when creating new indexes with the ORDI helper and point the users toward the new Sesame-based helper.

Modified Paths:
--------------
    mimir/trunk/plugins/ordi/src/gate/mimir/ordi/ORDISemanticAnnotationHelper.java

Modified: mimir/trunk/plugins/ordi/src/gate/mimir/ordi/ORDISemanticAnnotationHelper.java
===================================================================
--- mimir/trunk/plugins/ordi/src/gate/mimir/ordi/ORDISemanticAnnotationHelper.java	2011-06-28 10:44:31 UTC (rev 14084)
+++ mimir/trunk/plugins/ordi/src/gate/mimir/ordi/ORDISemanticAnnotationHelper.java	2011-06-28 10:48:43 UTC (rev 14085)
@@ -534,6 +534,9 @@
    */
   public void init(Indexer indexer){
     if(initDone) return;
+    logger.warn("The ORDI Semantic Annotation Helper is now deprecated and " +
+    		"should only be used for opening old indexes.\nPlease use the new " +
+    		"Sesame Semantic Annotation Helper instead for building new indexes!");
     try {
       TSource ordiSource = getOrdiSource(indexer.getIndexConfig());
       ordiConnection = ordiSource.getConnection();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[gate-cvs] SF.net SVN: gate:[14084] mimir/trunk/plugins/measurements/

[<va...@us...>]

Revision: 14084
          http://gate.svn.sourceforge.net/gate/?rev=14084&view=rev
Author:   valyt
Date:     2011-06-28 10:44:31 +0000 (Tue, 28 Jun 2011)

Log Message:
-----------
Ignore creole.xml (now generated).

Property Changed:
----------------
    mimir/trunk/plugins/measurements/


Property changes on: mimir/trunk/plugins/measurements
___________________________________________________________________
Modified: svn:ignore
   - classes
mimir-plugin-measurements-*.jar

   + classes
mimir-plugin-measurements-*.jar
creole.xml



This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.