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 2013/01/25 05:22:34 UTC
svn commit: r1438315 - in /airavata/trunk:
modules/distribution/xbaya-gui/src/main/resources/
modules/integration-tests/ modules/integration-tests/src/main/resources/
modules/integration-tests/src/test/java/
modules/integration-tests/src/test/resources...
Author: smarru
Date: Fri Jan 25 04:22:33 2013
New Revision: 1438315
URL: http://svn.apache.org/viewvc?rev=1438315&view=rev
Log:
Adding the missing license headers
Modified:
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/xbaya.jnlp
airavata/trunk/modules/integration-tests/src/main/resources/stop-derby.sh
airavata/trunk/modules/integration-tests/src/test/java/suite.xml
airavata/trunk/modules/integration-tests/src/test/resources/EchoWorkflow.xwf
airavata/trunk/modules/integration-tests/tomcat-distribution.iml
airavata/trunk/modules/rest/service/src/test/resources/authenticators.xml
airavata/trunk/modules/rest/webapp/src/main/resources/authenticators.xml
airavata/trunk/modules/rest/webapp/src/main/webapp/WEB-INF/web.xml
airavata/trunk/modules/rest/webapp/src/main/webapp/index.jsp
airavata/trunk/modules/rest/webapp/src/main/webapp/user-store/add.jsp
airavata/trunk/modules/rest/webapp/src/main/webapp/user-store/index.jsp
airavata/trunk/modules/rest/webapp/src/main/webapp/user-store/password.jsp
airavata/trunk/modules/security/src/test/resources/authenticators.xml
airavata/trunk/modules/security/src/test/resources/disabled-authenticator.xml
airavata/trunk/samples/airavata-client/create-application/src/main/java/org/apache/airavata/api/samples/CreateApplication.java
airavata/trunk/samples/airavata-client/workflow-run/src/main/java/org/apache/airavata/client/samples/MonitorListener.java
airavata/trunk/samples/airavata-client/workflow-run/src/main/java/org/apache/airavata/client/samples/MonitorWorkflow.java
airavata/trunk/samples/airavata-client/workflow-run/src/main/java/org/apache/airavata/client/samples/RunWorkflow.java
airavata/trunk/samples/airavata-client/workflow-run/src/main/resources/EchoWorkflow.xwf
airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.6/migrate_derby.sql
airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.6/migrate_mysql.sql
Modified: airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/xbaya.jnlp
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/xbaya.jnlp?rev=1438315&r1=1438314&r2=1438315&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/xbaya.jnlp (original)
+++ airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/xbaya.jnlp Fri Jan 25 04:22:33 2013
@@ -1,4 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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. -->
+
<jnlp spec="1.0+"
codebase="http://localhost:8080/airavata-xbaya/"
href="xbaya.jnlp">
Modified: airavata/trunk/modules/integration-tests/src/main/resources/stop-derby.sh
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/main/resources/stop-derby.sh?rev=1438315&r1=1438314&r2=1438315&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/src/main/resources/stop-derby.sh (original)
+++ airavata/trunk/modules/integration-tests/src/main/resources/stop-derby.sh Fri Jan 25 04:22:33 2013
@@ -1,4 +1,22 @@
#!/bin/sh
+
+# 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.
+
pid=$(ps -fe | grep '[d]erby' | awk '{print $2}')
if [[ -n $pid ]]; then
kill -TERM $pid
Modified: airavata/trunk/modules/integration-tests/src/test/java/suite.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/java/suite.xml?rev=1438315&r1=1438314&r2=1438315&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/src/test/java/suite.xml (original)
+++ airavata/trunk/modules/integration-tests/src/test/java/suite.xml Fri Jan 25 04:22:33 2013
@@ -0,0 +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. -->
Modified: airavata/trunk/modules/integration-tests/src/test/resources/EchoWorkflow.xwf
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/src/test/resources/EchoWorkflow.xwf?rev=1438315&r1=1438314&r2=1438315&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/src/test/resources/EchoWorkflow.xwf (original)
+++ airavata/trunk/modules/integration-tests/src/test/resources/EchoWorkflow.xwf Fri Jan 25 04:22:33 2013
@@ -1,4 +1,13 @@
-<?xml version="1.0"?><xwf:workflow xwf:version="0.5" xmlns:xwf="http://airavata.apache.org/xbaya/xwf">
+<?xml version="1.0"?>
+<!--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. -->
+
+<xwf:workflow xwf:version="0.5" xmlns:xwf="http://airavata.apache.org/xbaya/xwf">
<xgr:graph xgr:version="0.5" xgr:type="ws" xmlns:xgr="http://airavata.apache.org/xbaya/graph">
<xgr:id>Echo</xgr:id>
<xgr:name>Echo</xgr:name>
Modified: airavata/trunk/modules/integration-tests/tomcat-distribution.iml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/integration-tests/tomcat-distribution.iml?rev=1438315&r1=1438314&r2=1438315&view=diff
==============================================================================
--- airavata/trunk/modules/integration-tests/tomcat-distribution.iml (original)
+++ airavata/trunk/modules/integration-tests/tomcat-distribution.iml Fri Jan 25 04:22:33 2013
@@ -1,4 +1,17 @@
<?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. -->
+
<module relativePaths="false" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
Modified: airavata/trunk/modules/rest/service/src/test/resources/authenticators.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/service/src/test/resources/authenticators.xml?rev=1438315&r1=1438314&r2=1438315&view=diff
==============================================================================
--- airavata/trunk/modules/rest/service/src/test/resources/authenticators.xml (original)
+++ airavata/trunk/modules/rest/service/src/test/resources/authenticators.xml Fri Jan 25 04:22:33 2013
@@ -1,4 +1,16 @@
-<?xml version="1.0"?>
+<?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. -->
<!--
This file contains a sample authenticator configuration. We can define all authenticators in this file. Each authenticator
Modified: airavata/trunk/modules/rest/webapp/src/main/resources/authenticators.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/src/main/resources/authenticators.xml?rev=1438315&r1=1438314&r2=1438315&view=diff
==============================================================================
--- airavata/trunk/modules/rest/webapp/src/main/resources/authenticators.xml (original)
+++ airavata/trunk/modules/rest/webapp/src/main/resources/authenticators.xml Fri Jan 25 04:22:33 2013
@@ -1,4 +1,17 @@
-<?xml version="1.0"?>
+<?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. -->
+
<!--
This file contains a sample authenticator configuration. We can define all authenticators in this file. Each authenticator
Modified: airavata/trunk/modules/rest/webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/src/main/webapp/WEB-INF/web.xml?rev=1438315&r1=1438314&r2=1438315&view=diff
==============================================================================
--- airavata/trunk/modules/rest/webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ airavata/trunk/modules/rest/webapp/src/main/webapp/WEB-INF/web.xml Fri Jan 25 04:22:33 2013
@@ -1,4 +1,17 @@
<?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. -->
+
<!-- This web.xml file is not required when using Servlet 3.0 container,
see implementation details http://jersey.java.net/nonav/documentation/latest/jax-rs.html#d4e194 -->
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Modified: airavata/trunk/modules/rest/webapp/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/src/main/webapp/index.jsp?rev=1438315&r1=1438314&r2=1438315&view=diff
==============================================================================
--- airavata/trunk/modules/rest/webapp/src/main/webapp/index.jsp (original)
+++ airavata/trunk/modules/rest/webapp/src/main/webapp/index.jsp Fri Jan 25 04:22:33 2013
@@ -1,3 +1,20 @@
+<%--
+ 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.
+--%>
+
<html>
<body>
<img src="images/airavata-logo-2.png">
Modified: airavata/trunk/modules/rest/webapp/src/main/webapp/user-store/add.jsp
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/src/main/webapp/user-store/add.jsp?rev=1438315&r1=1438314&r2=1438315&view=diff
==============================================================================
--- airavata/trunk/modules/rest/webapp/src/main/webapp/user-store/add.jsp (original)
+++ airavata/trunk/modules/rest/webapp/src/main/webapp/user-store/add.jsp Fri Jan 25 04:22:33 2013
@@ -1,6 +1,21 @@
+<%--
+ 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.
+--%>
<%@ page import="org.apache.airavata.services.registry.rest.security.local.LocalUserStore" %>
-
<html>
<head>
Modified: airavata/trunk/modules/rest/webapp/src/main/webapp/user-store/index.jsp
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/src/main/webapp/user-store/index.jsp?rev=1438315&r1=1438314&r2=1438315&view=diff
==============================================================================
--- airavata/trunk/modules/rest/webapp/src/main/webapp/user-store/index.jsp (original)
+++ airavata/trunk/modules/rest/webapp/src/main/webapp/user-store/index.jsp Fri Jan 25 04:22:33 2013
@@ -1,3 +1,20 @@
+<%--
+ 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.
+--%>
+
<%@ page import = "org.apache.airavata.services.registry.rest.security.local.LocalUserStore" %>
<%@ page import="org.apache.airavata.services.registry.rest.security.basic.BasicAccessAuthenticator" %>
<%@ page import="org.apache.airavata.services.registry.rest.security.HttpAuthenticatorFilter" %>
Modified: airavata/trunk/modules/rest/webapp/src/main/webapp/user-store/password.jsp
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/rest/webapp/src/main/webapp/user-store/password.jsp?rev=1438315&r1=1438314&r2=1438315&view=diff
==============================================================================
--- airavata/trunk/modules/rest/webapp/src/main/webapp/user-store/password.jsp (original)
+++ airavata/trunk/modules/rest/webapp/src/main/webapp/user-store/password.jsp Fri Jan 25 04:22:33 2013
@@ -1,3 +1,20 @@
+<%--
+ 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.
+--%>
+
<%@ page import="org.apache.airavata.services.registry.rest.security.local.LocalUserStore" %>
<%
Modified: airavata/trunk/modules/security/src/test/resources/authenticators.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/security/src/test/resources/authenticators.xml?rev=1438315&r1=1438314&r2=1438315&view=diff
==============================================================================
--- airavata/trunk/modules/security/src/test/resources/authenticators.xml (original)
+++ airavata/trunk/modules/security/src/test/resources/authenticators.xml Fri Jan 25 04:22:33 2013
@@ -1,4 +1,16 @@
-<?xml version="1.0"?>
+<?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. -->
<!--
This file contains a sample authenticator configuration. We can define all authenticators in this file. Each authenticator
Modified: airavata/trunk/modules/security/src/test/resources/disabled-authenticator.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/security/src/test/resources/disabled-authenticator.xml?rev=1438315&r1=1438314&r2=1438315&view=diff
==============================================================================
--- airavata/trunk/modules/security/src/test/resources/disabled-authenticator.xml (original)
+++ airavata/trunk/modules/security/src/test/resources/disabled-authenticator.xml Fri Jan 25 04:22:33 2013
@@ -1,4 +1,16 @@
-<?xml version="1.0"?>
+<?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. -->
<!--
This file contains a sample authenticator configuration. We can define all authenticators in this file. Each authenticator
Modified: airavata/trunk/samples/airavata-client/create-application/src/main/java/org/apache/airavata/api/samples/CreateApplication.java
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/airavata-client/create-application/src/main/java/org/apache/airavata/api/samples/CreateApplication.java?rev=1438315&r1=1438314&r2=1438315&view=diff
==============================================================================
--- airavata/trunk/samples/airavata-client/create-application/src/main/java/org/apache/airavata/api/samples/CreateApplication.java (original)
+++ airavata/trunk/samples/airavata-client/create-application/src/main/java/org/apache/airavata/api/samples/CreateApplication.java Fri Jan 25 04:22:33 2013
@@ -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.api.samples;
import org.apache.airavata.client.AiravataAPIFactory;
@@ -34,9 +55,10 @@ public class CreateApplication {
private static AiravataAPI airavataAPI;
- public static void main(String[] args) throws AiravataAPIInvocationException, IOException, URISyntaxException, DescriptorRecordAlreadyExistsException {
+ public static void main(String[] args) throws AiravataAPIInvocationException, IOException, URISyntaxException,
+ DescriptorRecordAlreadyExistsException {
- //creating airavata client object //
+ // creating airavata client object //
port = Integer.parseInt("8080");
serverUrl = "localhost";
serverContextName = "airavata-registry";
@@ -50,10 +72,10 @@ public class CreateApplication {
log.info("Configurations - Registry URL : " + registryURL);
PasswordCallback passwordCallback = new PasswordCallbackImpl(getUserName(), getPassword());
- airavataAPI = AiravataAPIFactory.getAPI(new URI(getRegistryURL()),
- getGatewayName(), getUserName(), passwordCallback);
+ airavataAPI = AiravataAPIFactory.getAPI(new URI(getRegistryURL()), getGatewayName(), getUserName(),
+ passwordCallback);
- //Now creating documents to be saved in to registry using above created airavata client object//
+ // Now creating documents to be saved in to registry using above created airavata client object//
HostDescription descriptor = new HostDescription(GlobusHostType.type);
descriptor.getType().setHostName("localhost");
@@ -67,7 +89,7 @@ public class CreateApplication {
List<OutputParameterType> outputParameters = new ArrayList<OutputParameterType>();
serviceDescription.getType().setName("Echo");
serviceDescription.getType().setDescription("Echo service");
- //Creating input parameters
+ // Creating input parameters
InputParameterType parameter = InputParameterType.Factory.newInstance();
parameter.setParameterName("echo_input");
parameter.setParameterDescription("echo input");
@@ -76,7 +98,7 @@ public class CreateApplication {
parameterType.setName("String");
inputParameters.add(parameter);
- //Creating output parameters
+ // Creating output parameters
OutputParameterType outputParameter = OutputParameterType.Factory.newInstance();
outputParameter.setParameterName("echo_output");
outputParameter.setParameterDescription("Echo output");
@@ -85,27 +107,27 @@ public class CreateApplication {
outputParaType.setName("String");
outputParameters.add(outputParameter);
- //Setting input and output parameters to serviceDescriptor
- serviceDescription.getType().setInputParametersArray(inputParameters.toArray(new InputParameterType[]{}));
- serviceDescription.getType().setOutputParametersArray(outputParameters.toArray(new OutputParameterType[]{}));
+ // Setting input and output parameters to serviceDescriptor
+ serviceDescription.getType().setInputParametersArray(inputParameters.toArray(new InputParameterType[] {}));
+ serviceDescription.getType().setOutputParametersArray(outputParameters.toArray(new OutputParameterType[] {}));
log.info("Saving service description ...");
- //Saving service descriptor
+ // Saving service descriptor
airavataAPI.getApplicationManager().saveServiceDescription(serviceDescription);
// Deployment descriptor creation
ApplicationDescription applicationDeploymentDescription = new ApplicationDescription();
- ApplicationDeploymentDescriptionType applicationDeploymentDescriptionType
- = applicationDeploymentDescription.getType();
+ ApplicationDeploymentDescriptionType applicationDeploymentDescriptionType = applicationDeploymentDescription
+ .getType();
applicationDeploymentDescriptionType.addNewApplicationName().setStringValue("EchoApplication");
applicationDeploymentDescriptionType.setExecutableLocation("/bin/echo");
applicationDeploymentDescriptionType.setScratchWorkingDirectory("/tmp");
log.info("Saving deployment description ...");
- //Saving deployment Descriptor with an association with given serviceName, Host name
- airavataAPI.getApplicationManager().addApplicationDescription(serviceDescription,
- descriptor, applicationDeploymentDescription);
+ // Saving deployment Descriptor with an association with given serviceName, Host name
+ airavataAPI.getApplicationManager().addApplicationDescription(serviceDescription, descriptor,
+ applicationDeploymentDescription);
}
public static int getPort() {
Modified: airavata/trunk/samples/airavata-client/workflow-run/src/main/java/org/apache/airavata/client/samples/MonitorListener.java
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/airavata-client/workflow-run/src/main/java/org/apache/airavata/client/samples/MonitorListener.java?rev=1438315&r1=1438314&r2=1438315&view=diff
==============================================================================
--- airavata/trunk/samples/airavata-client/workflow-run/src/main/java/org/apache/airavata/client/samples/MonitorListener.java (original)
+++ airavata/trunk/samples/airavata-client/workflow-run/src/main/java/org/apache/airavata/client/samples/MonitorListener.java Fri Jan 25 04:22:33 2013
@@ -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 org.apache.airavata.ws.monitor.EventData;
@@ -9,54 +30,54 @@ import org.slf4j.LoggerFactory;
public class MonitorListener implements EventDataListener {
- private static final Logger log = LoggerFactory.getLogger(MonitorListener.class);
+ private static final Logger log = LoggerFactory.getLogger(MonitorListener.class);
- @Override
- public void notify(EventDataRepository eventDataRepo, EventData eventData) {
- log.info("ExperimentID: " + eventData.getExperimentID());
- log.info("Message: " + eventData.getMessage());
- }
+ @Override
+ public void notify(EventDataRepository eventDataRepo, EventData eventData) {
+ log.info("ExperimentID: " + eventData.getExperimentID());
+ log.info("Message: " + eventData.getMessage());
+ }
- @Override
- public void setExperimentMonitor(Monitor monitor) {
- // TODO Auto-generated method stub
+ @Override
+ public void setExperimentMonitor(Monitor monitor) {
+ // TODO Auto-generated method stub
- }
+ }
- @Override
- public void monitoringPreStart() {
- // TODO Auto-generated method stub
+ @Override
+ public void monitoringPreStart() {
+ // TODO Auto-generated method stub
- }
+ }
- @Override
- public void monitoringPostStart() {
- // TODO Auto-generated method stub
+ @Override
+ public void monitoringPostStart() {
+ // TODO Auto-generated method stub
- }
+ }
- @Override
- public void monitoringPreStop() {
- // TODO Auto-generated method stub
+ @Override
+ public void monitoringPreStop() {
+ // TODO Auto-generated method stub
- }
+ }
- @Override
- public void monitoringPostStop() {
- // TODO Auto-generated method stub
+ @Override
+ public void monitoringPostStop() {
+ // TODO Auto-generated method stub
- }
+ }
- @Override
- public void onFail(EventData failNotification) {
- // TODO Auto-generated method stub
+ @Override
+ public void onFail(EventData failNotification) {
+ // TODO Auto-generated method stub
- }
+ }
- @Override
- public void onCompletion(EventData completionNotification) {
- // TODO Auto-generated method stub
+ @Override
+ public void onCompletion(EventData completionNotification) {
+ // TODO Auto-generated method stub
- }
+ }
}
Modified: airavata/trunk/samples/airavata-client/workflow-run/src/main/java/org/apache/airavata/client/samples/MonitorWorkflow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/airavata-client/workflow-run/src/main/java/org/apache/airavata/client/samples/MonitorWorkflow.java?rev=1438315&r1=1438314&r2=1438315&view=diff
==============================================================================
--- airavata/trunk/samples/airavata-client/workflow-run/src/main/java/org/apache/airavata/client/samples/MonitorWorkflow.java (original)
+++ airavata/trunk/samples/airavata-client/workflow-run/src/main/java/org/apache/airavata/client/samples/MonitorWorkflow.java Fri Jan 25 04:22:33 2013
@@ -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.net.URI;
@@ -13,17 +34,17 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class MonitorWorkflow {
- private static final Logger log = LoggerFactory.getLogger(MonitorWorkflow.class);
+ private static final Logger log = LoggerFactory.getLogger(MonitorWorkflow.class);
- public static void monitor(final String experimentId) throws AiravataAPIInvocationException, URISyntaxException {
- PasswordCallback passwordCallback = new PasswordCallbackImpl(RunWorkflow.getUserName(),
- RunWorkflow.getPassword());
- AiravataAPI airavataAPI = AiravataAPIFactory.getAPI(new URI(RunWorkflow.getRegistryURL()),
- RunWorkflow.getGatewayName(), RunWorkflow.getUserName(), passwordCallback);
- MonitorListener monitorListener = new MonitorListener();
- Monitor experimentMonitor = airavataAPI.getExecutionManager().getExperimentMonitor(experimentId,
- monitorListener);
- log.info("Started the Workflow monitor");
- experimentMonitor.startMonitoring();
- }
+ public static void monitor(final String experimentId) throws AiravataAPIInvocationException, URISyntaxException {
+ PasswordCallback passwordCallback = new PasswordCallbackImpl(RunWorkflow.getUserName(),
+ RunWorkflow.getPassword());
+ AiravataAPI airavataAPI = AiravataAPIFactory.getAPI(new URI(RunWorkflow.getRegistryURL()),
+ RunWorkflow.getGatewayName(), RunWorkflow.getUserName(), passwordCallback);
+ MonitorListener monitorListener = new MonitorListener();
+ Monitor experimentMonitor = airavataAPI.getExecutionManager().getExperimentMonitor(experimentId,
+ monitorListener);
+ log.info("Started the Workflow monitor");
+ experimentMonitor.startMonitoring();
+ }
}
Modified: airavata/trunk/samples/airavata-client/workflow-run/src/main/java/org/apache/airavata/client/samples/RunWorkflow.java
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/airavata-client/workflow-run/src/main/java/org/apache/airavata/client/samples/RunWorkflow.java?rev=1438315&r1=1438314&r2=1438315&view=diff
==============================================================================
--- airavata/trunk/samples/airavata-client/workflow-run/src/main/java/org/apache/airavata/client/samples/RunWorkflow.java (original)
+++ airavata/trunk/samples/airavata-client/workflow-run/src/main/java/org/apache/airavata/client/samples/RunWorkflow.java Fri Jan 25 04:22:33 2013
@@ -17,7 +17,8 @@
* specific language governing permissions and limitations
* under the License.
*
-*/
+ */
+
package org.apache.airavata.client.samples;
import java.io.BufferedReader;
@@ -59,9 +60,10 @@ public class RunWorkflow {
private static AiravataAPI airavataAPI;
- public static void main(String[] args) throws AiravataAPIInvocationException, IOException, URISyntaxException, ExperimentLazyLoadedException {
+ public static void main(String[] args) throws AiravataAPIInvocationException, IOException, URISyntaxException,
+ ExperimentLazyLoadedException {
- //creating airavata client object //
+ // creating airavata client object //
port = Integer.parseInt("8080");
serverUrl = "localhost";
serverContextName = "airavata-registry";
@@ -75,49 +77,49 @@ public class RunWorkflow {
log.info("Configurations - Registry URL : " + registryURL);
PasswordCallback passwordCallback = new PasswordCallbackImpl(getUserName(), getPassword());
- airavataAPI = AiravataAPIFactory.getAPI(new URI(getRegistryURL()),
- getGatewayName(), getUserName(), passwordCallback);
+ airavataAPI = AiravataAPIFactory.getAPI(new URI(getRegistryURL()), getGatewayName(), getUserName(),
+ passwordCallback);
String workflowName = "EchoSample";
- //Saving workflow method, workflow file has the workflow Name set to EchoSample, so when we use saveWorkflow method it will
- //save the workflow with that name.
+ // Saving workflow method, workflow file has the workflow Name set to EchoSample, so when we use saveWorkflow
+ // method it will
+ // save the workflow with that name.
airavataAPI.getWorkflowManager().saveWorkflow(getWorkflowComposeContent());
- //Now workflow has saved, Now we have to set inputs
+ // Now workflow has saved, Now we have to set inputs
List<WorkflowInput> workflowInputs = new ArrayList<WorkflowInput>();
String name = "echo_input";
String type = "String";
String value = "echo_output=ODI Test";
- WorkflowInput workflowInput = new WorkflowInput(name, (type == null ||
- type.isEmpty()) ? "String" : type, null, value, false);
+ WorkflowInput workflowInput = new WorkflowInput(name, (type == null || type.isEmpty()) ? "String" : type, null,
+ value, false);
workflowInputs.add(workflowInput);
- //Now inputs are set properly to the workflow, now we are about to run the workflow(submit the workflow run to intepreterService)
+ // Now inputs are set properly to the workflow, now we are about to run the workflow(submit the workflow run to
+ // intepreterService)
- String result
- = airavataAPI.getExecutionManager().runExperiment(workflowName, workflowInputs);
+ String result = airavataAPI.getExecutionManager().runExperiment(workflowName, workflowInputs);
System.out.println("Experiment ID Returned : " + result);
MonitorWorkflow.monitor(result);
airavataAPI.getExecutionManager().waitForExperimentTermination(result);
ExperimentData experimentData = airavataAPI.getProvenanceManager().getExperimentData(result);
- List<WorkflowExecutionDataImpl> workflowInstanceData
- = experimentData.getWorkflowExecutionDataList();
+ List<WorkflowExecutionDataImpl> workflowInstanceData = experimentData.getWorkflowExecutionDataList();
System.out.println("Experiment Results");
System.out.println("==================");
- for(WorkflowExecutionDataImpl data:workflowInstanceData){
+ for (WorkflowExecutionDataImpl data : workflowInstanceData) {
List<NodeExecutionData> nodeDataList = data.getNodeDataList();
- for(NodeExecutionData nodeData:nodeDataList){
- System.out.println();
- System.out.println(nodeData.getType()+" : "+nodeData.getId());
- List<InputData> inputs=nodeData.getInputData();
- for(InputData input:inputs){
- System.out.println("\t\t[Input] \t" + input.getName()+"\t: "+input.getValue());
- }
- List<OutputData> outputs=nodeData.getOutputData();
- for(OutputData output:outputs){
- System.out.println("\t\t[Output] \t" + output.getName()+"\t: "+output.getValue());
- }
+ for (NodeExecutionData nodeData : nodeDataList) {
+ System.out.println();
+ System.out.println(nodeData.getType() + " : " + nodeData.getId());
+ List<InputData> inputs = nodeData.getInputData();
+ for (InputData input : inputs) {
+ System.out.println("\t\t[Input] \t" + input.getName() + "\t: " + input.getValue());
+ }
+ List<OutputData> outputs = nodeData.getOutputData();
+ for (OutputData output : outputs) {
+ System.out.println("\t\t[Output] \t" + output.getName() + "\t: " + output.getValue());
+ }
}
}
}
@@ -149,5 +151,3 @@ public class RunWorkflow {
return buffer.toString();
}
}
-
-
Modified: airavata/trunk/samples/airavata-client/workflow-run/src/main/resources/EchoWorkflow.xwf
URL: http://svn.apache.org/viewvc/airavata/trunk/samples/airavata-client/workflow-run/src/main/resources/EchoWorkflow.xwf?rev=1438315&r1=1438314&r2=1438315&view=diff
==============================================================================
--- airavata/trunk/samples/airavata-client/workflow-run/src/main/resources/EchoWorkflow.xwf (original)
+++ airavata/trunk/samples/airavata-client/workflow-run/src/main/resources/EchoWorkflow.xwf Fri Jan 25 04:22:33 2013
@@ -1,4 +1,13 @@
-<?xml version="1.0"?><xwf:workflow xwf:version="0.5" xmlns:xwf="http://airavata.apache.org/xbaya/xwf">
+<?xml version="1.0"?>
+<!--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. -->
+
+<xwf:workflow xwf:version="0.5" xmlns:xwf="http://airavata.apache.org/xbaya/xwf">
<xgr:graph xgr:version="0.5" xgr:type="ws" xmlns:xgr="http://airavata.apache.org/xbaya/graph">
<xgr:id>EchoSample</xgr:id>
<xgr:name>EchoSample</xgr:name>
Modified: airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.6/migrate_derby.sql
URL: http://svn.apache.org/viewvc/airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.6/migrate_derby.sql?rev=1438315&r1=1438314&r2=1438315&view=diff
==============================================================================
--- airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.6/migrate_derby.sql (original)
+++ airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.6/migrate_derby.sql Fri Jan 25 04:22:33 2013
@@ -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.
+ *
+ */
+
ALTER TABLE Configuration ADD category_id varchar(255) NOT NULL DEFAULT 'SYSTEM';
ALTER TABLE Configuration DROP PRIMARY KEY;
Modified: airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.6/migrate_mysql.sql
URL: http://svn.apache.org/viewvc/airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.6/migrate_mysql.sql?rev=1438315&r1=1438314&r2=1438315&view=diff
==============================================================================
--- airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.6/migrate_mysql.sql (original)
+++ airavata/trunk/tools/registry-tool/src/main/resources/db-scripts/0.6/migrate_mysql.sql Fri Jan 25 04:22:33 2013
@@ -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.
+ *
+ */
+
ALTER TABLE Configuration
ADD category_id varchar(255);