You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2014/04/04 17:25:24 UTC
git commit: fixing the build
Repository: airavata
Updated Branches:
refs/heads/master f2a7fc3e7 -> e083a8f6f
fixing the build
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/e083a8f6
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/e083a8f6
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/e083a8f6
Branch: refs/heads/master
Commit: e083a8f6fc2824bc2b6031257c6e0252d5b06d6a
Parents: f2a7fc3
Author: lahiru <la...@apache.org>
Authored: Fri Apr 4 11:25:14 2014 -0400
Committer: lahiru <la...@apache.org>
Committed: Fri Apr 4 11:25:14 2014 -0400
----------------------------------------------------------------------
.../client/samples/CreateLaunchExperiment.java | 2 +-
modules/airavata-client/pom.xml | 10 +--
.../main/resources/airavata-client.properties | 2 +-
modules/credential-store/pom.xml | 1 +
.../client/OrchestratorClientFactoryTest.java | 67 ++++----------------
.../client/sample/OrchestratorClientSample.java | 2 +-
.../registry/api/util/RegistrySettings.java | 1 +
modules/test-suite/pom.xml | 1 +
pom.xml | 3 +-
9 files changed, 24 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/e083a8f6/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
index d4756a2..0bab894 100644
--- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
+++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchExperiment.java
@@ -52,7 +52,7 @@ public class CreateLaunchExperiment {
public static final String THRIFT_SERVER_HOST = "localhost";
public static final int THRIFT_SERVER_PORT = 8930;
private final static Logger logger = LoggerFactory.getLogger(CreateLaunchExperiment.class);
- private static final String DEFAULT_USER = "defauly.registry.user";
+ private static final String DEFAULT_USER = "default.registry.user";
private static final String DEFAULT_GATEWAY = "default.registry.gateway";
public static void main(String[] args) {
http://git-wip-us.apache.org/repos/asf/airavata/blob/e083a8f6/modules/airavata-client/pom.xml
----------------------------------------------------------------------
diff --git a/modules/airavata-client/pom.xml b/modules/airavata-client/pom.xml
index c05ffff..37c1eca 100644
--- a/modules/airavata-client/pom.xml
+++ b/modules/airavata-client/pom.xml
@@ -29,11 +29,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.airavata</groupId>
- <artifactId>airavata-message-monitor</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-codegen</artifactId>
<version>${axis2.version}</version>
@@ -63,6 +58,11 @@
<artifactId>airavata-client-configuration</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-message-monitor</artifactId>
+ <version>${project.version}</version>
+ </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/airavata/blob/e083a8f6/modules/configuration/client/src/main/resources/airavata-client.properties
----------------------------------------------------------------------
diff --git a/modules/configuration/client/src/main/resources/airavata-client.properties b/modules/configuration/client/src/main/resources/airavata-client.properties
index 2a463b1..c275ded 100644
--- a/modules/configuration/client/src/main/resources/airavata-client.properties
+++ b/modules/configuration/client/src/main/resources/airavata-client.properties
@@ -47,7 +47,7 @@ start.derby.server.mode=true
validationQuery=SELECT 1 from CONFIGURATION
jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true
-defauly.registry.user=admin
+default.registry.user=admin
default.registry.password=admin
default.registry.password.hash.method=SHA
default.registry.gateway=default
http://git-wip-us.apache.org/repos/asf/airavata/blob/e083a8f6/modules/credential-store/pom.xml
----------------------------------------------------------------------
diff --git a/modules/credential-store/pom.xml b/modules/credential-store/pom.xml
index 9ac4a71..7340651 100644
--- a/modules/credential-store/pom.xml
+++ b/modules/credential-store/pom.xml
@@ -122,6 +122,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire.version}</version>
+ <inherited>true</inherited>
<configuration>
<systemPropertyVariables>
<credential.module.directory>${basedir}</credential.module.directory>
http://git-wip-us.apache.org/repos/asf/airavata/blob/e083a8f6/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java b/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java
index de5113a..e0af856 100644
--- a/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java
+++ b/modules/orchestrator/airavata-orchestrator-service/src/test/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactoryTest.java
@@ -53,12 +53,14 @@ public class OrchestratorClientFactoryTest {
private Registry registry;
private int NUM_CONCURRENT_REQUESTS = 1;
Initialize initialize;
- @Before
+ OrchestratorServer service;
+ @Test
public void setUp() {
initialize = new Initialize("registry-derby.sql");
initialize.initializeDB();
try {
- new OrchestratorServer().start();
+ service = (new OrchestratorServer());
+ service.start();
} catch (Exception e) {
e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
}
@@ -66,6 +68,13 @@ public class OrchestratorClientFactoryTest {
AiravataUtils.setExecutionAsServer();
documentCreator = new DocumentCreator(getAiravataAPI());
documentCreator.createLocalHostDocs();
+
+ try {
+ service.stop();
+ } catch (Exception e) {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ }
+
}
private AiravataAPI getAiravataAPI() {
@@ -85,58 +94,4 @@ public class OrchestratorClientFactoryTest {
private void storeDescriptors() {
}
-
- @Test
- public void storeExperimentDetail() {
- orchestratorClient = OrchestratorClientFactory.createOrchestratorClient("localhost", 8940);
-
- for (int i = 0; i < NUM_CONCURRENT_REQUESTS; i++) {
- Thread thread = new Thread() {
- public void run() {
- List<DataObjectType> exInputs = new ArrayList<DataObjectType>();
- DataObjectType input = new DataObjectType();
- input.setKey("echo_input");
- input.setType(DataType.STRING.toString());
- input.setValue("echo_output=Hello World");
- exInputs.add(input);
-
-
- List<DataObjectType> exOut = new ArrayList<DataObjectType>();
- DataObjectType output = new DataObjectType();
- output.setKey("echo_output");
- output.setType(DataType.STRING.toString());
- output.setValue("");
- exOut.add(output);
-
- Experiment simpleExperiment = ExperimentModelUtil.createSimpleExperiment("project1",
- "admin", "echoExperiment", "SimpleEcho0", "SimpleEcho0", exInputs);
- simpleExperiment.setExperimentOutputs(exOut);
-
- ComputationalResourceScheduling scheduling = ExperimentModelUtil.createComputationResourceScheduling("localhost", 1, 1, 1, "normal", 0, 0, 1, "TG-STA110014S");
- scheduling.setResourceHostId("localhost");
- UserConfigurationData userConfigurationData = new UserConfigurationData();
- userConfigurationData.setComputationalResourceScheduling(scheduling);
- simpleExperiment.setUserConfigurationData(userConfigurationData);
- String expId = null;
- try {
- expId = (String) registry.add(ParentDataType.EXPERIMENT, simpleExperiment);
- } catch (Exception e) {
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
- }
-
- try {
- orchestratorClient.launchExperiment(expId);
- } catch (TException e) {
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
- }
- }
- };
- thread.start();
- try {
- thread.join();
- } catch (InterruptedException e) {
- e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
- }
- }
- }
}
http://git-wip-us.apache.org/repos/asf/airavata/blob/e083a8f6/modules/orchestrator/orchestrator-client-sdks/src/main/java/org/apache/airavata/orchestrator/client/sample/OrchestratorClientSample.java
----------------------------------------------------------------------
diff --git a/modules/orchestrator/orchestrator-client-sdks/src/main/java/org/apache/airavata/orchestrator/client/sample/OrchestratorClientSample.java b/modules/orchestrator/orchestrator-client-sdks/src/main/java/org/apache/airavata/orchestrator/client/sample/OrchestratorClientSample.java
index 0d10eb9..3a5fc55 100644
--- a/modules/orchestrator/orchestrator-client-sdks/src/main/java/org/apache/airavata/orchestrator/client/sample/OrchestratorClientSample.java
+++ b/modules/orchestrator/orchestrator-client-sdks/src/main/java/org/apache/airavata/orchestrator/client/sample/OrchestratorClientSample.java
@@ -49,7 +49,7 @@ public class OrchestratorClientSample {
private static OrchestratorService.Client orchestratorClient;
private static Registry registry;
private static int NUM_CONCURRENT_REQUESTS = 1;
- private static final String DEFAULT_USER = "defauly.registry.user";
+ private static final String DEFAULT_USER = "default.registry.user";
private static final String DEFAULT_USER_PASSWORD = "default.registry.password";
private static final String DEFAULT_GATEWAY = "default.registry.gateway";
private static String sysUser;
http://git-wip-us.apache.org/repos/asf/airavata/blob/e083a8f6/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistrySettings.java
----------------------------------------------------------------------
diff --git a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistrySettings.java b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistrySettings.java
index 9b67f76..65c7978 100644
--- a/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistrySettings.java
+++ b/modules/registry/registry-api/src/main/java/org/apache/airavata/registry/api/util/RegistrySettings.java
@@ -63,6 +63,7 @@ public class RegistrySettings {
} catch (Exception e) {
propertyLoadException=e;
}
+ System.out.println(url);
}
private static void validateSuccessfulPropertyFileLoad() throws RegistrySettingsException{
http://git-wip-us.apache.org/repos/asf/airavata/blob/e083a8f6/modules/test-suite/pom.xml
----------------------------------------------------------------------
diff --git a/modules/test-suite/pom.xml b/modules/test-suite/pom.xml
index da81116..f070f27 100644
--- a/modules/test-suite/pom.xml
+++ b/modules/test-suite/pom.xml
@@ -110,6 +110,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <inherited>true</inherited>
<configuration>
<workingDirectory>${project.build.testOutputDirectory}</workingDirectory>
<skipTests>true</skipTests>
http://git-wip-us.apache.org/repos/asf/airavata/blob/e083a8f6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 381a012..00ab659 100644
--- a/pom.xml
+++ b/pom.xml
@@ -462,7 +462,6 @@
<modules>
<module>airavata-api</module>
<module>modules/gfac</module>
- <module>modules/ws-messenger</module>
<module>modules/workflow-model</module>
<module>modules/commons</module>
<module>modules/registry</module>
@@ -475,6 +474,8 @@
<module>modules/test-suite</module>
<module>modules/distribution</module>
<module>modules/integration-tests</module>
+ <module>modules/configuration</module>
+ <module>modules/ws-messenger</module>
<!--module>modules/rest</module-->
<!--module>samples</module-->
<!--module>modules/xbaya-gui</module-->