Skip to content

Commit

Permalink
Unified license text and copyright headers
Browse files Browse the repository at this point in the history 
Replaced any references to Div./Dept. Medical and Biological Informatics
by German Cancer Research Center (DKFZ).
  • Loading branch information
@kislinsk
kislinsk committed Dec 4, 2019
1 parent 4b80587 commit 1d57ec8
Show file tree
Hide file tree
Showing 6,564 changed files with 41,512 additions and 64,578 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
14 changes: 5 additions & 9 deletions Applications/CoreApp/MitkCoreApp.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
/*===================================================================
/*============================================================================
The Medical Imaging Interaction Toolkit (MITK)
Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
Copyright (c) German Cancer Research Center (DKFZ)
All rights reserved.
This software is distributed WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.
Use of this source code is governed by a 3-clause BSD license that can be
found in the LICENSE file.
See LICENSE.txt or http://www.mitk.org for details.
===================================================================*/
============================================================================*/

#include <mitkBaseApplication.h>

Expand Down
11 changes: 11 additions & 0 deletions Applications/PluginGenerator/COPYRIGHT_HEADER
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/*============================================================================

The Medical Imaging Interaction Toolkit (MITK)

Copyright (c) German Cancer Research Center (DKFZ)
All rights reserved.

Use of this source code is governed by a 3-clause BSD license that can be
found in the LICENSE file.

============================================================================*/
27 changes: 27 additions & 0 deletions Applications/PluginGenerator/LICENSE
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
Copyright (c) 2003-2019, German Cancer Research Center (DKFZ)
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* Neither the name of the German Cancer Research Center (DKFZ), nor the names
of its contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 changes: 0 additions & 29 deletions Applications/PluginGenerator/LICENSE.txt
View file

This file was deleted.

15 changes: 0 additions & 15 deletions Applications/PluginGenerator/MITKLicense.txt
View file

This file was deleted.

20 changes: 8 additions & 12 deletions Applications/PluginGenerator/PluginGenerator.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
/*===================================================================
/*============================================================================
The Medical Imaging Interaction Toolkit (MITK)
Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
Copyright (c) German Cancer Research Center (DKFZ)
All rights reserved.
This software is distributed WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.
Use of this source code is governed by a 3-clause BSD license that can be
found in the LICENSE file.
See LICENSE.txt or http://www.mitk.org for details.
===================================================================*/
============================================================================*/

#include "ctkCommandLineParser.h"
#include <PluginGeneratorConfig.h>
Expand Down Expand Up @@ -253,8 +249,8 @@ int main(int argc, char **argv)
parser.addArgument("help", "h", QVariant::Bool, " Show this help text");
parser.addArgument("out-dir", "o", QVariant::String, " Output directory", QDir::tempPath());
parser.addArgument(
"license", "l", QVariant::String, " Path to a file containing license information", ":/MITKLicense.txt");
parser.addArgument("vendor", "v", QVariant::String, " The vendor of the generated code", "DKFZ");
"license", "l", QVariant::String, " Path to a file containing license information", ":/COPYRIGHT_HEADER");
parser.addArgument("vendor", "v", QVariant::String, " The vendor of the generated code", "German Cancer Research Center (DKFZ)");
parser.addArgument("quiet", "q", QVariant::Bool, " Do not print additional information");
parser.addArgument("confirm-all", "y", QVariant::Bool, " Answer all questions with 'yes'");
//parser.addArgument("check-update", "u", QVariant::Bool, " Check for updates and exit");
Expand All @@ -271,7 +267,7 @@ int main(int argc, char **argv)

parser.beginGroup("Project options");
parser.addArgument(
"project-copyright", "", QVariant::String, " Path to a file containing copyright information", ":/LICENSE.txt");
"project-copyright", "", QVariant::String, " Path to a file containing copyright information", ":/LICENSE");
parser.addArgument("project-name", "", QVariant::String, " The project name");
parser.setExactMatchRegularExpression("--project-name", "^[a-zA-Z_\\-]+$", "Project name invalid");
parser.addArgument("project-app-name", "", QVariant::String, " The application name");
Expand Down
14 changes: 5 additions & 9 deletions Applications/PluginGenerator/PluginGeneratorConfig.h.in
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
/*===================================================================
/*============================================================================

The Medical Imaging Interaction Toolkit (MITK)

Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
Copyright (c) German Cancer Research Center (DKFZ)
All rights reserved.

This software is distributed WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.
Use of this source code is governed by a 3-clause BSD license that can be
found in the LICENSE file.

See LICENSE.txt or http://www.mitk.org for details.

===================================================================*/
============================================================================*/

