X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=plugins%2Forg.argeo.slc.client.ui.dist%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fclient%2Fui%2Fdist%2Fmodel%2FWorkspaceElem.java;h=3be73b5e568fc6ee9f78d87c75e8e7c1dee630a5;hb=39ceeb3083d5d9df0cf2f93bd26285e4c33234e3;hp=7cdccfc7a4436def5beb197993a766888ef0f481;hpb=63134af9b77c696f789043d40159c4feaba7da8e;p=gpl%2Fargeo-slc.git

diff --git a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java
index 7cdccfc7a..3be73b5e5 100644
--- a/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java
+++ b/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/model/WorkspaceElem.java
@@ -1,9 +1,14 @@
 package org.argeo.slc.client.ui.dist.model;
 
+import javax.jcr.Node;
 import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
-import javax.jcr.query.Query;
+import javax.jcr.query.InvalidQueryException;
+import javax.jcr.query.QueryManager;
+import javax.jcr.query.qom.QueryObjectModel;
+import javax.jcr.query.qom.QueryObjectModelFactory;
+import javax.jcr.query.qom.Selector;
 
 import org.argeo.ArgeoException;
 import org.argeo.jcr.JcrUtils;
@@ -14,7 +19,7 @@ import org.argeo.slc.jcr.SlcTypes;
 public class WorkspaceElem extends DistParentElem {
 	private final RepoElem repoElem;
 	private String workspaceName;
-	private Session defaultSession;
+	private Session currSession;
 
 	public WorkspaceElem(WkspGroupElem parent, RepoElem repoElem,
 			String workspaceName) {
@@ -33,22 +38,27 @@ public class WorkspaceElem extends DistParentElem {
 	}
 
 	public Boolean isConnected() {
-		if (defaultSession != null && defaultSession.isLive())
+		if (currSession != null && currSession.isLive())
 			return true;
 		else
 			return false;
 	}
 
 	public void login() {
-		defaultSession = repoElem.repositoryLogin(getName());
+		currSession = repoElem.repositoryLogin(getName());
+	}
+
+	/** Utility to create a new Session with correct credential in this context */
+	public Session getNewSession() {
+		return repoElem.repositoryLogin(getName());
 	}
 
 	public boolean hasChildren() {
 		try {
 			if (isConnected())
-				return defaultSession.getRootNode().hasNodes();
+				return currSession.getRootNode().hasNodes();
 			else
-				return false;
+				return true;
 		} catch (RepositoryException re) {
 			throw new ArgeoException(
 					"Unexpected error while checking children node existence",
@@ -64,24 +74,69 @@ public class WorkspaceElem extends DistParentElem {
 		} else {
 			// initialize current object
 			try {
-				if (defaultSession == null)
-					return null;
-				else {
-					Query groupQuery = defaultSession
-							.getWorkspace()
-							.getQueryManager()
-							.createQuery(
-									"select * from [" + SlcTypes.SLC_GROUP_BASE
-											+ "] as group order by group.["
-											+ SlcNames.SLC_GROUP_BASE_ID + "]",
-									Query.JCR_SQL2);
-					NodeIterator groups = groupQuery.execute().getNodes();
-					while (groups.hasNext()) {
-						addChild(new GroupBaseElem(WorkspaceElem.this, groups
-								.nextNode()
-								.getProperty(SlcNames.SLC_GROUP_BASE_ID)
-								.getString()));
+				// Lazy connect the first time we retrieve children
+				if (currSession == null)
+					login();
+
+				// Retrieve already existing distribution
+
+				// Use QOM rather than SQL2 - it seems more robust for remoting
+				// with JCR 2.2 (might also be some model refresh issue with the
+				// remoting)
+				QueryManager queryManager = currSession.getWorkspace()
+						.getQueryManager();
+				QueryObjectModelFactory factory = queryManager.getQOMFactory();
+				Selector selector = factory.selector(
+						SlcTypes.SLC_MODULAR_DISTRIBUTION,
+						SlcTypes.SLC_MODULAR_DISTRIBUTION);
+				// Curiously this works...
+				// Selector selector = factory.selector(
+				// SlcTypes.SLC_JAR_FILE,
+				// SlcTypes.SLC_JAR_FILE);
+
+				QueryObjectModel query = factory.createQuery(selector, null,
+						null, null);
+
+				// Query groupQuery = currSession
+				// .getWorkspace()
+				// .getQueryManager()
+				// .createQuery(
+				// "select * from ["
+				// + SlcTypes.SLC_MODULAR_DISTRIBUTION
+				// + "]", Query.JCR_SQL2);
+				NodeIterator distributions = null;
+				try {
+					distributions = query.execute().getNodes();
+				} catch (InvalidQueryException iqe) {
+					// For legacy only does not throw an exception while
+					// browsing
+					// legacy repositories that does not know
+					// SLC_MODULAR_DISTRIBUTION type
+				}
+				distribs: while (distributions != null
+						&& distributions.hasNext()) {
+					Node currDist = distributions.nextNode();
+					Node distBase = currDist.getParent().getParent();
+					if (!distBase.isNodeType(SlcTypes.SLC_ARTIFACT_BASE))
+						continue distribs;
+					String groupId = distBase
+							.getProperty(SlcNames.SLC_GROUP_ID).getString();
+					String artifactId = distBase.getProperty(
+							SlcNames.SLC_ARTIFACT_ID).getString();
+
+					String name;
+					String type;
+					if (ModularDistVersionBaseElem.AETHER_BINARIES_TYPE
+							.equals(artifactId)) {
+						name = groupId;
+						type = ModularDistVersionBaseElem.AETHER_BINARIES_TYPE;
+					} else {
+						name = artifactId;
+						type = ModularDistVersionBaseElem.AETHER_DEP_TYPE;
 					}
+					if (getChildByName(name) == null)
+						addChild(new ModularDistVersionBaseElem(
+								WorkspaceElem.this, name, distBase, type));
 				}
 				return super.getChildren();
 			} catch (RepositoryException e) {
@@ -91,10 +146,10 @@ public class WorkspaceElem extends DistParentElem {
 			}
 		}
 	}
-	
+
 	@Override
 	public synchronized void dispose() {
-		JcrUtils.logoutQuietly(defaultSession);
+		JcrUtils.logoutQuietly(currSession);
 		super.dispose();
 	}
-}
+}
\ No newline at end of file