Added: airavata/trunk/modules/gfac-core/src/test/resources/certificates/ffc3d59b.0 URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/test/resources/certificates/ffc3d59b.0?rev=1502732&view=auto ============================================================================== --- airavata/trunk/modules/gfac-core/src/test/resources/certificates/ffc3d59b.0 (added) +++ airavata/trunk/modules/gfac-core/src/test/resources/certificates/ffc3d59b.0 Sat Jul 13 00:49:09 2013 @@ -0,0 +1,23 @@ +-----BEGIN CERTIFICATE----- +MIIDwzCCAqugAwIBAgICAQAwDQYJKoZIhvcNAQEFBQAwVDELMAkGA1UEBhMCVUsx +FTATBgNVBAoTDGVTY2llbmNlUm9vdDESMBAGA1UECxMJQXV0aG9yaXR5MRowGAYD +VQQDExFVSyBlLVNjaWVuY2UgUm9vdDAeFw0xMTA2MTgxMzAwMDBaFw0yNzEwMzAw +OTAwMDBaMFMxCzAJBgNVBAYTAlVLMRMwEQYDVQQKEwplU2NpZW5jZUNBMRIwEAYD +VQQLEwlBdXRob3JpdHkxGzAZBgNVBAMTElVLIGUtU2NpZW5jZSBDQSAyQjCCASIw +DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKkLgb2eIcly4LZfj0Rf5F7s+HE/ +6Tvpf4jsKkm7qs33y3EEudCbcPwQKjS2MgytPv+8xpEPHqy/hqTseNlZ6oJgc+V8 +xlJ+0iws882Ca8a9ZJ/iGQH9UzXU4q35ArN3cbwoWAAvMvzZ6hUV86fAAQ1AueQN +6h7/tnfYfaUMiB4PNxucmouMHDJGmYzl47FtlLeHUr2c4m/oWSG5pADIvGFpWFHj +NIw8/x4n97w5/ks0tc/8/5Q6xzUfCX/VfqciQCvKcui2J5MBhUlBDLenzwqvUytB +4XAwX/pRcKmnFEYwoc9OKGExNx9tn9RjQYJAC/KLb44Jqno9l0eRxu3uw4sCAwEA +AaOBnzCBnDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjA5BgNVHR8E +MjAwMC6gLKAqhihodHRwOi8vY3JsLmNhLm5ncy5hYy51ay9jcmwvcm9vdC1jcmwu +ZGVyMB0GA1UdDgQWBBQSpb+Rn3/ir2pcCfLi+lngNuHzVTAfBgNVHSMEGDAWgBRe ++BtIpndrKTwuAFMzK2Oie36TwDANBgkqhkiG9w0BAQUFAAOCAQEAFQlXpYR45+fy +uKIh/c+7nIxODO5iWmKskxDSQhqhMCU8/d5WVfXZ35XoTakhhsxu+Q3smIa6AhbA +meAhIWc2kDgDatEUlMA5G3TQgUoQgjw5RAWxX5/7biaj2nSU7B4Nn5llOp4g+p9P +5H+wGm2KFhvslaoKBKhSUkM/1teS+XsoDjqaPp/4RQ80ywUYhVWJz18vH1ltWLQW +93i3mnLDDb+aOyeoxqIPCQSy6Q8nIYoM8e3jYvdjjZNruT45g6IK6bx7eQmEMfO+ +u7qJiCKWGMxY+72ZeOw/0DMw4y8kU0wrl7gQ1o1Jk94hHNpBam+hX0Btc1K7YwXB +CemmHAuKQw== +-----END CERTIFICATE-----
Added: airavata/trunk/modules/gfac-core/src/test/resources/certificates/ffc3d59b.crl_url URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/test/resources/certificates/ffc3d59b.crl_url?rev=1502732&view=auto ============================================================================== --- airavata/trunk/modules/gfac-core/src/test/resources/certificates/ffc3d59b.crl_url (added) +++ airavata/trunk/modules/gfac-core/src/test/resources/certificates/ffc3d59b.crl_url Sat Jul 13 00:49:09 2013 @@ -0,0 +1 @@ +http://crl.ca.ngs.ac.uk/crl/escience2b.crl Added: airavata/trunk/modules/gfac-core/src/test/resources/certificates/ffc3d59b.signing_policy URL: http://svn.apache.org/viewvc/airavata/trunk/modules/gfac-core/src/test/resources/certificates/ffc3d59b.signing_policy?rev=1502732&view=auto ============================================================================== --- airavata/trunk/modules/gfac-core/src/test/resources/certificates/ffc3d59b.signing_policy (added) +++ airavata/trunk/modules/gfac-core/src/test/resources/certificates/ffc3d59b.signing_policy Sat Jul 13 00:49:09 2013 @@ -0,0 +1,5 @@ +# @(#)$Id: ffc3d59b.signing_policy,v 1.3 2011/09/30 06:19:28 pmacvsdg Exp $ +# + access_id_CA X509 '/C=UK/O=eScienceCA/OU=Authority/CN=UK e-Science CA 2B' + pos_rights globus CA:sign + cond_subjects globus '"/C=UK/O=eScience/*"' Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ApplicationJob.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ApplicationJob.java?rev=1502732&r1=1502731&r2=1502732&view=diff ============================================================================== --- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ApplicationJob.java (original) +++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/workflow/ApplicationJob.java Sat Jul 13 00:49:09 2013 @@ -36,6 +36,11 @@ public class ApplicationJob { * based on type of application (eg: GRAM, EC2) being executed</em>. */ public static enum ApplicationJobStatus{ + + /** + * Job not yet submitted to Gram + */ + UN_SUBMITTED, /** * Validating the application job input data and configurations */ Added: airavata/trunk/modules/rest/webapp/src/main/webapp/credential-store/password-credentials.jsp URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/src/main/webapp/credential-store/password-credentials.jsp?rev=1502732&view=auto ============================================================================== --- airavata/trunk/modules/rest/webapp/src/main/webapp/credential-store/password-credentials.jsp (added) +++ airavata/trunk/modules/rest/webapp/src/main/webapp/credential-store/password-credentials.jsp Sat Jul 13 00:49:09 2013 @@ -0,0 +1,33 @@ +<%-- + ~ 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. + --%> + +<html> +<body> +<h2>Store Passwords</h2> +<p>This demonstrates how portal can use Credential Store to obtain community credentials ...</p> +<form name="input" action="../airavata-registry-rest-services/credential-store" method="post"> + + Gateway Name : <input type="text" name="gatewayName"><br> + Portal Username: <input type="text" name="portalUserName"><br> + Contact Email: <input type="text" name="email"> + + <input type="submit" value="Submit"> +</form> +</body> +</html> \ No newline at end of file Modified: airavata/trunk/modules/test-suite/pom.xml URL: http://svn.apache.org/viewvc/airavata/trunk/modules/test-suite/pom.xml?rev=1502732&r1=1502731&r2=1502732&view=diff ============================================================================== --- airavata/trunk/modules/test-suite/pom.xml (original) +++ airavata/trunk/modules/test-suite/pom.xml Sat Jul 13 00:49:09 2013 @@ -24,39 +24,17 @@ <dependencies> <dependency> - <groupId>cog-jglobus</groupId> - <artifactId>cog-jglobus</artifactId> - <version>1.8.0_1</version> - </dependency> - <dependency> <groupId>org.apache.axis2</groupId> <artifactId>axis2-transport-local</artifactId> <version>${axis2.version}</version> <scope>compile</scope> </dependency> + <dependency> - <groupId>cog-4_1_6_rc2</groupId> - <artifactId>puretls</artifactId> - <type>jar</type> - <version>cog-4_1_6</version> - </dependency> - <dependency> - <groupId>cog-4_1_6_rc2</groupId> - <artifactId>cryptix32</artifactId> - <version>cog-4_1_6</version> - </dependency> - <dependency> - <groupId>cog-4_1_6_rc2</groupId> - <artifactId>cryptix-asn1</artifactId> - <version>cog-4_1_6</version> - </dependency> - <dependency> - <groupId>bouncycastle</groupId> - <artifactId>bcprov-jdk15</artifactId> - <version>143</version> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk16</artifactId> </dependency> - <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> Modified: airavata/trunk/modules/xbaya-gui/pom.xml URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/pom.xml?rev=1502732&r1=1502731&r2=1502732&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/pom.xml (original) +++ airavata/trunk/modules/xbaya-gui/pom.xml Sat Jul 13 00:49:09 2013 @@ -140,11 +140,6 @@ <version>2.5.1</version> </dependency> <dependency> - <groupId>cog-jglobus</groupId> - <artifactId>cog-jglobus</artifactId> - <version>1.8.0_1</version> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> Modified: airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java?rev=1502732&r1=1502731&r2=1502732&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java (original) +++ airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/invoker/EmbeddedGFacInvoker.java Sat Jul 13 00:49:09 2013 @@ -44,10 +44,8 @@ import org.apache.airavata.commons.gfac. import org.apache.airavata.commons.gfac.type.ApplicationDescription; import org.apache.airavata.commons.gfac.type.HostDescription; import org.apache.airavata.commons.gfac.type.ServiceDescription; -import org.apache.airavata.gfac.Constants; -import org.apache.airavata.gfac.GFacAPI; -import org.apache.airavata.gfac.GFacConfiguration; -import org.apache.airavata.gfac.Scheduler; +import org.apache.airavata.credential.store.store.CredentialReaderFactory; +import org.apache.airavata.gfac.*; import org.apache.airavata.gfac.context.ApplicationContext; import org.apache.airavata.gfac.context.JobExecutionContext; import org.apache.airavata.gfac.context.MessageContext; @@ -419,31 +417,36 @@ public class EmbeddedGFacInvoker impleme } private void addSecurityContext(HostDescription registeredHost, Properties configurationProperties, - JobExecutionContext jobExecutionContext, ContextHeaderDocument.ContextHeader contextHeader) { + JobExecutionContext jobExecutionContext, ContextHeaderDocument.ContextHeader contextHeader) throws WorkflowException { if (registeredHost.getType() instanceof GlobusHostType || registeredHost.getType() instanceof UnicoreHostType) { SecurityContextDocument.SecurityContext.CredentialManagementService credentialManagementService = getCredentialManagementService(contextHeader); GSISecurityContext context; + RequestData requestData; + + String gatewayId = jobExecutionContext.getGFacConfiguration().getAiravataAPI().getGateway(); if (credentialManagementService != null) { String tokenId = credentialManagementService.getTokenId(); - String gatewayUser = credentialManagementService.getPortalUser(); - - String gatewayId = jobExecutionContext.getGFacConfiguration().getAiravataAPI().getGateway(); - - context = new GSISecurityContext(configurationProperties, tokenId, gatewayId, - gatewayUser); + String portalUser = credentialManagementService.getPortalUser(); + requestData = new RequestData(tokenId, portalUser, gatewayId); } else { - context = new GSISecurityContext(configurationProperties); + requestData = new RequestData(gatewayId); + } + + try { + context = new GSISecurityContext(CredentialReaderFactory.createCredentialStoreReader(), requestData); + } catch (Exception e) { + throw new WorkflowException("An error occurred while creating GSI security context", e); } - jobExecutionContext.addSecurityContext(GSISecurityContext.GSI_SECURITY_CONTEXT, context); + jobExecutionContext.addSecurityContext(GSISecurityContext.GSI_SECURITY_CONTEXT, context); } else if (registeredHost.getType() instanceof Ec2HostType) { if (this.configuration.getAmazonSecurityContext() != null) { Modified: airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/utils/TestUtilServer.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/utils/TestUtilServer.java?rev=1502732&r1=1502731&r2=1502732&view=diff ============================================================================== --- airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/utils/TestUtilServer.java (original) +++ airavata/trunk/modules/xbaya-gui/src/test/java/org/apache/airavata/xbaya/interpreter/utils/TestUtilServer.java Sat Jul 13 00:49:09 2013 @@ -130,7 +130,7 @@ public class TestUtilServer { new org.apache.airavata.wsmg.broker.wseventing.WSEventingMsgReceiver(), "http://schemas.xmlsoap.org/ws/2004/08/eventing/Renew";, "http://schemas.xmlsoap.org/ws/2004/08/eventing/RenewResponse";); - createOperation(eventingService, "getStatus", + createOperation(eventingService, "getCurrentStatus", new org.apache.airavata.wsmg.broker.wseventing.WSEventingMsgReceiver(), "http://schemas.xmlsoap.org/ws/2004/08/eventing/GetStatus";, "http://schemas.xmlsoap.org/ws/2004/08/eventing/GetStatusResponse";); Modified: airavata/trunk/pom.xml URL: http://svn.apache.org/viewvc/airavata/trunk/pom.xml?rev=1502732&r1=1502731&r2=1502732&view=diff ============================================================================== --- airavata/trunk/pom.xml (original) +++ airavata/trunk/pom.xml Sat Jul 13 00:49:09 2013 @@ -8,7 +8,8 @@ ANY ~ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> @@ -20,7 +21,7 @@ <groupId>org.apache</groupId> <artifactId>apache</artifactId> <version>13</version> - <relativePath /> + <relativePath/> </parent> <groupId>org.apache.airavata</groupId> @@ -80,6 +81,7 @@ <cargo.version>1.3.1</cargo.version> <oa4mp.version>1.0.6</oa4mp.version> <antrun.version>1.6</antrun.version> + <bouncy.castle.version>1.45</bouncy.castle.version> <skipTests>false</skipTests> </properties> @@ -323,11 +325,20 @@ <artifactId>junit</artifactId> <version>${junit.version}</version> </dependency> + <dependency> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk16</artifactId> + <version>${bouncy.castle.version}</version> + </dependency> </dependencies> </dependencyManagement> <repositories> <repository> + <id>my-local-repo</id> + <url>file:./jglobus-repo/repository</url> + </repository> + <repository> <id>central</id> <name>Maven Central</name> <url>http://repo1.maven.org/maven2</url> Modified: airavata/trunk/tools/phoebus-integration/pom.xml URL: http://svn.apache.org/viewvc/airavata/trunk/tools/phoebus-integration/pom.xml?rev=1502732&r1=1502731&r2=1502732&view=diff ============================================================================== --- airavata/trunk/tools/phoebus-integration/pom.xml (original) +++ airavata/trunk/tools/phoebus-integration/pom.xml Sat Jul 13 00:49:09 2013 @@ -24,17 +24,6 @@ <dependencies> <dependency> - <groupId>cog-jglobus</groupId> - <artifactId>cog-jglobus</artifactId> - <version>1.8.0_1</version> - </dependency> - <dependency> - <groupId>cog-4_1_6_rc2</groupId> - <artifactId>puretls</artifactId> - <type>jar</type> - <version>cog-4_1_6</version> - </dependency> - <dependency> <groupId>commons-configuration</groupId> <artifactId>commons-configuration</artifactId> <version>1.6</version>
