You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2014/06/30 21:23:14 UTC

[1/2] git commit: temporarly adding the unicore maven repo to fix the build.

Repository: airavata
Updated Branches:
  refs/heads/master 3a2c052c7 -> 506593c48


temporarly adding the unicore maven repo to fix the build.


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/45a73f43
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/45a73f43
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/45a73f43

Branch: refs/heads/master
Commit: 45a73f4325c2f699cd810a87cc2fac69a65728a2
Parents: 7147020
Author: Suresh Marru <sm...@apache.org>
Authored: Mon Jun 30 15:12:28 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Mon Jun 30 15:12:28 2014 -0400

----------------------------------------------------------------------
 modules/distribution/server/pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/45a73f43/modules/distribution/server/pom.xml
----------------------------------------------------------------------
diff --git a/modules/distribution/server/pom.xml b/modules/distribution/server/pom.xml
index d9055c2..0908438 100644
--- a/modules/distribution/server/pom.xml
+++ b/modules/distribution/server/pom.xml
@@ -127,6 +127,14 @@
         </plugins>
     </build>
 
+    <repositories>
+        <repository>
+            <id>unicore.eu</id>
+            <name>UNICORE repository</name>
+            <url>http://unicore-dev.zam.kfa-juelich.de/maven</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <dependency>
             <groupId>org.apache.derby</groupId>


[2/2] git commit: Merge remote-tracking branch 'origin/master'

Posted by sm...@apache.org.
Merge remote-tracking branch 'origin/master'


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/506593c4
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/506593c4
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/506593c4

Branch: refs/heads/master
Commit: 506593c4887853adb5fc2fdcbb3aa530a1c57ef2
Parents: 45a73f4 3a2c052
Author: Suresh Marru <sm...@apache.org>
Authored: Mon Jun 30 15:23:09 2014 -0400
Committer: Suresh Marru <sm...@apache.org>
Committed: Mon Jun 30 15:23:09 2014 -0400

----------------------------------------------------------------------
 .../resources/lib/experimentModel_types.cpp     | 290 +++++++++-------
 .../main/resources/lib/experimentModel_types.h  |  42 ++-
 .../Model/Workspace/Experiment/Types.php        |  77 ++++-
 .../workspace/experiment/ExecutionUnit.java     |  64 ++++
 .../experiment/WorkflowNodeDetails.java         | 278 +++++++++++++--
 .../model/util/ExperimentModelUtil.java         |   8 +
 .../experimentModel.thrift                      |   2 +-
 .../appcatalog/cpi/ComputeResource.java         |  13 +
 .../data/impl/ApplicationDeploymentImpl.java    |   3 +
 .../data/impl/ApplicationInterfaceImpl.java     | 173 +++++++++-
 .../catalog/data/impl/ComputeResourceImpl.java  | 217 +++++++++++-
 .../catalog/data/model/ApplicationInput.java    |  34 +-
 .../catalog/data/model/ApplicationOutput.java   |  10 -
 .../data/resources/AbstractResource.java        |  11 +-
 .../resources/ApplicationInputResource.java     |  41 ++-
 .../resources/ApplicationOutputResource.java    |  11 -
 .../resources/GSISSHSubmissionResource.java     |  15 +-
 .../resources/GlobusJobSubmissionResource.java  |  48 +--
 .../resources/GridFTPDataMovementResource.java  |  28 +-
 .../data/resources/SCPDataMovementResource.java |  14 +-
 .../data/resources/SSHSubmissionResource.java   |  26 +-
 .../catalog/data/util/AppCatalogJPAUtils.java   |   6 +-
 .../data/util/AppCatalogThriftConversion.java   | 335 ++++++++++++++++++-
 .../src/main/resources/appcatalog-derby.sql     |   6 +-
 .../src/main/resources/appcatalog-mysql.sql     |   5 +-
 modules/distribution/server/pom.xml             |  16 +-
 .../airavata/gfac/core/utils/GFacUtils.java     |   2 +-
 .../gfac/gsissh/handler/GSISSHInputHandler.java |   3 +-
 .../security/TokenizedMyProxyAuthInfo.java      |   3 +-
 .../gfac/services/impl/LocalProviderTest.java   |   4 +-
 .../ssh/handler/AdvancedSCPInputHandler.java    | 112 +++++--
 .../registry/jpa/impl/ExperimentRegistry.java   |   4 +
 .../registry/jpa/model/WorkflowNodeDetail.java  |  20 ++
 .../registry/jpa/resources/Utils.java           |   3 +
 .../resources/WorkflowNodeDetailResource.java   |  23 ++
 .../jpa/utils/ThriftDataModelConversion.java    |  59 +++-
 .../src/main/resources/registry-derby.sql       |   2 +
 .../src/main/resources/registry-mysql.sql       |   2 +
 38 files changed, 1576 insertions(+), 434 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/506593c4/modules/distribution/server/pom.xml
----------------------------------------------------------------------