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/10 09:18:01 UTC
incubator-taverna-server git commit: Fix most of the remaining
license issues.
Repository: incubator-taverna-server
Updated Branches:
refs/heads/master 419a7d460 -> 61706d413
Fix most of the remaining license issues.
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/61706d41
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/tree/61706d41
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/diff/61706d41
Branch: refs/heads/master
Commit: 61706d413b899edb798975938c2669a8c21eb2cd
Parents: 419a7d4
Author: Donal Fellows <do...@manchester.ac.uk>
Authored: Sat Sep 10 10:16:31 2016 +0100
Committer: Donal Fellows <do...@manchester.ac.uk>
Committed: Sat Sep 10 10:16:31 2016 +0100
----------------------------------------------------------------------
pom.xml | 7 +++
.../src/main/wadl/tavserv.wadl | 16 +++++
.../src/assemble/dist.xml | 65 +++++---------------
.../main/java/org/ogf/usage/JobUsageRecord.java | 14 +++++
.../src/test/java/TestUR.java | 16 +++++
.../resources/datanucleus_log4j.properties | 15 +++++
.../src/main/resources/admin.html | 16 +++++
.../src/main/resources/capabilities.properties | 15 +++++
.../src/main/resources/log4j.properties | 15 +++++
.../src/main/resources/security.policy | 15 +++++
.../src/main/resources/static/admin.js | 17 +++++
.../src/main/resources/version.properties | 15 +++++
.../src/main/resources/welcome.html | 16 +++++
.../src/main/webapp/META-INF/persistence.xml | 16 +++++
.../src/main/webapp/WEB-INF/beans.xml | 18 +++++-
.../src/main/webapp/WEB-INF/insecure.xml | 18 +++++-
.../src/main/webapp/WEB-INF/partsecure.xml | 18 +++++-
.../src/main/webapp/WEB-INF/providers.xml | 18 +++++-
.../src/main/webapp/WEB-INF/secure.xml | 18 +++++-
.../webapp/WEB-INF/security/users.properties | 15 +++++
.../webapp/WEB-INF/tavernaserver.properties | 28 +++++++++
.../src/main/webapp/WEB-INF/web-nosec.xml | 18 +++++-
.../src/main/webapp/WEB-INF/web-partsec.xml | 18 +++++-
.../src/main/webapp/WEB-INF/web-sec.xml | 18 +++++-
.../src/main/webapp/WEB-INF/webappBeans.xml | 18 +++++-
.../src/test/resources/example.xml | 16 +++++
.../src/test/resources/log4j.properties | 15 +++++
.../src/main/resources/security.policy | 15 +++++
28 files changed, 442 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7183a08..4c0d79f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,8 +127,15 @@ executing.</description>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
+ <!-- These refer to files under the Apache license, but which have no comment syntax. -->
<exclude>CITATION</exclude>
<exclude>**/META-INF/MANIFEST.MF</exclude>
+ <exclude>**/WEB-INF/lib/*.vtmpl</exclude>
+ <exclude>**/org.apache.cxf.Logger</exclude>
+
+ <!-- Cause problems with RAT; need replacing -->
+ <exclude>**/jquery*.js</exclude>
+ <exclude>**/jquery*.css</exclude>
</excludes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-client/src/main/wadl/tavserv.wadl
----------------------------------------------------------------------
diff --git a/taverna-server-client/src/main/wadl/tavserv.wadl b/taverna-server-client/src/main/wadl/tavserv.wadl
index 2ba8fbe..c3cb60a 100644
--- a/taverna-server-client/src/main/wadl/tavserv.wadl
+++ b/taverna-server-client/src/main/wadl/tavserv.wadl
@@ -4,6 +4,22 @@
xmlns:prefix10="http://ns.taverna.org.uk/2010/port/" xmlns:jxb="http://java.sun.com/xml/ns/jaxb"
xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" jxb:version="2.1">
+<!--
+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.
+ -->
<grammars>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:admin="http://ns.taverna.org.uk/2010/xml/server/admin/" xmlns:feed="http://ns.taverna.org.uk/2010/xml/server/feed/" xmlns:port="http://ns.taverna.org.uk/2010/port/" xmlns:tns="http://ns.taverna.org.uk/2010/xml/server/rest/" xmlns:ts="http://ns.taverna.org.uk/2010/xml/server/" xmlns:ts-rest="http://ns.taverna.org.uk/2010/xml/server/rest/" xmlns:ts-soap="http://ns.taverna.org.uk/2010/xml/server/soap/" xmlns:xlink="http://www.w3.org/1999/xlink" attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://ns.taverna.org.uk/2010/xml/server/rest/" jxb:version="2.1">
<xs:annotation>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-distribution/src/assemble/dist.xml
----------------------------------------------------------------------
diff --git a/taverna-server-distribution/src/assemble/dist.xml b/taverna-server-distribution/src/assemble/dist.xml
index a77883c..d382ba7 100644
--- a/taverna-server-distribution/src/assemble/dist.xml
+++ b/taverna-server-distribution/src/assemble/dist.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.
+ -->
<assembly
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -7,30 +23,6 @@
<formats>
<format>zip</format>
</formats>
-<!--
- <dependencySets>
- <dependencySet>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <useProjectArtifact>false</useProjectArtifact>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <fileMode>0644</fileMode>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
- <includes>
- <include>*.html</include>
- <include>*.xml</include>
- <include>*.txt</include>
- <include>*.pdf</include>
- </includes>
- <excludes>
- <exclude>pom.xml</exclude>
- </excludes>
- </fileSet>
- </fileSets>
--->
<fileSets>
<fileSet>
<directory>${project.parent.basedir}</directory>
@@ -54,29 +46,4 @@
<fileMode>0644</fileMode>
</fileSet>
</fileSets>
-<!--
- <moduleSets>
- <moduleSet>
- <includes>
- <include>uk.org.taverna.server:server</include>
- </includes>
- <sources>
- <fileSets>
- <fileSet>
- <includes>
- <include>*.html</include>
- <include>*.txt</include>
- </includes>
- </fileSet>
- </fileSets>
- </sources>
- </moduleSet>
- <moduleSet>
- <includes>
- <include>uk.org.taverna.server:server-webapp</include>
- </includes>
- <binaries />
- </moduleSet>
- </moduleSets>
--->
</assembly>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-usagerecord/src/main/java/org/ogf/usage/JobUsageRecord.java
----------------------------------------------------------------------
diff --git a/taverna-server-usagerecord/src/main/java/org/ogf/usage/JobUsageRecord.java b/taverna-server-usagerecord/src/main/java/org/ogf/usage/JobUsageRecord.java
index 29e19cf..23dc224 100644
--- a/taverna-server-usagerecord/src/main/java/org/ogf/usage/JobUsageRecord.java
+++ b/taverna-server-usagerecord/src/main/java/org/ogf/usage/JobUsageRecord.java
@@ -1,4 +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.
*/
package org.ogf.usage;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-usagerecord/src/test/java/TestUR.java
----------------------------------------------------------------------
diff --git a/taverna-server-usagerecord/src/test/java/TestUR.java b/taverna-server-usagerecord/src/test/java/TestUR.java
index 42e9000..9b5e70b 100644
--- a/taverna-server-usagerecord/src/test/java/TestUR.java
+++ b/taverna-server-usagerecord/src/test/java/TestUR.java
@@ -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.
+ */
import static java.lang.Runtime.getRuntime;
import java.io.IOException;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-webapp/src/build/resources/datanucleus_log4j.properties
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/build/resources/datanucleus_log4j.properties b/taverna-server-webapp/src/build/resources/datanucleus_log4j.properties
index 6707f55..b8392c0 100644
--- a/taverna-server-webapp/src/build/resources/datanucleus_log4j.properties
+++ b/taverna-server-webapp/src/build/resources/datanucleus_log4j.properties
@@ -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.
+
log4j.rootLogger=info, R
log4j.appender.R=org.apache.log4j.ConsoleAppender
log4j.appender.R.layout=org.apache.log4j.PatternLayout
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-webapp/src/main/resources/admin.html
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/resources/admin.html b/taverna-server-webapp/src/main/resources/admin.html
index a80a783..061d73e 100644
--- a/taverna-server-webapp/src/main/resources/admin.html
+++ b/taverna-server-webapp/src/main/resources/admin.html
@@ -1,6 +1,22 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
+<!--
+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.
+ -->
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Taverna Server ${project.version} Administration Interface</title>
<link id="admin" href="admin" />
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-webapp/src/main/resources/capabilities.properties
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/resources/capabilities.properties b/taverna-server-webapp/src/main/resources/capabilities.properties
index 2b4844f..c039d9c 100644
--- a/taverna-server-webapp/src/main/resources/capabilities.properties
+++ b/taverna-server-webapp/src/main/resources/capabilities.properties
@@ -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.
+
# This is currently a hand-curated list. This sucks!
######## --- PLATFORM --- ########
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-webapp/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/resources/log4j.properties b/taverna-server-webapp/src/main/resources/log4j.properties
index ea0ea12..9b727d6 100644
--- a/taverna-server-webapp/src/main/resources/log4j.properties
+++ b/taverna-server-webapp/src/main/resources/log4j.properties
@@ -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.
+
log4j.rootLogger=info, R
log4j.category.DataNucleus.Query=warn
#log4j.category.DataNucleus.Datastore.Schema=debug
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-webapp/src/main/resources/security.policy
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/resources/security.policy b/taverna-server-webapp/src/main/resources/security.policy
index 1ec4166..1786533 100644
--- a/taverna-server-webapp/src/main/resources/security.policy
+++ b/taverna-server-webapp/src/main/resources/security.policy
@@ -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.
+
grant {
permission java.security.AllPermission "*:*";
};
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-webapp/src/main/resources/static/admin.js
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/resources/static/admin.js b/taverna-server-webapp/src/main/resources/static/admin.js
index c2c41bf..810da4b 100644
--- a/taverna-server-webapp/src/main/resources/static/admin.js
+++ b/taverna-server-webapp/src/main/resources/static/admin.js
@@ -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.
+*/
+
// Wrappers round AJAX calls to simplify *most* of this stuff
/** How to retrieve text asynchronously. */
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-webapp/src/main/resources/version.properties
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/resources/version.properties b/taverna-server-webapp/src/main/resources/version.properties
index 7ddb7d3..a24b6cc 100644
--- a/taverna-server-webapp/src/main/resources/version.properties
+++ b/taverna-server-webapp/src/main/resources/version.properties
@@ -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.
+
# What is the version of the server? Bind this in automatically.
tavernaserver.version=${project.version}
tavernaserver.revision.describe=${git.commit.id.describe}
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-webapp/src/main/resources/welcome.html
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/resources/welcome.html b/taverna-server-webapp/src/main/resources/welcome.html
index f80da4a..2b12f03 100644
--- a/taverna-server-webapp/src/main/resources/welcome.html
+++ b/taverna-server-webapp/src/main/resources/welcome.html
@@ -1,6 +1,22 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
+<!--
+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.
+ -->
<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
<title>Taverna Server %{VERSION}</title>
</head>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-webapp/src/main/webapp/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/webapp/META-INF/persistence.xml b/taverna-server-webapp/src/main/webapp/META-INF/persistence.xml
index afd640a..ced0a39 100644
--- a/taverna-server-webapp/src/main/webapp/META-INF/persistence.xml
+++ b/taverna-server-webapp/src/main/webapp/META-INF/persistence.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.
+ -->
<persistence version="1.0"
xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd ">
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-webapp/src/main/webapp/WEB-INF/beans.xml
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/webapp/WEB-INF/beans.xml b/taverna-server-webapp/src/main/webapp/WEB-INF/beans.xml
index 73990a7..f0fc89c 100644
--- a/taverna-server-webapp/src/main/webapp/WEB-INF/beans.xml
+++ b/taverna-server-webapp/src/main/webapp/WEB-INF/beans.xml
@@ -1,6 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2010-2011 The University of Manchester See the file "LICENSE"
- for license terms. -->
+<!--
+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" xmlns:context="http://www.springframework.org/schema/context"
xmlns:task="http://www.springframework.org/schema/task" xmlns:util="http://www.springframework.org/schema/util"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-webapp/src/main/webapp/WEB-INF/insecure.xml
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/webapp/WEB-INF/insecure.xml b/taverna-server-webapp/src/main/webapp/WEB-INF/insecure.xml
index 92c0b03..b2b18d6 100644
--- a/taverna-server-webapp/src/main/webapp/WEB-INF/insecure.xml
+++ b/taverna-server-webapp/src/main/webapp/WEB-INF/insecure.xml
@@ -1,6 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2010-2012 The University of Manchester See the file "LICENSE"
- for license terms. -->
+<!--
+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"
xmlns:security="http://www.springframework.org/schema/security"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-webapp/src/main/webapp/WEB-INF/partsecure.xml
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/webapp/WEB-INF/partsecure.xml b/taverna-server-webapp/src/main/webapp/WEB-INF/partsecure.xml
index 2e27b81..ceab286 100644
--- a/taverna-server-webapp/src/main/webapp/WEB-INF/partsecure.xml
+++ b/taverna-server-webapp/src/main/webapp/WEB-INF/partsecure.xml
@@ -1,6 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2011-2012 The University of Manchester See the file "LICENSE"
- for license terms. -->
+<!--
+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"
xmlns:context="http://www.springframework.org/schema/context"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-webapp/src/main/webapp/WEB-INF/providers.xml
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/webapp/WEB-INF/providers.xml b/taverna-server-webapp/src/main/webapp/WEB-INF/providers.xml
index 43531ab..ffcc053 100644
--- a/taverna-server-webapp/src/main/webapp/WEB-INF/providers.xml
+++ b/taverna-server-webapp/src/main/webapp/WEB-INF/providers.xml
@@ -1,6 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2010-2011 The University of Manchester See the file "LICENSE"
- for license terms. -->
+<!--
+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"
xmlns:util="http://www.springframework.org/schema/util"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-webapp/src/main/webapp/WEB-INF/secure.xml
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/webapp/WEB-INF/secure.xml b/taverna-server-webapp/src/main/webapp/WEB-INF/secure.xml
index cf08083..3cb599b 100644
--- a/taverna-server-webapp/src/main/webapp/WEB-INF/secure.xml
+++ b/taverna-server-webapp/src/main/webapp/WEB-INF/secure.xml
@@ -1,6 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2010-2012 The University of Manchester See the file "LICENSE"
- for license terms. -->
+<!--
+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:context="http://www.springframework.org/schema/context"
xmlns:util="http://www.springframework.org/schema/util"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-webapp/src/main/webapp/WEB-INF/security/users.properties
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/webapp/WEB-INF/security/users.properties b/taverna-server-webapp/src/main/webapp/WEB-INF/security/users.properties
index 03f8436..d1d0aec 100644
--- a/taverna-server-webapp/src/main/webapp/WEB-INF/security/users.properties
+++ b/taverna-server-webapp/src/main/webapp/WEB-INF/security/users.properties
@@ -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.
+
# This is a Java properties file that defines the default users supported by
# Taverna Server. The keys are the user names, and the values are comma-
# -separated lists of values: the first is the password (which must not have
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-webapp/src/main/webapp/WEB-INF/tavernaserver.properties
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/webapp/WEB-INF/tavernaserver.properties b/taverna-server-webapp/src/main/webapp/WEB-INF/tavernaserver.properties
index 9616a45..a593582 100644
--- a/taverna-server-webapp/src/main/webapp/WEB-INF/tavernaserver.properties
+++ b/taverna-server-webapp/src/main/webapp/WEB-INF/tavernaserver.properties
@@ -1,3 +1,31 @@
+##############################################################
+##### THIS FILE IS INTENDED TO BE EDITED BY DEPLOYERS! #####
+##### #####
+##### Most settings default to something reasonable, but #####
+##### some features require configuration to work at all #####
+##### and this is where that configuration is done. #####
+##### #####
+##### Take care when editing this file; you can break a #####
+##### deployment thoroughly by getting it wrong. The #####
+##### damage can be reversed by reverting this file to #####
+##### what it was before changing it. Keep a backup! #####
+##############################################################
+
+## 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.
+
# Override the hostname, port and webapp; leave at 'NONE' if no override
# desired. If set, set it to something like:
# foo.example.com:8000/tav-serv
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-webapp/src/main/webapp/WEB-INF/web-nosec.xml
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/webapp/WEB-INF/web-nosec.xml b/taverna-server-webapp/src/main/webapp/WEB-INF/web-nosec.xml
index d6c6ee7..ed7ac06 100644
--- a/taverna-server-webapp/src/main/webapp/WEB-INF/web-nosec.xml
+++ b/taverna-server-webapp/src/main/webapp/WEB-INF/web-nosec.xml
@@ -3,8 +3,22 @@
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
-<!-- Copyright (C) 2010-2011 The University of Manchester See the file "LICENSE"
- for license terms. -->
+<!--
+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.
+ -->
<web-app id="TAVSERV-2.5.4">
<display-name>Taverna 2.5.4 Server</display-name>
<description>This is the front-end engine for Taverna 2.5.4 Server.</description>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-webapp/src/main/webapp/WEB-INF/web-partsec.xml
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/webapp/WEB-INF/web-partsec.xml b/taverna-server-webapp/src/main/webapp/WEB-INF/web-partsec.xml
index a2b545e..4e2aa1d 100644
--- a/taverna-server-webapp/src/main/webapp/WEB-INF/web-partsec.xml
+++ b/taverna-server-webapp/src/main/webapp/WEB-INF/web-partsec.xml
@@ -3,8 +3,22 @@
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
-<!-- Copyright (C) 2010-2011 The University of Manchester See the file "LICENSE"
- for license terms. -->
+<!--
+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.
+ -->
<web-app id="TAVSERV-2.5.4">
<display-name>Taverna 2.5.4 Server</display-name>
<description>This is the front-end engine for Taverna 2.5.4 Server.</description>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-webapp/src/main/webapp/WEB-INF/web-sec.xml
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/webapp/WEB-INF/web-sec.xml b/taverna-server-webapp/src/main/webapp/WEB-INF/web-sec.xml
index 9a5395a..becf2b0 100644
--- a/taverna-server-webapp/src/main/webapp/WEB-INF/web-sec.xml
+++ b/taverna-server-webapp/src/main/webapp/WEB-INF/web-sec.xml
@@ -3,8 +3,22 @@
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd">
-<!-- Copyright (C) 2010-2011 The University of Manchester See the file "LICENSE"
- for license terms. -->
+<!--
+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.
+ -->
<web-app id="TAVSERV-2.5.4">
<display-name>Taverna 2.5.4 Server</display-name>
<description>This is the front-end engine for Taverna 2.5.4 Server.</description>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-webapp/src/main/webapp/WEB-INF/webappBeans.xml
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/main/webapp/WEB-INF/webappBeans.xml b/taverna-server-webapp/src/main/webapp/WEB-INF/webappBeans.xml
index 22e74b3..6e4237e 100644
--- a/taverna-server-webapp/src/main/webapp/WEB-INF/webappBeans.xml
+++ b/taverna-server-webapp/src/main/webapp/WEB-INF/webappBeans.xml
@@ -1,6 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (C) 2010-2012 The University of Manchester See the file "LICENSE"
- for license terms. -->
+<!--
+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:context="http://www.springframework.org/schema/context"
xmlns:aop="http://www.springframework.org/schema/aop"
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-webapp/src/test/resources/example.xml
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/test/resources/example.xml b/taverna-server-webapp/src/test/resources/example.xml
index 14cc242..5a00c62 100644
--- a/taverna-server-webapp/src/test/resources/example.xml
+++ b/taverna-server-webapp/src/test/resources/example.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.
+ -->
<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-2.0.xsd">
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-webapp/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/taverna-server-webapp/src/test/resources/log4j.properties b/taverna-server-webapp/src/test/resources/log4j.properties
index 6707f55..b8392c0 100644
--- a/taverna-server-webapp/src/test/resources/log4j.properties
+++ b/taverna-server-webapp/src/test/resources/log4j.properties
@@ -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.
+
log4j.rootLogger=info, R
log4j.appender.R=org.apache.log4j.ConsoleAppender
log4j.appender.R.layout=org.apache.log4j.PatternLayout
http://git-wip-us.apache.org/repos/asf/incubator-taverna-server/blob/61706d41/taverna-server-worker/src/main/resources/security.policy
----------------------------------------------------------------------
diff --git a/taverna-server-worker/src/main/resources/security.policy b/taverna-server-worker/src/main/resources/security.policy
index 5b5c322..5066f7a 100644
--- a/taverna-server-worker/src/main/resources/security.policy
+++ b/taverna-server-worker/src/main/resources/security.policy
@@ -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.
+
//keystore "signers.jks";
//grant signedBy "taverna" {
// permission java.util.PropertyPermission "*", "read,write";