From: Richard Millet <remillet@berkeley.edu>
Date: Tue, 1 May 2012 16:35:47 +0000 (-0700)
Subject: Adding Nuxeo related CMIS libraries and updating test CMIS JOIN queries.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=53465403bd03c65ba1b2ebb90db8f47e8178693a;p=tmp%2Fjakarta-migration.git

Adding Nuxeo related CMIS libraries and updating test CMIS JOIN queries.
---

diff --git a/3rdparty/nuxeo/nuxeo-server/5.5/bundles/nuxeo-opencmis-bindings-5.5.jar b/3rdparty/nuxeo/nuxeo-server/5.5/bundles/nuxeo-opencmis-bindings-5.5.jar
new file mode 100644
index 000000000..3e313f989
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5/bundles/nuxeo-opencmis-bindings-5.5.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5/bundles/nuxeo-opencmis-impl-5.5.jar b/3rdparty/nuxeo/nuxeo-server/5.5/bundles/nuxeo-opencmis-impl-5.5.jar
new file mode 100644
index 000000000..e1b675766
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5/bundles/nuxeo-opencmis-impl-5.5.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5/lib/chemistry-opencmis-client-api-0.6.0.jar b/3rdparty/nuxeo/nuxeo-server/5.5/lib/chemistry-opencmis-client-api-0.6.0.jar
new file mode 100644
index 000000000..34bf0575e
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5/lib/chemistry-opencmis-client-api-0.6.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5/lib/chemistry-opencmis-client-bindings-0.6.0.jar b/3rdparty/nuxeo/nuxeo-server/5.5/lib/chemistry-opencmis-client-bindings-0.6.0.jar
new file mode 100644
index 000000000..2f5359ad9
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5/lib/chemistry-opencmis-client-bindings-0.6.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5/lib/chemistry-opencmis-client-impl-0.6.0.jar b/3rdparty/nuxeo/nuxeo-server/5.5/lib/chemistry-opencmis-client-impl-0.6.0.jar
new file mode 100644
index 000000000..c5c7d65c3
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5/lib/chemistry-opencmis-client-impl-0.6.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5/lib/chemistry-opencmis-commons-api-0.6.0.jar b/3rdparty/nuxeo/nuxeo-server/5.5/lib/chemistry-opencmis-commons-api-0.6.0.jar
new file mode 100644
index 000000000..ec01d8b5d
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5/lib/chemistry-opencmis-commons-api-0.6.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5/lib/chemistry-opencmis-commons-impl-0.6.0.jar b/3rdparty/nuxeo/nuxeo-server/5.5/lib/chemistry-opencmis-commons-impl-0.6.0.jar
new file mode 100644
index 000000000..06f7745c7
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5/lib/chemistry-opencmis-commons-impl-0.6.0.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5/lib/chemistry-opencmis-server-bindings-0.6.0-classes.jar b/3rdparty/nuxeo/nuxeo-server/5.5/lib/chemistry-opencmis-server-bindings-0.6.0-classes.jar
new file mode 100644
index 000000000..4b2ee5a36
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5/lib/chemistry-opencmis-server-bindings-0.6.0-classes.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5/lib/chemistry-opencmis-server-support-0.6.0.jar b/3rdparty/nuxeo/nuxeo-server/5.5/lib/chemistry-opencmis-server-support-0.6.0.jar
new file mode 100644
index 000000000..beea2d600
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5/lib/chemistry-opencmis-server-support-0.6.0.jar differ
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
index 99e8e84c6..de843e1bd 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryJavaClientImpl.java
@@ -699,7 +699,7 @@ public class RepositoryJavaClientImpl implements RepositoryClient<PoxPayloadIn,
     /*
      * See CSPACE-5036 - How to make CMISQL queries from Nuxeo
      */
