You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by dk...@apache.org on 2016/09/09 15:00:25 UTC
[2/2] incubator-taverna-server git commit: Fixing licenses and some
RAT excludes.
Fixing licenses and some RAT excludes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/commit/419a7d46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/419a7d46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/419a7d46
Branch: refs/heads/master
Commit: 419a7d460e0f509174a8370187c203500208456d
Parents: 0f0ea91
Author: Donal Fellows <do...@manchester.ac.uk>
Authored: Fri Sep 9 15:54:05 2016 +0100
Committer: Donal Fellows <do...@manchester.ac.uk>
Committed: Fri Sep 9 15:59:23 2016 +0100
----------------------------------------------------------------------
context.sample.xml | 16 ++++++++++++++++
pom.xml | 10 ++++++++++
src/clients/tcl/taverna2server.tcl | 21 ++++++++++++++++-----
tomcatcontext.xsd | 16 ++++++++++++++++
4 files changed, 58 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/419a7d46/context.sample.xml
----------------------------------------------------------------------
diff --git a/context.sample.xml b/context.sample.xml
index 9531bdb..e803beb 100644
--- a/context.sample.xml
+++ b/context.sample.xml
@@ -1,4 +1,20 @@
<?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.
+ -->
<!-- Sample context.xml showing how to tweak logging and some parameters. -->
<!-- See the Install Guide for more information about this file. -->
<Context path="/taverna-server">
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/419a7d46/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4f61c98..7183a08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,6 +122,16 @@ executing.</description>
</plugins>
</pluginManagement>
<plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>CITATION</exclude>
+ <exclude>**/META-INF/MANIFEST.MF</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/419a7d46/src/clients/tcl/taverna2server.tcl
----------------------------------------------------------------------
diff --git a/src/clients/tcl/taverna2server.tcl b/src/clients/tcl/taverna2server.tcl
index 02e2260..1391857 100644
--- a/src/clients/tcl/taverna2server.tcl
+++ b/src/clients/tcl/taverna2server.tcl
@@ -1,3 +1,18 @@
+## 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.
+
# Tcl package providing access to Taverna 2 Server release 1.
# This code also works as an executable script. Use it like this:
#
@@ -13,11 +28,7 @@
# Tcl 8.6
# tdom 0.8.2
#
-# Copyright (c) 2010, The University of Manchester
-#
-# $Id$
-#
-
+
if {[package vsatisfies [package require Tcl 8.5] 8.6]} {
# Skip requiring features that are built in to 8.6
} else {
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/419a7d46/tomcatcontext.xsd
----------------------------------------------------------------------
diff --git a/tomcatcontext.xsd b/tomcatcontext.xsd
index 3fa73c4..4351cc0 100644
--- a/tomcatcontext.xsd
+++ b/tomcatcontext.xsd
@@ -1,4 +1,20 @@
<?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.
+ -->
<xs:schema targetNamespace="urn:tomcat6" xmlns="urn:tomcat6"
xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="unqualified"
attributeFormDefault="unqualified">