X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.repo%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Frepo%2FRepoUtils.java;h=3d7d5920d04cffa6b7524cd864a7b427d37e9c67;hb=9b588d06696ad7a8609b52d1e55bb8f037d4cd92;hp=c962daf2e29be57a23c0fb7a974c83518e9d7cde;hpb=142bc73155f308b5e0dd5e9ae4f505db0ca21eec;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoUtils.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoUtils.java
index c962daf2e..3d7d5920d 100644
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoUtils.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/RepoUtils.java
@@ -1,3 +1,18 @@
+/*
+ * 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.ByteArrayOutputStream;
@@ -222,15 +237,28 @@ public class RepoUtils implements ArgeoNames, SlcNames {
 
 	/** Read the OSGi {@link NameVersion} */
 	public static NameVersion readNameVersion(File artifactFile) {
+		try {
+			return readNameVersion(new FileInputStream(artifactFile));
+		} catch (Exception e) {
+			// probably not a jar, skipping
+			if (log.isDebugEnabled()) {
+				log.debug("Skipping " + artifactFile + " because of " + e);
+				// e.printStackTrace();
+			}
+		}
+		return null;
+	}
+
+	/** Read the OSGi {@link NameVersion} */
+	public static NameVersion readNameVersion(InputStream in) {
 		JarInputStream jarInputStream = null;
 		try {
-			jarInputStream = new JarInputStream(new FileInputStream(
-					artifactFile));
+			jarInputStream = new JarInputStream(in);
 			return readNameVersion(jarInputStream.getManifest());
 		} catch (Exception e) {
 			// probably not a jar, skipping
 			if (log.isDebugEnabled()) {
-				log.debug("Skipping " + artifactFile + " because of " + e);
+				log.debug("Skipping because of " + e);
 				// e.printStackTrace();
 			}
 		} finally {