EnvironmentLoader using Java 5 API.
+ *
+ * @author Jing Xue
+ */
+public class Java5EnvironmentLoader extends EnvironmentLoader {
+
+ /**
+ * Retrieves the environment variables using System.getEnv() (available in Java 5+).
+ *
+ * @see org.apache.ivy.core.settings.environment.EnvironmentLoader#getEnvironment()
+ * @see java.lang.System#getenv()
+ */
+ public Map getEnvironment() throws Exception {
+ // this can be updated to directly invoking the method once this class is moved
+ // into a separated source directory as Xavier suggested, and the conditional compilation
+ // Jan suggested is implemented.
+ Method getEnvMethod = System.class.getMethod("getenv", new Class[0]);
+ return (Map)getEnvMethod.invoke(null, null);
+ }
+}
Index: src/java/org/apache/ivy/core/settings/environment/EnvironmentLoader.java
===================================================================
--- src/java/org/apache/ivy/core/settings/environment/EnvironmentLoader.java (revision 0)
+++ src/java/org/apache/ivy/core/settings/environment/EnvironmentLoader.java (revision 0)
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.apache.ivy.core.settings.environment;
+
+import java.util.Map;
+
+import org.apache.ivy.util.Message;
+
+/**
+ * @author Jing Xue
+ */
+public abstract class EnvironmentLoader {
+ public static final String ANT_EXECUTE_CLASS = "org.apache.tools.ant.taskdefs.Execute";
+ public static final String JAVA5_GETENV_METHOD = "getenv";
+
+ public static EnvironmentLoader getInstance() {
+ try {
+ System.class.getMethod(JAVA5_GETENV_METHOD, new Class[0]);
+ Message.verbose("System." + JAVA5_GETENV_METHOD + "() found. Use "
+ + Java5EnvironmentLoader.class);
+ return new Java5EnvironmentLoader();
+ } catch (NoSuchMethodException nsme) {
+ Message.verbose("System." + JAVA5_GETENV_METHOD + "() not found. Checking if Ant is available.");
+ try {
+ Class.forName(ANT_EXECUTE_CLASS);
+ Message.verbose(ANT_EXECUTE_CLASS + " found. Use "
+ + AntEnvironmentLoader.class);
+ return new AntEnvironmentLoader();
+ } catch (ClassNotFoundException cnfe) {
+ Message.verbose(ANT_EXECUTE_CLASS + " not found.");
+ throw new UnsupportedOperationException("Environment importing is only supported when running in Java 5 or with Ant.");
+ }
+ }
+ }
+
+ public abstract Map getEnvironment() throws Exception;
+}
Index: src/java/org/apache/ivy/core/settings/environment/AntEnvironmentLoader.java
===================================================================
--- src/java/org/apache/ivy/core/settings/environment/AntEnvironmentLoader.java (revision 0)
+++ src/java/org/apache/ivy/core/settings/environment/AntEnvironmentLoader.java (revision 0)
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.apache.ivy.core.settings.environment;
+
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ivy.util.Message;
+
+/**
+ * Implements EnvironmentLoader leveraging Ant's facilities.
+ *
+ * @author Jing Xue
+ */
+public class AntEnvironmentLoader extends EnvironmentLoader {
+
+ /**
+ * Returns environment variables using Ant's Execute task implementation.
+ *
+ * @see org.apache.ivy.core.settings.environment.EnvironmentLoader#getEnvironment()
+ */
+ public Map getEnvironment() throws Exception {
+ // borrowed from Ant's Property.loadEnvironment() implementation,
+ // and brought up to JDK 1.4 compliant.
+ Map env = new HashMap();
+ Method getEnvMethod = Class.forName(ANT_EXECUTE_CLASS).getMethod("getProcEnvironment", null);
+
+ List osEnv = (List)getEnvMethod.invoke(null, null);
+ for (Iterator iEntry = osEnv.iterator(); iEntry.hasNext();) {
+ String entry = (String) iEntry.next();
+ int pos = entry.indexOf('=');
+ if (pos > 0) {
+ env.put(entry.substring(0, pos).trim(), entry.substring(pos + 1).trim());
+ } else {
+ Message.verbose("Ignoring environment line: " + entry);
+ }
+ }
+ return env;
+ }
+}
Index: src/java/org/apache/ivy/core/settings/XmlSettingsParser.java
===================================================================
--- src/java/org/apache/ivy/core/settings/XmlSettingsParser.java (revision 580659)
+++ src/java/org/apache/ivy/core/settings/XmlSettingsParser.java (working copy)
@@ -32,6 +32,7 @@
import org.apache.ivy.core.module.id.ModuleId;
import org.apache.ivy.core.module.status.StatusManager;
+import org.apache.ivy.core.settings.environment.EnvironmentLoader;
import org.apache.ivy.plugins.circular.CircularDependencyStrategy;
import org.apache.ivy.plugins.conflict.ConflictManager;
import org.apache.ivy.plugins.latest.LatestStrategy;
@@ -214,24 +215,46 @@
ivy.setVariable(name, value, override == null ? true : Boolean.valueOf(override)
.booleanValue());
} else if ("properties".equals(qName)) {
+ String overrideStr = ivy.substitute((String) attributes.get("override"));
+ boolean override = overrideStr == null ? true: Boolean.valueOf(overrideStr).booleanValue();
+
+ String envPrefix = ivy.substitute((String) attributes.get("environment"));
+ if (envPrefix != null) {
+ // append a dot only if the specified prefix doesn't have one. this is
+ // compatible with ant's behavior.
+ if (!envPrefix.endsWith(".")) {
+ envPrefix += '.';
+ }
+
+ Map env;
+ try {
+ env = EnvironmentLoader.getInstance().getEnvironment();
+ } catch (Exception e) {
+ throw new IllegalArgumentException("Unable to import environment variables: " + e);
+ }
+ for (Iterator iterator = env.entrySet().iterator(); iterator.hasNext();) {
+ Map.Entry entry = (Map.Entry) iterator.next();
+ ivy.setVariable(envPrefix + entry.getKey(), (String)entry.getValue(), override);
+ }
+ }
+
String propFilePath = ivy.substitute((String) attributes.get("file"));
- String override = ivy.substitute((String) attributes.get("override"));
- try {
- Message.verbose("loading properties: " + propFilePath);
- ivy.loadProperties(new File(propFilePath), override == null ? true : Boolean
- .valueOf(override).booleanValue());
- } catch (Exception fileEx) {
- Message.verbose("failed to load properties as file: trying as url: "
- + propFilePath);
+ if (propFilePath != null) {
try {
- ivy.loadProperties(new URL(propFilePath), override == null ? true : Boolean
- .valueOf(override).booleanValue());
- } catch (Exception urlEx) {
- throw new IllegalArgumentException(
- "unable to load properties from "
- + propFilePath
- + ". Tried both as an url and a file, with no success. File exception: "
- + fileEx + ". URL exception: " + urlEx);
+ Message.verbose("loading properties: " + propFilePath);
+ ivy.loadProperties(new File(propFilePath), override);
+ } catch (Exception fileEx) {
+ Message.verbose("failed to load properties as file: trying as url: "
+ + propFilePath);
+ try {
+ ivy.loadProperties(new URL(propFilePath), override);
+ } catch (Exception urlEx) {
+ throw new IllegalArgumentException(
+ "unable to load properties from "
+ + propFilePath
+ + ". Tried both as an url and a file, with no success. File exception: "
+ + fileEx + ". URL exception: " + urlEx);
+ }
}
}
} else if ("include".equals(qName)) {
Index: doc/configuration/properties.html
===================================================================
--- doc/configuration/properties.html (revision 580659)
+++ doc/configuration/properties.html (working copy)
@@ -35,7 +35,9 @@