From commits-return-4237-apmail-airavata-commits-archive=airavata.apache.org@airavata.apache.org Wed May 22 16:31:51 2013 Return-Path: X-Original-To: apmail-airavata-commits-archive@www.apache.org Delivered-To: apmail-airavata-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 94B69DCDF for ; Wed, 22 May 2013 16:31:51 +0000 (UTC) Received: (qmail 33700 invoked by uid 500); 22 May 2013 16:31:51 -0000 Delivered-To: apmail-airavata-commits-archive@airavata.apache.org Received: (qmail 33579 invoked by uid 500); 22 May 2013 16:31:49 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 33522 invoked by uid 99); 22 May 2013 16:31:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 May 2013 16:31:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 22 May 2013 16:31:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E5ADE2388ABB; Wed, 22 May 2013 16:31:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1485274 - in /airavata/trunk/modules: airavata-client/src/main/java/org/apache/airavata/client/api/ airavata-client/src/main/java/org/apache/airavata/client/impl/ commons/utils/src/main/java/org/apache/airavata/common/utils/ registry/airav... Date: Wed, 22 May 2013 16:31:23 -0000 To: commits@airavata.apache.org From: samindaw@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130522163123.E5ADE2388ABB@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: samindaw Date: Wed May 22 16:31:23 2013 New Revision: 1485274 URL: http://svn.apache.org/r1485274 Log: fixing the url protocol missing issue + fixing a function name typo Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java?rev=1485274&r1=1485273&r2=1485274&view=diff ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java (original) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/api/ProvenanceManager.java Wed May 22 16:31:23 2013 @@ -421,7 +421,7 @@ public interface ProvenanceManager { * @param metadata * @throws AiravataAPIInvocationException */ - public void updateGFacJobMetadta(String gfacJobId, String metadata) throws AiravataAPIInvocationException; + public void updateGFacJobMetadata(String gfacJobId, String metadata) throws AiravataAPIInvocationException; /** * Retrieve the GFac Job for the given job id Modified: airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java?rev=1485274&r1=1485273&r2=1485274&view=diff ============================================================================== --- airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java (original) +++ airavata/trunk/modules/airavata-client/src/main/java/org/apache/airavata/client/impl/ProvenanceManagerImpl.java Wed May 22 16:31:23 2013 @@ -561,10 +561,10 @@ public class ProvenanceManagerImpl imple } @Override - public void updateGFacJobMetadta(String gfacJobId, String metadata) + public void updateGFacJobMetadata(String gfacJobId, String metadata) throws AiravataAPIInvocationException { try { - client.getRegistryClient().updateGFacJobMetadta(gfacJobId, metadata); + client.getRegistryClient().updateGFacJobMetadata(gfacJobId, metadata); } catch (Exception e) { throw new AiravataAPIInvocationException(e); } Modified: airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java?rev=1485274&r1=1485273&r2=1485274&view=diff ============================================================================== --- airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java (original) +++ airavata/trunk/modules/commons/utils/src/main/java/org/apache/airavata/common/utils/ServiceUtils.java Wed May 22 16:31:23 2013 @@ -77,9 +77,9 @@ public class ServiceUtils { port = (String) transportInDescription .getParameter(PORT).getValue(); } - localAddress = "http://" + localAddress + ":" + port; } - localAddress = localAddress + "/" + localAddress = "http://" + localAddress + ":" + port; + localAddress = localAddress + "/" //We are not using axis2 config context to get the context root because it is invalid //+ context.getContextRoot() + "/" //FIXME: the context root will be correct after updating the web.xml Modified: airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java?rev=1485274&r1=1485273&r2=1485274&view=diff ============================================================================== --- airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java (original) +++ airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java Wed May 22 16:31:23 2013 @@ -2231,7 +2231,7 @@ public class AiravataJPARegistry extends } @Override - public void updateGFacJobMetadta(String gfacJobId, String metadata) + public void updateGFacJobMetadata(String gfacJobId, String metadata) throws RegistryException { // TODO Auto-generated method stub Modified: airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java?rev=1485274&r1=1485273&r2=1485274&view=diff ============================================================================== --- airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java (original) +++ airavata/trunk/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/ProvenanceRegistry.java Wed May 22 16:31:23 2013 @@ -485,7 +485,7 @@ public interface ProvenanceRegistry exte * @param metadata * @throws RegistryException */ - public void updateGFacJobMetadta(String gfacJobId, String metadata) throws RegistryException; + public void updateGFacJobMetadata(String gfacJobId, String metadata) throws RegistryException; /** * Retrieve the GFac Job for the given job id Modified: airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java?rev=1485274&r1=1485273&r2=1485274&view=diff ============================================================================== --- airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java (original) +++ airavata/trunk/modules/rest/client/src/main/java/org/apache/airavata/rest/client/RegistryClient.java Wed May 22 16:31:23 2013 @@ -942,7 +942,7 @@ public class RegistryClient extends Aira } @Override - public void updateGFacJobMetadta(String gfacJobId, String metadata) + public void updateGFacJobMetadata(String gfacJobId, String metadata) throws RegistryException { // TODO Auto-generated method stub