You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ch...@apache.org on 2014/09/17 17:55:42 UTC
[1/2] git commit: adding rabbit mq
Repository: airavata
Updated Branches:
refs/heads/master b8bb82ce8 -> 17e8fd3b3
refs/heads/messaging_framework e257af721 -> 288fb82aa
adding rabbit mq
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/288fb82a
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/288fb82a
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/288fb82a
Branch: refs/heads/messaging_framework
Commit: 288fb82aaa3752daffa9af840e5f05f5398a1f9b
Parents: e257af7
Author: chathuriw <ka...@gmail.com>
Authored: Wed Sep 17 11:30:59 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Wed Sep 17 11:30:59 2014 -0400
----------------------------------------------------------------------
modules/messaging/core/pom.xml | 31 +++++++++++++++++++------------
1 file changed, 19 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/288fb82a/modules/messaging/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/messaging/core/pom.xml b/modules/messaging/core/pom.xml
index 4bb4995..4b36cda 100644
--- a/modules/messaging/core/pom.xml
+++ b/modules/messaging/core/pom.xml
@@ -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">
<parent>
<groupId>org.apache.airavata</groupId>
@@ -38,25 +39,31 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-data-models</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-client-configuration</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.rabbitmq</groupId>
+ <artifactId>amqp-client</artifactId>
+ <version>3.3.5</version>
+ </dependency>
</dependencies>
+
</project>
[2/2] git commit: fixing error condition
Posted by ch...@apache.org.
fixing error condition
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/17e8fd3b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/17e8fd3b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/17e8fd3b
Branch: refs/heads/master
Commit: 17e8fd3b3c9dfd2eab8d811561d8357215f3d77d
Parents: b8bb82c
Author: Chathuri Wimalasena <ka...@gmail.com>
Authored: Wed Sep 17 11:55:36 2014 -0400
Committer: Chathuri Wimalasena <ka...@gmail.com>
Committed: Wed Sep 17 11:55:36 2014 -0400
----------------------------------------------------------------------
.../application/catalog/data/impl/ComputeResourceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/17e8fd3b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
----------------------------------------------------------------------
diff --git a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
index 2b13cee..5b55556 100644
--- a/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
+++ b/modules/app-catalog/app-catalog-data/src/main/java/org/apache/aiaravata/application/catalog/data/impl/ComputeResourceImpl.java
@@ -38,7 +38,7 @@ public class ComputeResourceImpl implements ComputeResource {
@Override
public String addComputeResource(ComputeResourceDescription description) throws AppCatalogException {
try {
- if (description.getComputeResourceId().equals("") || !description.getComputeResourceId().equals(computeResourceModelConstants.DEFAULT_ID)){
+ if (!description.getComputeResourceId().equals("") || !description.getComputeResourceId().equals(computeResourceModelConstants.DEFAULT_ID)){
description.setComputeResourceId(AppCatalogUtils.getID(description.getHostName()));
}
return saveComputeResourceDescriptorData(description);