You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by st...@apache.org on 2016/04/28 02:15:43 UTC
[11/26] incubator-taverna-engine git commit: ASF headers
ASF headers
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/commit/12fa7a25
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/tree/12fa7a25
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/diff/12fa7a25
Branch: refs/heads/master
Commit: 12fa7a250007b79a90a56ed5da63cb65514e1621
Parents: 957741f
Author: Stian Soiland-Reyes <st...@apache.org>
Authored: Thu Apr 28 00:32:39 2016 +0100
Committer: Stian Soiland-Reyes <st...@apache.org>
Committed: Thu Apr 28 00:32:39 2016 +0100
----------------------------------------------------------------------
.../reference/impl/IdentifiedArrayList.java | 40 +++++++++-----------
.../impl/InMemoryErrorDocumentDao.java | 39 +++++++++----------
.../src/test/resources/log4j.properties | 17 ++++++++-
3 files changed, 52 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/12fa7a25/taverna-reference-impl/src/main/java/org/apache/taverna/reference/impl/IdentifiedArrayList.java
----------------------------------------------------------------------
diff --git a/taverna-reference-impl/src/main/java/org/apache/taverna/reference/impl/IdentifiedArrayList.java b/taverna-reference-impl/src/main/java/org/apache/taverna/reference/impl/IdentifiedArrayList.java
index 43325dc..601fad3 100644
--- a/taverna-reference-impl/src/main/java/org/apache/taverna/reference/impl/IdentifiedArrayList.java
+++ b/taverna-reference-impl/src/main/java/org/apache/taverna/reference/impl/IdentifiedArrayList.java
@@ -1,23 +1,21 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
+/*
+* 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.taverna.reference.impl;
import java.util.ArrayList;
@@ -32,8 +30,6 @@ import org.apache.taverna.reference.IdentifiedList;
* Implementation of IdentifiedList which delegates to an ArrayList for its
* storage functionality.
*
- * @author Tom Oinn
- *
* @param <T>
*/
public class IdentifiedArrayList<T> extends AbstractEntityImpl implements
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/12fa7a25/taverna-reference-impl/src/main/java/org/apache/taverna/reference/impl/InMemoryErrorDocumentDao.java
----------------------------------------------------------------------
diff --git a/taverna-reference-impl/src/main/java/org/apache/taverna/reference/impl/InMemoryErrorDocumentDao.java b/taverna-reference-impl/src/main/java/org/apache/taverna/reference/impl/InMemoryErrorDocumentDao.java
index d06ecbe..37e4175 100644
--- a/taverna-reference-impl/src/main/java/org/apache/taverna/reference/impl/InMemoryErrorDocumentDao.java
+++ b/taverna-reference-impl/src/main/java/org/apache/taverna/reference/impl/InMemoryErrorDocumentDao.java
@@ -1,23 +1,21 @@
-/*******************************************************************************
- * Copyright (C) 2007 The University of Manchester
- *
- * Modifications to the initial code base are copyright of their
- * respective authors, or their employers as appropriate.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- ******************************************************************************/
+/*
+* 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.taverna.reference.impl;
import java.util.Map;
@@ -32,7 +30,6 @@ import org.apache.taverna.reference.T2Reference;
* A trivial in-memory implementation of ErrorDocumentDao for either testing or
* very lightweight embedded systems. Uses a java Map as the backing store.
*
- * @author Tom Oinn
*/
public class InMemoryErrorDocumentDao implements ErrorDocumentDao {
private Map<T2Reference, ErrorDocument> store;
http://git-wip-us.apache.org/repos/asf/incubator-taverna-engine/blob/12fa7a25/taverna-workflowmodel-impl/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/taverna-workflowmodel-impl/src/test/resources/log4j.properties b/taverna-workflowmodel-impl/src/test/resources/log4j.properties
index 2fba8c6..3c70e57 100644
--- a/taverna-workflowmodel-impl/src/test/resources/log4j.properties
+++ b/taverna-workflowmodel-impl/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=WARN, CONSOLE
log4j.logger.net.sf.taverna.t2=DEBUG
#log4j.logger.net.sf.taverna.t2.ui=DEBUG
@@ -7,4 +22,4 @@ log4j.logger.net.sf.taverna.t2=DEBUG
# Default output to console
log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%-5p %d{ISO8601} (%c:%L) - %m%n
\ No newline at end of file
+log4j.appender.CONSOLE.layout.ConversionPattern=%-5p %d{ISO8601} (%c:%L) - %m%n