Revision: 19754
http://sourceforge.net/p/gate/code/19754
Author: markagreenwood
Date: 2016-11-18 17:58:45 +0000 (Fri, 18 Nov 2016)
Log Message:
-----------
the workspace cache works nicely, now I just have to figure out how to wire it
into the save/load of an xgapp
Modified Paths:
--------------
gate/branches/sawdust2/gate-core/src/main/java/gate/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/Utils.java
Modified: gate/branches/sawdust2/gate-core/src/main/java/gate/Plugin.java
===================================================================
--- gate/branches/sawdust2/gate-core/src/main/java/gate/Plugin.java
2016-11-18 17:14:02 UTC (rev 19753)
+++ gate/branches/sawdust2/gate-core/src/main/java/gate/Plugin.java
2016-11-18 17:58:45 UTC (rev 19754)
@@ -55,8 +55,6 @@
import org.apache.maven.model.building.DefaultModelBuildingRequest;
import org.apache.maven.model.building.ModelBuilder;
import org.apache.maven.model.building.ModelBuildingRequest;
-import org.apache.maven.settings.Profile;
-import org.apache.maven.settings.Repository;
import org.eclipse.aether.RepositorySystem;
import org.eclipse.aether.RepositorySystemSession;
import org.eclipse.aether.artifact.Artifact;
@@ -513,7 +511,8 @@
ArtifactRequest artifactRequest = new ArtifactRequest(artifactObj,
repos, null);
RepositorySystem repoSystem = getRepositorySystem();
- RepositorySystemSession repoSession = getRepositorySession(repoSystem);
+ RepositorySystemSession repoSession = getRepositorySession(repoSystem,
null);
+
ArtifactResult artifactResult =
repoSystem.resolveArtifact(repoSession,
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
2016-11-18 17:14:02 UTC (rev 19753)
+++
gate/branches/sawdust2/gate-core/src/main/java/gate/util/maven/SimpleMavenCache.java
2016-11-18 17:58:45 UTC (rev 19754)
@@ -1,12 +1,14 @@
package gate.util.maven;
+import static gate.util.maven.Utils.getRepositoryList;
+import static gate.util.maven.Utils.getRepositorySession;
+import static gate.util.maven.Utils.getRepositorySystem;
+
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import static gate.util.maven.Utils.*;
-
import org.apache.commons.io.FileUtils;
import org.apache.maven.settings.building.SettingsBuildingException;
import org.eclipse.aether.RepositorySystem;
@@ -33,6 +35,8 @@
public SimpleMavenCache(File root) {
this.root = root;
+ System.err.println("HERE WE ARE!");
+ System.err.println("Workspace: " + root.getAbsolutePath());
repo = new WorkspaceRepository();
}
@@ -83,7 +87,7 @@
Dependency dependency = new Dependency(artifact, "runtime");
RepositorySystem repoSystem = getRepositorySystem();
- RepositorySystemSession repoSession = getRepositorySession(repoSystem);
+ RepositorySystemSession repoSession = getRepositorySession(repoSystem,
null);
CollectRequest collectRequest = new
CollectRequest(dependency,getRepositoryList());
Modified:
gate/branches/sawdust2/gate-core/src/main/java/gate/util/maven/Utils.java
===================================================================
--- gate/branches/sawdust2/gate-core/src/main/java/gate/util/maven/Utils.java
2016-11-18 17:14:02 UTC (rev 19753)
+++ gate/branches/sawdust2/gate-core/src/main/java/gate/util/maven/Utils.java
2016-11-18 17:58:45 UTC (rev 19754)
@@ -24,6 +24,7 @@
import org.eclipse.aether.impl.DefaultServiceLocator;
import org.eclipse.aether.repository.LocalRepository;
import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.repository.WorkspaceReader;
import org.eclipse.aether.spi.connector.RepositoryConnectorFactory;
import org.eclipse.aether.spi.connector.transport.TransporterFactory;
import org.eclipse.aether.transport.file.FileTransporterFactory;
@@ -116,9 +117,11 @@
return locator.getService(RepositorySystem.class);
}
- public static RepositorySystemSession getRepositorySession(RepositorySystem
repoSystem) {
+ public static RepositorySystemSession getRepositorySession(RepositorySystem
repoSystem, WorkspaceReader workspace) {
DefaultRepositorySystemSession repoSystemSession =
MavenRepositorySystemUtils.newSession();
+
+
String repoLocation = System.getProperty("user.home") + File.separator
+ ".m2" + File.separator + "repository/";
@@ -139,7 +142,7 @@
.newLocalRepositoryManager(repoSystemSession, localRepo));
//repoSystemSession.setWorkspaceReader(new SimpleMavenCache(new
File("repo")));
-
+ if (workspace != null) repoSystemSession.setWorkspaceReader(workspace);
return repoSystemSession;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
