Remove old license headers

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

diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java
index ef61bf11c57f3701ac32e25068c4424f293c2ff1..7a25c4bffc0bdbbc94f816d12f7a4ad1f75a2222 100644 (file)
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/NormalizeGroup.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.osgi;
 
 import java.util.ArrayList;
@@ -32,20 +17,20 @@ import javax.jcr.Session;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.ArgeoMonitor;
+import org.argeo.jcr.JcrMonitor;
 import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.SlcException;
-import org.argeo.slc.aether.ArtifactIdComparator;
-import org.argeo.slc.jcr.SlcNames;
-import org.argeo.slc.jcr.SlcTypes;
+import org.argeo.slc.SlcNames;
+import org.argeo.slc.SlcTypes;
 import org.argeo.slc.repo.ArtifactIndexer;
 import org.argeo.slc.repo.RepoConstants;
 import org.argeo.slc.repo.RepoUtils;
+import org.argeo.slc.repo.maven.ArtifactIdComparator;
 import org.argeo.slc.repo.maven.MavenConventionsUtils;
-import org.osgi.framework.Constants;
-import org.osgi.framework.Version;
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
+import org.osgi.framework.Constants;
+import org.osgi.framework.Version;
 
 /**
  * Make sure that all JCR metadata and Maven metadata are consistent for this
@@ -100,7 +85,7 @@ public class NormalizeGroup implements Runnable, SlcNames {
        }
 
        public static void processGroupNode(Node groupNode, String version,
-                       Boolean overridePoms, ArgeoMonitor monitor)
+                       Boolean overridePoms, JcrMonitor monitor)
                        throws RepositoryException {
                // TODO set artifactsBase based on group node
                NormalizeGroup ng = new NormalizeGroup();
@@ -112,7 +97,7 @@ public class NormalizeGroup implements Runnable, SlcNames {
                ng.processGroupNode(groupNode, monitor);
        }
 
-       protected void processGroupNode(Node groupNode, ArgeoMonitor monitor)
+       protected void processGroupNode(Node groupNode, JcrMonitor monitor)
                        throws RepositoryException {
                if (monitor != null)
                        monitor.subTask("Group " + groupId);