From: <mar...@us...> - 2017-02-08 09:50:16
|
Revision: 20076 http://sourceforge.net/p/gate/code/20076 Author: markagreenwood Date: 2017-02-08 09:50:13 +0000 (Wed, 08 Feb 2017) Log Message: ----------- converted the Russian plugin to maven as well Modified Paths: -------------- gate/branches/sawdust2/plugins/Lang_Russian/.classpath gate/branches/sawdust2/plugins/Lang_Russian/.project gate/branches/sawdust2/plugins/Lang_Russian/src/main/java/com/ontotext/russie/gazetteer/RussGazetteer.java gate/branches/sawdust2/plugins/Lang_Russian/src/main/resources/resources/RussIE.xgapp gate/branches/sawdust2/plugins/Lang_Russian/src/main/resources/resources/RussIE_inflex.xgapp gate/branches/sawdust2/plugins/Lang_Russian/src/main/resources/resources/RussIE_ortho.xgapp gate/branches/sawdust2/plugins/Lang_Russian/src/main/resources/resources/RussIE_ortho_inflex.xgapp Added Paths: ----------- gate/branches/sawdust2/plugins/Lang_Russian/pom.xml gate/branches/sawdust2/plugins/Lang_Russian/src/main/ gate/branches/sawdust2/plugins/Lang_Russian/src/main/java/ gate/branches/sawdust2/plugins/Lang_Russian/src/main/java/com/ gate/branches/sawdust2/plugins/Lang_Russian/src/main/java/gate/ gate/branches/sawdust2/plugins/Lang_Russian/src/main/resources/ gate/branches/sawdust2/plugins/Lang_Russian/src/main/resources/creole.xml gate/branches/sawdust2/plugins/Lang_Russian/src/main/resources/resources/ Removed Paths: ------------- gate/branches/sawdust2/plugins/Lang_Russian/build.xml gate/branches/sawdust2/plugins/Lang_Russian/creole.xml gate/branches/sawdust2/plugins/Lang_Russian/resources/ gate/branches/sawdust2/plugins/Lang_Russian/src/com/ gate/branches/sawdust2/plugins/Lang_Russian/src/gate/ Property Changed: ---------------- gate/branches/sawdust2/plugins/Lang_Russian/ Index: gate/branches/sawdust2/plugins/Lang_Russian =================================================================== --- gate/branches/sawdust2/plugins/Lang_Russian 2017-02-08 02:23:45 UTC (rev 20075) +++ gate/branches/sawdust2/plugins/Lang_Russian 2017-02-08 09:50:13 UTC (rev 20076) Property changes on: gate/branches/sawdust2/plugins/Lang_Russian ___________________________________________________________________ Modified: svn:ignore ## -1,4 +1,2 ## -russie.jar -classes +target .settings -doc Modified: gate/branches/sawdust2/plugins/Lang_Russian/.classpath =================================================================== --- gate/branches/sawdust2/plugins/Lang_Russian/.classpath 2017-02-08 02:23:45 UTC (rev 20075) +++ gate/branches/sawdust2/plugins/Lang_Russian/.classpath 2017-02-08 09:50:13 UTC (rev 20076) @@ -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/Lang_Russian/.project =================================================================== --- gate/branches/sawdust2/plugins/Lang_Russian/.project 2017-02-08 02:23:45 UTC (rev 20075) +++ gate/branches/sawdust2/plugins/Lang_Russian/.project 2017-02-08 09:50:13 UTC (rev 20076) @@ -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/Lang_Russian/build.xml =================================================================== --- gate/branches/sawdust2/plugins/Lang_Russian/build.xml 2017-02-08 02:23:45 UTC (rev 20075) +++ gate/branches/sawdust2/plugins/Lang_Russian/build.xml 2017-02-08 09:50:13 UTC (rev 20076) @@ -1,92 +0,0 @@ -<project name="russie" basedir="." default="jar"> - <!-- 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="russie.jar" /> - <property name="doc.dir" location="doc" /> - <property name="javadoc.dir" location="${doc.dir}/javadoc" /> - <property name="gate.compile.maxwarnings" value="10000" /> - - <!-- Path to compile - includes gate.jar and GATE/lib/*.jar --> - <path id="compile.classpath"> - <pathelement location="${gate.jar}" /> - <fileset dir="${gate.lib}" includes="*.jar" /> - </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" - encoding="UTF-8" - source="1.6" - target="1.6"> - <compilerarg value="-Xmaxwarns" /> - <compilerarg value="${gate.compile.maxwarnings}" /> - <compilerarg value="-Xlint:all" /> - </javac> - </target> - - <!-- copy resources (i.e. anything non-.java) from src to classes --> - <target name="copy.resources" depends="prepare"> - <copy todir="${classes.dir}" includeEmptyDirs="true"> - <fileset dir="${src.dir}" excludes="**/*.java" /> - </copy> - </target> - - <!-- create the JAR file --> - <target name="jar" depends="compile, copy.resources"> - <jar destfile="${jar.location}" update="false" basedir="${classes.dir}" /> - </target> - - <!-- remove the generated .class files --> - <target name="clean.classes"> - <delete dir="${classes.dir}" /> - </target> - - <!-- Clean up - remove .class and .jar files --> - <target name="clean" depends="clean.classes"> - <delete file="${jar.location}" /> - </target> - - <!-- 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="${plugin.name} JavaDoc" source="1.6"> - <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> - - <!-- 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 - --> - <target name="build" depends="jar" /> - <target name="test" /> - <target name="distro.prepare" depends="clean.classes" /> - -</project> Deleted: gate/branches/sawdust2/plugins/Lang_Russian/creole.xml =================================================================== --- gate/branches/sawdust2/plugins/Lang_Russian/creole.xml 2017-02-08 02:23:45 UTC (rev 20075) +++ gate/branches/sawdust2/plugins/Lang_Russian/creole.xml 2017-02-08 09:50:13 UTC (rev 20076) @@ -1,5 +0,0 @@ -<?xml version="1.0"?> -<CREOLE-DIRECTORY> - <JAR SCAN="TRUE">russie.jar</JAR> -</CREOLE-DIRECTORY> - Added: gate/branches/sawdust2/plugins/Lang_Russian/pom.xml =================================================================== --- gate/branches/sawdust2/plugins/Lang_Russian/pom.xml (rev 0) +++ gate/branches/sawdust2/plugins/Lang_Russian/pom.xml 2017-02-08 09:50:13 UTC (rev 20076) @@ -0,0 +1,44 @@ + +<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>lang-russian</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 --> + <dependency> + <groupId>uk.ac.gate.plugins</groupId> + <artifactId>annie</artifactId> + <version>9.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + </dependencies> + +</project> Modified: gate/branches/sawdust2/plugins/Lang_Russian/src/main/java/com/ontotext/russie/gazetteer/RussGazetteer.java =================================================================== --- gate/branches/sawdust2/plugins/Lang_Russian/src/com/ontotext/russie/gazetteer/RussGazetteer.java 2017-02-08 02:23:45 UTC (rev 20075) +++ gate/branches/sawdust2/plugins/Lang_Russian/src/main/java/com/ontotext/russie/gazetteer/RussGazetteer.java 2017-02-08 09:50:13 UTC (rev 20076) @@ -174,7 +174,7 @@ try { definition = new LinearDefinition(); - definition.setURL(listsURL); + definition.setURL(listsURL.toURL()); definition.load(); int linesCnt = definition.size(); listsByNode = definition.loadLists(); Copied: gate/branches/sawdust2/plugins/Lang_Russian/src/main/resources/creole.xml (from rev 20075, gate/branches/sawdust2/plugins/Lang_Russian/creole.xml) =================================================================== --- gate/branches/sawdust2/plugins/Lang_Russian/src/main/resources/creole.xml (rev 0) +++ gate/branches/sawdust2/plugins/Lang_Russian/src/main/resources/creole.xml 2017-02-08 09:50:13 UTC (rev 20076) @@ -0,0 +1,5 @@ +<?xml version="1.0"?> +<CREOLE-DIRECTORY> + <REQUIRES GROUP="uk.ac.gate.plugins" ARTIFACT="annie" VERSION="9.0-SNAPSHOT"/> +</CREOLE-DIRECTORY> + Modified: gate/branches/sawdust2/plugins/Lang_Russian/src/main/resources/resources/RussIE.xgapp =================================================================== --- gate/branches/sawdust2/plugins/Lang_Russian/resources/RussIE.xgapp 2017-02-08 02:23:45 UTC (rev 20075) +++ gate/branches/sawdust2/plugins/Lang_Russian/src/main/resources/resources/RussIE.xgapp 2017-02-08 09:50:13 UTC (rev 20076) @@ -2,12 +2,16 @@ <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$..</urlString> - </gate.util.persistence.PersistenceManager-URLHolder> + <gate.creole.Plugin-Maven> + <group>uk.ac.gate.plugins</group> + <artifact>annie</artifact> + <version>9.0-SNAPSHOT</version> + </gate.creole.Plugin-Maven> + <gate.creole.Plugin-Maven> + <group>uk.ac.gate.plugins</group> + <artifact>lang-russian</artifact> + <version>9.0-SNAPSHOT</version> + </gate.creole.Plugin-Maven> </localList> <collectionType>java.util.ArrayList</collectionType> </urlList> Modified: gate/branches/sawdust2/plugins/Lang_Russian/src/main/resources/resources/RussIE_inflex.xgapp =================================================================== --- gate/branches/sawdust2/plugins/Lang_Russian/resources/RussIE_inflex.xgapp 2017-02-08 02:23:45 UTC (rev 20075) +++ gate/branches/sawdust2/plugins/Lang_Russian/src/main/resources/resources/RussIE_inflex.xgapp 2017-02-08 09:50:13 UTC (rev 20076) @@ -2,12 +2,16 @@ <gate.util.persistence.GateApplication> <urlList class='gate.util.persistence.CollectionPersistence'> <localList> - <gate.util.persistence.PersistenceManager-URLHolder> - <urlString>$gatehome$plugins/ANNIE/</urlString> - </gate.util.persistence.PersistenceManager-URLHolder> - <gate.util.persistence.PersistenceManager-URLHolder> - <urlString>$relpath$..</urlString> - </gate.util.persistence.PersistenceManager-URLHolder> + <gate.creole.Plugin-Maven> + <group>uk.ac.gate.plugins</group> + <artifact>annie</artifact> + <version>9.0-SNAPSHOT</version> + </gate.creole.Plugin-Maven> + <gate.creole.Plugin-Maven> + <group>uk.ac.gate.plugins</group> + <artifact>lang-russian</artifact> + <version>9.0-SNAPSHOT</version> + </gate.creole.Plugin-Maven> </localList> <collectionType>java.util.ArrayList</collectionType> </urlList> Modified: gate/branches/sawdust2/plugins/Lang_Russian/src/main/resources/resources/RussIE_ortho.xgapp =================================================================== --- gate/branches/sawdust2/plugins/Lang_Russian/resources/RussIE_ortho.xgapp 2017-02-08 02:23:45 UTC (rev 20075) +++ gate/branches/sawdust2/plugins/Lang_Russian/src/main/resources/resources/RussIE_ortho.xgapp 2017-02-08 09:50:13 UTC (rev 20076) @@ -2,12 +2,16 @@ <gate.util.persistence.GateApplication> <urlList class='gate.util.persistence.CollectionPersistence'> <localList> - <gate.util.persistence.PersistenceManager-URLHolder> - <urlString>$gatehome$plugins/ANNIE/</urlString> - </gate.util.persistence.PersistenceManager-URLHolder> - <gate.util.persistence.PersistenceManager-URLHolder> - <urlString>$relpath$..</urlString> - </gate.util.persistence.PersistenceManager-URLHolder> + <gate.creole.Plugin-Maven> + <group>uk.ac.gate.plugins</group> + <artifact>annie</artifact> + <version>9.0-SNAPSHOT</version> + </gate.creole.Plugin-Maven> + <gate.creole.Plugin-Maven> + <group>uk.ac.gate.plugins</group> + <artifact>lang-russian</artifact> + <version>9.0-SNAPSHOT</version> + </gate.creole.Plugin-Maven> </localList> <collectionType>java.util.ArrayList</collectionType> </urlList> Modified: gate/branches/sawdust2/plugins/Lang_Russian/src/main/resources/resources/RussIE_ortho_inflex.xgapp =================================================================== --- gate/branches/sawdust2/plugins/Lang_Russian/resources/RussIE_ortho_inflex.xgapp 2017-02-08 02:23:45 UTC (rev 20075) +++ gate/branches/sawdust2/plugins/Lang_Russian/src/main/resources/resources/RussIE_ortho_inflex.xgapp 2017-02-08 09:50:13 UTC (rev 20076) @@ -2,12 +2,16 @@ <gate.util.persistence.GateApplication> <urlList class='gate.util.persistence.CollectionPersistence'> <localList> - <gate.util.persistence.PersistenceManager-URLHolder> - <urlString>$gatehome$plugins/ANNIE/</urlString> - </gate.util.persistence.PersistenceManager-URLHolder> - <gate.util.persistence.PersistenceManager-URLHolder> - <urlString>$relpath$..</urlString> - </gate.util.persistence.PersistenceManager-URLHolder> + <gate.creole.Plugin-Maven> + <group>uk.ac.gate.plugins</group> + <artifact>annie</artifact> + <version>9.0-SNAPSHOT</version> + </gate.creole.Plugin-Maven> + <gate.creole.Plugin-Maven> + <group>uk.ac.gate.plugins</group> + <artifact>lang-russian</artifact> + <version>9.0-SNAPSHOT</version> + </gate.creole.Plugin-Maven> </localList> <collectionType>java.util.ArrayList</collectionType> </urlList> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |