Repository: airavata Updated Branches: refs/heads/airavata-0.15-release-branch 09143819d -> c5819c6ff
Adding missing license headers and preparing for release Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/c5819c6f Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/c5819c6f Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/c5819c6f Branch: refs/heads/airavata-0.15-release-branch Commit: c5819c6ffacc4d79a5398a5d0155187224988120 Parents: 0914381 Author: smarru <[email protected]> Authored: Fri Dec 4 04:20:23 2015 -0500 Committer: smarru <[email protected]> Committed: Fri Dec 4 04:20:23 2015 -0500 ---------------------------------------------------------------------- .../src/main/resources/lib/thrift/stamp-h2 | 1 - .../resources/lib/thrift/windows/tr1/functional | 0 .../client/samples/CreateLaunchBES.java | 21 ++++++++++++++++++++ modules/distribution/release/pom.xml | 8 ++++---- modules/distribution/server/pom.xml | 4 ++-- .../server/src/main/assembly/bin-assembly.xml | 3 +++ .../gfac-application-specific-handlers/pom.xml | 12 +++++++++++ .../gsissh/handler/NewGSISSHOutputHandler.java | 21 ++++++++++++++++++++ .../gfac-monitor/gfac-email-monitor/pom.xml | 9 +++++++++ .../gfac/gfac-monitor/gfac-hpc-monitor/pom.xml | 9 +++++++++ .../gfac/ssh/handler/NewSSHOutputHandler.java | 21 ++++++++++++++++++++ .../airavata/gfac/ssh/util/HandleOutputs.java | 21 ++++++++++++++++++++ .../airavata/messaging/client/TestReader.java | 21 ++++++++++++++++++++ .../messaging/core/stats/CountWriterTask.java | 21 ++++++++++++++++++++ .../messaging/core/stats/LatencyWriterTask.java | 21 ++++++++++++++++++++ .../messaging/core/stats/StatCounter.java | 21 ++++++++++++++++++++ modules/orchestrator/NULL | 1 - .../airavata-orchestrator-service/pom.xml | 4 ++-- .../server/OrchestratorServerHandler.java | 16 ++++++++------- .../src/main/resources/test-framework.yaml | 16 +++++++++++++++ modules/workflow/pom.xml | 11 ++++++++++ modules/workflow/workflow-core/pom.xml | 11 ++++++++++ pom.xml | 10 ++++++++-- tools/rabbitmq-download-start.sh | 16 +++++++++++++++ 24 files changed, 280 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/thrift/stamp-h2 ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/thrift/stamp-h2 b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/thrift/stamp-h2 deleted file mode 100644 index c089805..0000000 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/thrift/stamp-h2 +++ /dev/null @@ -1 +0,0 @@ -timestamp for lib/cpp/src/thrift/config.h http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/thrift/windows/tr1/functional ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/thrift/windows/tr1/functional b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/thrift/windows/tr1/functional deleted file mode 100644 index e69de29..0000000 http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java index 59fb51b..dd53a4c 100644 --- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java +++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/CreateLaunchBES.java @@ -1,3 +1,24 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + package org.apache.airavata.client.samples; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/modules/distribution/release/pom.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/release/pom.xml b/modules/distribution/release/pom.xml index b96951c..3bb1d43 100644 --- a/modules/distribution/release/pom.xml +++ b/modules/distribution/release/pom.xml @@ -54,7 +54,7 @@ </artifactItem> <!--Airavata Client Distributions--> <!--Java SDK--> - <artifactItem> +<!-- <artifactItem> <groupId>org.apache.airavata</groupId> <artifactId>apache-airavata-client-java-sdk</artifactId> <version>${project.version}</version> @@ -68,7 +68,7 @@ <type>tar.gz</type> <classifier>bin</classifier> </artifactItem> - <!--PHP SDK--> + <!–PHP SDK–> <artifactItem> <groupId>org.apache.airavata</groupId> <artifactId>apache-airavata-client-php-sdk</artifactId> @@ -83,7 +83,7 @@ <type>tar.gz</type> <classifier>bin</classifier> </artifactItem> - <!--CPP SDK--> + <!–CPP SDK–> <artifactItem> <groupId>org.apache.airavata</groupId> <artifactId>apache-airavata-client-cpp-sdk</artifactId> @@ -97,7 +97,7 @@ <version>${project.version}</version> <type>tar.gz</type> <classifier>bin</classifier> - </artifactItem> + </artifactItem>--> </artifactItems> <outputDirectory>${project.build.directory}/release-artifacts</outputDirectory> </configuration> http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/modules/distribution/server/pom.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/server/pom.xml b/modules/distribution/server/pom.xml index c293edf..cb1b83f 100644 --- a/modules/distribution/server/pom.xml +++ b/modules/distribution/server/pom.xml @@ -324,11 +324,11 @@ <version>${project.version}</version> </dependency> - <dependency> +<!-- <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-workflow-model-core</artifactId> <version>${project.version}</version> - </dependency> + </dependency>--> <dependency> <groupId>org.apache.airavata</groupId> http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/modules/distribution/server/src/main/assembly/bin-assembly.xml ---------------------------------------------------------------------- diff --git a/modules/distribution/server/src/main/assembly/bin-assembly.xml b/modules/distribution/server/src/main/assembly/bin-assembly.xml index 8b88e92..48d23bf 100644 --- a/modules/distribution/server/src/main/assembly/bin-assembly.xml +++ b/modules/distribution/server/src/main/assembly/bin-assembly.xml @@ -182,6 +182,9 @@ <includes> <include>*:*:jar</include> </includes> + <excludes> + <exclude>mysql:mysql-connector-java</exclude> + </excludes> </dependencySet> </dependencySets> http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/modules/gfac/gfac-application-specific-handlers/pom.xml ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-application-specific-handlers/pom.xml b/modules/gfac/gfac-application-specific-handlers/pom.xml index b6b7d4f..bf9cd9e 100644 --- a/modules/gfac/gfac-application-specific-handlers/pom.xml +++ b/modules/gfac/gfac-application-specific-handlers/pom.xml @@ -1,4 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> + +<!--Licensed to the Apache Software Foundation (ASF) under one or more contributor + license agreements. See the NOTICE file distributed with this work for additional + information regarding copyright ownership. The ASF licenses this file to + you under the Apache License, Version 2.0 (theà "License"); you may not use + this file except in compliance with the License. You may obtain a copy of + the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required + by applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + OF 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/xsd/maven-4.0.0.xsd";> http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/NewGSISSHOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/NewGSISSHOutputHandler.java b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/NewGSISSHOutputHandler.java index ed94312..c2134c7 100644 --- a/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/NewGSISSHOutputHandler.java +++ b/modules/gfac/gfac-gsissh/src/main/java/org/apache/airavata/gfac/gsissh/handler/NewGSISSHOutputHandler.java @@ -1,3 +1,24 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + package org.apache.airavata.gfac.gsissh.handler; import java.util.List; http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/modules/gfac/gfac-monitor/gfac-email-monitor/pom.xml ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-monitor/gfac-email-monitor/pom.xml b/modules/gfac/gfac-monitor/gfac-email-monitor/pom.xml index 0bff287..7e2e3d2 100644 --- a/modules/gfac/gfac-monitor/gfac-email-monitor/pom.xml +++ b/modules/gfac/gfac-monitor/gfac-email-monitor/pom.xml @@ -1,4 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> + +<!--Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file + distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under + the Apache License, Version 2.0 (theà "License"); you may not use this file except in compliance with the License. You may + obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to + in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF + 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/xsd/maven-4.0.0.xsd";> http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/modules/gfac/gfac-monitor/gfac-hpc-monitor/pom.xml ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-monitor/gfac-hpc-monitor/pom.xml b/modules/gfac/gfac-monitor/gfac-hpc-monitor/pom.xml index 3d40edc..c5d5883 100644 --- a/modules/gfac/gfac-monitor/gfac-hpc-monitor/pom.xml +++ b/modules/gfac/gfac-monitor/gfac-hpc-monitor/pom.xml @@ -1,4 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> + +<!--Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file + distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under + the Apache License, Version 2.0 (theà "License"); you may not use this file except in compliance with the License. You may + obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to + in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF + 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/xsd/maven-4.0.0.xsd";> http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/NewSSHOutputHandler.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/NewSSHOutputHandler.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/NewSSHOutputHandler.java index 93d0ed0..2a5ae78 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/NewSSHOutputHandler.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/handler/NewSSHOutputHandler.java @@ -1,3 +1,24 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + package org.apache.airavata.gfac.ssh.handler; import java.io.PrintWriter; http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java ---------------------------------------------------------------------- diff --git a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java index 3ee84f9..be55fd9 100644 --- a/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java +++ b/modules/gfac/gfac-ssh/src/main/java/org/apache/airavata/gfac/ssh/util/HandleOutputs.java @@ -1,3 +1,24 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + package org.apache.airavata.gfac.ssh.util; import java.io.File; http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/TestReader.java ---------------------------------------------------------------------- diff --git a/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/TestReader.java b/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/TestReader.java index 4ddbf42..c4337b6 100644 --- a/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/TestReader.java +++ b/modules/messaging/client/src/main/java/org/apache/airavata/messaging/client/TestReader.java @@ -1,3 +1,24 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + package org.apache.airavata.messaging.client; import java.io.*; http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/CountWriterTask.java ---------------------------------------------------------------------- diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/CountWriterTask.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/CountWriterTask.java index 5261512..b053206 100644 --- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/CountWriterTask.java +++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/CountWriterTask.java @@ -1,3 +1,24 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + package org.apache.airavata.messaging.core.stats; import java.io.*; http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/LatencyWriterTask.java ---------------------------------------------------------------------- diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/LatencyWriterTask.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/LatencyWriterTask.java index 1e2ccd0..951c56f 100644 --- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/LatencyWriterTask.java +++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/LatencyWriterTask.java @@ -1,3 +1,24 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + package org.apache.airavata.messaging.core.stats; import java.io.*; http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java ---------------------------------------------------------------------- diff --git a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java index 19c675a..7e7e02a 100644 --- a/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java +++ b/modules/messaging/core/src/main/java/org/apache/airavata/messaging/core/stats/StatCounter.java @@ -1,3 +1,24 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + package org.apache.airavata.messaging.core.stats; http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/modules/orchestrator/NULL ---------------------------------------------------------------------- diff --git a/modules/orchestrator/NULL b/modules/orchestrator/NULL deleted file mode 100644 index 6c7ca83..0000000 --- a/modules/orchestrator/NULL +++ /dev/null @@ -1 +0,0 @@ -Device 0 (VID=18d1 and PID=4ee1) is a Google Inc (for LG Electronics/Samsung) Nexus 4/10 (MTP). http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/modules/orchestrator/airavata-orchestrator-service/pom.xml ---------------------------------------------------------------------- diff --git a/modules/orchestrator/airavata-orchestrator-service/pom.xml b/modules/orchestrator/airavata-orchestrator-service/pom.xml index 3c1a6a6..1ef1ef8 100644 --- a/modules/orchestrator/airavata-orchestrator-service/pom.xml +++ b/modules/orchestrator/airavata-orchestrator-service/pom.xml @@ -50,11 +50,11 @@ <artifactId>airavata-orchestrator-stubs</artifactId> <version>${project.version}</version> </dependency> - <dependency> +<!-- <dependency> <groupId>org.apache.airavata</groupId> <artifactId>airavata-workflow-core</artifactId> <version>${project.version}</version> - </dependency> + </dependency>--> <dependency> <groupId>org.apache.airavata</groupId> <artifactId>app-catalog-data</artifactId> http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java ---------------------------------------------------------------------- diff --git a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java index 4ef9dbc..bf47cec 100644 --- a/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java +++ b/modules/orchestrator/airavata-orchestrator-service/src/main/java/org/apache/airavata/orchestrator/server/OrchestratorServerHandler.java @@ -73,7 +73,7 @@ import org.apache.airavata.registry.cpi.RegistryException; import org.apache.airavata.registry.cpi.RegistryModelType; import org.apache.airavata.registry.cpi.utils.Constants.FieldConstants.TaskDetailConstants; import org.apache.airavata.registry.cpi.utils.Constants.FieldConstants.WorkflowNodeConstants; -import org.apache.airavata.workflow.core.WorkflowEnactmentService; +//import org.apache.airavata.workflow.core.WorkflowEnactmentService; import org.apache.thrift.TBase; import org.apache.thrift.TException; @@ -511,12 +511,14 @@ public class OrchestratorServerHandler implements OrchestratorService.Iface { } private void launchWorkflowExperiment(String experimentId, String airavataCredStoreToken) throws TException { - try { - WorkflowEnactmentService.getInstance(). - submitWorkflow(experimentId, airavataCredStoreToken, getGatewayName(), getRabbitMQProcessPublisher()); - } catch (Exception e) { - log.error("Error while launching workflow", e); - } +// try { +// WorkflowEnactmentService.getInstance(). +// submitWorkflow(experimentId, airavataCredStoreToken, getGatewayName(), getRabbitMQProcessPublisher()); +// +// } catch (Exception e) { +// log.error("Error while launching workflow", e); +// } + log.error("Workflow implementations are non funcational. Please contact Airavata dev list for details"); } public synchronized RabbitMQProcessPublisher getRabbitMQProcessPublisher() throws Exception { http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/modules/test-suite/multi-tenanted-airavata/src/main/resources/test-framework.yaml ---------------------------------------------------------------------- diff --git a/modules/test-suite/multi-tenanted-airavata/src/main/resources/test-framework.yaml b/modules/test-suite/multi-tenanted-airavata/src/main/resources/test-framework.yaml index 6c1a6e6..d228bee 100644 --- a/modules/test-suite/multi-tenanted-airavata/src/main/resources/test-framework.yaml +++ b/modules/test-suite/multi-tenanted-airavata/src/main/resources/test-framework.yaml @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. gcount: 10 gname: testGateway gdomain: .airavata.org http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/modules/workflow/pom.xml ---------------------------------------------------------------------- diff --git a/modules/workflow/pom.xml b/modules/workflow/pom.xml index 4fb8e09..32e960e 100644 --- a/modules/workflow/pom.xml +++ b/modules/workflow/pom.xml @@ -1,4 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> +<!--Licensed to the Apache Software Foundation (ASF) under one or more contributor + license agreements. See the NOTICE file distributed with this work for additional + information regarding copyright ownership. The ASF licenses this file to + you under the Apache License, Version 2.0 (theà "License"); you may not use + this file except in compliance with the License. You may obtain a copy of + the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required + by applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + OF 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/xsd/maven-4.0.0.xsd";> http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/modules/workflow/workflow-core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/workflow/workflow-core/pom.xml b/modules/workflow/workflow-core/pom.xml index 2983924..32383d2 100644 --- a/modules/workflow/workflow-core/pom.xml +++ b/modules/workflow/workflow-core/pom.xml @@ -1,4 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> +<!--Licensed to the Apache Software Foundation (ASF) under one or more contributor + license agreements. See the NOTICE file distributed with this work for additional + information regarding copyright ownership. The ASF licenses this file to + you under the Apache License, Version 2.0 (theà "License"); you may not use + this file except in compliance with the License. You may obtain a copy of + the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required + by applicable law or agreed to in writing, software distributed under the + License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS + OF 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/xsd/maven-4.0.0.xsd";> http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 821e2c7..3279ed4 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>16</version> + <version>17</version> </parent> <groupId>org.apache.airavata</groupId> @@ -94,7 +94,7 @@ <ebay.cors.filter>1.0.0</ebay.cors.filter> <thrift.version>0.9.1</thrift.version> <mysql.connector.version>5.1.34</mysql.connector.version> - <skipTests>false</skipTests> + <skipTests>true</skipTests> <google.gson.version>2.3</google.gson.version> <zk.version>3.4.0</zk.version> <amqp.client.version>3.5.1</amqp.client.version> @@ -585,6 +585,12 @@ <exclude>**/*.jks</exclude> <exclude>**/*.pem</exclude> <exclude>**/*.pk8</exclude> + <exclude>**/*.json</exclude> + <exclude>**/*.cpp</exclude> + <exclude>**/*.h</exclude> + <exclude>**/*.php</exclude> + <exclude>**/*.py</exclude> + <exclude>**/*.awf</exclude> </excludes> </configuration> <executions> http://git-wip-us.apache.org/repos/asf/airavata/blob/c5819c6f/tools/rabbitmq-download-start.sh ---------------------------------------------------------------------- diff --git a/tools/rabbitmq-download-start.sh b/tools/rabbitmq-download-start.sh index ea4d9bd..7cba554 100755 --- a/tools/rabbitmq-download-start.sh +++ b/tools/rabbitmq-download-start.sh @@ -1,4 +1,20 @@ #!/usr/bin/env bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. RABBITMQ_DOWNLOAD_URL="https://github.com/rabbitmq/rabbitmq-server/releases/download/rabbitmq_v3_5_1/rabbitmq-server-generic-unix-3.5.1.tar.gz"; RABBITMQ_DIRECTORY="rabbitmq_server-3.5.1"
