You can subscribe to this list here.
2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
(33) |
Nov
(96) |
Dec
(173) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2006 |
Jan
(45) |
Feb
(46) |
Mar
(58) |
Apr
(83) |
May
(11) |
Jun
(62) |
Jul
(79) |
Aug
(62) |
Sep
(42) |
Oct
(105) |
Nov
(57) |
Dec
(73) |
2007 |
Jan
(187) |
Feb
(60) |
Mar
(313) |
Apr
(174) |
May
(74) |
Jun
(99) |
Jul
(132) |
Aug
(62) |
Sep
(65) |
Oct
(83) |
Nov
(63) |
Dec
(41) |
2008 |
Jan
(83) |
Feb
(82) |
Mar
(42) |
Apr
(88) |
May
(68) |
Jun
(67) |
Jul
(37) |
Aug
(69) |
Sep
(52) |
Oct
(85) |
Nov
(65) |
Dec
(49) |
2009 |
Jan
(50) |
Feb
(70) |
Mar
(95) |
Apr
(69) |
May
(122) |
Jun
(44) |
Jul
(217) |
Aug
(397) |
Sep
(307) |
Oct
(302) |
Nov
(131) |
Dec
(104) |
2010 |
Jan
(87) |
Feb
(102) |
Mar
(105) |
Apr
(141) |
May
(110) |
Jun
(85) |
Jul
(80) |
Aug
(110) |
Sep
(56) |
Oct
(63) |
Nov
(65) |
Dec
(45) |
2011 |
Jan
(58) |
Feb
(93) |
Mar
(86) |
Apr
(177) |
May
(82) |
Jun
(182) |
Jul
(91) |
Aug
(72) |
Sep
(70) |
Oct
(124) |
Nov
(154) |
Dec
(251) |
2012 |
Jan
(414) |
Feb
(211) |
Mar
(153) |
Apr
(69) |
May
(139) |
Jun
(50) |
Jul
(80) |
Aug
(48) |
Sep
(61) |
Oct
(101) |
Nov
(192) |
Dec
(52) |
2013 |
Jan
(48) |
Feb
(47) |
Mar
(75) |
Apr
(43) |
May
(32) |
Jun
(14) |
Jul
(39) |
Aug
(80) |
Sep
(128) |
Oct
(77) |
Nov
(105) |
Dec
(61) |
2014 |
Jan
(61) |
Feb
(224) |
Mar
(265) |
Apr
(154) |
May
(130) |
Jun
(88) |
Jul
(98) |
Aug
(57) |
Sep
(81) |
Oct
(58) |
Nov
(57) |
Dec
(34) |
2015 |
Jan
(38) |
Feb
(37) |
Mar
(26) |
Apr
(43) |
May
(73) |
Jun
(76) |
Jul
(38) |
Aug
(44) |
Sep
(39) |
Oct
(51) |
Nov
(36) |
Dec
(41) |
2016 |
Jan
(35) |
Feb
(51) |
Mar
(16) |
Apr
(106) |
May
(121) |
Jun
(58) |
Jul
(40) |
Aug
(71) |
Sep
(53) |
Oct
(100) |
Nov
(127) |
Dec
(66) |
2017 |
Jan
(130) |
Feb
(48) |
Mar
(1) |
Apr
(8) |
May
(16) |
Jun
(19) |
Jul
(12) |
Aug
(4) |
Sep
(2) |
Oct
(2) |
Nov
(4) |
Dec
(3) |
2018 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
(2) |
May
(3) |
Jun
(3) |
Jul
|
Aug
(1) |
Sep
|
Oct
(1) |
Nov
(2) |
Dec
(1) |
2019 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2022 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(4) |
2023 |
Jan
|
Feb
(2) |
Mar
(1) |
Apr
(2) |
May
(3) |
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
(2) |
Nov
(1) |
Dec
|
2024 |
Jan
(1) |
Feb
(4) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(4) |
Sep
|
Oct
|
Nov
|
Dec
|
From: <mar...@us...> - 2017-02-07 15:01:34
|
Revision: 20071 http://sourceforge.net/p/gate/code/20071 Author: markagreenwood Date: 2017-02-07 15:01:32 +0000 (Tue, 07 Feb 2017) Log Message: ----------- added the GATE snapshot repo to the pom so that we have somewhere to publish snapshot releases Modified Paths: -------------- gate/branches/sawdust2/gate-core/pom.xml Modified: gate/branches/sawdust2/gate-core/pom.xml =================================================================== --- gate/branches/sawdust2/gate-core/pom.xml 2017-02-07 13:36:44 UTC (rev 20070) +++ gate/branches/sawdust2/gate-core/pom.xml 2017-02-07 15:01:32 UTC (rev 20071) @@ -599,4 +599,13 @@ </plugins> </reporting> + <distributionManagement> + <snapshotRepository> + <id>gate.snapshots</id> + <name>GATE Snapshots Repository</name> + <url>http://repo.gate.ac.uk/content/repositories/snapshots</url> + <layout>default</layout> + </snapshotRepository> + </distributionManagement> + </project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ian...@us...> - 2017-02-07 13:36:47
|
Revision: 20070 http://sourceforge.net/p/gate/code/20070 Author: ian_roberts Date: 2017-02-07 13:36:44 +0000 (Tue, 07 Feb 2017) Log Message: ----------- Merged [r20069] from trunk Revision Links: -------------- http://sourceforge.net/p/gate/code/20069 Modified Paths: -------------- gate/branches/sawdust2/plugins/TermRaider/src/main/resources/resources/jape/augmentation.jape gate/branches/sawdust2/plugins/TermRaider/src/main/resources/resources/jape/term-candidate-threshold.jape Property Changed: ---------------- gate/branches/sawdust2/plugins/TermRaider/src/main/resources/ Index: gate/branches/sawdust2/plugins/TermRaider/src/main/resources =================================================================== --- gate/branches/sawdust2/plugins/TermRaider/src/main/resources 2017-02-07 13:14:03 UTC (rev 20069) +++ gate/branches/sawdust2/plugins/TermRaider/src/main/resources 2017-02-07 13:36:44 UTC (rev 20070) Property changes on: gate/branches/sawdust2/plugins/TermRaider/src/main/resources ___________________________________________________________________ Added: svn:mergeinfo ## -0,0 +1,6 ## +/gate/branches/new-ontology-api/plugins/TermRaider/src/main/resources:10584-11598 +/gate/branches/release-7.0/plugins/TermRaider/src/main/resources:15335-15398 +/gate/branches/sawdust/plugins/TermRaider/src/main/resources:17055-17079 +/gate/tags/release-7.0/plugins/TermRaider/src/main/resources:15399-15407 +/gate/trunk/plugins/TermRaider:20069 +/gate/trunk/plugins/TermRaider/src/main/resources:3-390 \ No newline at end of property Modified: gate/branches/sawdust2/plugins/TermRaider/src/main/resources/resources/jape/augmentation.jape =================================================================== --- gate/branches/sawdust2/plugins/TermRaider/src/main/resources/resources/jape/augmentation.jape 2017-02-07 13:14:03 UTC (rev 20069) +++ gate/branches/sawdust2/plugins/TermRaider/src/main/resources/resources/jape/augmentation.jape 2017-02-07 13:36:44 UTC (rev 20070) @@ -33,7 +33,5 @@ } } - if (score > 0.0F) { - inner.getFeatures().put("localAugTfIdf", score); - } + inner.getFeatures().put("localAugTfIdf", score); } Modified: gate/branches/sawdust2/plugins/TermRaider/src/main/resources/resources/jape/term-candidate-threshold.jape =================================================================== --- gate/branches/sawdust2/plugins/TermRaider/src/main/resources/resources/jape/term-candidate-threshold.jape 2017-02-07 13:14:03 UTC (rev 20069) +++ gate/branches/sawdust2/plugins/TermRaider/src/main/resources/resources/jape/term-candidate-threshold.jape 2017-02-07 13:36:44 UTC (rev 20070) @@ -18,7 +18,7 @@ // & look in the lower left corner. If the feature is missing, // the fallback given above is used. - if (oldf.containsKey("tfIdfAug") && + if ( (oldf.get("tfIdfAug") != null) && (((Double) oldf.get("tfIdfAug")) > threshold) ) { Long start = ann.getStartNode().getOffset(); Long end = ann.getEndNode().getOffset(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ada...@us...> - 2017-02-07 13:14:06
|
Revision: 20069 http://sourceforge.net/p/gate/code/20069 Author: adamfunk Date: 2017-02-07 13:14:03 +0000 (Tue, 07 Feb 2017) Log Message: ----------- Suppress NPEs (use zeros instead) when people don't use enough documents in the corpus. Modified Paths: -------------- gate/trunk/plugins/TermRaider/resources/jape/augmentation.jape gate/trunk/plugins/TermRaider/resources/jape/term-candidate-threshold.jape Modified: gate/trunk/plugins/TermRaider/resources/jape/augmentation.jape =================================================================== --- gate/trunk/plugins/TermRaider/resources/jape/augmentation.jape 2017-02-07 02:23:36 UTC (rev 20068) +++ gate/trunk/plugins/TermRaider/resources/jape/augmentation.jape 2017-02-07 13:14:03 UTC (rev 20069) @@ -33,7 +33,5 @@ } } - if (score > 0.0F) { - inner.getFeatures().put("localAugTfIdf", score); - } + inner.getFeatures().put("localAugTfIdf", score); } Modified: gate/trunk/plugins/TermRaider/resources/jape/term-candidate-threshold.jape =================================================================== --- gate/trunk/plugins/TermRaider/resources/jape/term-candidate-threshold.jape 2017-02-07 02:23:36 UTC (rev 20068) +++ gate/trunk/plugins/TermRaider/resources/jape/term-candidate-threshold.jape 2017-02-07 13:14:03 UTC (rev 20069) @@ -18,7 +18,7 @@ // & look in the lower left corner. If the feature is missing, // the fallback given above is used. - if (oldf.containsKey("tfIdfAug") && + if ( (oldf.get("tfIdfAug") != null) && (((Double) oldf.get("tfIdfAug")) > threshold) ) { Long start = ann.getStartNode().getOffset(); Long end = ann.getEndNode().getOffset(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gat...@us...> - 2017-02-07 02:23:38
|
Revision: 20068 http://sourceforge.net/p/gate/code/20068 Author: gate-project Date: 2017-02-07 02:23:36 +0000 (Tue, 07 Feb 2017) Log Message: ----------- Build number update (build 5736) Modified Paths: -------------- gate/trunk/build/build.properties gate/trunk/build/build.txt Modified: gate/trunk/build/build.properties =================================================================== --- gate/trunk/build/build.properties 2017-02-06 02:23:16 UTC (rev 20067) +++ gate/trunk/build/build.properties 2017-02-07 02:23:36 UTC (rev 20068) @@ -1,4 +1,4 @@ #Build Number for ANT. Do not edit! -#Mon Feb 06 02:09:41 GMT 2017 +#Tue Feb 07 02:09:52 GMT 2017 cvs.version=$Id\: build.properties 7542 2006-07-17 14\:26\:51Z ian_roberts $ -build.number=5736 +build.number=5737 Modified: gate/trunk/build/build.txt =================================================================== --- gate/trunk/build/build.txt 2017-02-06 02:23:16 UTC (rev 20067) +++ gate/trunk/build/build.txt 2017-02-07 02:23:36 UTC (rev 20068) @@ -1 +1 @@ -5735 \ No newline at end of file +5736 \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gat...@us...> - 2017-02-06 02:23:18
|
Revision: 20067 http://sourceforge.net/p/gate/code/20067 Author: gate-project Date: 2017-02-06 02:23:16 +0000 (Mon, 06 Feb 2017) Log Message: ----------- Build number update (build 5735) Modified Paths: -------------- gate/trunk/build/build.properties gate/trunk/build/build.txt Modified: gate/trunk/build/build.properties =================================================================== --- gate/trunk/build/build.properties 2017-02-05 02:23:29 UTC (rev 20066) +++ gate/trunk/build/build.properties 2017-02-06 02:23:16 UTC (rev 20067) @@ -1,4 +1,4 @@ #Build Number for ANT. Do not edit! -#Sun Feb 05 02:09:52 GMT 2017 +#Mon Feb 06 02:09:41 GMT 2017 cvs.version=$Id\: build.properties 7542 2006-07-17 14\:26\:51Z ian_roberts $ -build.number=5735 +build.number=5736 Modified: gate/trunk/build/build.txt =================================================================== --- gate/trunk/build/build.txt 2017-02-05 02:23:29 UTC (rev 20066) +++ gate/trunk/build/build.txt 2017-02-06 02:23:16 UTC (rev 20067) @@ -1 +1 @@ -5734 \ No newline at end of file +5735 \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gat...@us...> - 2017-02-05 02:23:31
|
Revision: 20066 http://sourceforge.net/p/gate/code/20066 Author: gate-project Date: 2017-02-05 02:23:29 +0000 (Sun, 05 Feb 2017) Log Message: ----------- Build number update (build 5734) Modified Paths: -------------- gate/trunk/build/build.properties gate/trunk/build/build.txt Modified: gate/trunk/build/build.properties =================================================================== --- gate/trunk/build/build.properties 2017-02-04 02:24:38 UTC (rev 20065) +++ gate/trunk/build/build.properties 2017-02-05 02:23:29 UTC (rev 20066) @@ -1,4 +1,4 @@ #Build Number for ANT. Do not edit! -#Sat Feb 04 02:12:15 GMT 2017 +#Sun Feb 05 02:09:52 GMT 2017 cvs.version=$Id\: build.properties 7542 2006-07-17 14\:26\:51Z ian_roberts $ -build.number=5734 +build.number=5735 Modified: gate/trunk/build/build.txt =================================================================== --- gate/trunk/build/build.txt 2017-02-04 02:24:38 UTC (rev 20065) +++ gate/trunk/build/build.txt 2017-02-05 02:23:29 UTC (rev 20066) @@ -1 +1 @@ -5733 \ No newline at end of file +5734 \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gat...@us...> - 2017-02-04 02:24:41
|
Revision: 20065 http://sourceforge.net/p/gate/code/20065 Author: gate-project Date: 2017-02-04 02:24:38 +0000 (Sat, 04 Feb 2017) Log Message: ----------- Build number update (build 5733) Modified Paths: -------------- gate/trunk/build/build.properties gate/trunk/build/build.txt Modified: gate/trunk/build/build.properties =================================================================== --- gate/trunk/build/build.properties 2017-02-03 02:23:51 UTC (rev 20064) +++ gate/trunk/build/build.properties 2017-02-04 02:24:38 UTC (rev 20065) @@ -1,4 +1,4 @@ #Build Number for ANT. Do not edit! -#Fri Feb 03 02:10:20 GMT 2017 +#Sat Feb 04 02:12:15 GMT 2017 cvs.version=$Id\: build.properties 7542 2006-07-17 14\:26\:51Z ian_roberts $ -build.number=5733 +build.number=5734 Modified: gate/trunk/build/build.txt =================================================================== --- gate/trunk/build/build.txt 2017-02-03 02:23:51 UTC (rev 20064) +++ gate/trunk/build/build.txt 2017-02-04 02:24:38 UTC (rev 20065) @@ -1 +1 @@ -5732 \ No newline at end of file +5733 \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gat...@us...> - 2017-02-03 02:23:53
|
Revision: 20064 http://sourceforge.net/p/gate/code/20064 Author: gate-project Date: 2017-02-03 02:23:51 +0000 (Fri, 03 Feb 2017) Log Message: ----------- Build number update (build 5732) Modified Paths: -------------- gate/trunk/build/build.properties gate/trunk/build/build.txt Modified: gate/trunk/build/build.properties =================================================================== --- gate/trunk/build/build.properties 2017-02-02 13:53:16 UTC (rev 20063) +++ gate/trunk/build/build.properties 2017-02-03 02:23:51 UTC (rev 20064) @@ -1,4 +1,4 @@ #Build Number for ANT. Do not edit! -#Thu Feb 02 02:09:59 GMT 2017 +#Fri Feb 03 02:10:20 GMT 2017 cvs.version=$Id\: build.properties 7542 2006-07-17 14\:26\:51Z ian_roberts $ -build.number=5732 +build.number=5733 Modified: gate/trunk/build/build.txt =================================================================== --- gate/trunk/build/build.txt 2017-02-02 13:53:16 UTC (rev 20063) +++ gate/trunk/build/build.txt 2017-02-03 02:23:51 UTC (rev 20064) @@ -1 +1 @@ -5731 \ No newline at end of file +5732 \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2017-02-02 13:53:19
|
Revision: 20063 http://sourceforge.net/p/gate/code/20063 Author: markagreenwood Date: 2017-02-02 13:53:16 +0000 (Thu, 02 Feb 2017) Log Message: ----------- helps if you make all the changes in one commit Modified Paths: -------------- gate/branches/sawdust2/gate-core/src/main/java/gate/gui/NameBearerHandle.java Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/gui/NameBearerHandle.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/gui/NameBearerHandle.java 2017-02-02 13:00:32 UTC (rev 20062) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/gui/NameBearerHandle.java 2017-02-02 13:53:16 UTC (rev 20063) @@ -878,7 +878,6 @@ task.setDestFile(targetGapp); // sensible default settings task.setCopyPlugins(true); - task.setExpandIvy(true); task.setCopyResourceDirs(true); task.setOnUnresolved(PackageGappTask.UnresolvedAction.recover); task.init(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2017-02-02 13:00:35
|
Revision: 20062 http://sourceforge.net/p/gate/code/20062 Author: markagreenwood Date: 2017-02-02 13:00:32 +0000 (Thu, 02 Feb 2017) Log Message: ----------- when reloading a plugin via the persistence manager we now check to see if there is a cached copy of artifacts in maven-cache.gate relative to any of the file: URLS in the persistence stack Modified Paths: -------------- gate/branches/sawdust2/gate-core/src/main/java/gate/creole/Plugin.java gate/branches/sawdust2/gate-core/src/main/java/gate/util/maven/SimpleMavenCache.java gate/branches/sawdust2/gate-core/src/main/java/gate/util/maven/SimpleModelResolver.java gate/branches/sawdust2/gate-core/src/main/java/gate/util/persistence/PersistenceManager.java Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/creole/Plugin.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/creole/Plugin.java 2017-02-02 12:59:12 UTC (rev 20061) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/creole/Plugin.java 2017-02-02 13:00:32 UTC (rev 20062) @@ -85,7 +85,9 @@ import gate.util.asm.Opcodes; import gate.util.asm.Type; import gate.util.asm.commons.EmptyVisitor; +import gate.util.maven.SimpleMavenCache; import gate.util.maven.SimpleModelResolver; +import gate.util.persistence.PersistenceManager; public abstract class Plugin { @@ -417,8 +419,6 @@ private String group, artifact, version; private transient URL artifactURL; - - private WorkspaceReader workspace = null;//new SimpleMavenCache(new File("cache")); public Maven(String group, String artifact, String version) { this.group = group; @@ -526,14 +526,39 @@ ArtifactRequest artifactRequest = new ArtifactRequest(artifactObj, repos, null); RepositorySystem repoSystem = getRepositorySystem(); + + WorkspaceReader workspace = null; + + List<URL> persistenceURLStack = PersistenceManager.currentPersistenceURLStack(); + + if (persistenceURLStack != null && !persistenceURLStack.isEmpty()) { + List<File> workspaces = new ArrayList<File>(); + + for (URL url : persistenceURLStack) { + try { + File file = gate.util.Files.fileFromURL(url); + File cache = new File(file.getParentFile(),"maven-cache.gate"); + System.out.println(cache.getAbsolutePath()); + if (cache.exists() && cache.isDirectory()) { + workspaces.add(cache); + } + } + catch (IllegalArgumentException e) { + //ignore this for now + } + } + + if (!workspaces.isEmpty()) { + workspace = new SimpleMavenCache(workspaces.toArray(new File[workspaces.size()])); + } + } + RepositorySystemSession repoSession = getRepositorySession(repoSystem, workspace); ArtifactResult artifactResult = repoSystem.resolveArtifact(repoSession, artifactRequest); - - //baseURL = new URI("creole://"+group+";"+artifact+";"+version+"/"); artifactURL = new URL("jar:" @@ -577,6 +602,9 @@ for(ArtifactResult ar : result.getArtifactResults()) { + log.info(ar.getArtifact().getFile().toURI().toURL() + .toExternalForm()); + Element jarElement = new Element("JAR"); jarElement.setText(ar.getArtifact().getFile().toURI().toURL() .toExternalForm()); Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/util/maven/SimpleMavenCache.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/util/maven/SimpleMavenCache.java 2017-02-02 12:59:12 UTC (rev 20061) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/util/maven/SimpleMavenCache.java 2017-02-02 13:00:32 UTC (rev 20062) @@ -39,12 +39,16 @@ private transient WorkspaceRepository repo; - public SimpleMavenCache(File head, File... tail) { - this.head = head; + public SimpleMavenCache(File... dir) { + + if (dir == null || dir.length == 0) { + throw new NullPointerException("At least one workspace directory must be specified"); + } + + head = dir[0]; - if (tail.length > 0) { - this.tail = new SimpleMavenCache(tail[0], - tail.length == 1 ? new File[] {} : Arrays.copyOfRange(tail, 1, tail.length - 1)); + if (dir.length > 1) { + tail = new SimpleMavenCache(Arrays.copyOfRange(dir, 1, dir.length)); } } @@ -141,8 +145,8 @@ } Artifact artifactObj = new DefaultArtifact("uk.ac.gate.plugins", "annie", "jar", "9.0-SNAPSHOT"); - artifactObj = artifactObj.setFile( - new File("/home/mark/.m2/repository/uk/ac/gate/plugins/annie/9.0-SNAPSHOT/annie-9.0-SNAPSHOT.jar")); + //artifactObj = artifactObj.setFile( + // new File("/home/mark/.m2/repository/uk/ac/gate/plugins/annie/9.0-SNAPSHOT/annie-9.0-SNAPSHOT.jar")); SimpleMavenCache reader = new SimpleMavenCache(new File("repo")); System.out.println(reader.findArtifact(artifactObj)); Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/util/maven/SimpleModelResolver.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/util/maven/SimpleModelResolver.java 2017-02-02 12:59:12 UTC (rev 20061) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/util/maven/SimpleModelResolver.java 2017-02-02 13:00:32 UTC (rev 20062) @@ -20,6 +20,7 @@ import org.eclipse.aether.repository.RemoteRepository; import org.eclipse.aether.resolution.ArtifactRequest; +@SuppressWarnings("deprecation") public class SimpleModelResolver implements ModelResolver { private final RepositorySystem system; Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/util/persistence/PersistenceManager.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/util/persistence/PersistenceManager.java 2017-02-02 12:59:12 UTC (rev 20061) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/util/persistence/PersistenceManager.java 2017-02-02 13:00:32 UTC (rev 20062) @@ -36,6 +36,7 @@ import java.text.NumberFormat; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.Comparator; import java.util.HashMap; import java.util.Iterator; @@ -1167,9 +1168,13 @@ /** * Get the file currently being saved by this thread. */ - private static File currentPersistenceFile() { + public static File currentPersistenceFile() { return persistenceFile.get().getFirst(); } + + public static List<File> currentPersistenceFileStack() { + return Collections.unmodifiableList(persistenceFile.get()); + } private static Boolean currentWarnAboutGateHome() { return warnAboutGateHome.get().getFirst(); @@ -1358,9 +1363,13 @@ /** * Get the URL currently being loaded by this thread. */ - private static URL currentPersistenceURL() { + public static URL currentPersistenceURL() { return persistenceURL.get().getFirst(); } + + public static List<URL> currentPersistenceURLStack() { + return Collections.unmodifiableList(persistenceURL.get()); + } /** * Clean up the thread-local state at the end of a loading run. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2017-02-02 12:59:14
|
Revision: 20061 http://sourceforge.net/p/gate/code/20061 Author: markagreenwood Date: 2017-02-02 12:59:12 +0000 (Thu, 02 Feb 2017) Log Message: ----------- removed some left over ivy stuff Modified Paths: -------------- gate/branches/sawdust2/gate-core/src/main/java/gate/util/ant/packager/PackageGappTask.java Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/util/ant/packager/PackageGappTask.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/util/ant/packager/PackageGappTask.java 2017-02-02 10:57:23 UTC (rev 20060) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/util/ant/packager/PackageGappTask.java 2017-02-02 12:59:12 UTC (rev 20061) @@ -107,12 +107,6 @@ * declared in an <extrafiles> sub-element. */ private boolean copyPlugins = true; - - /** - * Should we expand any Ivy based dependencies to create a standalone - * application. If true then local copies of each dependency will be - */ - private boolean expandIvy = false; /** * Should we copy the complete contents of the parent directories of @@ -243,14 +237,6 @@ public void setCopyPlugins(boolean copyPlugins) { this.copyPlugins = copyPlugins; } - - public void setExpandIvy(boolean expandIvy) { - this.expandIvy = expandIvy; - } - - public boolean getExpandIvy() { - return expandIvy; - } /** * Will the task copy the complete contents of directories containing This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2017-02-02 10:57:25
|
Revision: 20060 http://sourceforge.net/p/gate/code/20060 Author: markagreenwood Date: 2017-02-02 10:57:23 +0000 (Thu, 02 Feb 2017) Log Message: ----------- removed some exceptions left over from goodness knows what Removed Paths: ------------- gate/branches/sawdust2/gate-core/src/main/java/gate/util/LaxErrorHandler.java gate/branches/sawdust2/gate-core/src/main/java/gate/util/TemplateLaxErrorHandler.java Deleted: gate/branches/sawdust2/gate-core/src/main/java/gate/util/LaxErrorHandler.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/util/LaxErrorHandler.java 2017-02-02 10:57:04 UTC (rev 20059) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/util/LaxErrorHandler.java 2017-02-02 10:57:23 UTC (rev 20060) @@ -1,48 +0,0 @@ -/* - * LaxErrorHandler.java - * - * Copyright (c) 1995-2012, The University of Sheffield. See the file - * COPYRIGHT.txt in the software or at http://gate.ac.uk/gate/COPYRIGHT.txt - * - * This file is part of GATE (see http://gate.ac.uk/), and is free - * software, licenced under the GNU Library General Public License, - * Version 2, June 1991 (in the distribution as file licence.html, - * and also available at http://gate.ac.uk/gate/licence.html). - * - * Cristian URSU, 7/July/2000 - * - * $Id$ - */ -package gate.util; - -/** - * LaxErrorHandler - */ -import org.xml.sax.*; - -public abstract class LaxErrorHandler implements ErrorHandler { - - /** - * LaxErrorHandler constructor comment. - */ - public LaxErrorHandler() {super();} - - /** - * error method comment. - */ - @Override - public abstract void error(SAXParseException ex) throws SAXException; - - /** - * fatalError method comment. - */ - @Override - public abstract void fatalError(SAXParseException ex) throws SAXException ; - - /** - * warning method comment. - */ - @Override - public abstract void warning(SAXParseException ex) throws SAXException ; - -} // class LaxErrorHandler Deleted: gate/branches/sawdust2/gate-core/src/main/java/gate/util/TemplateLaxErrorHandler.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/util/TemplateLaxErrorHandler.java 2017-02-02 10:57:04 UTC (rev 20059) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/util/TemplateLaxErrorHandler.java 2017-02-02 10:57:23 UTC (rev 20060) @@ -1,72 +0,0 @@ -/* - * TemplateLaxErrorHandler.java - * - * Copyright (c) 1995-2012, The University of Sheffield. See the file - * COPYRIGHT.txt in the software or at http://gate.ac.uk/gate/COPYRIGHT.txt - * - * This file is part of GATE (see http://gate.ac.uk/), and is free - * software, licenced under the GNU Library General Public License, - * Version 2, June 1991 (in the distribution as file licence.html, - * and also available at http://gate.ac.uk/gate/licence.html). - * - * Cristian URSU, 07/July/2000 - * - * $Id$ - */ - -// modify this according with your package -package gate.util; - -/** - * TemplateLaxErrorHandler - */ -import java.io.File; - -import org.xml.sax.SAXException; -import org.xml.sax.SAXParseException; - -// this import is for the abstract class LaxErrorHandler located in gate.util - - -// modify the class name the way you want -public class TemplateLaxErrorHandler extends LaxErrorHandler { - - /** - * TemplateLaxErrorHandler constructor comment. - */ - public TemplateLaxErrorHandler() {super();} - - /** - * error method comment. - */ - @Override - public void error(SAXParseException ex) throws SAXException{ - // do something with the error - File fInput = new File (ex.getSystemId()); - Err.println("e: " + fInput.getPath() + ": line " + - ex.getLineNumber() + ": " + ex); - } // error - - /** - * fatalError method comment. - */ - @Override - public void fatalError(SAXParseException ex) throws SAXException{ - // do something with the fatalError - File fInput = new File(ex.getSystemId()); - Err.println("E: " + fInput.getName() + ": line " + - ex.getLineNumber() + ": " + ex); - } // fatalError - - /** - * warning method comment. - */ - @Override - public void warning(SAXParseException ex) throws SAXException { - // do something with the warning. - File fInput = new File(ex.getSystemId()); - Err.println("w: " + fInput.getName() + ": line " + - ex.getLineNumber() + ": " + ex); - } // warning - -} // TemplateLaxErrorHandler This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2017-02-02 10:57:06
|
Revision: 20059 http://sourceforge.net/p/gate/code/20059 Author: markagreenwood Date: 2017-02-02 10:57:04 +0000 (Thu, 02 Feb 2017) Log Message: ----------- support for multiple workspaces by chaining them together so that maven only ever sees the top one Modified Paths: -------------- gate/branches/sawdust2/gate-core/src/main/java/gate/util/maven/SimpleMavenCache.java Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/util/maven/SimpleMavenCache.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/util/maven/SimpleMavenCache.java 2017-02-02 10:02:32 UTC (rev 20058) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/util/maven/SimpleMavenCache.java 2017-02-02 10:57:04 UTC (rev 20059) @@ -8,6 +8,7 @@ import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.apache.commons.io.FileUtils; @@ -32,16 +33,23 @@ private static final long serialVersionUID = 8612094868614282978L; - private File root; + private File head; + private SimpleMavenCache tail; + private transient WorkspaceRepository repo; - public SimpleMavenCache(File root) { - this.root = root; + public SimpleMavenCache(File head, File... tail) { + this.head = head; + + if (tail.length > 0) { + this.tail = new SimpleMavenCache(tail[0], + tail.length == 1 ? new File[] {} : Arrays.copyOfRange(tail, 1, tail.length - 1)); + } } private File getArtifactFile(Artifact artifact) { - File file = root; + File file = head; for (String part : artifact.getGroupId().split("\\.")) { file = new File(file, part); @@ -61,16 +69,23 @@ File file = getArtifactFile(artifact); - if (!file.exists()) + if (file.exists()) + return file; + + if (tail == null) return null; - return file; + return tail.findArtifact(artifact); } @Override public List<String> findVersions(Artifact artifact) { List<String> versions = new ArrayList<String>(); + if (tail != null) { + versions.addAll(tail.findVersions(artifact)); + } + File file = getArtifactFile(artifact).getParentFile().getParentFile(); if (!file.exists() || !file.isDirectory()) @@ -105,7 +120,7 @@ File file = getArtifactFile(ar.getArtifact()); // file.getParentFile().mkdirs(); - System.out.println(ar.getArtifact().getFile()); + //System.out.println(ar.getArtifact().getFile()); FileUtils.copyFile(ar.getArtifact().getFile(), file); } @@ -135,7 +150,10 @@ reader.cacheArtifact(artifactObj); System.out.println(reader.findArtifact(artifactObj)); System.out.println(reader.findVersions(artifactObj)); - + + reader = new SimpleMavenCache(new File("repo2"), new File("repo")); + System.out.println(reader.findArtifact(artifactObj)); + System.out.println(reader.findVersions(artifactObj)); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2017-02-02 10:02:35
|
Revision: 20058 http://sourceforge.net/p/gate/code/20058 Author: markagreenwood Date: 2017-02-02 10:02:32 +0000 (Thu, 02 Feb 2017) Log Message: ----------- removed all the Ivy support as it was badly broken anyway Modified Paths: -------------- gate/branches/sawdust2/gate-core/pom.xml gate/branches/sawdust2/gate-core/src/main/java/gate/creole/CreoleAnnotationHandler.java gate/branches/sawdust2/gate-core/src/main/java/gate/util/ant/packager/PackageGappTask.java Removed Paths: ------------- gate/branches/sawdust2/gate-core/src/main/java/gate/util/ant/ExpandIvy.java Modified: gate/branches/sawdust2/gate-core/pom.xml =================================================================== --- gate/branches/sawdust2/gate-core/pom.xml 2017-02-02 09:51:16 UTC (rev 20057) +++ gate/branches/sawdust2/gate-core/pom.xml 2017-02-02 10:02:32 UTC (rev 20058) @@ -335,15 +335,6 @@ </exclusions> </dependency> - <!-- we need Ivy for creole plugins which use the IVY element. Note this - will be deprecated at some future point --> - <dependency> - <groupId>org.apache.ivy</groupId> - <artifactId>ivy</artifactId> - <version>2.3.0</version> - <scope>compile</scope> - </dependency> - <!-- ANT is used internally by GATE for some tasks, such as the export for GATECloud.net --> <dependency> Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/creole/CreoleAnnotationHandler.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/creole/CreoleAnnotationHandler.java 2017-02-02 09:51:16 UTC (rev 20057) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/creole/CreoleAnnotationHandler.java 2017-02-02 10:02:32 UTC (rev 20058) @@ -16,21 +16,6 @@ package gate.creole; -import gate.Gate; -import gate.Gate.ResourceInfo; -import gate.Resource; -import gate.creole.metadata.AutoInstance; -import gate.creole.metadata.AutoInstanceParam; -import gate.creole.metadata.CreoleParameter; -import gate.creole.metadata.CreoleResource; -import gate.creole.metadata.GuiType; -import gate.creole.metadata.HiddenCreoleParameter; -import gate.creole.metadata.Optional; -import gate.creole.metadata.RunTime; -import gate.util.GateClassLoader; -import gate.util.GateException; -import gate.util.ant.ExpandIvy; - import java.beans.BeanInfo; import java.beans.IntrospectionException; import java.beans.Introspector; @@ -49,18 +34,26 @@ import java.util.List; import java.util.Map; -import org.apache.ivy.Ivy; -import org.apache.ivy.core.LogOptions; -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.util.filter.FilterHelper; import org.apache.log4j.Logger; import org.jdom.Document; import org.jdom.Element; import org.jdom.JDOMException; import org.jdom.xpath.XPath; +import gate.Gate; +import gate.Gate.ResourceInfo; +import gate.Resource; +import gate.creole.metadata.AutoInstance; +import gate.creole.metadata.AutoInstanceParam; +import gate.creole.metadata.CreoleParameter; +import gate.creole.metadata.CreoleResource; +import gate.creole.metadata.GuiType; +import gate.creole.metadata.HiddenCreoleParameter; +import gate.creole.metadata.Optional; +import gate.creole.metadata.RunTime; +import gate.util.GateClassLoader; +import gate.util.GateException; + /** * Class to take a creole.xml file (as a JDOM tree) and add elements * corresponding to the CREOLE annotations on the RESOURCE classes it declares. @@ -91,12 +84,19 @@ * @param jdomDoc * JDOM document representing a parsed creole.xml file. */ - public void addJarsToClassLoader(GateClassLoader gcl, Document jdomDoc) - throws IOException { - addJarsToClassLoader(gcl, jdomDoc.getRootElement()); - addIvyDependencies(gcl, jdomDoc); - } + public void addJarsToClassLoader(GateClassLoader gcl, Document jdomDoc) throws IOException { + try { + XPath jarXPath = XPath.newInstance("//*[translate(local-name(), 'ivy', 'IVY') = 'IVY']"); + if (jarXPath.selectNodes(jdomDoc).size() > 0) { + throw new IOException("Using Ivy for dependency management is no longer supported"); + } + } catch (JDOMException e) { + throw new IOException("Unable to load plugin", e); + } + addJarsToClassLoader(gcl, jdomDoc.getRootElement()); + } + /** * Extracts all the the REQUIRES elements from the given JDOM document, * expands the URLs and then attempts to load the specified plugin @@ -145,47 +145,6 @@ } /** - * Extract all the IVY elements from the given JDOM document and then add all - * the jars resulting from ivy's dependency resolution to the GateClassLoader. - * - * @param creoleDoc - * JDOM document representing a parsed creole.xml file. - */ - @Deprecated - private void addIvyDependencies(GateClassLoader gcl, Document creoleDoc) - throws IOException { - - try { - List<Element> ivyElts = ExpandIvy.getIvyElements(creoleDoc); - - if(ivyElts.size() > 0) { - - Ivy ivy = ExpandIvy.getIvy(ExpandIvy.getSettingsURL()); - - ResolveOptions resolveOptions = new ResolveOptions(); - resolveOptions.setArtifactFilter(FilterHelper - .getArtifactTypeFilter(new String[]{"jar"})); - resolveOptions.setLog(LogOptions.LOG_QUIET); - - for(Element e : ivyElts) { - URL url = new URL(plugin.getBaseURL(), ExpandIvy.getIvyPath(e)); - - ResolveReport report = ivy.resolve(url, resolveOptions); - if(report.getAllProblemMessages().size() > 0) - throw new Exception("Unable to resolve all IVY dependencies"); - - for(ArtifactDownloadReport dlReport : report.getAllArtifactsReports()) { - gcl.addURL(dlReport.getLocalFile().toURI().toURL()); - } - - } - } - } catch(Exception ex) { - throw new IOException("Error using Ivy to add required dependencies", ex); - } - } - - /** * Recursively search the given element for JAR entries and add these jars to * the GateClassLoader * Deleted: gate/branches/sawdust2/gate-core/src/main/java/gate/util/ant/ExpandIvy.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/util/ant/ExpandIvy.java 2017-02-02 09:51:16 UTC (rev 20057) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/util/ant/ExpandIvy.java 2017-02-02 10:02:32 UTC (rev 20058) @@ -1,409 +0,0 @@ -/* - * Copyright (c) 1995-2012, The University of Sheffield. See the file - * COPYRIGHT.txt in the software or at http://gate.ac.uk/gate/COPYRIGHT.txt - * - * This file is part of GATE (see http://gate.ac.uk/), and is free software, - * licenced under the GNU Library General Public License, Version 2, June 1991 - * (in the distribution as file licence.html, and also available at - * http://gate.ac.uk/gate/licence.html). - * - * Mark A. Greenwood, 12/01/2012 - * - * $Id$ - */ - -package gate.util.ant; - -import gate.util.persistence.PersistenceManager; - -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.net.URL; -import java.text.ParseException; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.ivy.Ivy; -import org.apache.ivy.core.LogOptions; -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.retrieve.RetrieveOptions; -import org.apache.ivy.core.settings.IvySettings; -import org.apache.ivy.util.DefaultMessageLogger; -import org.apache.ivy.util.Message; -import org.apache.ivy.util.filter.Filter; -import org.apache.ivy.util.filter.FilterHelper; -import org.apache.tools.ant.BuildException; -import org.apache.tools.ant.Task; -import org.apache.tools.ant.taskdefs.Copy; -import org.jdom.Document; -import org.jdom.Element; -import org.jdom.JDOMException; -import org.jdom.input.SAXBuilder; -import org.jdom.output.Format; -import org.jdom.output.XMLOutputter; -import org.jdom.xpath.XPath; - -/** - * An ANT task that takes a CREOLE plugin and adds local copies of Ivy managed - * dependencies. This involves copying JAR files into the plugin directory as - * well as updating the creole.xml to substitute the IVY elements with - * appropriate JAR elements. - */ -public class ExpandIvy extends Task { - - private XMLOutputter outputter = new XMLOutputter(Format.getPrettyFormat()); - - private File dir, settings; - - private boolean verbose = false; - - private boolean fully = false; - - /** - * Get the CREOLE plugin directory being processed. - * - * @return the CREOLE plugin directory being processed. - */ - public File getDir() { - return dir; - } - - /** - * Set the CREOLE plugin directory to be processed. - * - * @param dir - * the CREOLE plugin directory to be processed. - */ - public void setDir(File dir) { - this.dir = dir; - } - - /** - * Get the Ivy settings file used to control dependency resolution. - * - * @return the Ivy settings file used to control dependency resolution, or - * null if the default settings are being used. - */ - public File getSettings() { - return dir; - } - - /** - * Specifies the settings file used to control dependency resolution. - * - * @param settings - * the settings file used to control dependency resolution, or null - * to use the default settings. - */ - public void setSettings(File settings) { - this.settings = settings; - } - - /** - * If true then Ivy will spit out lots of messages while resolving - * dependencies. - * - * @return if true then Ivy will spit out lots of messages while resolving - * dependencies. - */ - public boolean getVerbose() { - return verbose; - } - - /** - * Controls the log level of Ivy. - * - * @param verbose - * if true then Ivy will spit out lots of messages while resolving - * dependencies. - */ - public void setVerbose(boolean verbose) { - this.verbose = verbose; - } - - /** - * Should we fully remove the link to Ivy by removing the dependency XML - * files. - * - * @return if true Ivy files referenced in creole.xml will be removed after - * they have been processed. - */ - public boolean getFully() { - return fully; - } - - /** - * If true Ivy files referenced in creole.xml will be removed after they have - * been processed. - * - * @param fully - * if true Ivy files referenced in creole.xml will be removed after - * they have been processed. - */ - public void setFully(boolean fully) { - this.fully = fully; - } - - @Override - public void execute() throws BuildException { - if(dir == null) - throw new BuildException("Please specify a directory", getLocation()); - - if(!dir.exists() || !dir.isDirectory()) - throw new BuildException("Specified directory doesn't exist", - getLocation()); - - File creoleXml = new File(dir, "creole.xml"); - - if(!creoleXml.exists()) - throw new BuildException("Supplied directory isn't a CREOLE plugin"); - - try { - // load the creole.xml into a JDOM structure - SAXBuilder builder = new SAXBuilder(); - Document creoleDoc = builder.build(creoleXml); - - // get the IVY elements from the creole XML file - List<Element> ivyElts = getIvyElements(creoleDoc); - - if(ivyElts.size() > 0) { - // if there are some elements to process then we have work to do... - - // get a configured Ivy instance - Ivy ivy = - getIvy(settings != null - ? settings.toURI().toURL() - : getSettingsURL(), dir); - - // we only want the binary jars so create a filter for them - Filter filter = FilterHelper.getArtifactTypeFilter(new String[]{"jar"}); - - // set up the options for doing a resolve - ResolveOptions resolveOptions = new ResolveOptions(); - resolveOptions.setArtifactFilter(filter); - if(!verbose) resolveOptions.setLog(LogOptions.LOG_QUIET); - - // set up the options for doing a retrieve - RetrieveOptions retrieveOptions = new RetrieveOptions(); - retrieveOptions.setArtifactFilter(filter); - if(!verbose) retrieveOptions.setLog(LogOptions.LOG_QUIET); - - // an ANT task to handle all the copying - Copy copyTask; - - for(Element e : ivyElts) { - // for each IVY element in the creole.xml file.... - - // get the location of the ivy file (assume ivy.xml if not specified) - File ivyFile = getIvyFile(e, creoleXml); - - if(!ivyFile.exists()) - throw new BuildException("Referenced ivy file does not exist: " - + ivyFile, getLocation()); - - // remove the IVY element from the XML - Element parent = e.getParentElement(); - parent.removeContent(e); - - // get ivy to resolve the dependencies and generate a report - ResolveReport report = - ivy.resolve(ivyFile.toURI().toURL(), resolveOptions); - - if(report.getAllProblemMessages().size() > 0) - throw new BuildException("Unable to resolve all IVY dependencies", - getLocation()); - - // don't do a retrieve but find out what it would actually do. - // NOTE: we need to do this as a retrieve just returns the number of - // jar files copied and not what they were which we need to update the - // creole.xml file - @SuppressWarnings("unchecked") - Map<ArtifactDownloadReport, Set<String>> toCopy = - ivy.getRetrieveEngine().determineArtifactsToCopy( - report.getModuleDescriptor().getModuleRevisionId(), - ivy.getSettings().substitute( - ivy.getSettings().getVariable("ivy.retrieve.pattern")), - retrieveOptions); - - for(Map.Entry<ArtifactDownloadReport, Set<String>> entry : toCopy - .entrySet()) { - // for each artifact a retrieve would copy.... - ArtifactDownloadReport dlReport = - entry.getKey(); - - for(String destPath : entry.getValue()) { - // find out where it should end up - File destFile = new File(destPath); - - // make sure the dir actually exists - destFile.getParentFile().mkdirs(); - - // set up ANT ready to copy from the cache into the plugin dir - copyTask = new Copy(); - copyTask.setProject(getProject()); - copyTask.setLocation(getLocation()); - copyTask.setTaskName(getTaskName()); - copyTask.setFile(dlReport.getLocalFile()); - copyTask.setTofile(destFile); - copyTask.init(); - - // do the actual copy - copyTask.perform(); - - // add a new JAR element to creole.xml pointing at the newly added - // jar - Element jarElement = - new Element("JAR").setText(PersistenceManager - .getRelativePath(dir.toURI().toURL(), destFile.toURI() - .toURL())); - parent.addContent(jarElement); - } - - if(fully && !ivyFile.delete()) ivyFile.deleteOnExit(); - } - } - - // now we have finished write the new XML back to creole.xml - outputter.output(creoleDoc, new FileWriter(creoleXml)); - } - } catch(Exception e) { - // if anything goes wrong just re-throw the exception - throw new BuildException(e); - } - } - - /** - * Processes the specified creole.xml file to extract all the <IVY> - * elements - * - * @param creoleXML - * the URL of the creole.xml file to process - * @return a list of the <IVY> XML elements - */ - public static List<Element> getIvyElements(URL creoleXML) - throws JDOMException, IOException { - // load the creole.xml into a JDOM structure - SAXBuilder builder = new SAXBuilder(); - Document doc = builder.build(creoleXML); - return getIvyElements(doc); - } - - /** - * Processes the specified XML document file to extract all the <IVY> - * elements - * - * @param doc - * the XML document to process - * @return a list of the <IVY> XML elements - */ - @SuppressWarnings("unchecked") - public static List<Element> getIvyElements(Document doc) throws JDOMException { - // use XPath to find all the IVY elements - XPath jarXPath = - XPath.newInstance("//*[translate(local-name(), 'ivy', 'IVY') = 'IVY']"); - return jarXPath.selectNodes(doc); - } - - /** - * Turns an <IVY> XML element into a File instance by resolving relative - * to the creole.xml file. - * - * @param element - * the <IVY> element to convert - * @param creoleXML - * the creole.xml file to resolve relative to - * @return a File instance pointing to the Ivy file specified by the XML - * element - */ - public static File getIvyFile(Element element, File creoleXML) { - return new File(creoleXML.getParentFile(), getIvyPath(element)); - } - - /** - * Retrieve the path to the Ivy file as specified in the XML element. If no - * path is given use the default of 'ivy.xml'. - * - * @param element - * the <IVY> XML element to process - * @return the path to the Ivy file as specified in the XML element, defaults - * to 'ivy.xml'. - */ - public static String getIvyPath(Element element) { - String ivyText = element.getTextTrim(); - if(ivyText == null || ivyText.equals("")) ivyText = "ivy.xml"; - return ivyText; - } - - public static Ivy getIvy() throws ParseException, IOException { - return getIvy(null, null); - } - - public static Ivy getIvy(File dir) throws ParseException, IOException { - return getIvy(null, dir); - } - - public static Ivy getIvy(URL settings) throws ParseException, IOException { - return getIvy(settings, null); - } - - public static Ivy getIvy(URL settings, File dir) throws ParseException, - IOException { - IvySettings ivySettings = new IvySettings(); - - if(settings != null) - ivySettings.load(settings); - else ivySettings.loadDefault(); - - if(dir != null) ivySettings.setBaseDir(dir); - - // get an instance of ivy - return Ivy.newInstance(ivySettings); - } - - /** - * Attempts to find a custom Ivy settings file to use instead of the default - * configuration. This looks first for a system property - * <code>ivy.settings.file</code> and then <code>ivy.settings.url</code>. If - * neither exist or can be converted to a valid URL then the method returns - * null. - * - * @return the URL of the settings file to use or null if one was not - * specified or could not be correctly converted. - */ - public static URL getSettingsURL() { - - String val = System.getProperty("ivy.settings.file"); - if(val != null) { - try { - File file = new File(val); - if(file.exists() && file.isFile() && file.canRead()) - return file.toURI().toURL(); - } catch(Exception e) { - // ignore this and try the URL - System.err.println("Ivalid ivy.settings.file will be ignored: " + val); - } - } - - val = System.getProperty("ivy.settings.url"); - if(val != null) { - try { - return new URL(val); - } catch(Exception e) { - // ignore this - System.err.println("Ivalid ivy.settings.url will be ignored: " + val); - } - } - - // neither of the system properties were helpful so return null - return null; - } - - static { - // this seems to be the only way to suppress the loading settings message - Message.setDefaultLogger(new DefaultMessageLogger(Message.MSG_ERR)); - } -} \ No newline at end of file Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/util/ant/packager/PackageGappTask.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/util/ant/packager/PackageGappTask.java 2017-02-02 09:51:16 UTC (rev 20057) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/util/ant/packager/PackageGappTask.java 2017-02-02 10:02:32 UTC (rev 20058) @@ -13,10 +13,6 @@ */ package gate.util.ant.packager; -import gate.util.Files; -import gate.util.ant.ExpandIvy; -import gate.util.persistence.PersistenceManager; - import java.io.File; import java.io.IOException; import java.net.MalformedURLException; @@ -49,6 +45,9 @@ import org.jdom.input.SAXBuilder; import org.jdom.xpath.XPath; +import gate.util.Files; +import gate.util.persistence.PersistenceManager; + /** * Ant task to copy a gapp file, rewriting any relative paths it * contains to point within the same directory as the target file @@ -651,23 +650,6 @@ log("Also copying complete plugin contents", Project.MSG_VERBOSE); } copyDirectories(pluginCopyMap, !copyPlugins); - - if(expandIvy) { - ExpandIvy ivyExpander = new ExpandIvy(); - ivyExpander.setProject(getProject()); - ivyExpander.setLocation(getLocation()); - ivyExpander.setTaskName(getTaskName()); - ivyExpander.setFully(!copyPlugins); - - for(URL url : pluginCopyMap.values()) { - File dir = Files.fileFromURL(url); - if(dir.exists()) { - ivyExpander.setDir(dir); - ivyExpander.init(); - ivyExpander.perform(); - } - } - } } // handle extra directories @@ -740,18 +722,6 @@ NameEntry jarInclude = fileSet.createInclude(); jarInclude.setName(jarString); } - - // copy the ivy files as either they will be needed to load the plugin - // or they will be needed when the expand task is run - try { - for(Element e : ExpandIvy.getIvyElements(creoleXml)) { - NameEntry ivyInclude = fileSet.createInclude(); - ivyInclude.setName(ExpandIvy.getIvyPath(e)); - } - } catch(Exception e) { - throw new BuildException("Error processing IVY includes", e, - getLocation()); - } } // do the copying This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2017-02-02 09:51:18
|
Revision: 20057 http://sourceforge.net/p/gate/code/20057 Author: markagreenwood Date: 2017-02-02 09:51:16 +0000 (Thu, 02 Feb 2017) Log Message: ----------- added the LuckyException back as removing it would break old versions of plugins that used it, but it is now deprecated so could be removed at some future date Added Paths: ----------- gate/branches/sawdust2/gate-core/src/main/java/gate/util/LuckyException.java Added: gate/branches/sawdust2/gate-core/src/main/java/gate/util/LuckyException.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/util/LuckyException.java (rev 0) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/util/LuckyException.java 2017-02-02 09:51:16 UTC (rev 20057) @@ -0,0 +1,70 @@ +/* + * LuckyException.java + * + * Copyright (c) 1995-2012, The University of Sheffield. See the file + * COPYRIGHT.txt in the software or at http://gate.ac.uk/gate/COPYRIGHT.txt + * + * This file is part of GATE (see http://gate.ac.uk/), and is free + * software, licenced under the GNU Library General Public License, + * Version 2, June 1991 (in the distribution as file licence.html, + * and also available at http://gate.ac.uk/gate/licence.html). + * + * Valentin Tablan 06/2000 + * + * $Id: LuckyException.java 17600 2014-03-08 18:47:11Z markagreenwood $ + */ +package gate.util; + +/** + * This exception is intended to be used in places where there definitely + * shouldn't be any exceptions thrown but the API requires us to catch some, eg: + * <code> + * try{ + * if( a != null){ + * a.doSomething(); + * } + * }catch(NullPointerException npe){ + * throw new LuckyException("I found a null pointer!"); + * } + *</code> Of course the system will never require you to catch + * NullPOinterException as it derives from RuntimeException, but I couldn't come + * with a better example. + * + * @deprecated serves no purpose over and above either + * {@link gate.util.GateRuntimeException GateRuntimeException} or + * just plain {@link java.lang.RuntimeException RuntimeException} + * and one of those should be used instead. + */ +@Deprecated +public class LuckyException extends RuntimeException { + + private static final long serialVersionUID = -8051339390451934567L; + + /** Default constructor, creates a new execption with the default message */ + public LuckyException() { + super(defaultMessage); + } + + /** + * Creates a new exception with the provided message prepended to the + * default one on a separate line. + * + * @param message + * the uses message + */ + public LuckyException(String message) { + super(message + "\n" + defaultMessage); + } + + public LuckyException(String message, Throwable cause) { + super(message + "\n" + defaultMessage, cause); + } + + public LuckyException(Throwable cause) { + super(defaultMessage, cause); + } + + /** The default message carried by this type of exceptions */ + static String defaultMessage = "Congratulations, you found the ONLY bug in GATE!"; + +}// end class LuckyException This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2017-02-02 07:01:04
|
Revision: 20056 http://sourceforge.net/p/gate/code/20056 Author: markagreenwood Date: 2017-02-02 07:01:02 +0000 (Thu, 02 Feb 2017) Log Message: ----------- some notes on how it might work Modified Paths: -------------- gate/branches/sawdust2/plugins/Developer_Tools/src/main/java/gate/creole/MoveToMaven.java Modified: gate/branches/sawdust2/plugins/Developer_Tools/src/main/java/gate/creole/MoveToMaven.java =================================================================== --- gate/branches/sawdust2/plugins/Developer_Tools/src/main/java/gate/creole/MoveToMaven.java 2017-02-02 06:58:58 UTC (rev 20055) +++ gate/branches/sawdust2/plugins/Developer_Tools/src/main/java/gate/creole/MoveToMaven.java 2017-02-02 07:01:02 UTC (rev 20056) @@ -27,5 +27,15 @@ @Override public List<Action> getActions() { return null; + + //choose a file + + //read the plugins out of the XML (not using persistence manager) + + //for each URL try and find a new plugin + + //replace the URL with the new plugin entry + + //scan the rest of the app for any URLs that go inside the plugin base URL and replace with creole:// ResourceReference instances } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2017-02-02 06:59:01
|
Revision: 20055 http://sourceforge.net/p/gate/code/20055 Author: markagreenwood Date: 2017-02-02 06:58:58 +0000 (Thu, 02 Feb 2017) Log Message: ----------- an empty tool where ideas for how to automagically move apps onto the new plugins can go Added Paths: ----------- gate/branches/sawdust2/plugins/Developer_Tools/src/main/java/gate/creole/MoveToMaven.java Added: gate/branches/sawdust2/plugins/Developer_Tools/src/main/java/gate/creole/MoveToMaven.java =================================================================== --- gate/branches/sawdust2/plugins/Developer_Tools/src/main/java/gate/creole/MoveToMaven.java (rev 0) +++ gate/branches/sawdust2/plugins/Developer_Tools/src/main/java/gate/creole/MoveToMaven.java 2017-02-02 06:58:58 UTC (rev 20055) @@ -0,0 +1,31 @@ +/* + * MoveToMaven.java + * + * Copyright (c) 2017, The University of Sheffield. See the file + * COPYRIGHT.txt in the software or at http://gate.ac.uk/gate/COPYRIGHT.txt + * + * This file is part of GATE (see http://gate.ac.uk/), and is free + * software, licenced under the GNU Library General Public License, + * Version 3, June 2007 (in the distribution as file licence.html, + * and also available at http://gate.ac.uk/gate/licence.html). + * + * Mark A. Greenwood, 2nd February 2017 + */ +package gate.creole; + +import java.util.ArrayList; +import java.util.List; +import javax.swing.Action; + +import gate.creole.metadata.AutoInstance; +import gate.creole.metadata.CreoleResource; +import gate.gui.ActionsPublisher; + +@CreoleResource(tool = true, isPrivate = true, autoinstances = @AutoInstance, name = "Upgrade App to new Plugin format", comment = "Upgrade the plugins used within an app to the new Maven based format") +public class MoveToMaven extends AbstractResource implements ActionsPublisher { + + @Override + public List<Action> getActions() { + return null; + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2017-02-02 06:44:15
|
Revision: 20054 http://sourceforge.net/p/gate/code/20054 Author: markagreenwood Date: 2017-02-02 06:44:12 +0000 (Thu, 02 Feb 2017) Log Message: ----------- removed LuckyException by replacing all uses with GateRuntimeException -- no point having both and the latter has a much more semantically useful name Modified Paths: -------------- gate/branches/sawdust2/gate-core/src/main/java/gate/Gate.java gate/branches/sawdust2/gate-core/src/main/java/gate/creole/CreoleRegisterImpl.java gate/branches/sawdust2/gate-core/src/main/java/gate/gui/FeatureMapEditorDialog.java gate/branches/sawdust2/gate-core/src/main/java/gate/gui/MainFrame.java gate/branches/sawdust2/gate-core/src/main/java/gate/gui/ResourceParametersEditor.java gate/branches/sawdust2/gate-core/src/main/java/gate/gui/annedit/SearchAndAnnotatePanel.java gate/branches/sawdust2/gate-core/src/main/java/gate/gui/annedit/SearchExpressionsAction.java gate/branches/sawdust2/gate-core/src/main/java/gate/gui/docview/AnnotationSetsView.java gate/branches/sawdust2/gate-core/src/main/java/gate/gui/docview/OntologyClassView.java gate/branches/sawdust2/gate-core/src/main/java/gate/gui/docview/OntologyInstanceView.java gate/branches/sawdust2/gate-core/src/main/java/gate/util/ant/packager/GappModel.java gate/branches/sawdust2/notes.txt gate/branches/sawdust2/plugins/ANNIE/src/main/java/com/ontotext/gate/gazetteer/HashGazetteer.java gate/branches/sawdust2/plugins/ANNIE/src/main/java/gate/creole/gazetteer/GazetteerList.java gate/branches/sawdust2/plugins/ANNIE/src/main/java/gate/creole/tokeniser/SimpleTokeniser.java gate/branches/sawdust2/plugins/ANNIE/src/main/java/gate/jape/parser/ParseCpsl.jj gate/branches/sawdust2/plugins/Format_Twitter/src/main/java/gate/corpora/export/GATEJsonExporter.java gate/branches/sawdust2/plugins/Gazetteer_LKB/src/com/ontotext/kim/gate/KimGazetteer.java gate/branches/sawdust2/plugins/Lang_French/tokeniser/postprocess.jape gate/branches/sawdust2/plugins/Lang_Russian/src/com/ontotext/russie/gazetteer/InflectionalGazetteer.java gate/branches/sawdust2/plugins/Lang_Russian/src/com/ontotext/russie/gazetteer/RussGazetteer.java gate/branches/sawdust2/plugins/Lang_Russian/src/com/ontotext/russie/morph/POSTagger.java gate/branches/sawdust2/plugins/Machine_Learning/src/gate/creole/ml/MachineLearningPR.java gate/branches/sawdust2/plugins/Schema_Annotation_Editor/src/main/java/gate/gui/annedit/SchemaAnnotationEditor.java gate/branches/sawdust2/plugins/Tagger_Framework/resources/tagger-independent/chunk-annots.jape gate/branches/sawdust2/plugins/Tagger_Framework/resources/tagger-independent/chunk-feature.jape gate/branches/sawdust2/plugins/Tagger_Framework/resources/tagger-independent/entity-annots.jape gate/branches/sawdust2/plugins/Tagger_Framework/resources/tagger-independent/entity-feature.jape gate/branches/sawdust2/plugins/Tagger_Numbers/src/main/resources/resources/jape/exponents.jape gate/branches/sawdust2/plugins/Tagger_Numbers/src/main/resources/resources/jape/numbers.jape gate/branches/sawdust2/plugins/Tagger_Numbers/src/main/resources/resources/jape/sequence.jape Removed Paths: ------------- gate/branches/sawdust2/gate-core/src/main/java/gate/util/LuckyException.java Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/Gate.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/Gate.java 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/Gate.java 2017-02-02 06:44:12 UTC (rev 20054) @@ -27,7 +27,6 @@ import gate.util.GateClassLoader; import gate.util.GateException; import gate.util.GateRuntimeException; -import gate.util.LuckyException; import gate.util.OptionsMap; import gate.util.Strings; @@ -857,7 +856,7 @@ Thread.sleep(200); } catch(InterruptedException ie) { - throw new LuckyException(ie.toString()); + throw new GateRuntimeException(ie.toString()); } } currentExecutable = executable; Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/creole/CreoleRegisterImpl.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/creole/CreoleRegisterImpl.java 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/creole/CreoleRegisterImpl.java 2017-02-02 06:44:12 UTC (rev 20054) @@ -33,7 +33,6 @@ import gate.util.GateClassLoader; import gate.util.GateException; import gate.util.GateRuntimeException; -import gate.util.LuckyException; import gate.util.Out; import java.io.IOException; @@ -720,7 +719,7 @@ } } } catch(ClassNotFoundException cnfe) { - throw new LuckyException( + throw new GateRuntimeException( "A type registered in the creole register does not exist in the VM!"); } Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/gui/FeatureMapEditorDialog.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/gui/FeatureMapEditorDialog.java 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/gui/FeatureMapEditorDialog.java 2017-02-02 06:44:12 UTC (rev 20054) @@ -70,8 +70,8 @@ } catch(ResourceInstantiationException rie) { // can't happen, but needs to be caught to satisfy the compiler - throw new LuckyException("FeaturesSchemaEditor.init() threw " - + "ResourceInstantiationException!"); + throw new GateRuntimeException("FeaturesSchemaEditor.init() threw " + + "ResourceInstantiationException!", rie); } fmView.setTarget(tempFMHolder); // make sure the window is a sensible size Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/gui/MainFrame.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/gui/MainFrame.java 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/gui/MainFrame.java 2017-02-02 06:44:12 UTC (rev 20054) @@ -191,7 +191,6 @@ import gate.util.GateClassLoader; import gate.util.GateException; import gate.util.GateRuntimeException; -import gate.util.LuckyException; import gate.util.NameBearer; import gate.util.OptionsMap; import gate.util.Out; @@ -2067,7 +2066,7 @@ } break; default: - throw new LuckyException("A phanthom state of things!"); + throw new GateRuntimeException("A phanthom state of things!"); } } if(nameBuilder.length() > 0) name = nameBuilder.toString(); Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/gui/ResourceParametersEditor.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/gui/ResourceParametersEditor.java 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/gui/ResourceParametersEditor.java 2017-02-02 06:44:12 UTC (rev 20054) @@ -31,7 +31,7 @@ import gate.util.Err; import gate.util.ExtensionFileFilter; import gate.util.GateException; -import gate.util.LuckyException; +import gate.util.GateRuntimeException; import gate.util.NameBearer; import java.awt.Component; @@ -964,7 +964,7 @@ return combo; } catch(Exception ex) { - throw new LuckyException("Error calling \"values\" method of an " + throw new GateRuntimeException("Error calling \"values\" method of an " + "enum type", ex); } } Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/gui/annedit/SearchAndAnnotatePanel.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/gui/annedit/SearchAndAnnotatePanel.java 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/gui/annedit/SearchAndAnnotatePanel.java 2017-02-02 06:44:12 UTC (rev 20054) @@ -653,7 +653,7 @@ } catch(InvalidOffsetException e) { //the offsets here should always be valid. - throw new LuckyException(e); + throw new GateRuntimeException(e); } } } @@ -719,7 +719,7 @@ } catch(InvalidOffsetException e) { //the offsets here should always be valid. - throw new LuckyException(e); + throw new GateRuntimeException(e); } } } Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/gui/annedit/SearchExpressionsAction.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/gui/annedit/SearchExpressionsAction.java 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/gui/annedit/SearchExpressionsAction.java 2017-02-02 06:44:12 UTC (rev 20054) @@ -14,7 +14,7 @@ package gate.gui.annedit; -import gate.util.LuckyException; +import gate.util.GateRuntimeException; import javax.swing.*; import javax.swing.text.BadLocationException; @@ -380,7 +380,7 @@ } } catch (BadLocationException e) { // should never happend - throw new LuckyException(e); + throw new GateRuntimeException(e); } textField.requestFocus(); } Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/gui/docview/AnnotationSetsView.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/gui/docview/AnnotationSetsView.java 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/gui/docview/AnnotationSetsView.java 2017-02-02 06:44:12 UTC (rev 20054) @@ -1623,7 +1623,6 @@ catch(BadLocationException e1) { //this should not happen, as the text location comes from the text view //if it does. we'll just ignore it. -// throw new LuckyException(e1); }finally{ mouseMovementTimer.restart(); } Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/gui/docview/OntologyClassView.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/gui/docview/OntologyClassView.java 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/gui/docview/OntologyClassView.java 2017-02-02 06:44:12 UTC (rev 20054) @@ -32,7 +32,7 @@ import gate.gui.annedit.AnnotationData; import gate.gui.annedit.AnnotationDataImpl; import gate.gui.ontology.OntologyItemComparator; -import gate.util.LuckyException; +import gate.util.GateRuntimeException; import gate.util.OptionsMap; import java.awt.BorderLayout; @@ -761,7 +761,7 @@ } } catch(BadLocationException ble) { - throw new LuckyException(ble); + throw new GateRuntimeException(ble); }finally{ mouseMovementTimer.restart(); } Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/gui/docview/OntologyInstanceView.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/gui/docview/OntologyInstanceView.java 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/gui/docview/OntologyInstanceView.java 2017-02-02 06:44:12 UTC (rev 20054) @@ -23,7 +23,7 @@ import gate.swing.XJTable; import gate.creole.ontology.*; import gate.util.InvalidOffsetException; -import gate.util.LuckyException; +import gate.util.GateRuntimeException; import gate.util.Out; import gate.util.Strings; @@ -598,7 +598,7 @@ // create a new annotation from the text selected set.add((long) start, (long) end, ANNOTATION_TYPE, features); } catch(InvalidOffsetException e) { - throw new LuckyException(e); + throw new GateRuntimeException(e); } classView.setClassHighlighted(selectedClass, false); classView.setClassHighlighted(selectedClass, true); Deleted: gate/branches/sawdust2/gate-core/src/main/java/gate/util/LuckyException.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/util/LuckyException.java 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/util/LuckyException.java 2017-02-02 06:44:12 UTC (rev 20054) @@ -1,61 +0,0 @@ -/* - * LuckyException.java - * - * Copyright (c) 1995-2012, The University of Sheffield. See the file - * COPYRIGHT.txt in the software or at http://gate.ac.uk/gate/COPYRIGHT.txt - * - * This file is part of GATE (see http://gate.ac.uk/), and is free - * software, licenced under the GNU Library General Public License, - * Version 2, June 1991 (in the distribution as file licence.html, - * and also available at http://gate.ac.uk/gate/licence.html). - * - * Valentin Tablan 06/2000 - * - * $Id$ - */ -package gate.util; -/**This exception is intended to be used in places where there definitely - *shouldn't be any exceptions thrown but the API requires us to catch some, - *eg: <code> - * try{ - * if( a != null){ - * a.doSomething(); - * } - * }catch(NullPointerException npe){ - * throw new LuckyException("I found a null pointer!"); - * } - *</code> - *Of course the system will never require you to catch NullPOinterException as - *it derives from RuntimeException, but I couldn't come with a better example. - */ -public class LuckyException extends RuntimeException { - - private static final long serialVersionUID = -8051339390451934567L; - - /** Default constructor, creates a new execption with the default message */ - public LuckyException() { - super(defaultMessage); - } - - /** Creates a new exception with the provided message prepended to the default - * one on a separate line. - * @param message the uses message - */ - public LuckyException(String message) { - super(message + "\n" + defaultMessage); - } - - public LuckyException(String message, Throwable cause) { - super(message + "\n" + defaultMessage, cause); - } - - public LuckyException(Throwable cause) { - super(defaultMessage, cause); - } - - /**The default message carried by this type of exceptions*/ - static String defaultMessage = - "Congratulations, you found the ONLY bug in GATE!"; - -}// end class LuckyException - Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/util/ant/packager/GappModel.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/util/ant/packager/GappModel.java 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/util/ant/packager/GappModel.java 2017-02-02 06:44:12 UTC (rev 20054) @@ -2,7 +2,6 @@ import gate.util.Files; import gate.util.GateRuntimeException; -import gate.util.LuckyException; import gate.util.persistence.PersistenceManager; import java.io.BufferedOutputStream; @@ -336,7 +335,7 @@ } } catch(JDOMException e) { - throw new LuckyException( + throw new GateRuntimeException( "Error applying XPath expression to remove duplicate plugins", e); } } Modified: gate/branches/sawdust2/notes.txt =================================================================== --- gate/branches/sawdust2/notes.txt 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/notes.txt 2017-02-02 06:44:12 UTC (rev 20054) @@ -32,12 +32,6 @@ things to remove ================ -gate.gui.HelpFrame -can't display the user guide properly but need to unwire from options dialog - -gate.swing.XJEditorPane -only used by the HelpFrame so can go - gate.swing.VerticalTextIcon gate.swing.WaitDialog @@ -45,7 +39,6 @@ gate.util.LanguageAnalyserDocumentProcessor gate.util.LaxErrorHandler gate.util.TemplateLaxErrorHandler -gate.util.LuckyException -- replace with RuntimeException gate.util.ObjectPool gate.util.ObjectWriter gate.util.OrderByRestriction Modified: gate/branches/sawdust2/plugins/ANNIE/src/main/java/com/ontotext/gate/gazetteer/HashGazetteer.java =================================================================== --- gate/branches/sawdust2/plugins/ANNIE/src/main/java/com/ontotext/gate/gazetteer/HashGazetteer.java 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/plugins/ANNIE/src/main/java/com/ontotext/gate/gazetteer/HashGazetteer.java 2017-02-02 06:44:12 UTC (rev 20054) @@ -21,7 +21,7 @@ import gate.creole.metadata.HiddenCreoleParameter; import gate.creole.metadata.Sharable; import gate.util.InvalidOffsetException; -import gate.util.LuckyException; +import gate.util.GateRuntimeException; import java.io.IOException; import java.util.ArrayList; @@ -269,7 +269,7 @@ annotationSet.add(Long.valueOf(i), Long.valueOf(documentPosition), "Lookup", featuremap); } catch(InvalidOffsetException invalidoffsetexception) { - throw new LuckyException(invalidoffsetexception.toString()); + throw new GateRuntimeException(invalidoffsetexception.toString()); } } } Modified: gate/branches/sawdust2/plugins/ANNIE/src/main/java/gate/creole/gazetteer/GazetteerList.java =================================================================== --- gate/branches/sawdust2/plugins/ANNIE/src/main/java/gate/creole/gazetteer/GazetteerList.java 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/plugins/ANNIE/src/main/java/gate/creole/gazetteer/GazetteerList.java 2017-02-02 06:44:12 UTC (rev 20054) @@ -517,7 +517,7 @@ listReader.close(); } catch(IOException x) { /** should never be thrown */ - throw new gate.util.LuckyException("IOException :" + x.getMessage()); + throw new gate.util.GateRuntimeException("IOException :" + x.getMessage()); } isModified = !tempEntries.equals(entries); Modified: gate/branches/sawdust2/plugins/ANNIE/src/main/java/gate/creole/tokeniser/SimpleTokeniser.java =================================================================== --- gate/branches/sawdust2/plugins/ANNIE/src/main/java/gate/creole/tokeniser/SimpleTokeniser.java 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/plugins/ANNIE/src/main/java/gate/creole/tokeniser/SimpleTokeniser.java 2017-02-02 06:44:12 UTC (rev 20054) @@ -51,7 +51,7 @@ import gate.util.Err; import gate.util.GateRuntimeException; import gate.util.InvalidOffsetException; -import gate.util.LuckyException; +import gate.util.GateRuntimeException; /** Implementation of a Unicode rule based tokeniser. * The tokeniser gets its rules from a file an {@link java.io.InputStream @@ -866,7 +866,7 @@ try{ characterClassFields = Class.forName("java.lang.Character").getFields(); }catch(ClassNotFoundException cnfe){ - throw new LuckyException("Could not find the java.lang.Character class!"); + throw new GateRuntimeException("Could not find the java.lang.Character class!"); } Collection<Field> staticFields = new LinkedList<Field>(); @@ -902,7 +902,7 @@ } } } catch(Exception e) { - throw new LuckyException(e.toString()); + throw new GateRuntimeException(e.toString()); } typeIds = Collections.unmodifiableMap(tempTypeIds); Modified: gate/branches/sawdust2/plugins/ANNIE/src/main/java/gate/jape/parser/ParseCpsl.jj =================================================================== --- gate/branches/sawdust2/plugins/ANNIE/src/main/java/gate/jape/parser/ParseCpsl.jj 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/plugins/ANNIE/src/main/java/gate/jape/parser/ParseCpsl.jj 2017-02-02 06:44:12 UTC (rev 20054) @@ -254,7 +254,7 @@ blockBuffer.append(" );" + nl); blockBuffer.append(" }" + nl); blockBuffer.append(" catch(gate.util.InvalidOffsetException ioe) {" + nl); - blockBuffer.append(" throw new gate.util.LuckyException(\"Invalid offset exception generated \" +" + nl); + blockBuffer.append(" throw new gate.util.GateRuntimeException(\"Invalid offset exception generated \" +" + nl); blockBuffer.append(" \"from offsets taken from same document!\");" + nl); blockBuffer.append(" }" + nl); blockBuffer.append(" }" + nl); Modified: gate/branches/sawdust2/plugins/Format_Twitter/src/main/java/gate/corpora/export/GATEJsonExporter.java =================================================================== --- gate/branches/sawdust2/plugins/Format_Twitter/src/main/java/gate/corpora/export/GATEJsonExporter.java 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/plugins/Format_Twitter/src/main/java/gate/corpora/export/GATEJsonExporter.java 2017-02-02 06:44:12 UTC (rev 20054) @@ -29,7 +29,7 @@ import gate.creole.metadata.Optional; import gate.creole.metadata.RunTime; import gate.util.InvalidOffsetException; -import gate.util.LuckyException; +import gate.util.GateRuntimeException; import java.io.IOException; import java.io.OutputStream; @@ -219,7 +219,7 @@ } } catch(InvalidOffsetException e) { // should never happen, as all offsets come from the document itself - throw new LuckyException("Invalid offset found within document", e); + throw new GateRuntimeException("Invalid offset found within document", e); } } } Modified: gate/branches/sawdust2/plugins/Gazetteer_LKB/src/com/ontotext/kim/gate/KimGazetteer.java =================================================================== --- gate/branches/sawdust2/plugins/Gazetteer_LKB/src/com/ontotext/kim/gate/KimGazetteer.java 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/plugins/Gazetteer_LKB/src/com/ontotext/kim/gate/KimGazetteer.java 2017-02-02 06:44:12 UTC (rev 20054) @@ -8,7 +8,7 @@ import gate.creole.ResourceInstantiationException; import gate.util.Files; import gate.util.InvalidOffsetException; -import gate.util.LuckyException; +import gate.util.GateRuntimeException; import java.io.File; import java.net.MalformedURLException; @@ -53,7 +53,7 @@ KIMConstants.LOOKUP, fm); } catch (InvalidOffsetException ioe) { - throw new LuckyException(ioe.toString()); + throw new GateRuntimeException(ioe.toString()); } ++annotatedEntities; Modified: gate/branches/sawdust2/plugins/Lang_French/tokeniser/postprocess.jape =================================================================== --- gate/branches/sawdust2/plugins/Lang_French/tokeniser/postprocess.jape 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/plugins/Lang_French/tokeniser/postprocess.jape 2017-02-02 06:44:12 UTC (rev 20054) @@ -87,7 +87,7 @@ outputAS.add(offset+startIndex, endOffset, "Token", features); // <-- MODIF HERE } } catch (InvalidOffsetException e) { - throw new LuckyException(e); + throw new GateRuntimeException(e); } outputAS.remove(annotation); } Modified: gate/branches/sawdust2/plugins/Lang_Russian/src/com/ontotext/russie/gazetteer/InflectionalGazetteer.java =================================================================== --- gate/branches/sawdust2/plugins/Lang_Russian/src/com/ontotext/russie/gazetteer/InflectionalGazetteer.java 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/plugins/Lang_Russian/src/com/ontotext/russie/gazetteer/InflectionalGazetteer.java 2017-02-02 06:44:12 UTC (rev 20054) @@ -31,7 +31,7 @@ import gate.creole.metadata.RunTime; import gate.creole.metadata.Sharable; import gate.util.InvalidOffsetException; -import gate.util.LuckyException; +import gate.util.GateRuntimeException; import gate.util.profile.Profiler; import java.io.BufferedReader; @@ -468,7 +468,7 @@ annotationSet.add(new Long(matchedRegionStart), new Long( matchedRegionEnd), TYPE_LOOKUP, fm); } catch(InvalidOffsetException ioe) { - throw new LuckyException(ioe.toString()); + throw new GateRuntimeException(ioe.toString()); } // catchx }// while(lemmaIter.hasNext()) } // generate MSD for the phraseso far Modified: gate/branches/sawdust2/plugins/Lang_Russian/src/com/ontotext/russie/gazetteer/RussGazetteer.java =================================================================== --- gate/branches/sawdust2/plugins/Lang_Russian/src/com/ontotext/russie/gazetteer/RussGazetteer.java 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/plugins/Lang_Russian/src/com/ontotext/russie/gazetteer/RussGazetteer.java 2017-02-02 06:44:12 UTC (rev 20054) @@ -45,7 +45,7 @@ import gate.creole.metadata.RunTime; import gate.creole.metadata.Sharable; import gate.util.InvalidOffsetException; -import gate.util.LuckyException; +import gate.util.GateRuntimeException; import java.io.FileNotFoundException; import java.io.IOException; @@ -494,7 +494,7 @@ annotationSet.add(new Long(matchedRegionStart), new Long( matchedRegionEnd), LOOKUP_ANNOTATION_TYPE, fm); } catch(InvalidOffsetException ioe) { - throw new LuckyException(ioe.toString()); + throw new GateRuntimeException(ioe.toString()); } // catchx }// while(lookupIter.hasNext()) Modified: gate/branches/sawdust2/plugins/Lang_Russian/src/com/ontotext/russie/morph/POSTagger.java =================================================================== --- gate/branches/sawdust2/plugins/Lang_Russian/src/com/ontotext/russie/morph/POSTagger.java 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/plugins/Lang_Russian/src/com/ontotext/russie/morph/POSTagger.java 2017-02-02 06:44:12 UTC (rev 20054) @@ -36,7 +36,7 @@ import gate.creole.metadata.Sharable; import gate.util.GateRuntimeException; import gate.util.InvalidOffsetException; -import gate.util.LuckyException; +import gate.util.GateRuntimeException; import gate.util.profile.Profiler; import java.io.BufferedReader; @@ -482,7 +482,7 @@ annotationSet.add(new Long(matchedRegionStart), new Long( matchedRegionEnd), TYPE_MSD, fm); } catch(InvalidOffsetException ioe) { - throw new LuckyException(ioe.toString()); + throw new GateRuntimeException(ioe.toString()); } // catchx } // while types }// while(lemmaIter.hasNext()) Modified: gate/branches/sawdust2/plugins/Machine_Learning/src/gate/creole/ml/MachineLearningPR.java =================================================================== --- gate/branches/sawdust2/plugins/Machine_Learning/src/gate/creole/ml/MachineLearningPR.java 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/plugins/Machine_Learning/src/gate/creole/ml/MachineLearningPR.java 2017-02-02 06:44:12 UTC (rev 20054) @@ -406,7 +406,7 @@ return getValue(attribute, actualPosition, attributesMap); } //we should never get here - throw new LuckyException( + throw new GateRuntimeException( "Attribute position is neither 0, nor negative nor positive!"); } Modified: gate/branches/sawdust2/plugins/Schema_Annotation_Editor/src/main/java/gate/gui/annedit/SchemaAnnotationEditor.java =================================================================== --- gate/branches/sawdust2/plugins/Schema_Annotation_Editor/src/main/java/gate/gui/annedit/SchemaAnnotationEditor.java 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/plugins/Schema_Annotation_Editor/src/main/java/gate/gui/annedit/SchemaAnnotationEditor.java 2017-02-02 06:44:12 UTC (rev 20054) @@ -89,7 +89,7 @@ import gate.util.GateException; import gate.util.GateRuntimeException; import gate.util.InvalidOffsetException; -import gate.util.LuckyException; +import gate.util.GateRuntimeException; /** * An annotation editor that enforces the annotation schemas currently loaded in @@ -703,7 +703,7 @@ owner.annotationChanged(newAnn, annSet, oldAnn.getType()); } catch(InvalidOffsetException ioe) { // this should never happen - throw new LuckyException(ioe); + throw new GateRuntimeException(ioe); } } } Modified: gate/branches/sawdust2/plugins/Tagger_Framework/resources/tagger-independent/chunk-annots.jape =================================================================== --- gate/branches/sawdust2/plugins/Tagger_Framework/resources/tagger-independent/chunk-annots.jape 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/plugins/Tagger_Framework/resources/tagger-independent/chunk-annots.jape 2017-02-02 06:44:12 UTC (rev 20054) @@ -21,6 +21,6 @@ outputAS.add(chunk.firstNode().getOffset(),chunk.lastNode().getOffset(),type,features); } catch (Exception e) { - throw new LuckyException(e); + throw new GateRuntimeException(e); } } Modified: gate/branches/sawdust2/plugins/Tagger_Framework/resources/tagger-independent/chunk-feature.jape =================================================================== --- gate/branches/sawdust2/plugins/Tagger_Framework/resources/tagger-independent/chunk-feature.jape 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/plugins/Tagger_Framework/resources/tagger-independent/chunk-feature.jape 2017-02-02 06:44:12 UTC (rev 20054) @@ -22,6 +22,6 @@ outputAS.add(chunk.firstNode().getOffset(),chunk.lastNode().getOffset(),"Chunk",features); } catch (Exception e) { - throw new LuckyException(e); + throw new GateRuntimeException(e); } } Modified: gate/branches/sawdust2/plugins/Tagger_Framework/resources/tagger-independent/entity-annots.jape =================================================================== --- gate/branches/sawdust2/plugins/Tagger_Framework/resources/tagger-independent/entity-annots.jape 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/plugins/Tagger_Framework/resources/tagger-independent/entity-annots.jape 2017-02-02 06:44:12 UTC (rev 20054) @@ -21,6 +21,6 @@ outputAS.add(entity.firstNode().getOffset(),entity.lastNode().getOffset(),type,features); } catch (Exception e) { - throw new LuckyException(e); + throw new GateRuntimeException(e); } } Modified: gate/branches/sawdust2/plugins/Tagger_Framework/resources/tagger-independent/entity-feature.jape =================================================================== --- gate/branches/sawdust2/plugins/Tagger_Framework/resources/tagger-independent/entity-feature.jape 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/plugins/Tagger_Framework/resources/tagger-independent/entity-feature.jape 2017-02-02 06:44:12 UTC (rev 20054) @@ -22,6 +22,6 @@ outputAS.add(entity.firstNode().getOffset(),entity.lastNode().getOffset(),"Entity",features); } catch (Exception e) { - throw new LuckyException(e); + throw new GateRuntimeException(e); } } Modified: gate/branches/sawdust2/plugins/Tagger_Numbers/src/main/resources/resources/jape/exponents.jape =================================================================== --- gate/branches/sawdust2/plugins/Tagger_Numbers/src/main/resources/resources/jape/exponents.jape 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/plugins/Tagger_Numbers/src/main/resources/resources/jape/exponents.jape 2017-02-02 06:44:12 UTC (rev 20054) @@ -67,7 +67,7 @@ try { outputAS.add(start, end, NUMBER_ANNOTATION_NAME, features); } catch(InvalidOffsetException ioe){ - throw new LuckyException(ioe); + throw new GateRuntimeException(ioe); } } @@ -102,6 +102,6 @@ try { outputAS.add(start, end, NUMBER_ANNOTATION_NAME, features); } catch(InvalidOffsetException ioe){ - throw new LuckyException(ioe); + throw new GateRuntimeException(ioe); } } \ No newline at end of file Modified: gate/branches/sawdust2/plugins/Tagger_Numbers/src/main/resources/resources/jape/numbers.jape =================================================================== --- gate/branches/sawdust2/plugins/Tagger_Numbers/src/main/resources/resources/jape/numbers.jape 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/plugins/Tagger_Numbers/src/main/resources/resources/jape/numbers.jape 2017-02-02 06:44:12 UTC (rev 20054) @@ -35,7 +35,7 @@ try { outputAS.add(num.getStartNode().getOffset()+1, num.getEndNode().getOffset(), NUMBER_ANNOTATION_NAME, features); } catch(InvalidOffsetException ioe){ - throw new LuckyException(ioe); + throw new GateRuntimeException(ioe); } inputAS.remove(num); @@ -60,7 +60,7 @@ try { outputAS.add(n1.getStartNode().getOffset(), n2.getEndNode().getOffset(), NUMBER_ANNOTATION_NAME, features); } catch(InvalidOffsetException ioe){ - throw new LuckyException(ioe); + throw new GateRuntimeException(ioe); } inputAS.remove(n1); @@ -85,7 +85,7 @@ try { outputAS.add(n1.getStartNode().getOffset(), n2.getEndNode().getOffset(), NUMBER_ANNOTATION_NAME, features); } catch(InvalidOffsetException ioe){ - throw new LuckyException(ioe); + throw new GateRuntimeException(ioe); } inputAS.remove(n1); Modified: gate/branches/sawdust2/plugins/Tagger_Numbers/src/main/resources/resources/jape/sequence.jape =================================================================== --- gate/branches/sawdust2/plugins/Tagger_Numbers/src/main/resources/resources/jape/sequence.jape 2017-02-02 06:09:08 UTC (rev 20053) +++ gate/branches/sawdust2/plugins/Tagger_Numbers/src/main/resources/resources/jape/sequence.jape 2017-02-02 06:44:12 UTC (rev 20054) @@ -42,7 +42,7 @@ try { outputAS.add(numbers.firstNode().getOffset(), numbers.lastNode().getOffset(), NUMBER_ANNOTATION_NAME, features); } catch(InvalidOffsetException ioe){ - throw new LuckyException(ioe); + throw new GateRuntimeException(ioe); } inputAS.removeAll(numbers); @@ -72,7 +72,7 @@ try { outputAS.add(numbers.firstNode().getOffset(), numbers.lastNode().getOffset(), NUMBER_ANNOTATION_NAME, features); } catch(InvalidOffsetException ioe){ - throw new LuckyException(ioe); + throw new GateRuntimeException(ioe); } inputAS.removeAll(numbers); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2017-02-02 06:09:11
|
Revision: 20053 http://sourceforge.net/p/gate/code/20053 Author: markagreenwood Date: 2017-02-02 06:09:08 +0000 (Thu, 02 Feb 2017) Log Message: ----------- removed the Java based help viewer as it was incapable of displaying the user guide so was worse than a chocolate kettle Modified Paths: -------------- gate/branches/sawdust2/gate-core/src/main/java/gate/gui/MainFrame.java gate/branches/sawdust2/gate-core/src/main/java/gate/gui/OptionsDialog.java Removed Paths: ------------- gate/branches/sawdust2/gate-core/src/main/java/gate/gui/HelpFrame.java gate/branches/sawdust2/gate-core/src/main/java/gate/swing/XJEditorPane.java Deleted: gate/branches/sawdust2/gate-core/src/main/java/gate/gui/HelpFrame.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/gui/HelpFrame.java 2017-02-02 02:23:13 UTC (rev 20052) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/gui/HelpFrame.java 2017-02-02 06:09:08 UTC (rev 20053) @@ -1,85 +0,0 @@ -package gate.gui; - -import java.awt.BorderLayout; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.io.IOException; -import java.net.URL; - -import javax.swing.*; -import javax.swing.text.Document; - -import gate.event.StatusListener; -import gate.swing.XJEditorPane; - -/** - * A frame used by Gate to display Help information. - * It is a basic HTML browser. - */ -@SuppressWarnings("serial") -public class HelpFrame extends JFrame implements StatusListener { - - public HelpFrame(){ - super(); - initLocalData(); - initGuiComponents(); - initListeners(); - } - - protected void initLocalData(){ - } - - protected void initGuiComponents(){ - getContentPane().setLayout(new BorderLayout()); - textPane = new XJEditorPane(); - textPane.setEditable(false); - getContentPane().add(new JScrollPane(textPane), BorderLayout.CENTER); - - toolBar = new JToolBar(); - toolBar.add(textPane.getBackAction()); - toolBar.add(textPane.getForwardAction()); - - getContentPane().add(toolBar, BorderLayout.NORTH); - - Box southBox = Box.createHorizontalBox(); - southBox.add(new JLabel(" ")); - status = new JLabel(); - southBox.add(status); - getContentPane().add(southBox, BorderLayout.SOUTH); - - } - - protected void initListeners(){ - textPane.addPropertyChangeListener(new PropertyChangeListener(){ - @Override - public void propertyChange(PropertyChangeEvent e) { - if(e.getPropertyName().equals("document")){ - String title = (String)textPane.getDocument(). - getProperty("title"); - setTitle((title == null) ? - "GATE help browser" : - title + " - GATE help browser"); - } - } - }); - - textPane.addStatusListener(this); - } - - public void setPage(URL newPage) throws IOException{ - textPane.setPage(newPage); - String title = (String)textPane.getDocument(). - getProperty(Document.TitleProperty); - setTitle((title == null) ? - "GATE help browser" : - title + " - GATE help browser"); - } - - XJEditorPane textPane; - JToolBar toolBar; - JLabel status; - @Override - public void statusChanged(String e) { - status.setText(e); - } -} \ No newline at end of file Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/gui/MainFrame.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/gui/MainFrame.java 2017-02-02 02:23:13 UTC (rev 20052) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/gui/MainFrame.java 2017-02-02 06:09:08 UTC (rev 20053) @@ -284,8 +284,6 @@ protected NewResourceDialog newResourceDialog; - protected HelpFrame helpFrame; - /** * Holds all the icons used in the Gate GUI indexed by filename. This * is needed so we do not need to decode the icon everytime we need it @@ -4082,9 +4080,6 @@ } } - // only hidden when closed - if(helpFrame != null) helpFrame.dispose(); - // trying to release all resources occupied by all try { //make a list of lists of resources of various kinds @@ -4933,11 +4928,8 @@ } catch (IOException ioe1) {/* skip to next try catch */} if (process == null || process.waitFor() != 0) { String message = "Unable to determine the default browser.\n" - + "Will use a Java browser. To use a custom command line\n" - + "go to the Options menu then Configuration."; + + "To use a custom command line go to the Options menu then Configuration."; log.info(message); - // Java help browser - displayJavaHelpBrowser(actualURL.toString()); }}}}} } catch(SecurityException se) { JOptionPane.showMessageDialog(instance, @@ -4949,7 +4941,7 @@ log.error("Help browser Error", ie); } - } else if(!commandLine.equals("Internal Java browser.")) { + } else { // external browser commandLine = commandLine.replaceFirst("%file", actualURL.toString()); try { @@ -4962,39 +4954,13 @@ log.error(message, error); } - } else { - displayJavaHelpBrowser(actualURL.toString()); + } } - } }; Thread thread = new Thread(runnable, "showHelpFrame"); thread.start(); } - private void displayJavaHelpBrowser(String urlString) { - if (helpFrame == null) { - helpFrame = new HelpFrame(); - helpFrame.setSize(800, 600); - helpFrame.setDefaultCloseOperation(HIDE_ON_CLOSE); - // center on screen - Dimension frameSize = helpFrame.getSize(); - Dimension ownerSize = Toolkit.getDefaultToolkit().getScreenSize(); - Point ownerLocation = new Point(0, 0); - helpFrame.setLocation(ownerLocation.x - + (ownerSize.width - frameSize.width) / 2, ownerLocation.y - + (ownerSize.height - frameSize.height) / 2); - } - try { - helpFrame.setPage(new URL(urlString)); - } catch (IOException error) { - String message = "Error when loading help page."; - log.error(message, error); - return; - } - helpFrame.setVisible(false); - helpFrame.setVisible(true); - } - class HelpUserGuideInContextAction extends AbstractAction { private static final long serialVersionUID = 1L; public HelpUserGuideInContextAction() { Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/gui/OptionsDialog.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/gui/OptionsDialog.java 2017-02-02 02:23:13 UTC (rev 20052) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/gui/OptionsDialog.java 2017-02-02 06:09:08 UTC (rev 20053) @@ -192,10 +192,10 @@ addSpaceOnMarkupUnpackChk.setSelected(false); browserComboBox = new JComboBox<String>(new String[] { - "Default browser", "Java", "Custom"}); + "Default browser", "Custom"}); browserComboBox.setPrototypeDisplayValue("Default browser"); browserComboBox.setToolTipText( - "Use Java or Custom only if Default doesn't work."); + "Use Custom only if Default doesn't work."); browserCommandLineTextField = new JTextField(15); String commandLine = userConfig.getString(MainFrame.class.getName()+".browsercommandline"); @@ -205,10 +205,6 @@ browserComboBox.setSelectedItem("Default browser"); browserCommandLineTextField.setEnabled(false); } - else if(commandLine.equals("Internal Java browser.")) { - browserComboBox.setSelectedItem("Java"); - browserCommandLineTextField.setEnabled(false); - } else { browserComboBox.setSelectedItem("Custom"); } @@ -378,11 +374,7 @@ if(item.equals("Default browser")) { browserCommandLineTextField.setText( "Set dynamically when you display help."); - } - else if(item.equals("Java")) { - browserCommandLineTextField.setText("Internal Java browser."); - } - else if(item.equals("Custom")) { + } else if(item.equals("Custom")) { browserCommandLineTextField.setText("firefox %file"); } } Deleted: gate/branches/sawdust2/gate-core/src/main/java/gate/swing/XJEditorPane.java =================================================================== --- gate/branches/sawdust2/gate-core/src/main/java/gate/swing/XJEditorPane.java 2017-02-02 02:23:13 UTC (rev 20052) +++ gate/branches/sawdust2/gate-core/src/main/java/gate/swing/XJEditorPane.java 2017-02-02 06:09:08 UTC (rev 20053) @@ -1,177 +0,0 @@ -package gate.swing; - -import gate.event.StatusListener; -import gate.gui.MainFrame; -import gate.util.Err; - -import java.awt.event.ActionEvent; -import java.io.IOException; -import java.net.URL; -import java.util.LinkedList; -import java.util.Vector; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.JEditorPane; -import javax.swing.event.HyperlinkEvent; -import javax.swing.event.HyperlinkListener; -import javax.swing.text.html.HTMLDocument; -import javax.swing.text.html.HTMLFrameHyperlinkEvent; - -/** - * An enhanced version of {@link javax.swing.JEditorPane} that is able of - * handling hyperlinks from the HTML document displayed. - */ -@SuppressWarnings("serial") -public class XJEditorPane extends JEditorPane { - - public XJEditorPane(){ - super(); - init(); - } - - public XJEditorPane(String url) throws IOException{ - super(url); - init(); - } - - public XJEditorPane(URL initialPage)throws IOException{ - super(initialPage); - init(); - } - - protected void init(){ - initLocalData(); - initListeners(); - }//protected void init() - - protected void initLocalData(){ - backUrls = new LinkedList<URL>(); - forwardUrls = new LinkedList<URL>(); - try{ - backAction = new BackAction(); - forwardAction = new ForwardAction(); - }catch(IOException ioe){ - Err.prln("Resource mising! Is your classpath OK?"); - ioe.printStackTrace(Err.getPrintWriter()); - } - }//protected void initLocalData() - - protected void initListeners(){ - addHyperlinkListener(new HyperlinkListener() { - @Override - public void hyperlinkUpdate(HyperlinkEvent e){ - if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED){ - if (e instanceof HTMLFrameHyperlinkEvent) { - HTMLFrameHyperlinkEvent evt = (HTMLFrameHyperlinkEvent)e; - HTMLDocument doc = (HTMLDocument)getDocument(); - doc.processHTMLFrameHyperlinkEvent(evt); - }else{ - try { - backUrls.addLast(getPage()); - forwardUrls.clear(); - setPage(e.getURL().toExternalForm()); - }catch (Throwable t){ - t.printStackTrace(Err.getPrintWriter()); - } - } - }else if(e.getEventType() == HyperlinkEvent.EventType.ENTERED){ - fireStatusChanged(e.getURL().toExternalForm()); - }else if(e.getEventType() == HyperlinkEvent.EventType.EXITED){ - fireStatusChanged(""); - } - }//public void hyperlinkUpdate(HyperlinkEvent e) - }); - }//protected void initListeners() - - public Action getForwardAction(){ - return forwardAction; - } - - public Action getBackAction(){ - return backAction; - } - - @Override - public void setPage(URL page) throws IOException{ - try{ - super.setPage(page); - }catch(Exception e){ - fireStatusChanged(e.toString()); - e.printStackTrace(Err.getPrintWriter()); - } - updateEnableState(); - } - - class ForwardAction extends AbstractAction{ - private ForwardAction() throws IOException{ - super("Forward", MainFrame.getIcon("forward")); - } - - @Override - public void actionPerformed(ActionEvent e){ - backUrls.addLast(getPage()); - try{ - setPage(forwardUrls.removeFirst()); - }catch(IOException ioe){ - ioe.printStackTrace(Err.getPrintWriter()); - } - } - }//class ForwardAction extends AbstractAction - - class BackAction extends AbstractAction{ - private BackAction() throws IOException{ - super("Back", MainFrame.getIcon("back")); - } - - @Override - public void actionPerformed(ActionEvent e){ - forwardUrls.addFirst(getPage()); - try{ - setPage(backUrls.removeLast()); - }catch(IOException ioe){ - ioe.printStackTrace(Err.getPrintWriter()); - } - } - }//class ForwardAction extends AbstractAction - - - /** - * Updates the enabled/disabled state for the back/forward actions - */ - protected void updateEnableState(){ - forwardAction.setEnabled(!forwardUrls.isEmpty()); - backAction.setEnabled(!backUrls.isEmpty()); - } - public synchronized void removeStatusListener(StatusListener l) { - if (statusListeners != null && statusListeners.contains(l)) { - @SuppressWarnings("unchecked") - Vector<StatusListener> v = (Vector<StatusListener>) statusListeners.clone(); - v.removeElement(l); - statusListeners = v; - } - } - public synchronized void addStatusListener(StatusListener l) { - @SuppressWarnings("unchecked") - Vector<StatusListener> v = statusListeners == null ? new Vector<StatusListener>(2) : (Vector<StatusListener>) statusListeners.clone(); - if (!v.contains(l)) { - v.addElement(l); - statusListeners = v; - } - } - - protected LinkedList<URL> backUrls; - protected LinkedList<URL> forwardUrls; - protected Action backAction; - protected Action forwardAction; - private transient Vector<StatusListener> statusListeners; - protected void fireStatusChanged(String e) { - if (statusListeners != null) { - Vector<StatusListener> listeners = statusListeners; - int count = listeners.size(); - for (int i = 0; i < count; i++) { - listeners.elementAt(i).statusChanged(e); - } - } - } -}//public class XJEditorPane extends JEditorPane This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <gat...@us...> - 2017-02-02 02:23:15
|
Revision: 20052 http://sourceforge.net/p/gate/code/20052 Author: gate-project Date: 2017-02-02 02:23:13 +0000 (Thu, 02 Feb 2017) Log Message: ----------- Build number update (build 5731) Modified Paths: -------------- gate/trunk/build/build.properties gate/trunk/build/build.txt Modified: gate/trunk/build/build.properties =================================================================== --- gate/trunk/build/build.properties 2017-02-01 16:54:43 UTC (rev 20051) +++ gate/trunk/build/build.properties 2017-02-02 02:23:13 UTC (rev 20052) @@ -1,4 +1,4 @@ #Build Number for ANT. Do not edit! -#Wed Feb 01 02:10:01 GMT 2017 +#Thu Feb 02 02:09:59 GMT 2017 cvs.version=$Id\: build.properties 7542 2006-07-17 14\:26\:51Z ian_roberts $ -build.number=5731 +build.number=5732 Modified: gate/trunk/build/build.txt =================================================================== --- gate/trunk/build/build.txt 2017-02-01 16:54:43 UTC (rev 20051) +++ gate/trunk/build/build.txt 2017-02-02 02:23:13 UTC (rev 20052) @@ -1 +1 @@ -5730 \ No newline at end of file +5731 \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <joh...@us...> - 2017-02-01 16:54:45
|
Revision: 20051 http://sourceforge.net/p/gate/code/20051 Author: johann_p Date: 2017-02-01 16:54:43 +0000 (Wed, 01 Feb 2017) Log Message: ----------- Bump LearningFramework to latest version 3.6. Modified Paths: -------------- gate/trunk/build/deploy/plugins/gate-8.1.xml Modified: gate/trunk/build/deploy/plugins/gate-8.1.xml =================================================================== --- gate/trunk/build/deploy/plugins/gate-8.1.xml 2017-02-01 14:47:06 UTC (rev 20050) +++ gate/trunk/build/deploy/plugins/gate-8.1.xml 2017-02-01 16:54:43 UTC (rev 20051) @@ -20,8 +20,8 @@ downloadURL="https://github.com/johann-petrak/gateplugin-VirtualCorpus/releases/download/V0.16/VirtualCorpus-0.16.zip" /> <CreolePlugin - url="https://raw.githubusercontent.com/GateNLP/gateplugin-LearningFramework/V3_5_4/" - downloadURL="https://github.com/GateNLP/gateplugin-LearningFramework/releases/download/V3_5_4/gateplugin-LearningFramework-3.5.4.zip" + url="https://raw.githubusercontent.com/GateNLP/gateplugin-LearningFramework/V3_6/" + downloadURL="https://github.com/GateNLP/gateplugin-LearningFramework/releases/download/V3_6/gateplugin-LearningFramework-3.6.zip" /> <CreolePlugin url="https://raw.githubusercontent.com/GateNLP/cloud-client/1.0.1/gate-plugin/src/assembly/" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2017-02-01 14:47:09
|
Revision: 20050 http://sourceforge.net/p/gate/code/20050 Author: markagreenwood Date: 2017-02-01 14:47:06 +0000 (Wed, 01 Feb 2017) Log Message: ----------- removed some rubbish Modified Paths: -------------- gate/branches/sawdust2/gate-core/pom.xml Modified: gate/branches/sawdust2/gate-core/pom.xml =================================================================== --- gate/branches/sawdust2/gate-core/pom.xml 2017-02-01 14:46:44 UTC (rev 20049) +++ gate/branches/sawdust2/gate-core/pom.xml 2017-02-01 14:47:06 UTC (rev 20050) @@ -145,12 +145,6 @@ <scope>compile</scope> </dependency> - <!-- - If this is omitted, we somehow get a ClassNotFoundException for - - org.codehaus.plexus.util.xml.pull.EntityReplacementMap despite the - dependency - appearing with scope compile in the dependency hierarchy... --> - <!-- <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>3.0.22</version> <scope>compile</scope> </dependency> --> - <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-settings-builder</artifactId> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2017-02-01 14:46:46
|
Revision: 20049 http://sourceforge.net/p/gate/code/20049 Author: markagreenwood Date: 2017-02-01 14:46:44 +0000 (Wed, 01 Feb 2017) Log Message: ----------- More notes Modified Paths: -------------- gate/branches/sawdust2/notes.txt Modified: gate/branches/sawdust2/notes.txt =================================================================== --- gate/branches/sawdust2/notes.txt 2017-02-01 12:01:43 UTC (rev 20048) +++ gate/branches/sawdust2/notes.txt 2017-02-01 14:46:44 UTC (rev 20049) @@ -67,3 +67,5 @@ alignment plugin has metadata in creole.xml not as annotations do we want to drop binary jape and apps + +are we completely removing ivy support in plugins? This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2017-02-01 12:01:45
|
Revision: 20048 http://sourceforge.net/p/gate/code/20048 Author: markagreenwood Date: 2017-02-01 12:01:43 +0000 (Wed, 01 Feb 2017) Log Message: ----------- actually keep hold of the file handle once created Modified Paths: -------------- gate/branches/sawdust2/plugins/ANNIE/src/main/java/gate/gui/GazetteerEditor.java Modified: gate/branches/sawdust2/plugins/ANNIE/src/main/java/gate/gui/GazetteerEditor.java =================================================================== --- gate/branches/sawdust2/plugins/ANNIE/src/main/java/gate/gui/GazetteerEditor.java 2017-02-01 10:46:18 UTC (rev 20047) +++ gate/branches/sawdust2/plugins/ANNIE/src/main/java/gate/gui/GazetteerEditor.java 2017-02-01 12:01:43 UTC (rev 20048) @@ -827,7 +827,7 @@ // update file list name in the drop down list File defFile = null; try { - Files.fileFromURL(gazetteer.getListsURL().toURL()); + defFile = Files.fileFromURL(gazetteer.getListsURL().toURL()); } catch (IOException ioe) { ioe.printStackTrace(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mar...@us...> - 2017-02-01 10:46:20
|
Revision: 20047 http://sourceforge.net/p/gate/code/20047 Author: markagreenwood Date: 2017-02-01 10:46:18 +0000 (Wed, 01 Feb 2017) Log Message: ----------- updated the pom.xml so as well as populating the lib folder during the build it deletes it on a clean so jars don't get left in there and confuse the hell out of me when the dependencies change Modified Paths: -------------- gate/branches/sawdust2/gate-core/pom.xml Property Changed: ---------------- gate/branches/sawdust2/gate-core/ Index: gate/branches/sawdust2/gate-core =================================================================== --- gate/branches/sawdust2/gate-core 2017-02-01 10:10:20 UTC (rev 20046) +++ gate/branches/sawdust2/gate-core 2017-02-01 10:46:18 UTC (rev 20047) Property changes on: gate/branches/sawdust2/gate-core ___________________________________________________________________ Modified: svn:ignore ## -1 +1,2 ## target +lib Modified: gate/branches/sawdust2/gate-core/pom.xml =================================================================== --- gate/branches/sawdust2/gate-core/pom.xml 2017-02-01 10:10:20 UTC (rev 20046) +++ gate/branches/sawdust2/gate-core/pom.xml 2017-02-01 10:46:18 UTC (rev 20047) @@ -145,16 +145,12 @@ <scope>compile</scope> </dependency> - <!-- - If this is omitted, we somehow get a ClassNotFoundException for - - org.codehaus.plexus.util.xml.pull.EntityReplacementMap despite the - dependency + <!-- - If this is omitted, we somehow get a ClassNotFoundException for + - org.codehaus.plexus.util.xml.pull.EntityReplacementMap despite the - dependency appearing with scope compile in the dependency hierarchy... --> - <!-- <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>3.0.22</version> - <scope>compile</scope> - </dependency> --> - + <!-- <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> + <version>3.0.22</version> <scope>compile</scope> </dependency> --> + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-settings-builder</artifactId> @@ -476,10 +472,22 @@ </dependencies> - <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clean-plugin</artifactId> + <version>3.0.0</version> + <configuration> + <followSymLinks>false</followSymLinks> + <filesets> + <fileset> + <directory>${basedir}/lib</directory> + </fileset> + </filesets> + </configuration> + </plugin> + <plugin> <groupId>org.jacoco</groupId> <artifactId>jacoco-maven-plugin</artifactId> <version>0.7.6.201602180812</version> @@ -513,14 +521,14 @@ <configuration> <outputDirectory>${project.basedir}/lib</outputDirectory> <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> + <overWriteSnapshots>true</overWriteSnapshots> <overWriteIfNewer>true</overWriteIfNewer> </configuration> </execution> </executions> </plugin> </plugins> - + <resources> <!-- this adds the version number into the right file in the jar --> <resource> @@ -551,18 +559,18 @@ <version>2.19.1</version> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.4</version> - </plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.4</version> + </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> <version>3.0.3</version> <configuration> <findbugsXmlOutput>true</findbugsXmlOutput> - <findbugsXmlWithMessages>true</findbugsXmlWithMessages> - <excludeFilterFile>findbugs-excluded.xml</excludeFilterFile> + <findbugsXmlWithMessages>true</findbugsXmlWithMessages> + <excludeFilterFile>findbugs-excluded.xml</excludeFilterFile> <xmlOutput>true</xmlOutput> <effort>Max</effort> <threshold>Low</threshold> @@ -597,8 +605,8 @@ <artifactId>maven-javadoc-plugin</artifactId> <version>2.9.1</version> <configuration> - <!-- in theory we should only need one of these and it would be nice to get - rid of them alltogether but that's for another day --> + <!-- in theory we should only need one of these and it would be nice + to get rid of them alltogether but that's for another day --> <failOnError>false</failOnError> <additionalparam>-Xdoclint:none</additionalparam> </configuration> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |