Repository: incubator-taverna-plugin-gis Updated Branches: refs/heads/master 683a7a057 -> 123d3f401
ASF license headers Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/commit/123d3f40 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/tree/123d3f40 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/diff/123d3f40 Branch: refs/heads/master Commit: 123d3f40153ddf53a933ee09c2ea57723b28ae03 Parents: 683a7a0 Author: Stian Soiland-Reyes <[email protected]> Authored: Mon Jul 11 14:48:15 2016 +0100 Committer: Stian Soiland-Reyes <[email protected]> Committed: Mon Jul 11 14:48:15 2016 +0100 ---------------------------------------------------------------------- apache-taverna-activity-gis-activity-ui/pom.xml | 20 +++++++++- .../resources/META-INF/spring/context-osgi.xml | 18 +++++++++ .../main/resources/META-INF/spring/context.xml | 18 +++++++++ apache-taverna-activity-gis-activity/pom.xml | 20 +++++++++- .../src/main/resources/spring/context-osgi.xml | 18 +++++++++ .../src/main/resources/spring/context.xml | 18 +++++++++ apache-taverna-activity-gis-plugin/pom.xml | 40 +++++++++++++++----- pom.xml | 28 +++++++++----- taverna-gis-client/pom.xml | 19 ++++++++++ 9 files changed, 178 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/123d3f40/apache-taverna-activity-gis-activity-ui/pom.xml ---------------------------------------------------------------------- diff --git a/apache-taverna-activity-gis-activity-ui/pom.xml b/apache-taverna-activity-gis-activity-ui/pom.xml index 8acc7be..3619a02 100644 --- a/apache-taverna-activity-gis-activity-ui/pom.xml +++ b/apache-taverna-activity-gis-activity-ui/pom.xml @@ -1,4 +1,22 @@ <?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/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> @@ -7,7 +25,7 @@ <artifactId>apache-taverna-plugin-gis</artifactId> <version>0.0.1-incubating-SNAPSHOT</version> </parent> - <artifactId>apache-taverna-activity-gis-activity-ui</artifactId> + <artifactId>taverna-gis-activity-ui</artifactId> <packaging>bundle</packaging> <name>Gis Taverna activity UI</name> http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/123d3f40/apache-taverna-activity-gis-activity-ui/src/main/resources/META-INF/spring/context-osgi.xml ---------------------------------------------------------------------- diff --git a/apache-taverna-activity-gis-activity-ui/src/main/resources/META-INF/spring/context-osgi.xml b/apache-taverna-activity-gis-activity-ui/src/main/resources/META-INF/spring/context-osgi.xml index 4987ea3..c6bf32c 100644 --- a/apache-taverna-activity-gis-activity-ui/src/main/resources/META-INF/spring/context-osgi.xml +++ b/apache-taverna-activity-gis-activity-ui/src/main/resources/META-INF/spring/context-osgi.xml @@ -1,4 +1,22 @@ <?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. + +--> <beans:beans xmlns="http://www.springframework.org/schema/osgi"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:beans="http://www.springframework.org/schema/beans"; xsi:schemaLocation="http://www.springframework.org/schema/beans http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/123d3f40/apache-taverna-activity-gis-activity-ui/src/main/resources/META-INF/spring/context.xml ---------------------------------------------------------------------- diff --git a/apache-taverna-activity-gis-activity-ui/src/main/resources/META-INF/spring/context.xml b/apache-taverna-activity-gis-activity-ui/src/main/resources/META-INF/spring/context.xml index f0c1255..4b75d5f 100644 --- a/apache-taverna-activity-gis-activity-ui/src/main/resources/META-INF/spring/context.xml +++ b/apache-taverna-activity-gis-activity-ui/src/main/resources/META-INF/spring/context.xml @@ -1,4 +1,22 @@ <?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. + +--> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://www.springframework.org/schema/beans http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/123d3f40/apache-taverna-activity-gis-activity/pom.xml ---------------------------------------------------------------------- diff --git a/apache-taverna-activity-gis-activity/pom.xml b/apache-taverna-activity-gis-activity/pom.xml index 3bf151f..62ba36c 100644 --- a/apache-taverna-activity-gis-activity/pom.xml +++ b/apache-taverna-activity-gis-activity/pom.xml @@ -1,4 +1,22 @@ <?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/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> @@ -7,7 +25,7 @@ <artifactId>apache-taverna-plugin-gis</artifactId> <version>0.0.1-incubating-SNAPSHOT</version> </parent> - <artifactId>apache-taverna-activity-gis-activity</artifactId> + <artifactId>taverna-gis-activity</artifactId> <packaging>bundle</packaging> <name>Gis Taverna activity</name> http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/123d3f40/apache-taverna-activity-gis-activity/src/main/resources/spring/context-osgi.xml ---------------------------------------------------------------------- diff --git a/apache-taverna-activity-gis-activity/src/main/resources/spring/context-osgi.xml b/apache-taverna-activity-gis-activity/src/main/resources/spring/context-osgi.xml index 1b2a8c3..98809c2 100644 --- a/apache-taverna-activity-gis-activity/src/main/resources/spring/context-osgi.xml +++ b/apache-taverna-activity-gis-activity/src/main/resources/spring/context-osgi.xml @@ -1,4 +1,22 @@ <?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. + +--> <beans:beans xmlns="http://www.springframework.org/schema/osgi"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:beans="http://www.springframework.org/schema/beans"; xsi:schemaLocation="http://www.springframework.org/schema/beans http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/123d3f40/apache-taverna-activity-gis-activity/src/main/resources/spring/context.xml ---------------------------------------------------------------------- diff --git a/apache-taverna-activity-gis-activity/src/main/resources/spring/context.xml b/apache-taverna-activity-gis-activity/src/main/resources/spring/context.xml index e2b290e..c42932d 100644 --- a/apache-taverna-activity-gis-activity/src/main/resources/spring/context.xml +++ b/apache-taverna-activity-gis-activity/src/main/resources/spring/context.xml @@ -1,4 +1,22 @@ <?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. + +--> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/123d3f40/apache-taverna-activity-gis-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/apache-taverna-activity-gis-plugin/pom.xml b/apache-taverna-activity-gis-plugin/pom.xml index a0a5275..4a19ebb 100644 --- a/apache-taverna-activity-gis-plugin/pom.xml +++ b/apache-taverna-activity-gis-plugin/pom.xml @@ -1,4 +1,22 @@ <?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/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> @@ -7,22 +25,26 @@ <artifactId>apache-taverna-plugin-gis</artifactId> <version>0.0.1-incubating-SNAPSHOT</version> </parent> - <artifactId>apache-taverna-activity-gis-plugin</artifactId> + <artifactId>taverna-gis-plugin</artifactId> <packaging>taverna-plugin</packaging> - <name>Gis Taverna plugin</name> - <description>Description of Example Taverna plugin</description> + <name>Apache Taverna GIS plugin</name> + <description>Activity and workbench integration for invoking GIS services</description> <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-taverna-activity-gis-activity</artifactId> - <version>0.0.1-incubating-SNAPSHOT</version> + <artifactId>taverna-gis-activity</artifactId> + <version>${project.version}</version> </dependency> - <!-- Enable for Workbench integration <dependency> <groupId>${project.groupId}</groupId> - <artifactId>apache-taverna-activity-gis-activity-ui</artifactId> - <version>0.0.1-incubating-SNAPSHOT</version> + <artifactId>taverna-gis-client</artifactId> + <version>${project.version}</version> + </dependency> + <!-- Enable for Workbench integration --> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>taverna-gis-activity-ui</artifactId> + <version>${project.version}</version> </dependency> - --> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/123d3f40/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index a4af2e0..170209b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,14 +1,22 @@ <?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. --> +<!-- + + 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/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> http://git-wip-us.apache.org/repos/asf/incubator-taverna-plugin-gis/blob/123d3f40/taverna-gis-client/pom.xml ---------------------------------------------------------------------- diff --git a/taverna-gis-client/pom.xml b/taverna-gis-client/pom.xml index 7cf6f56..54143cb 100644 --- a/taverna-gis-client/pom.xml +++ b/taverna-gis-client/pom.xml @@ -1,3 +1,22 @@ +<?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";> <modelVersion>4.0.0</modelVersion> <parent>