#ifndef PLUGINGENERATORCONFIG_H
#define PLUGINGENERATORCONFIG_H
Expand Down
4 changes: 2 additions & 2 deletions Applications/PluginGenerator/ProjectTemplate/CMake/CPackSetup.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "This is an awesome app")
set(CPACK_PACKAGE_VENDOR "$(vendor)")
set(CPACK_CREATE_DESKTOP_LINKS "${MY_APP_NAME}")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/LICENSE.txt")
set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/LICENSE")
set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
set(CPACK_PACKAGE_VERSION_MAJOR "${${PROJECT_NAME}_VERSION_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${${PROJECT_NAME}_VERSION_MINOR}")

Expand Down
0 ...uginGenerator/ProjectTemplate/LICENSE.txt → ...s/PluginGenerator/ProjectTemplate/LICENSE
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions Applications/PluginGenerator/SetupPackaging.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ include(InstallRequiredSystemLibraries)
set(CPACK_PACKAGE_NAME "MitkPluginGenerator")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MITK PluginGenerator bootstraps MITK-based projects")
set(CPACK_PACKAGE_VENDOR "German Cancer Research Center (DKFZ)")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
Expand Down
2 changes: 1 addition & 1 deletion Applications/PluginGenerator/plugin_template.qrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
<file>PluginTemplate/src/internal/QmitkTemplateView.cpp</file>
<file>PluginTemplate/src/internal/QmitkTemplateView.h</file>
<file>PluginTemplate/src/internal/QmitkTemplateViewControls.ui</file>
<file>MITKLicense.txt</file>
<file>COPYRIGHT_HEADER</file>
</qresource>
</RCC>
4 changes: 2 additions & 2 deletions Applications/PluginGenerator/project_template.qrc
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<RCC>
<qresource prefix="/">
<file>ProjectTemplate/CMakeLists.txt</file>
<file>ProjectTemplate/LICENSE.txt</file>
<file>ProjectTemplate/LICENSE</file>
<file>ProjectTemplate/SuperBuild.cmake</file>
<file>ProjectTemplate/Apps/TemplateApp/CMakeLists.txt</file>
<file>ProjectTemplate/Apps/TemplateApp/startTemplateApp.bat.in</file>
Expand All @@ -12,6 +12,6 @@
<file>ProjectTemplate/CMake/MacroEmptyExternalProject.cmake</file>
<file>ProjectTemplate/CMakeExternals/MITK.cmake</file>
<file>ProjectTemplate/Plugins/Plugins.cmake</file>
<file>LICENSE.txt</file>
<file>LICENSE</file>
</qresource>
</RCC>
16 changes: 6 additions & 10 deletions Applications/Solstice/MitkSolstice.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
/*===================================================================
/*============================================================================
BlueBerry Platform
The Medical Imaging Interaction Toolkit (MITK)
Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
Copyright (c) German Cancer Research Center (DKFZ)
All rights reserved.
This software is distributed WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.
Use of this source code is governed by a 3-clause BSD license that can be
found in the LICENSE file.
See LICENSE.txt or http://www.mitk.org for details.
===================================================================*/
============================================================================*/

#include "berryStarter.h"

Expand Down
16 changes: 6 additions & 10 deletions Applications/Solstice/MitkSolsticeUI.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
/*===================================================================
/*============================================================================
BlueBerry Platform
The Medical Imaging Interaction Toolkit (MITK)
Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
Copyright (c) German Cancer Research Center (DKFZ)
All rights reserved.
This software is distributed WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.
Use of this source code is governed by a 3-clause BSD license that can be
found in the LICENSE file.
See LICENSE.txt or http://www.mitk.org for details.
===================================================================*/
============================================================================*/

