Update build system

[gpl/argeo-slc.git] / org.argeo.slc.repo / src / org / argeo / slc / repo / RepoSync.java

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.java
index d524a2cc3bd1e0d9c321f1e059fd4946fb94252d..567ea36d502ccb37341a89df1972afb573437cf1 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/RepoSync.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.repo;
 
 import java.io.InputStream;
@@ -42,11 +27,10 @@ import javax.jcr.query.Query;
 import javax.jcr.query.QueryResult;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
+import org.argeo.cms.jcr.CmsJcrUtils;
 import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
-import org.argeo.api.NodeUtils;
 import org.argeo.slc.SlcException;
 import org.xml.sax.SAXException;
 
@@ -59,7 +43,7 @@ import org.xml.sax.SAXException;
  * we copy the content of the source workspace into the target one.
  */
 public class RepoSync implements Runnable {
-       private final static Log log = LogFactory.getLog(RepoSync.class);
+       private final static CmsLog log = CmsLog.getLog(RepoSync.class);
 
        // Centralizes definition of workspaces that must be ignored by the sync.
        private final static List<String> IGNORED_WKSP_LIST = Arrays.asList("security", "localrepo");
@@ -119,14 +103,14 @@ public class RepoSync implements Runnable {
 
                        // Setup
                        if (sourceRepository == null)
-                               sourceRepository = NodeUtils.getRepositoryByUri(repositoryFactory, sourceRepoUri);
+                               sourceRepository = CmsJcrUtils.getRepositoryByUri(repositoryFactory, sourceRepoUri);
                        if (sourceCredentials == null && sourceUsername != null)
                                sourceCredentials = new SimpleCredentials(sourceUsername, sourcePassword);
                        // FIXME make it more generic
                        sourceDefaultSession = sourceRepository.login(sourceCredentials, RepoConstants.DEFAULT_DEFAULT_WORKSPACE);
 
                        if (targetRepository == null)
-                               targetRepository = NodeUtils.getRepositoryByUri(repositoryFactory, targetRepoUri);
+                               targetRepository = CmsJcrUtils.getRepositoryByUri(repositoryFactory, targetRepoUri);
                        if (targetCredentials == null && targetUsername != null)
                                targetCredentials = new SimpleCredentials(targetUsername, targetPassword);
                        targetDefaultSession = targetRepository.login(targetCredentials);