Remove old license headers

[lgpl/argeo-commons.git] / org.argeo.api / src / org / argeo / api / NodeUtils.java

diff --git a/org.argeo.api/src/org/argeo/api/NodeUtils.java b/org.argeo.api/src/org/argeo/api/NodeUtils.java
index f64cbe6f71ed14e2e9520e86675b9f1af9b8d204..926f023dbe771ed43081de532f6f62e1b09f8ab0 100644 (file)
--- a/org.argeo.api/src/org/argeo/api/NodeUtils.java
+++ b/org.argeo.api/src/org/argeo/api/NodeUtils.java
@@ -1,18 +1,3 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.argeo.api;
 
 import java.security.PrivilegedAction;
@@ -21,13 +6,10 @@ import java.util.Map;
 
 import javax.jcr.NoSuchWorkspaceException;
 import javax.jcr.Node;
-import javax.jcr.NodeIterator;
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.RepositoryFactory;
 import javax.jcr.Session;
-import javax.jcr.query.Query;
-import javax.jcr.query.QueryResult;
 import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 import javax.security.auth.AuthPermission;
@@ -128,7 +110,7 @@ public class NodeUtils {
 
        private static void checkUserWorkspace(Session session, String username) {
                String workspaceName = session.getWorkspace().getName();
-               if (!NodeConstants.HOME.equals(workspaceName))
+               if (!NodeConstants.HOME_WORKSPACE.equals(workspaceName))
                        throw new IllegalArgumentException(workspaceName + " is not the home workspace for user " + username);
        }
 
@@ -182,7 +164,7 @@ public class NodeUtils {
 
        private static void checkGroupWorkspace(Session session, String groupname) {
                String workspaceName = session.getWorkspace().getName();
-               if (!NodeConstants.SRV.equals(workspaceName))
+               if (!NodeConstants.SRV_WORKSPACE.equals(workspaceName))
                        throw new IllegalArgumentException(workspaceName + " is not the group workspace for group " + groupname);
        }
 
@@ -192,24 +174,24 @@ public class NodeUtils {
         * @return one single node or null if none was found
         * @throws ArgeoJcrException if more than one node was found
         */
-       private static Node querySingleNode(Query query) {
-               NodeIterator nodeIterator;
-               try {
-                       QueryResult queryResult = query.execute();
-                       nodeIterator = queryResult.getNodes();
-               } catch (RepositoryException e) {
-                       throw new RuntimeException("Cannot execute query " + query, e);
-               }
-               Node node;
-               if (nodeIterator.hasNext())
-                       node = nodeIterator.nextNode();
-               else
-                       return null;
-
-               if (nodeIterator.hasNext())
-                       throw new RuntimeException("Query returned more than one node.");
-               return node;
-       }
+//     private static Node querySingleNode(Query query) {
+//             NodeIterator nodeIterator;
+//             try {
+//                     QueryResult queryResult = query.execute();
+//                     nodeIterator = queryResult.getNodes();
+//             } catch (RepositoryException e) {
+//                     throw new RuntimeException("Cannot execute query " + query, e);
+//             }
+//             Node node;
+//             if (nodeIterator.hasNext())
+//                     node = nodeIterator.nextNode();
+//             else
+//                     return null;
+//
+//             if (nodeIterator.hasNext())
+//                     throw new RuntimeException("Query returned more than one node.");
+//             return node;
+//     }
 
        /** Returns the home node of the session user or null if none was found. */
        public static Node getUserHome(Session session) {