#include "berryStarter.h"

Expand Down
14 changes: 5 additions & 9 deletions Applications/Workbench/MitkWorkbench.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,14 @@
/*===================================================================
/*============================================================================
The Medical Imaging Interaction Toolkit (MITK)
Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
Copyright (c) German Cancer Research Center (DKFZ)
All rights reserved.
This software is distributed WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.
Use of this source code is governed by a 3-clause BSD license that can be
found in the LICENSE file.
See LICENSE.txt or http://www.mitk.org for details.
===================================================================*/
============================================================================*/

#include <mitkBaseApplication.h>

Expand Down
6 changes: 3 additions & 3 deletions CMake/mitkSetupCPack.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ endif()
include(InstallRequiredSystemLibraries)

set(CPACK_PACKAGE_NAME "MITK")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MITK is a medical image processing tool")
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The Medical Imaging Interaction Toolkit")
set(CPACK_PACKAGE_VENDOR "German Cancer Research Center (DKFZ)")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${MITK_SOURCE_DIR}/LICENSE.txt")
set(CPACK_RESOURCE_FILE_LICENSE "${MITK_SOURCE_DIR}/LICENSE.txt")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${MITK_SOURCE_DIR}/LICENSE")
set(CPACK_RESOURCE_FILE_LICENSE "${MITK_SOURCE_DIR}/LICENSE")

set(CPACK_PACKAGE_VERSION_MAJOR ${MITK_REVISION_DESC})
string(REPLACE " [local changes]" "-local_changes" CPACK_PACKAGE_VERSION_MAJOR ${CPACK_PACKAGE_VERSION_MAJOR})
Expand Down
14 changes: 5 additions & 9 deletions COPYRIGHT_HEADER
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
/*===================================================================
/*============================================================================

The Medical Imaging Interaction Toolkit (MITK)

Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics.
Copyright (c) German Cancer Research Center (DKFZ)
All rights reserved.

This software is distributed WITHOUT ANY WARRANTY; without
even the implied warranty of MERCHANTABILITY or FITNESS FOR
A PARTICULAR PURPOSE.
Use of this source code is governed by a 3-clause BSD license that can be
found in the LICENSE file.

See LICENSE.txt or http://www.mitk.org for details.

===================================================================*/
============================================================================*/
8 changes: 4 additions & 4 deletions Documentation/CMakeDoxygenFilter.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*=============================================================================
/*============================================================================
Copyright (c) German Cancer Research Center,
Division of Medical and Biological Informatics
Copyright (c) German Cancer Research Center (DKFZ)
All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -15,7 +15,7 @@
See the License for the specific language governing permissions and
limitations under the License.
=============================================================================*/
============================================================================*/

#include <cstdlib>
#include <fstream>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/Doxygen/2-UserManual/MiniApps.dox
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ $./GibbsTracking --xml
<category>Fiber Tracking and Processing Methods</category>
<title>Gibbs Tracking</title>
<description></description>
<contributor>MBI</contributor>
<contributor>German Cancer Research Center (DKFZ)</contributor>
<parameters>
...
</parameters>
Expand Down
4 changes: 2 additions & 2 deletions ...eveloperManual/Starting/FirstSteps/MiniAppCommandLineTool/MiniAppCommandLineToolHowTo.dox
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Running the ExampleToUpperCaseMiniApp without an argument or with wrong ones:
\verbatim
Command Line Utility *To Upper Case* in Category *MITK-Examples*
An example MiniApp that converts the contents of a test file to upper case.
MBI
German Cancer Research Center (DKFZ)

Use --xml to generate an XML description parsable as a CTK Command Line Module Plugin.

Expand Down Expand Up @@ -103,7 +103,7 @@ Running the ExampleToUpperCaseMiniApp with argument "--xml" ...
<category>MITK-Examples</category>
<title>To Upper Case</title>
<description>An example MiniApp that converts the contents of a test file to upper case.</description>
<contributor>MBI</contributor>
<contributor>German Cancer Research Center (DKFZ)</contributor>
<parameters>
<label>Parameters</label>
<description>Parameters</description>
Expand Down
Loading

0 comments on commit 1d57ec8

Please sign in to comment.