Revision: 19315
http://sourceforge.net/p/gate/code/19315
Author: markagreenwood
Date: 2016-05-13 14:31:18 +0000 (Fri, 13 May 2016)
Log Message:
-----------
fixed a NPE now that running in sandbox is the default (kind of)
Modified Paths:
--------------
gate/branches/sawdust2/notes.txt
gate/branches/sawdust2/src/main/java/gate/Plugin.java
gate/branches/sawdust2/src/main/java/gate/gui/MainFrame.java
Modified: gate/branches/sawdust2/notes.txt
===================================================================
--- gate/branches/sawdust2/notes.txt 2016-05-13 08:39:44 UTC (rev 19314)
+++ gate/branches/sawdust2/notes.txt 2016-05-13 14:31:18 UTC (rev 19315)
@@ -14,7 +14,7 @@
cd ../Plugin_Base
mvn install
-then install a plugin or two (currently just ANNIE and Tools are mavenized)
+then install a plugin or two (currently just ANNIE, Tools, and Developer_Tools
are mavenized)
cd ../../plugins/ANNIE
mvn install
@@ -85,3 +85,18 @@
====================
gate.gui.annedit.Schema*
gate.gui.Teamware (do we even need any of this)
+
+
+pickup maven settings.xml
+=========================
+we should be able to use
+
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings-builder</artifactId>
+ <version>3.3.9</version>
+ </dependency>
+
+but from a quick test I've found maven settings on ubunutu are a bit hit and
miss
+http://git.eclipse.org/c/aether/aether-ant.git/tree/src/main/java/org/eclipse/aether/internal/ant/AntRepoSys.java#n350
+http://stackoverflow.com/questions/27818659/loading-mavens-settings-xml-for-jcabi-aether-to-use
Modified: gate/branches/sawdust2/src/main/java/gate/Plugin.java
===================================================================
--- gate/branches/sawdust2/src/main/java/gate/Plugin.java 2016-05-13
08:39:44 UTC (rev 19314)
+++ gate/branches/sawdust2/src/main/java/gate/Plugin.java 2016-05-13
14:31:18 UTC (rev 19315)
@@ -502,8 +502,7 @@
repoSystemSession = MavenRepositorySystemUtils.newSession();
- // LocalRepository localRepo = new
- // LocalRepository("target/local-repo");
+ //TODO pull this from the maven settings.xml file
LocalRepository localRepo =
new
LocalRepository(System.getProperty("user.home")+File.separator+".m2"+File.separator+"repository/");
System.out.println(localRepo);
Modified: gate/branches/sawdust2/src/main/java/gate/gui/MainFrame.java
===================================================================
--- gate/branches/sawdust2/src/main/java/gate/gui/MainFrame.java
2016-05-13 08:39:44 UTC (rev 19314)
+++ gate/branches/sawdust2/src/main/java/gate/gui/MainFrame.java
2016-05-13 14:31:18 UTC (rev 19315)
@@ -4035,8 +4035,9 @@
}
// save the session;
+ //TODO better handling of this by moving session out of the API into
developer
File sessionFile = Gate.getUserSessionFile();
- if(userConfig.getBoolean(GateConstants.SAVE_SESSION_ON_EXIT)) {
+ if(sessionFile != null &&
userConfig.getBoolean(GateConstants.SAVE_SESSION_ON_EXIT)) {
// save all the open applications
try {
List<Resource> appList = new ArrayList<Resource>(
@@ -4059,7 +4060,7 @@
}
else {
// we don't want to save the session
- if(sessionFile.exists() && !sessionFile.delete()) {
+ if(sessionFile != null && sessionFile.exists() &&
!sessionFile.delete()) {
log.error("Error when deleting the session file.");
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Mobile security can be enabling, not merely restricting. Employees who
bring their own devices (BYOD) to work are irked by the imposition of MDM
restrictions. Mobile Device Manager Plus allows you to control only the
apps on BYO-devices by containerizing them, leaving personal data untouched!
https://ad.doubleclick.net/ddm/clk/304595813;131938128;j
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
