X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.maven%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fmaven%2FMavenDeployEnvironment.java;h=2bef26e146e74d16da6766c8b907e19ac13515db;hb=5fcacdb600e4c9e765cb93b46132932662832c1b;hp=50717fae6ac9834ba6c9865cd5dec625f95130b3;hpb=289692714f0f92973a0f475aefd224982dccd06b;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java b/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java
index 50717fae6..2bef26e14 100644
--- a/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java
+++ b/runtime/org.argeo.slc.support.maven/src/main/java/org/argeo/slc/maven/MavenDeployEnvironment.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>
+ *
+ * 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.maven;
 
 import java.io.File;
@@ -18,14 +34,15 @@ public abstract class MavenDeployEnvironment implements DeployEnvironment {
 
 	public void unpackTo(Object packg, File targetLocation,
 			Map<String, String> filter) {
-		File packageLocation;
+		File packageLocation=null;
 		String type = null;
 		String removeRootDir = "enabled";
-		if (packg instanceof MavenFile) {
-			packageLocation = mavenManager
-					.getPackageLocation((MavenFile) packg);
-			type = ((MavenFile) packg).getType();
-		} else if (packg instanceof File) {
+//		if (packg instanceof MavenFile) {
+//			packageLocation = mavenManager
+//					.getPackageLocation((MavenFile) packg);
+//			type = ((MavenFile) packg).getType();
+//		} else 
+		if (packg instanceof File) {
 			packageLocation = (File) packg;
 			// TODO: type based on extension
 		} else {