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=d3949a200da1955bf4be4108d635e81c10740f72;hpb=600777d558fd165dabc6c3a19f3356f1e6b85c50;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 d3949a200..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,22 +1,48 @@
+/*
+ * 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;
+import java.net.URL;
+import java.util.Map;
+import java.util.Properties;
+import java.util.UUID;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.argeo.slc.SlcException;
 import org.argeo.slc.deploy.DeployEnvironment;
 
 public abstract class MavenDeployEnvironment implements DeployEnvironment {
-/*	private static final Log log = LogFactory
+	private static final Log log = LogFactory
 			.getLog(MavenDeployEnvironment.class);
 	private MavenManager mavenManager;
 
 	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 {
@@ -41,13 +67,13 @@ public abstract class MavenDeployEnvironment implements DeployEnvironment {
 			URL antUrl = getClass().getClassLoader().getResource(
 					"org/argeo/slc/support/deploy/ant/build.xml");
 
-//			if (type == null || type.equals("zip")) {
-//				new AntRunner(antUrl, "deployZip", props).run();
-//			} else if (type.equals("tar.gz")) {
-//				new AntRunner(antUrl, "deployTarGz", props).run();
-//			} else {
-//				throw new SlcException("Unknow package type " + type);
-//			}
+			// if (type == null || type.equals("zip")) {
+			// new AntRunner(antUrl, "deployZip", props).run();
+			// } else if (type.equals("tar.gz")) {
+			// new AntRunner(antUrl, "deployTarGz", props).run();
+			// } else {
+			// throw new SlcException("Unknow package type " + type);
+			// }
 			throw new SlcException("Not implemented.");
 		} catch (SlcException e) {
 			throw e;
@@ -60,5 +86,5 @@ public abstract class MavenDeployEnvironment implements DeployEnvironment {
 	public void setMavenManager(MavenManager mavenManager) {
 		this.mavenManager = mavenManager;
 	}
-*/
+
 }