Revision: 19787
          http://sourceforge.net/p/gate/code/19787
Author:   markagreenwood
Date:     2016-11-24 13:46:32 +0000 (Thu, 24 Nov 2016)
Log Message:
-----------
more mavenization

Modified Paths:
--------------
    gate/branches/sawdust2/plugins/Format_MediaWiki/.classpath
    gate/branches/sawdust2/plugins/Format_MediaWiki/.project

Added Paths:
-----------
    gate/branches/sawdust2/plugins/Format_MediaWiki/pom.xml
    gate/branches/sawdust2/plugins/Format_MediaWiki/src/main/
    gate/branches/sawdust2/plugins/Format_MediaWiki/src/main/java/
    gate/branches/sawdust2/plugins/Format_MediaWiki/src/main/java/gate/
    gate/branches/sawdust2/plugins/Format_MediaWiki/src/main/resources/
    
gate/branches/sawdust2/plugins/Format_MediaWiki/src/main/resources/creole.xml

Removed Paths:
-------------
    gate/branches/sawdust2/plugins/Format_MediaWiki/build.xml
    gate/branches/sawdust2/plugins/Format_MediaWiki/creole.xml
    gate/branches/sawdust2/plugins/Format_MediaWiki/lib/
    gate/branches/sawdust2/plugins/Format_MediaWiki/src/gate/

Property Changed:
----------------
    gate/branches/sawdust2/plugins/Format_MediaWiki/

Index: gate/branches/sawdust2/plugins/Format_MediaWiki
===================================================================
--- gate/branches/sawdust2/plugins/Format_MediaWiki     2016-11-24 13:16:39 UTC 
(rev 19786)
+++ gate/branches/sawdust2/plugins/Format_MediaWiki     2016-11-24 13:46:32 UTC 
(rev 19787)

Property changes on: gate/branches/sawdust2/plugins/Format_MediaWiki
___________________________________________________________________
Modified: svn:ignore
## -1,4 +1,2 ##
-classes
-format-mediawiki.jar
+target
 .settings
-doc
Modified: gate/branches/sawdust2/plugins/Format_MediaWiki/.classpath
===================================================================
--- gate/branches/sawdust2/plugins/Format_MediaWiki/.classpath  2016-11-24 
13:16:39 UTC (rev 19786)
+++ gate/branches/sawdust2/plugins/Format_MediaWiki/.classpath  2016-11-24 
13:46:32 UTC (rev 19787)
@@ -1,8 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" path="src"/>
-       <classpathentry exported="true" kind="lib" 
path="lib/bliki-core-3.0.19.jar"/>
-       <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/Format_MediaWiki/.project
===================================================================
--- gate/branches/sawdust2/plugins/Format_MediaWiki/.project    2016-11-24 
13:16:39 UTC (rev 19786)
+++ gate/branches/sawdust2/plugins/Format_MediaWiki/.project    2016-11-24 
13:46:32 UTC (rev 19787)
@@ -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/Format_MediaWiki/build.xml
===================================================================
--- gate/branches/sawdust2/plugins/Format_MediaWiki/build.xml   2016-11-24 
13:16:39 UTC (rev 19786)
+++ gate/branches/sawdust2/plugins/Format_MediaWiki/build.xml   2016-11-24 
13:46:32 UTC (rev 19787)
@@ -1,89 +0,0 @@
-<project name="Format_MediaWiki" basedir="." default="build">
-  <!-- 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="format-mediawiki.jar" />
-       <property name="lib" location="lib" />
-       <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">
-               <fileset dir="lib">
-                       <include name="**/*.jar" />
-               </fileset>
-               <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>
-
-       <target name="resources" depends="prepare">
-               <!-- <copy todir="${classes.dir}/gate/resources" 
includeEmptyDirs="true">
-                       <fileset dir="${src.dir}/gate/resources" />
-               </copy> -->
-       </target>
-
-       <!-- compile the source -->
-       <target name="compile" depends="prepare, resources">
-               <javac classpathref="compile.classpath" srcdir="${src.dir}" 
destdir="${classes.dir}" debug="true" debuglevel="lines,source" source="1.6" 
target="1.6">
-                       <compilerarg value="-Xmaxwarns" />
-                       <compilerarg value="${gate.compile.maxwarnings}" />
-                       <compilerarg value="-Xlint:all" />
-               </javac>
-       </target>
-
-       <!-- create the JAR file -->
-       <target name="jar" depends="compile">
-               <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="jar, doc.prepare">
-               <javadoc destdir="${javadoc.dir}" packagenames="*" 
classpathref="compile.classpath" encoding="UTF-8" windowtitle="MediaWiki 
Document Format 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/Format_MediaWiki/creole.xml
===================================================================
--- gate/branches/sawdust2/plugins/Format_MediaWiki/creole.xml  2016-11-24 
13:16:39 UTC (rev 19786)
+++ gate/branches/sawdust2/plugins/Format_MediaWiki/creole.xml  2016-11-24 
13:46:32 UTC (rev 19787)
@@ -1,5 +0,0 @@
-<?xml version="1.0"?>
-<CREOLE-DIRECTORY>
-  <JAR SCAN="true">format-mediawiki.jar</JAR>
-  <JAR>lib/bliki-core-3.0.19.jar</JAR>
-</CREOLE-DIRECTORY>

Added: gate/branches/sawdust2/plugins/Format_MediaWiki/pom.xml
===================================================================
--- gate/branches/sawdust2/plugins/Format_MediaWiki/pom.xml                     
        (rev 0)
+++ gate/branches/sawdust2/plugins/Format_MediaWiki/pom.xml     2016-11-24 
13:46:32 UTC (rev 19787)
@@ -0,0 +1,51 @@
+
+<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>format-mediawiki</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>info.bliki.wiki</groupId>
+                       <artifactId>bliki-core</artifactId>
+                       <version>3.0.19</version>
+                       <exclusions>
+                               <!-- prior to being a maven plugin we only used
+                               the main jar so we don't need any dependencies 
-->
+                               <exclusion>
+                                       <groupId>*</groupId>
+                                       <artifactId>*</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+       </dependencies>
+
+</project>

Copied: 
gate/branches/sawdust2/plugins/Format_MediaWiki/src/main/resources/creole.xml 
(from rev 19775, gate/branches/sawdust2/plugins/Format_MediaWiki/creole.xml)
===================================================================
--- 
gate/branches/sawdust2/plugins/Format_MediaWiki/src/main/resources/creole.xml   
                            (rev 0)
+++ 
gate/branches/sawdust2/plugins/Format_MediaWiki/src/main/resources/creole.xml   
    2016-11-24 13:46:32 UTC (rev 19787)
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<CREOLE-DIRECTORY>
+
+</CREOLE-DIRECTORY>

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

Reply via email to