You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2015/02/17 12:51:06 UTC

[48/50] [abbrv] incubator-taverna-osgi git commit: Avoid setting AxisProperties from here

Avoid setting AxisProperties from here


Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/commit/6e565955
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/tree/6e565955
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/diff/6e565955

Branch: refs/heads/master
Commit: 6e5659553dea9aaeec15978cd5e78ea6a8f88609
Parents: 863892d
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Mon Jan 5 11:58:48 2015 +0000
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Mon Jan 5 11:58:48 2015 +0000

----------------------------------------------------------------------
 taverna-configuration-impl/pom.xml                               | 2 +-
 .../configuration/proxy/impl/HttpProxyConfigurationImpl.java     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/6e565955/taverna-configuration-impl/pom.xml
----------------------------------------------------------------------
diff --git a/taverna-configuration-impl/pom.xml b/taverna-configuration-impl/pom.xml
index 3c00732..3be7a08 100644
--- a/taverna-configuration-impl/pom.xml
+++ b/taverna-configuration-impl/pom.xml
@@ -48,12 +48,12 @@
 			<artifactId>wsdl-generic</artifactId>
 			<version>${wsdl.generic.version}</version>
 		</dependency>
-	-->
 	<dependency>
 		<groupId>org.apache.axis</groupId>
 		<artifactId>com.springsource.org.apache.axis</artifactId>
 		<version>${axis.version}</version>
 	</dependency>
+	-->
 	
 
 		<dependency>

http://git-wip-us.apache.org/repos/asf/incubator-taverna-osgi/blob/6e565955/taverna-configuration-impl/src/main/java/uk/org/taverna/configuration/proxy/impl/HttpProxyConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/taverna-configuration-impl/src/main/java/uk/org/taverna/configuration/proxy/impl/HttpProxyConfigurationImpl.java b/taverna-configuration-impl/src/main/java/uk/org/taverna/configuration/proxy/impl/HttpProxyConfigurationImpl.java
index 7eb79f0..ddcdf65 100644
--- a/taverna-configuration-impl/src/main/java/uk/org/taverna/configuration/proxy/impl/HttpProxyConfigurationImpl.java
+++ b/taverna-configuration-impl/src/main/java/uk/org/taverna/configuration/proxy/impl/HttpProxyConfigurationImpl.java
@@ -24,7 +24,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.axis.AxisProperties;
+//import org.apache.axis.AxisProperties;
 import org.apache.log4j.Logger;
 
 import uk.org.taverna.configuration.AbstractConfigurable;
@@ -117,7 +117,7 @@ public class HttpProxyConfigurationImpl extends AbstractConfigurable implements
 		} else {
 			System.setProperty(key, value);
 		}
-		AxisProperties.setProperty(key, (value == null ? "" : value));
+		//AxisProperties.setProperty(key, (value == null ? "" : value));
 	}
 
 	@Override