Menu
▾
▴
[Unicore-cvs-commits] SF.net SVN: unicore:[16679] eclipseclient/branches/u66update/plugins
|
From: <bsc...@us...> - 2013-06-27 10:45:38
|
Revision: 16679
http://sourceforge.net/p/unicore/svn/16679
Author: bschuller
Date: 2013-06-27 10:45:34 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
update URC code to use new UNICORE client libs; remove unused and outdated usermanager module
Modified Paths:
--------------
eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.common/META-INF/MANIFEST.MF
eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.common/src/main/java/de/fzj/unicore/rcp/common/utils/ArrayUtils.java
eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.gpe4eclipse/src/main/java/de/fzj/unicore/rcp/gpe4eclipse/SWTSecurityProvider.java
eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.gpe4eclipse/src/main/java/de/fzj/unicore/rcp/gpe4eclipse/clientstubs/IWSRFClientFactory.java
eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.gpe4eclipse/src/main/java/de/fzj/unicore/rcp/gpe4eclipse/clientstubs/WSRFClientFactory.java
eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.identity/src/main/java/de/fzj/unicore/rcp/identity/CertificateUtility.java
eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.identity/src/main/java/de/fzj/unicore/rcp/identity/IdentityActivator.java
eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.identity/src/main/java/de/fzj/unicore/rcp/identity/extensionpoints/ICredentialTypeExtensionPoint.java
eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.identity/src/main/java/de/fzj/unicore/rcp/identity/extensions/CredentialTypeCertificateExtension.java
eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.identity/src/main/java/de/fzj/unicore/rcp/identity/extensions/CredentialTypeProxyExtension.java
eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.identity/src/main/java/de/fzj/unicore/rcp/identity/extensions/SelectUIDExtension.java
eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.identity/src/main/java/de/fzj/unicore/rcp/identity/keystore/KeystoreView.java
eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.servicebrowser/src/main/java/de/fzj/unicore/rcp/servicebrowser/NodeExtensionPointImpl.java
eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.servicebrowser/src/main/java/de/fzj/unicore/rcp/servicebrowser/ServiceBrowserActivator.java
eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.servicebrowser/src/main/java/de/fzj/unicore/rcp/servicebrowser/actions/SetTerminationTimeAction.java
eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.servicebrowser/src/main/java/de/fzj/unicore/rcp/servicebrowser/nodes/AbstractFileNode.java
eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.servicebrowser/src/main/java/de/fzj/unicore/rcp/servicebrowser/nodes/JobNode.java
eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.servicebrowser/src/main/java/de/fzj/unicore/rcp/servicebrowser/nodes/MoreFilesNode.java
eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.servicebrowser/src/main/java/de/fzj/unicore/rcp/servicebrowser/nodes/SecuredNode.java
eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.servicebrowser/src/main/java/de/fzj/unicore/rcp/servicebrowser/nodes/TargetSystemFactoryNode.java
eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.servicebrowser/src/main/java/de/fzj/unicore/rcp/servicebrowser/nodes/TargetSystemNode.java
eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.servicebrowser/src/main/java/de/fzj/unicore/rcp/servicebrowser/ui/NewRegistryFrame.java
eclipseclient/branches/u66update/plugins/org.chemomentum.rcp.common/META-INF/MANIFEST.MF
eclipseclient/branches/u66update/plugins/org.chemomentum.rcp.servicebrowser/src/main/java/org/chemomentum/rcp/servicebrowser/actions/LMResolveLogicalNameAction.java
eclipseclient/branches/u66update/plugins/org.chemomentum.rcp.servicebrowser/src/main/java/org/chemomentum/rcp/servicebrowser/nodes/WorkflowFactoryNode.java
eclipseclient/branches/u66update/plugins/org.chemomentum.rcp.servicebrowser/src/main/java/org/chemomentum/rcp/servicebrowser/nodes/WorkflowNode.java
eclipseclient/branches/u66update/plugins/org.chemomentum.rcp.tracing/src/main/java/org/chemomentum/rcp/tracing/actions/TraceWFNodeAction.java
eclipseclient/branches/u66update/plugins/org.chemomentum.rcp.tracing/src/main/java/org/chemomentum/rcp/tracing/retrieval/TraceRefresher.java
eclipseclient/branches/u66update/plugins/org.chemomentum.rcp.wfeditor/src/main/java/org/chemomentum/rcp/wfeditor/clientstubs/C9MActivityJobClient.java
eclipseclient/branches/u66update/plugins/org.chemomentum.rcp.wfeditor/src/main/java/org/chemomentum/rcp/wfeditor/transfers/DMFileResolver.java
eclipseclient/branches/u66update/plugins/org.chemomentum.rcp.wfeditor/src/main/java/org/chemomentum/rcp/wfeditor/transfers/DMToLocalFileTransmitter.java
eclipseclient/branches/u66update/plugins/org.chemomentum.rcp.wfeditor/src/main/java/org/chemomentum/rcp/wfeditor/transfers/LMFileResolver.java
eclipseclient/branches/u66update/plugins/org.chemomentum.rcp.wfeditor/src/main/java/org/chemomentum/rcp/wfeditor/transfers/LMToLocalFileTransmitter.java
eclipseclient/branches/u66update/plugins/org.chemomentum.rcp.wfeditor/src/main/java/org/chemomentum/rcp/wfeditor/transfers/LocalToDMFileTransmitter.java
eclipseclient/branches/u66update/plugins/org.chemomentum.rcp.wfeditor/src/main/java/org/chemomentum/rcp/wfeditor/transfers/LocalToLMFileTransmitter.java
eclipseclient/branches/u66update/plugins/org.chemomentum.rcp.wfeditor/src/main/java/org/chemomentum/rcp/wfeditor/utils/DataManagementUtils.java
Removed Paths:
-------------
eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.usermanager/
Modified: eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.common/META-INF/MANIFEST.MF
===================================================================
--- eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.common/META-INF/MANIFEST.MF 2013-06-26 19:47:36 UTC (rev 16678)
+++ eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.common/META-INF/MANIFEST.MF 2013-06-27 10:45:34 UTC (rev 16679)
@@ -56,6 +56,7 @@
de.fzj.unicore.wsrflite.xmlbeans.sg,
de.fzj.unicore.wsrflite.xmlbeans.wsn,
de.fzj.unicore.wsrflite.xmlbeans.wsn.util,
+ eu.emi.security.authn.x509,
eu.unicore.broker.jsdl.xmlbeans,
eu.unicore.broker.jsdl.xmlbeans.impl,
eu.unicore.jsdl.extensions,
@@ -71,7 +72,6 @@
eu.unicore.security.etd,
eu.unicore.security.user,
eu.unicore.security.util.client,
- eu.unicore.util.httpclient,
eu.unicore.security.xfireutil,
eu.unicore.security.xfireutil.client,
eu.unicore.unicore6.enumeration,
@@ -80,6 +80,7 @@
eu.unicore.unicore6.filetransfer.udt.impl,
eu.unicore.unicore6.task,
eu.unicore.unicore6.task.impl,
+ eu.unicore.util.httpclient,
net.sf.ehcache,
net.sf.ehcache.config,
net.sf.ehcache.store,
Modified: eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.common/src/main/java/de/fzj/unicore/rcp/common/utils/ArrayUtils.java
===================================================================
--- eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.common/src/main/java/de/fzj/unicore/rcp/common/utils/ArrayUtils.java 2013-06-26 19:47:36 UTC (rev 16678)
+++ eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.common/src/main/java/de/fzj/unicore/rcp/common/utils/ArrayUtils.java 2013-06-27 10:45:34 UTC (rev 16679)
@@ -4,6 +4,17 @@
public class ArrayUtils {
+ public static <T> boolean contains(T[] array, T test) {
+ if(array==null || array.length==0)
+ return false;
+
+ for(T s: array){
+ if(s!=null && s.equals(test))
+ return true;
+ }
+ return false;
+ }
+
public static String[] add(String[] array, String... added) {
if(array == null && added == null) return new String[0];
return concat(array,added);
Modified: eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.gpe4eclipse/src/main/java/de/fzj/unicore/rcp/gpe4eclipse/SWTSecurityProvider.java
===================================================================
--- eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.gpe4eclipse/src/main/java/de/fzj/unicore/rcp/gpe4eclipse/SWTSecurityProvider.java 2013-06-26 19:47:36 UTC (rev 16678)
+++ eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.gpe4eclipse/src/main/java/de/fzj/unicore/rcp/gpe4eclipse/SWTSecurityProvider.java 2013-06-27 10:45:34 UTC (rev 16679)
@@ -6,15 +6,15 @@
import de.fzj.unicore.rcp.identity.IdentityActivator;
import de.fzj.unicore.rcp.servicebrowser.ServiceBrowserActivator;
-import eu.unicore.security.util.client.IClientProperties;
+import eu.unicore.util.httpclient.IClientConfiguration;
public class SWTSecurityProvider implements SecurityProvider {
- public IClientProperties getDefaultSecurityProperties() {
+ public IClientConfiguration getDefaultSecurityProperties() {
return IdentityActivator.getDefault().getUASSecProps("");
}
- public IClientProperties getSecurityProperties(
+ public IClientConfiguration getSecurityProperties(
EndpointReferenceType epr) {
return ServiceBrowserActivator.getDefault().getUASSecProps(epr);
}
Modified: eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.gpe4eclipse/src/main/java/de/fzj/unicore/rcp/gpe4eclipse/clientstubs/IWSRFClientFactory.java
===================================================================
--- eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.gpe4eclipse/src/main/java/de/fzj/unicore/rcp/gpe4eclipse/clientstubs/IWSRFClientFactory.java 2013-06-26 19:47:36 UTC (rev 16678)
+++ eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.gpe4eclipse/src/main/java/de/fzj/unicore/rcp/gpe4eclipse/clientstubs/IWSRFClientFactory.java 2013-06-27 10:45:34 UTC (rev 16679)
@@ -38,7 +38,7 @@
import de.fzj.unicore.rcp.gpe4eclipse.SWTSecurityProvider;
import de.fzj.unicore.rcp.servicebrowser.nodes.NodePath;
-import de.fzj.unicore.uas.security.IUASSecurityProperties;
+import eu.unicore.util.httpclient.IClientConfiguration;
/**
* @author demuth
@@ -55,7 +55,7 @@
* @return
*/
public WSLTClient createWSLTClient(EndpointReferenceType epr,
- IUASSecurityProperties secProps);
+ IClientConfiguration secProps);
/**
* Create a GPE WSRF client stub for the given epr using an
@@ -79,7 +79,7 @@
*/
@Deprecated
public WSRFClientImpl createWSRFClient(EndpointReferenceType epr,
- IUASSecurityProperties secProps);
+ IClientConfiguration secProps);
/**
* Create a GPE WSRF client stub for the given NodePath.
Modified: eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.gpe4eclipse/src/main/java/de/fzj/unicore/rcp/gpe4eclipse/clientstubs/WSRFClientFactory.java
===================================================================
--- eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.gpe4eclipse/src/main/java/de/fzj/unicore/rcp/gpe4eclipse/clientstubs/WSRFClientFactory.java 2013-06-26 19:47:36 UTC (rev 16678)
+++ eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.gpe4eclipse/src/main/java/de/fzj/unicore/rcp/gpe4eclipse/clientstubs/WSRFClientFactory.java 2013-06-27 10:45:34 UTC (rev 16679)
@@ -45,7 +45,7 @@
import de.fzj.unicore.rcp.servicebrowser.nodes.NodeFactory;
import de.fzj.unicore.rcp.servicebrowser.nodes.NodePath;
import de.fzj.unicore.rcp.servicebrowser.nodes.SecuredNode;
-import de.fzj.unicore.uas.security.IUASSecurityProperties;
+import eu.unicore.util.httpclient.IClientConfiguration;
/**
* @author demuth
@@ -68,7 +68,7 @@
* de.fzj.unicore.uas.security.IUASSecurityProperties)
*/
public WSLTClient createWSLTClient(EndpointReferenceType epr,
- IUASSecurityProperties secProps) {
+ IClientConfiguration secProps) {
return new WSLTClientImpl(createWSRFClient(epr, secProps));
}
@@ -86,7 +86,7 @@
* (org.w3.x2005.x08.addressing.EndpointReferenceType)
*/
public WSRFClientImpl createWSRFClient(EndpointReferenceType epr,
- IUASSecurityProperties secProps) {
+ IClientConfiguration secProps) {
SecurityProviderImpl securityProvider = new SecurityProviderImpl();
securityProvider.init(secProps);
@@ -99,7 +99,7 @@
SecurityProviderImpl securityProvider = new SecurityProviderImpl();
Node n = NodeFactory.revealNode(path, null);
if (n != null && n instanceof SecuredNode) {
- IUASSecurityProperties secProps = ((SecuredNode) n)
+ IClientConfiguration secProps = ((SecuredNode) n)
.getUASSecProps();
securityProvider.init(secProps);
GPEClientProperties props = GPEActivator.getDefault().getClient()
Modified: eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.identity/src/main/java/de/fzj/unicore/rcp/identity/CertificateUtility.java
===================================================================
--- eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.identity/src/main/java/de/fzj/unicore/rcp/identity/CertificateUtility.java 2013-06-26 19:47:36 UTC (rev 16678)
+++ eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.identity/src/main/java/de/fzj/unicore/rcp/identity/CertificateUtility.java 2013-06-27 10:45:34 UTC (rev 16679)
@@ -71,6 +71,7 @@
import java.util.StringTokenizer;
import java.util.Vector;
+import org.bouncycastle.asn1.ASN1InputStream;
import org.bouncycastle.asn1.DERObjectIdentifier;
import org.bouncycastle.asn1.DEROctetString;
import org.bouncycastle.asn1.DERSequence;
@@ -89,8 +90,6 @@
*
* @author Thomas Kenetemich (Intel GmbH)
* @author schuller
- * @version $Id: CertificateUtility.java,v 1.1 2005/06/27 11:14:07 schuller Exp
- * $
*/
public class CertificateUtility {
Modified: eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.identity/src/main/java/de/fzj/unicore/rcp/identity/IdentityActivator.java
===================================================================
--- eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.identity/src/main/java/de/fzj/unicore/rcp/identity/IdentityActivator.java 2013-06-26 19:47:36 UTC (rev 16678)
+++ eclipseclient/branches/u66update/plugins/de.fzj.unicore.rcp.identity/src/main/java/de/fzj/unicore/rcp/identity/IdentityActivator.java 2013-06-27 10:45:34 UTC (rev 16679)
@@ -94,6 +94,7 @@
import eu.unicore.security.util.client.IClientProperties;
import eu.unicore.util.httpclient.ClientProperties;
+import eu.unicore.util.httpclient.IClientConfiguration;
/**
* The activator class controls the plug-in life cycle
@@ -407,7 +408,10 @@
j.schedule(5000);
}
- private IClientProperties createDefaultUASSecProps() {
+ /**
+ * TODO support more CANL options
+ */
+ private ClientProperties createDefaultUASSecProps() {
try {
if (keystore == null || !InputUtils.passwdCorrect(passwd, keystore)) {
log(IStatus.ERROR,
@@ -420,50 +424,58 @@
Properties p=new Properties();
- p.setProperty(ClientProperties.DEFAULT_PREFIX+CredentialProperties.PR.keystore.getAbsolutePath());
+ p.setProperty("credential.path",keystore.getAbsolutePath());
+ p.setProperty("credential.password",passwd);
+
+ p.setProperty("credential.type","keystore");
+ p.setProperty("truststore.keystorePath",keystore.getAbsolutePath());
+ p.setProperty("credential.keystorePassword",passwd);
+
p.setProperty(DEFAULT_PROPERTIES, Boolean.TRUE.toString());
- secProps.setTruststore(keystore.getAbsolutePath());
- secProps.setKeystorePassword(passwd);
- secProps.setTruststorePassword(passwd);
- IClientProperties secProps = new UASSecurityProperties(new Properties());
-
-
- // set http timeout and proxy related properties
+ // set http connection timeout and proxy related properties
IPreferencesService service = Platform.getPreferencesService();
- String prop = HttpUtils.CONNECT_TIMEOUT;
+ String prop = "client.http.connection.timeout";
String timeout = String.valueOf(service.getInt(
UnicoreCommonActivator.PLUGIN_ID,
Constants.P_CONNECTION_TIMEOUT, 300, null));
@@ Diff output truncated at 10000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|