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 2011/08/01 03:02:58 UTC
svn commit: r1152671 - in /incubator/airavata/trunk/xbaya-gui: ./
src/main/java/org/apache/airavata/xbaya/mylead/
src/main/java/org/apache/airavata/xbaya/security/
src/main/java/org/apache/airavata/xbaya/test/
src/main/java/org/apache/airavata/xbaya/util/
Author: smarru
Date: Mon Aug 1 01:02:57 2011
New Revision: 1152671
URL: http://svn.apache.org/viewvc?rev=1152671&view=rev
Log:
Fixed AIRAVATA-44 missing property file error.
Modified:
incubator/airavata/trunk/xbaya-gui/pom.xml
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/mylead/MyLead.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/security/XBayaSecurity.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GFacServiceCreaterTestCase.java
incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/AmazonUtil.java
Modified: incubator/airavata/trunk/xbaya-gui/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/pom.xml?rev=1152671&r1=1152670&r2=1152671&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/pom.xml (original)
+++ incubator/airavata/trunk/xbaya-gui/pom.xml Mon Aug 1 01:02:57 2011
@@ -14,25 +14,13 @@
<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>
- <groupId>XBaya</groupId>
- <artifactId>XBaya</artifactId>
+ <groupId>airavata</groupId>
+ <artifactId>airavata-xbaya-gui</artifactId>
<packaging>jar</packaging>
- <version>3.8.1</version>
- <name>XBaya</name>
- <url>http://www.collab-ogce.org/ogce/index.php/XBaya</url>
+ <version>0.0.1-SNAPSHOT</version>
+ <name>Airavata XBaya</name>
+ <url>http://incubator.apache.org/airavata/</url>
- <!--
- When building the OGCE Suite, the parent properties will be inherited.
- the parent and associated properties will be ignored for stand alone
- builds.
-
- <parent>
- <groupId>ogce.tutorial</groupId>
- <artifactId>main-driver</artifactId>
- <version>1.0</version>
- <relativePath>..</relativePath>
- </parent>
- -->
<!-- Edit the following properties.-->
<profiles>
<profile>
@@ -435,45 +423,4 @@
<version>0.8.0</version>
</dependency>
</dependencies>
-</project>
- <!--
- /* * Indiana University Extreme! Lab Software License, Version 1.2 * *
- Copyright (c) 2002-2004 The Trustees of Indiana University. * All
- rights reserved. * * Redistribution and use in source and binary
- forms, with or without * modification, are permitted provided that the
- following conditions are * met: * * 1) All redistributions of source
- code must retain the above * copyright notice, the list of authors in
- the original source * code, this list of conditions and the disclaimer
- listed in this * license; * * 2) All redistributions in binary form
- must reproduce the above * copyright notice, this list of conditions
- and the disclaimer * listed in this license in the documentation
- and/or other * materials provided with the distribution; * * 3) Any
- documentation included with all redistributions must include * the
- following acknowledgement: * * "This product includes software
- developed by the Indiana * University Extreme! Lab. For further
- information please visit * http://www.extreme.indiana.edu/" * *
- Alternatively, this acknowledgment may appear in the software *
- itself, and wherever such third-party acknowledgments normally *
- appear. * * 4) The name "Indiana University" or "Indiana University *
- Extreme! Lab" shall not be used to endorse or promote * products
- derived from this software without prior written * permission from
- Indiana University. For written permission, * please contact
- http://www.extreme.indiana.edu/. * * 5) Products derived from this
- software may not use "Indiana * University" name nor may "Indiana
- University" appear in their name, * without prior written permission
- of the Indiana University. * * Indiana University provides no
- reassurances that the source code * provided does not infringe the
- patent or any other intellectual * property rights of any other
- entity. Indiana University disclaims any * liability to any recipient
- for claims brought by any other entity * based on infringement of
- intellectual property rights or otherwise. * * LICENSEE UNDERSTANDS
- THAT SOFTWARE IS PROVIDED "AS IS" FOR WHICH * NO WARRANTIES AS TO
- CAPABILITIES OR ACCURACY ARE MADE. INDIANA * UNIVERSITY GIVES NO
- WARRANTIES AND MAKES NO REPRESENTATION THAT * SOFTWARE IS FREE OF
- INFRINGEMENT OF THIRD PARTY PATENT, COPYRIGHT, OR * OTHER PROPRIETARY
- RIGHTS. INDIANA UNIVERSITY MAKES NO WARRANTIES THAT * SOFTWARE IS FREE
- FROM "BUGS", "VIRUSES", "TROJAN HORSES", "TRAP * DOORS", "WORMS", OR
- OTHER HARMFUL CODE. LICENSEE ASSUMES THE ENTIRE * RISK AS TO THE
- PERFORMANCE OF SOFTWARE AND/OR ASSOCIATED MATERIALS, * AND TO THE
- PERFORMANCE AND VALIDITY OF INFORMATION GENERATED USING * SOFTWARE. */
- -->
+</project>
\ No newline at end of file
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/mylead/MyLead.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/mylead/MyLead.java?rev=1152671&r1=1152670&r2=1152671&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/mylead/MyLead.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/mylead/MyLead.java Mon Aug 1 01:02:57 2011
@@ -19,7 +19,7 @@
*
*/
-package org.apache.airavata.xbaya.mylead.gui;
+package org.apache.airavata.xbaya.mylead;
import java.net.URI;
import java.net.URISyntaxException;
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/security/XBayaSecurity.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/security/XBayaSecurity.java?rev=1152671&r1=1152670&r2=1152671&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/security/XBayaSecurity.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/security/XBayaSecurity.java Mon Aug 1 01:02:57 2011
@@ -40,8 +40,6 @@ public class XBayaSecurity {
public static final String OGCE_TRUSTED_CERTIFICATES = "/ogce-teragrid-cas.pem";
- public static final String LEAD_TRUSTED_CERTIFICATES = "/lead-trusted-cas.pem";
-
private static final String ANONYMOUS_CERTIFICATE = "/hostcertkey-annonymous.pem";
private static X509Certificate[] trustedCertificates;
@@ -57,11 +55,9 @@ public class XBayaSecurity {
}
List<X509Certificate> ogceTrustedCertificates = getTrustedCertificates(OGCE_TRUSTED_CERTIFICATES);
- List<X509Certificate> leadTrustedCertificates = getTrustedCertificates(LEAD_TRUSTED_CERTIFICATES);
List<X509Certificate> allTrustedCertificates = new ArrayList<X509Certificate>();
allTrustedCertificates.addAll(ogceTrustedCertificates);
- allTrustedCertificates.addAll(leadTrustedCertificates);
trustedCertificates = allTrustedCertificates.toArray(new X509Certificate[allTrustedCertificates.size()]);
return trustedCertificates;
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GFacServiceCreaterTestCase.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GFacServiceCreaterTestCase.java?rev=1152671&r1=1152670&r2=1152671&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GFacServiceCreaterTestCase.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/test/GFacServiceCreaterTestCase.java Mon Aug 1 01:02:57 2011
@@ -19,6 +19,8 @@
*
*/
+package org.apache.airavata.xbaya.test;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
Modified: incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/AmazonUtil.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/AmazonUtil.java?rev=1152671&r1=1152670&r2=1152671&view=diff
==============================================================================
--- incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/AmazonUtil.java (original)
+++ incubator/airavata/trunk/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/AmazonUtil.java Mon Aug 1 01:02:57 2011
@@ -19,6 +19,8 @@
*
*/
+package org.apache.airavata.xbaya.util;
+
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;