Fix various build issues

[gpl/argeo-slc.git] / org.argeo.slc.jcr / src / org / argeo / slc / jcr / SlcJcrResultUtils.java

diff --git a/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrResultUtils.java b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrResultUtils.java
index 6353804df36e7cd15e56976f50f8fa4e311c0bd9..219309f33bbac4363391b619499b8d83edd3d407 100644 (file)
--- a/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrResultUtils.java
+++ b/org.argeo.slc.jcr/src/org/argeo/slc/jcr/SlcJcrResultUtils.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.slc.jcr;
 
 import javax.jcr.Node;
@@ -20,8 +5,8 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
 
+import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.node.NodeUtils;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.SlcNames;
 import org.argeo.slc.SlcTypes;
@@ -37,7 +22,7 @@ public class SlcJcrResultUtils {
         */
        public static String getSlcResultsBasePath(Session session) {
                try {
-                       Node userHome = NodeUtils.getUserHome(session);
+                       Node userHome = CmsJcrUtils.getUserHome(session);
                        if (userHome == null)
                                throw new SlcException("No user home available for "
                                                + session.getUserID());
@@ -55,7 +40,6 @@ public class SlcJcrResultUtils {
         * it throws an exception.
         * 
         * @param session
-        * @return
         */
        public static Node getSlcResultsParentNode(Session session) {
                try {
@@ -87,7 +71,7 @@ public class SlcJcrResultUtils {
         */
        public static String getMyResultsBasePath(Session session) {
                try {
-                       Node userHome = NodeUtils.getUserHome(session);
+                       Node userHome = CmsJcrUtils.getUserHome(session);
                        if (userHome == null)
                                throw new SlcException("No user home available for "
                                                + session.getUserID());
@@ -105,7 +89,6 @@ public class SlcJcrResultUtils {
         * that node if it has the correct type and throws an exception otherwise.
         * 
         * @param session
-        * @return
         */
        public static Node getMyResultParentNode(Session session) {
                try {
@@ -138,7 +121,6 @@ public class SlcJcrResultUtils {
         * 
         * @param session
         * @param absPath
-        * @return
         */
        public static synchronized Node createResultFolderNode(Session session,
                        String absPath) {