Revision: 19204
http://sourceforge.net/p/gate/code/19204
Author: markagreenwood
Date: 2016-04-06 16:07:17 +0000 (Wed, 06 Apr 2016)
Log Message:
-----------
moved the JDT compiler into the ANNIE plugin
Modified Paths:
--------------
gate/branches/sawdust2/ivy.xml
gate/branches/sawdust2/plugins/ANNIE/.classpath
gate/branches/sawdust2/plugins/Tools/creole.xml
gate/branches/sawdust2/src/main/gate/Plugin.java
Added Paths:
-----------
gate/branches/sawdust2/plugins/ANNIE/pom.xml
gate/branches/sawdust2/plugins/ANNIE/src/gate/util/
gate/branches/sawdust2/plugins/ANNIE/src/gate/util/compilers/
Removed Paths:
-------------
gate/branches/sawdust2/src/main/gate/util/compilers/
Modified: gate/branches/sawdust2/ivy.xml
===================================================================
--- gate/branches/sawdust2/ivy.xml 2016-04-06 09:31:50 UTC (rev 19203)
+++ gate/branches/sawdust2/ivy.xml 2016-04-06 16:07:17 UTC (rev 19204)
@@ -35,8 +35,7 @@
<!-- things that we repackage under an alternative package name -->
<dependency org="uk.ac.gate" name="gate-asm" rev="5.0.3"
conf="required->master" />
- <dependency org="uk.ac.gate" name="gate-compiler-jdt"
rev="4.3.2-P20140317-1600" conf="required->master" />
-
+
<!-- needed to ensure the same version across configurations -->
<dependency org="commons-logging" name="commons-logging" rev="1.1.3" />
Modified: gate/branches/sawdust2/plugins/ANNIE/.classpath
===================================================================
--- gate/branches/sawdust2/plugins/ANNIE/.classpath 2016-04-06 09:31:50 UTC
(rev 19203)
+++ gate/branches/sawdust2/plugins/ANNIE/.classpath 2016-04-06 16:07:17 UTC
(rev 19204)
@@ -3,5 +3,6 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/GATE"/>
+ <classpathentry kind="lib"
path="/home/mark/gate-top/externals/gate/lib/gate-compiler-jdt-4.3.2-P20140317-1600.jar"/>
<classpathentry kind="output" path="classes"/>
</classpath>
Added: gate/branches/sawdust2/plugins/ANNIE/pom.xml
===================================================================
--- gate/branches/sawdust2/plugins/ANNIE/pom.xml
(rev 0)
+++ gate/branches/sawdust2/plugins/ANNIE/pom.xml 2016-04-06 16:07:17 UTC
(rev 19204)
@@ -0,0 +1,23 @@
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>uk.ac.gate</groupId>
+ <artifactId>ANNIE</artifactId>
+ <version>9</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>uk.ac.gate</groupId>
+ <artifactId>gate-core</artifactId>
+ <version>8.2-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>uk.ac.gate</groupId>
+ <artifactId>gate-compiler-jdt</artifactId>
+ <version>4.3.2-P20140317-1600</version>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Modified: gate/branches/sawdust2/plugins/Tools/creole.xml
===================================================================
--- gate/branches/sawdust2/plugins/Tools/creole.xml 2016-04-06 09:31:50 UTC
(rev 19203)
+++ gate/branches/sawdust2/plugins/Tools/creole.xml 2016-04-06 16:07:17 UTC
(rev 19204)
@@ -3,7 +3,7 @@
<CREOLE-DIRECTORY>
<JAR SCAN="true">tools.jar</JAR>
- <REQUIRES>../ANNIE</REQUIRES>
+ <REQUIRES GROUP="uk.ac.gate" ARTIFACT="ANNIE" VERSION="9"/>
</CREOLE-DIRECTORY>
Modified: gate/branches/sawdust2/src/main/gate/Plugin.java
===================================================================
--- gate/branches/sawdust2/src/main/gate/Plugin.java 2016-04-06 09:31:50 UTC
(rev 19203)
+++ gate/branches/sawdust2/src/main/gate/Plugin.java 2016-04-06 16:07:17 UTC
(rev 19204)
@@ -27,6 +27,20 @@
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
+import org.apache.ivy.core.LogOptions;
+import org.apache.ivy.core.cache.DefaultRepositoryCacheManager;
+import org.apache.ivy.core.cache.RepositoryCacheManager;
+import org.apache.ivy.core.module.id.ModuleRevisionId;
+import org.apache.ivy.core.report.ArtifactDownloadReport;
+import org.apache.ivy.core.report.ResolveReport;
+import org.apache.ivy.core.resolve.ResolveOptions;
+import org.apache.ivy.core.settings.IvySettings;
+import org.apache.ivy.plugins.repository.file.FileRepository;
+import org.apache.ivy.plugins.resolver.ChainResolver;
+import org.apache.ivy.plugins.resolver.FileSystemResolver;
+import org.apache.ivy.plugins.resolver.IBiblioResolver;
+import org.apache.ivy.plugins.resolver.URLResolver;
+import org.apache.ivy.util.filter.FilterHelper;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.apache.maven.repository.internal.MavenRepositorySystemUtils;
@@ -138,7 +152,7 @@
XMLOutputter xmlOut = new XMLOutputter(Format.getPrettyFormat());
log.debug(xmlOut.outputString(creoleDoc));
-
+
final Map<String, ResourceInfo> resInfos = new LinkedHashMap<String,
ResourceInfo>();
List<Element> jobsList = new ArrayList<Element>();
List<String> jarsToScan = new ArrayList<String>();
@@ -619,17 +633,19 @@
}
}
+
public static void main(String args[]) throws Exception {
Gate.runInSandbox(true);
Gate.init();
- Plugin annieDir = new Plugin.Directory(new
File("/home/mark/gate-top/externals/gate-ix/plugins/Tools").toURI().toURL());
+ /*Plugin annieDir = new Plugin.Directory(new
File("/home/mark/gate-top/externals/gate-ix/plugins/Tools").toURI().toURL());
System.out.println(annieDir.getResourceInfoList());
System.out.println(annieDir.getRequiredPlugins());
Plugin annieMaven = new Plugin.Maven("uk.ac.gate", "ANNIE", "9");
- System.out.println(annieMaven.getResourceInfoList());
+ System.out.println(annieMaven.getResourceInfoList());*/
+
}
}
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
