Revision: 19781
http://sourceforge.net/p/gate/code/19781
Author: markagreenwood
Date: 2016-11-24 11:05:17 +0000 (Thu, 24 Nov 2016)
Log Message:
-----------
mavenized this plugin as well
Modified Paths:
--------------
gate/branches/sawdust2/plugins/Tagger_Measurements/.classpath
gate/branches/sawdust2/plugins/Tagger_Measurements/.project
gate/branches/sawdust2/plugins/Tagger_Measurements/src/main/resources/resources/annie-measurements.xgapp
gate/branches/sawdust2/plugins/Tagger_Measurements/src/main/resources/resources/measurements.xgapp
gate/branches/sawdust2/plugins/Tagger_Measurements/src/test/java/gate/creole/measurements/MeasurementsTest.java
Added Paths:
-----------
gate/branches/sawdust2/plugins/Tagger_Measurements/pom.xml
gate/branches/sawdust2/plugins/Tagger_Measurements/src/main/
gate/branches/sawdust2/plugins/Tagger_Measurements/src/main/java/
gate/branches/sawdust2/plugins/Tagger_Measurements/src/main/java/gate/
gate/branches/sawdust2/plugins/Tagger_Measurements/src/main/resources/
gate/branches/sawdust2/plugins/Tagger_Measurements/src/main/resources/creole.xml
gate/branches/sawdust2/plugins/Tagger_Measurements/src/main/resources/gate/
gate/branches/sawdust2/plugins/Tagger_Measurements/src/main/resources/gate/resources/
gate/branches/sawdust2/plugins/Tagger_Measurements/src/main/resources/resources/
gate/branches/sawdust2/plugins/Tagger_Measurements/src/test/
gate/branches/sawdust2/plugins/Tagger_Measurements/src/test/java/
gate/branches/sawdust2/plugins/Tagger_Measurements/src/test/java/gate/
Removed Paths:
-------------
gate/branches/sawdust2/plugins/Tagger_Measurements/build.xml
gate/branches/sawdust2/plugins/Tagger_Measurements/creole.xml
gate/branches/sawdust2/plugins/Tagger_Measurements/resources/
gate/branches/sawdust2/plugins/Tagger_Measurements/src/gate/
gate/branches/sawdust2/plugins/Tagger_Measurements/src/main/java/gate/resources/
gate/branches/sawdust2/plugins/Tagger_Measurements/src/test/java/src/
gate/branches/sawdust2/plugins/Tagger_Measurements/test/
Property Changed:
----------------
gate/branches/sawdust2/plugins/Tagger_Measurements/
Index: gate/branches/sawdust2/plugins/Tagger_Measurements
===================================================================
--- gate/branches/sawdust2/plugins/Tagger_Measurements 2016-11-24 11:03:02 UTC
(rev 19780)
+++ gate/branches/sawdust2/plugins/Tagger_Measurements 2016-11-24 11:05:17 UTC
(rev 19781)
Property changes on: gate/branches/sawdust2/plugins/Tagger_Measurements
___________________________________________________________________
Modified: svn:ignore
## -1,3 +1,2 ##
-classes
-MeasurementTagger.jar
+target
.settings
Modified: gate/branches/sawdust2/plugins/Tagger_Measurements/.classpath
===================================================================
--- gate/branches/sawdust2/plugins/Tagger_Measurements/.classpath
2016-11-24 11:03:02 UTC (rev 19780)
+++ gate/branches/sawdust2/plugins/Tagger_Measurements/.classpath
2016-11-24 11:05:17 UTC (rev 19781)
@@ -1,7 +1,31 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry combineaccessrules="false" exported="true" kind="src"
path="/GATE"/>
- <classpathentry kind="output" path="classes"/>
+ <classpathentry kind="src" output="target/classes" path="src/main/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry excluding="**" kind="src" output="target/classes"
path="src/main/resources">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="src" output="target/test-classes"
path="src/test/java">
+ <attributes>
+ <attribute name="optional" value="true"/>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con"
path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+ <attributes>
+ <attribute name="maven.pomderived" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: gate/branches/sawdust2/plugins/Tagger_Measurements/.project
===================================================================
--- gate/branches/sawdust2/plugins/Tagger_Measurements/.project 2016-11-24
11:03:02 UTC (rev 19780)
+++ gate/branches/sawdust2/plugins/Tagger_Measurements/.project 2016-11-24
11:05:17 UTC (rev 19781)
@@ -10,8 +10,14 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
Deleted: gate/branches/sawdust2/plugins/Tagger_Measurements/build.xml
===================================================================
--- gate/branches/sawdust2/plugins/Tagger_Measurements/build.xml
2016-11-24 11:03:02 UTC (rev 19780)
+++ gate/branches/sawdust2/plugins/Tagger_Measurements/build.xml
2016-11-24 11:05:17 UTC (rev 19781)
@@ -1,123 +0,0 @@
-<project name="Tagger_Measurements" basedir=".">
- <!-- Prevent Ant from warning about includeantruntime not being set -->
- <property name="build.sysclasspath" value="ignore" />
-
- <property file="build.properties" />
-
- <property name="gate.home" location="../.." />
- <property name="gate.lib" location="${gate.home}/lib" />
- <property name="gate.jar" location="${gate.home}/bin/gate.jar" />
- <property name="src.dir" location="src" />
- <property name="classes.dir" location="classes" />
- <property name="jar.location" location="MeasurementTagger.jar" />
- <property name="doc.dir" location="doc" />
- <property name="javadoc.dir" location="${doc.dir}/javadoc" />
- <property name="test.dir" location="test" />
- <property name="test.reports.dir" location="${test.dir}/reports" />
- <property name="test.src.dir" location="${test.dir}/src" />
- <property name="test.classes.dir" location="${test.dir}/classes" />
-
- <!-- Path to compile - includes gate.jar and GATE/lib/*.jar -->
- <path id="compile.classpath">
- <pathelement location="${gate.jar}" />
- <fileset dir="${gate.lib}">
- <include name="**/*.jar" />
- <include name="**/*.zip" />
- </fileset>
- </path>
-
- <!-- create build directory structure -->
- <target name="prepare">
- <mkdir dir="${classes.dir}" />
- </target>
-
- <!-- compile the source -->
- <target name="compile" depends="prepare">
- <javac classpathref="compile.classpath" srcdir="${src.dir}"
destdir="${classes.dir}" debug="true" debuglevel="lines,source" source="1.5"
target="1.5" />
- </target>
-
- <target name="resources" depends="prepare">
- <copy todir="${classes.dir}/gate/resources"
includeEmptyDirs="true">
- <fileset dir="${src.dir}/gate/resources" />
- </copy>
- </target>
-
- <!-- create the JAR file -->
- <target name="jar" depends="compile, resources">
- <jar destfile="${jar.location}" update="false"
basedir="${classes.dir}" />
- </target>
-
- <!-- remove the generated .class files -->
- <target name="clean.classes">
- <delete dir="${classes.dir}" />
- <delete dir="${test.classes.dir}" />
- <delete dir="${test.reports.dir}" />
- </target>
-
- <!-- Clean up - remove .class and .jar files -->
- <target name="clean" depends="clean.classes">
- <delete file="${jar.location}" />
- </target>
-
- <!-- Targets used by the main GATE build file:
- build: build the plugin - just calls "jar" target
- test : run the unit tests - there aren't any
- distro.prepare: remove intermediate files that shouldn't be in the
- distribution
- -->
-
- <!-- Build JavaDoc documentation -->
- <target name="doc.prepare">
- <mkdir dir="${javadoc.dir}" />
- </target>
-
- <target name="javadoc" depends="doc.prepare">
- <javadoc destdir="${javadoc.dir}" packagenames="*"
classpathref="compile.classpath" encoding="UTF-8" windowtitle="Measurements
Tagger JavaDoc" source="1.6" public="true">
- <sourcepath>
- <pathelement location="${src.dir}" />
- </sourcepath>
- <link href="http://docs.oracle.com/javase/6/docs/api/";
/>
- <link href="http://gate.ac.uk/gate/doc/javadoc/"; />
- </javadoc>
- </target>
-
- <target name="build" depends="jar" />
-
- <!-- Remove JUnit test results -->
- <target name="distro.prepare" depends="clean.classes">
- <delete>
- <fileset dir="." includes="TEST*.xml" />
- </delete>
- </target>
-
-
- <!-- Unit tests -->
-
- <path id="test.classpath">
- <path refid="compile.classpath" />
- <pathelement location="${jar.location}" />
- </path>
-
- <target name="test.prepare">
- <mkdir dir="${test.classes.dir}" />
- <mkdir dir="${test.reports.dir}" />
- </target>
-
- <target name="test.compile" depends="test.prepare, build">
- <javac classpathref="test.classpath" srcdir="${test.src.dir}"
destdir="${test.classes.dir}" debug="true" debuglevel="lines,source"
source="1.5" />
- </target>
-
- <target name="test" depends="test.compile">
- <junit fork="yes" haltonfailure="no" printsummary="on">
- <test name="gate.creole.measurements.MeasurementsTest"
toDir="${test.reports.dir}" />
- <sysproperty key="gate.measurements.plugin.dir"
- file="${basedir}" />
- <formatter type="xml" />
- <classpath>
- <path refid="test.classpath" />
- <pathelement path="${test.classes.dir}" />
- </classpath>
- </junit>
- </target>
-
-</project>
Deleted: gate/branches/sawdust2/plugins/Tagger_Measurements/creole.xml
===================================================================
--- gate/branches/sawdust2/plugins/Tagger_Measurements/creole.xml
2016-11-24 11:03:02 UTC (rev 19780)
+++ gate/branches/sawdust2/plugins/Tagger_Measurements/creole.xml
2016-11-24 11:05:17 UTC (rev 19781)
@@ -1,4 +0,0 @@
-<!-- creole.xml for Measurement Tagger -->
-<CREOLE-DIRECTORY>
- <JAR SCAN="true">MeasurementTagger.jar</JAR>
-</CREOLE-DIRECTORY>
Added: gate/branches/sawdust2/plugins/Tagger_Measurements/pom.xml
===================================================================
--- gate/branches/sawdust2/plugins/Tagger_Measurements/pom.xml
(rev 0)
+++ gate/branches/sawdust2/plugins/Tagger_Measurements/pom.xml 2016-11-24
11:05:17 UTC (rev 19781)
@@ -0,0 +1,38 @@
+
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>uk.ac.gate.plugins</groupId>
+ <artifactId>base-plugin</artifactId>
+ <!-- this should be the version of GATE you wish to build
against -->
+ <version>9.0-SNAPSHOT</version>
+ <relativePath>../../Plugin_Base/pom.xml</relativePath>
+ </parent>
+
+ <!-- this is the description of this plugin -->
+ <groupId>uk.ac.gate.plugins</groupId>
+ <artifactId>tagger-measurements</artifactId>
+ <version>9.0-SNAPSHOT</version>
+
+ <licenses>
+ <license>
+ <name>GNU Lesser General Public License (LGPL), Version
3</name>
+ <url>http://www.gnu.org/licenses/lgpl-3.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <organization>
+ <name>GATE</name>
+ <url>http://gate.ac.uk</url>
+ </organization>
+
+ <dependencies>
+ <!-- add any other libraries your plugin depends on. Any other
GATE plugins
+ you depend on at compile time should use the provided
scope -->
+ </dependencies>
+
+</project>
Copied:
gate/branches/sawdust2/plugins/Tagger_Measurements/src/main/resources/creole.xml
(from rev 19775, gate/branches/sawdust2/plugins/Tagger_Measurements/creole.xml)
===================================================================
---
gate/branches/sawdust2/plugins/Tagger_Measurements/src/main/resources/creole.xml
(rev 0)
+++
gate/branches/sawdust2/plugins/Tagger_Measurements/src/main/resources/creole.xml
2016-11-24 11:05:17 UTC (rev 19781)
@@ -0,0 +1,4 @@
+<!-- creole.xml for Measurement Tagger -->
+<CREOLE-DIRECTORY>
+ <REQUIRES GROUP="uk.ac.gate.plugins" ARTIFACT="jape-plus"
VERSION="9.0-SNAPSHOT"/>
+</CREOLE-DIRECTORY>
Modified:
gate/branches/sawdust2/plugins/Tagger_Measurements/src/main/resources/resources/annie-measurements.xgapp
===================================================================
---
gate/branches/sawdust2/plugins/Tagger_Measurements/resources/annie-measurements.xgapp
2016-11-24 02:22:42 UTC (rev 19775)
+++
gate/branches/sawdust2/plugins/Tagger_Measurements/src/main/resources/resources/annie-measurements.xgapp
2016-11-24 11:05:17 UTC (rev 19781)
@@ -1,18 +1,26 @@
<gate.util.persistence.GateApplication>
<urlList class="gate.util.persistence.CollectionPersistence">
<localList>
- <gate.util.persistence.PersistenceManager-URLHolder>
- <urlString>$relpath$../../ANNIE/</urlString>
- </gate.util.persistence.PersistenceManager-URLHolder>
- <gate.util.persistence.PersistenceManager-URLHolder>
- <urlString>$relpath$../../JAPE_Plus/</urlString>
- </gate.util.persistence.PersistenceManager-URLHolder>
- <gate.util.persistence.PersistenceManager-URLHolder>
- <urlString>$relpath$../../Tagger_Numbers/</urlString>
- </gate.util.persistence.PersistenceManager-URLHolder>
- <gate.util.persistence.PersistenceManager-URLHolder>
- <urlString>$relpath$../../Tagger_Measurements/</urlString>
- </gate.util.persistence.PersistenceManager-URLHolder>
+ <gate.Plugin-Maven>
+ <group>uk.ac.gate.plugins</group>
+ <artifact>annie</artifact>
+ <version>9.0-SNAPSHOT</version>
+ </gate.Plugin-Maven>
+ <gate.Plugin-Maven>
+ <group>uk.ac.gate.plugins</group>
+ <artifact>jape-plus</artifact>
+ <version>9.0-SNAPSHOT</version>
+ </gate.Plugin-Maven>
+ <gate.Plugin-Maven>
+ <group>uk.ac.gate.plugins</group>
+ <artifact>tagger-numbers</artifact>
+ <version>9.0-SNAPSHOT</version>
+ </gate.Plugin-Maven>
+ <gate.Plugin-Maven>
+ <group>uk.ac.gate.plugins</group>
+ <artifact>tagger-measurements</artifact>
+ <version>9.0-SNAPSHOT</version>
+ </gate.Plugin-Maven>
</localList>
<collectionType>java.util.ArrayList</collectionType>
</urlList>
Modified:
gate/branches/sawdust2/plugins/Tagger_Measurements/src/main/resources/resources/measurements.xgapp
===================================================================
---
gate/branches/sawdust2/plugins/Tagger_Measurements/resources/measurements.xgapp
2016-11-24 02:22:42 UTC (rev 19775)
+++
gate/branches/sawdust2/plugins/Tagger_Measurements/src/main/resources/resources/measurements.xgapp
2016-11-24 11:05:17 UTC (rev 19781)
@@ -1,18 +1,26 @@
<gate.util.persistence.GateApplication>
<urlList class="gate.util.persistence.CollectionPersistence">
<localList>
- <gate.util.persistence.PersistenceManager-URLHolder>
- <urlString>$relpath$../../ANNIE/</urlString>
- </gate.util.persistence.PersistenceManager-URLHolder>
- <gate.util.persistence.PersistenceManager-URLHolder>
- <urlString>$relpath$../../JAPE_Plus/</urlString>
- </gate.util.persistence.PersistenceManager-URLHolder>
- <gate.util.persistence.PersistenceManager-URLHolder>
- <urlString>$relpath$../../Tagger_Numbers/</urlString>
- </gate.util.persistence.PersistenceManager-URLHolder>
- <gate.util.persistence.PersistenceManager-URLHolder>
- <urlString>$relpath$../../Tagger_Measurements/</urlString>
- </gate.util.persistence.PersistenceManager-URLHolder>
+ <gate.Plugin-Maven>
+ <group>uk.ac.gate.plugins</group>
+ <artifact>annie</artifact>
+ <version>9.0-SNAPSHOT</version>
+ </gate.Plugin-Maven>
+ <gate.Plugin-Maven>
+ <group>uk.ac.gate.plugins</group>
+ <artifact>jape-plus</artifact>
+ <version>9.0-SNAPSHOT</version>
+ </gate.Plugin-Maven>
+ <gate.Plugin-Maven>
+ <group>uk.ac.gate.plugins</group>
+ <artifact>tagger-numbers</artifact>
+ <version>9.0-SNAPSHOT</version>
+ </gate.Plugin-Maven>
+ <gate.Plugin-Maven>
+ <group>uk.ac.gate.plugins</group>
+ <artifact>tagger-measurements</artifact>
+ <version>9.0-SNAPSHOT</version>
+ </gate.Plugin-Maven>
</localList>
<collectionType>java.util.ArrayList</collectionType>
</urlList>
Modified:
gate/branches/sawdust2/plugins/Tagger_Measurements/src/test/java/gate/creole/measurements/MeasurementsTest.java
===================================================================
---
gate/branches/sawdust2/plugins/Tagger_Measurements/test/src/gate/creole/measurements/MeasurementsTest.java
2016-11-24 02:22:42 UTC (rev 19775)
+++
gate/branches/sawdust2/plugins/Tagger_Measurements/src/test/java/gate/creole/measurements/MeasurementsTest.java
2016-11-24 11:05:17 UTC (rev 19781)
@@ -9,13 +9,12 @@
package gate.creole.measurements;
-import gate.Gate;
-import gate.util.GateException;
-
import java.io.File;
import java.io.IOException;
import java.net.MalformedURLException;
+import java.net.URL;
+import gate.util.GateException;
import junit.framework.TestCase;
/**
@@ -27,13 +26,10 @@
@Override
public void setUp() throws MalformedURLException, IOException, GateException
{
- if (!Gate.isInitialised()) {
- Gate.init();
- }
+ URL units = getClass().getClassLoader().getResource("resources/units.dat");
+ URL commonWords =
getClass().getClassLoader().getResource("resources/common_words.txt");
- File baseDir = new File(Gate.getPluginsHome(), "Tagger_Measurements");
-
- parser = new MeasurementsParser((new File(baseDir,
"resources/units.dat")).toURI().toURL(), new File(baseDir,
"resources/common_words.txt").toURI().toURL());
+ parser = new MeasurementsParser(units, commonWords);
}
@Override
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
