X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.osgi%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fosgi%2Fbuild%2FBundleModularDistribution.java;h=51595750eec5afaa051e6eab5f62eac6d45c80d6;hb=7d6251e4260ed330236ae86b732307439affcf76;hp=c7660023afaac41025f585c3b68f384d3789bc16;hpb=16e2ffb035a4c41576acc74efb37610c7aec1887;p=gpl%2Fargeo-slc.git diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/build/BundleModularDistribution.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/build/BundleModularDistribution.java index c7660023a..51595750e 100644 --- a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/build/BundleModularDistribution.java +++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/build/BundleModularDistribution.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Mathieu Baudier + * 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. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.argeo.slc.osgi.build; import java.net.URL; @@ -24,7 +23,7 @@ import java.util.jar.JarInputStream; import java.util.jar.Manifest; import org.apache.commons.io.IOUtils; -import org.argeo.slc.BasicNameVersion; +import org.argeo.slc.DefaultNameVersion; import org.argeo.slc.NameVersion; import org.argeo.slc.build.Distribution; import org.argeo.slc.core.build.VersionedResourceDistribution; @@ -60,7 +59,7 @@ public class BundleModularDistribution extends AbstractOsgiModularDistribution String version = mf.getMainAttributes().getValue( Constants.BUNDLE_VERSION); - BasicNameVersion nameVersion = new BasicNameVersion(name, + DefaultNameVersion nameVersion = new DefaultNameVersion(name, version); distributions.put(nameVersion, new VersionedResourceDistribution(name, version,