-    private void makeCMISQLQuery(RepositoryInstance repoSession) {
+    private void makeCMISQLQuery(RepositoryInstance repoSession, String query) {
     	// the NuxeoRepository should be constructed only once, then cached
         // (its construction is expensive)
         try {
@@ -712,17 +712,13 @@ public class RepositoryJavaClientImpl implements RepositoryClient<PoxPayloadIn,
 					callContext.put(CallContext.USERNAME, repoSession.getPrincipal().getName());
 					NuxeoCmisService cmisService = new NuxeoCmisService(repo, callContext, repoSession);
 
-					// do a query
-//					String query = "SELECT cmis:objectId, dc:title FROM cmis:document WHERE dc:title = 'REMBlobs'"; // try eaee111c-a8d8-48c7-95cb
-					String query = "SELECT cmis:objectId, cmis:name, dc:title, nuxeo:lifecycleState FROM Dimension WHERE dc:title = 'REMBlobs'"; // try eaee111c-a8d8-48c7-95cb
-//					String query = "SELECT * from Dimension D JOIN Relation R ON D.cmis:name = R.relations_common:objectcsid";
-//					String query = "SELECT * FROM cmis:document WHERE dc:title = 'REMBlobs'"; // try eaee111c-a8d8-48c7-95cb
 					IterableQueryResult result = repoSession.queryAndFetch(query, "CMISQL", cmisService);
 					for (Map<String, Serializable> row : result) {
-						logger.debug("dc:title is: " + (String)row.get("dc:title")
-								+ " Hierarchy Table ID is:" + row.get("cmis:objectId")
+						logger.debug(
+//								"dc:title is: " + (String)row.get("dc:title")
+								"" + " Hierarchy Table ID is:" + row.get("cmis:objectId")
 								+ " cmis:name is: " + row.get("cmis:name")
-								+ " nuxeo:lifecycleState is: " + row.get("nuxeo:lifecycleState")
+//								+ " nuxeo:lifecycleState is: " + row.get("nuxeo:lifecycleState")
 								); 
 					}			
 		} catch (ClientException e) {
@@ -757,7 +753,32 @@ public class RepositoryJavaClientImpl implements RepositoryClient<PoxPayloadIn,
             //
             // CSPACE-5036 - How to make CMISQL queries from Nuxeo
             //
-            makeCMISQLQuery(repoSession);
+            
+			// do a query
+			String query1 = "SELECT A.intakes_common:entryReason FROM Intake A"; // try eaee111c-a8d8-48c7-95cb
+            makeCMISQLQuery(repoSession, query1);
+
+			String query2 = "SELECT * FROM Intake A where A.intakes_common:entryReason <> 'foo'"; // try eaee111c-a8d8-48c7-95cb
+            makeCMISQLQuery(repoSession, query2);
+
+            String query3 = "SELECT A.cmis:objectId, A.dc:title FROM Intake A where A.intakes_common:entryReason <> 'foo'"; // try eaee111c-a8d8-48c7-95cb
+            makeCMISQLQuery(repoSession, query3);
+
+            String query4 = "SELECT A.cmis:objectId, A.dc:title FROM Intake A where A.intakes_common:entryReason = '38ed4b32-e38f-4f82-adaa'";
+            makeCMISQLQuery(repoSession, query4);
+
+			String query5 = "SELECT A.cmis:name, A.dc:title, B.intakes_common:entryReason FROM Dimension A JOIN Intake B ON A.cmis:name = B.intakes_common:entryReason"; // try eaee111c-a8d8-48c7-95cb
+            makeCMISQLQuery(repoSession, query5);
+            
+			String query6 = "SELECT A.cmis:name, A.dc:title, B.intakes_common:entryReason FROM Dimension A JOIN Intake B ON A.dc:title = B.intakes_common:entryReason"; // try eaee111c-a8d8-48c7-95cb
+            makeCMISQLQuery(repoSession, query6);
+            
+            query6 = "SELECT A.cmis:name, A.dc:title, B.intakes_common:entryReason FROM Dimension A JOIN Intake B ON B.intakes_common:entryReason = A.dc:title"; // try eaee111c-a8d8-48c7-95cb
+            makeCMISQLQuery(repoSession, query6);
+            
+            String query7 = "SELECT B.intakes_common:entryReason FROM Intake B"; // try eaee111c-a8d8-48c7-95cb
+            makeCMISQLQuery(repoSession, query7);
+            
             
             DocumentModelList docList = null;
             String query = NuxeoUtils.buildNXQLQuery(ctx, queryContext);