X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.repo%2Fsrc%2Forg%2Fargeo%2Fslc%2Frepo%2Fosgi%2FArgeoOsgiDistributionImpl.java;h=3d6adcd7b1f63df0ce33310f696e129528d6d5c3;hb=82ce036ceb9e151dfc8ba46b6568929a22245099;hp=7e4a32e0e91c7feb4e2fadb81d60cc74d4011ba6;hpb=6fc94d69efe089414ac9e63bde3efab1cbf7b7ca;p=gpl%2Fargeo-slc.git diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArgeoOsgiDistributionImpl.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArgeoOsgiDistributionImpl.java index 7e4a32e0e..3d6adcd7b 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArgeoOsgiDistributionImpl.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ArgeoOsgiDistributionImpl.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.io.Writer; import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.Paths; import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; @@ -14,8 +15,7 @@ import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.argeo.api.cms.CmsLog; import org.argeo.slc.CategoryNameVersion; import org.argeo.slc.ModuleSet; import org.argeo.slc.NameVersion; @@ -31,7 +31,7 @@ import org.osgi.framework.Constants; * A consistent and versioned OSGi distribution, which can be built and tested. */ public class ArgeoOsgiDistributionImpl extends ArtifactDistribution implements ArgeoOsgiDistribution { - private final static Log log = LogFactory.getLog(ArgeoOsgiDistributionImpl.class); + private final static CmsLog log = CmsLog.getLog(ArgeoOsgiDistributionImpl.class); private List modules = new ArrayList(); @@ -42,7 +42,7 @@ public class ArgeoOsgiDistributionImpl extends ArtifactDistribution implements A public void init() { if (log.isDebugEnabled()) log.debug(describe()); -// migrateTov2(Paths.get(System.getProperty("user.home"), "dev/git/gpl/argeo-tp/argeo-tp")); + migrateTov2(Paths.get(System.getProperty("user.home"), "dev/git/unstable/argeo-tp/argeo-tp")); } public void destroy() {