From 339668520d6d10a381156ca88937f65071fe5cad Mon Sep 17 00:00:00 2001
From: Rena Tsantouli <rena.tsantouli@mycompany.com>
Date: Thu, 7 May 2009 11:30:19 +0000
Subject: [PATCH] git-svn-id:
 http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/application-support-layer/applicationSupportLayerCore@11730
 82a268e6-3cf1-43bd-a215-b396298e98cf

---
 .classpath                                        |  4 ++--
 .../cache/factories/ApplicationCredentials.java   | 15 ++++++++++-----
 .../framework/core/util/UserCredential.java       |  6 +++---
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.classpath b/.classpath
index 871aab6..af23129 100644
--- a/.classpath
+++ b/.classpath
@@ -3,8 +3,8 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="C:/Documents and Settings/rena/Desktop/ISCache.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/dependenciesD4S"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ehcache"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/gCore"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/gCore-0-5"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/dependenciesNewVoms"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/src/org/gcube/application/framework/core/cache/factories/ApplicationCredentials.java b/src/org/gcube/application/framework/core/cache/factories/ApplicationCredentials.java
index 7d51e84..9a4544b 100644
--- a/src/org/gcube/application/framework/core/cache/factories/ApplicationCredentials.java
+++ b/src/org/gcube/application/framework/core/cache/factories/ApplicationCredentials.java
@@ -61,11 +61,16 @@ public class ApplicationCredentials {
 				//user "application" does not exist on this VRE, so we add him and try to get credential again
 				VOMSAdminImpl vomsA;
 				try {
-					vomsA = VOMSAdminManager.getVOMSAdmin();
-					String[] roles = vomsA.listRoles();
-					vomsA.createUser("application", userDN+"application", userCA, "application@gcube.org");
-					vomsA.addMember(VREname, userDN+"application", userCA);
-					vomsA.assignRole(VREname, roles[0], userDN+"application", userCA);
+				//	vomsA = VOMSAdminManager.getVOMSAdmin();
+				//	String[] roles = vomsA.listRoles();
+				//	vomsA.createUser("application", userDN+"application", userCA, "application@gcube.org");
+				//	vomsA.addMember(VREname, userDN+"application", userCA);
+				//	vomsA.assignRole(VREname, roles[0], userDN+"application", userCA);
+					vomsA =  new VOMSAdminImpl();
+					String[] roles = vomsA.getPortType().listRoles();
+					vomsA.getExtendedPortType().createUser("application", userDN+"application", userCA, "application@gcube.org");
+					vomsA.getExtendedPortType().addOnlineCAMember(VREname, userDN+"application");
+					vomsA.getExtendedPortType().assignOnlineCARole(VREname, roles[0], userDN+"application");
 				} 
 				catch (Exception e) {
 					vomsA = null;
diff --git a/src/org/gcube/application/framework/core/util/UserCredential.java b/src/org/gcube/application/framework/core/util/UserCredential.java
index 7e44103..aa08ec7 100644
--- a/src/org/gcube/application/framework/core/util/UserCredential.java
+++ b/src/org/gcube/application/framework/core/util/UserCredential.java
@@ -23,9 +23,9 @@ public class UserCredential {
 		try {
 			String sharedDir = Settings.getInstance().getProperty("sharedDir");
 			System.out.println("file " + sharedDir + "/vomsAPI.properties exists: "+ new File(sharedDir + "/vomsAPI.properties").exists());
-			man = new CredentialsManagerImpl(sharedDir + "/vomsAPI.properties");
-		//	VOMSAdminImpl vomsAdm = new VOMSAdminImpl(sharedDir + "/vomsAPI.properties");
-		//	man = new CredentialsManagerImpl(vomsAdm);
+		//	man = new CredentialsManagerImpl(sharedDir + "/vomsAPI.properties");
+			VOMSAdminImpl vomsAdm = new VOMSAdminImpl(sharedDir + "/vomsAPI.properties");
+			man = new CredentialsManagerImpl(vomsAdm);
 		} catch (Exception e1) {
 			e1.printStackTrace();
 		}