Skip to content

Commit

Permalink
Merge pull request #113 from reliatec-gmbh/lc-0.6.0
Browse files Browse the repository at this point in the history
LC 0.6.0
  • Loading branch information
chae-reliatec authored Jan 22, 2020
2 parents 925f28d + 63b1d43 commit dbf0fe4
Show file tree
Hide file tree
Showing 1,507 changed files with 9,729 additions and 3,909 deletions.
12 changes: 4 additions & 8 deletions core/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

OpenClinica, copyright (C) 2005-2009 Akaza Research, is distributed
under the GNU Lesser General Public License (GNU LGPL). OpenClinica
LibreClinica, copyright (C) 2020, is distributed
under the GNU Lesser General Public License (GNU LGPL). LibreClinica
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
Expand Down Expand Up @@ -485,7 +485,7 @@ safest to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.

Copyright (C) 2005-2008 Akaza Research
LibreClinica, copyright (C) 2020

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Expand All @@ -499,9 +499,5 @@ convey the exclusion of warranty; and each file should have at least the

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

460 Totten Pond Rd, Suite 200
Waltham, MA 02451

Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

135 changes: 0 additions & 135 deletions core/README.txt

This file was deleted.

2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>org.libreclinica</groupId>
<artifactId>LibreClinica</artifactId>
<version>0.5.0</version>
<version>0.6.0</version>
</parent>
<dependencies>
<dependency>
Expand Down
34 changes: 17 additions & 17 deletions core/src/main/filters/datainfo.properties
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ maxInactiveInterval=3600
#############################################################################
# 11 - Logging configuration

# SysLog support has been fully implemented in OpenClinica, but by default has been turned off.
# SysLog support has been fully implemented in LibreClinica, but by default has been turned off.
# Every piece of code that could send information to the syslog server has not been reviewed
# and cleaned to ensure it is entirely readable and useful. This will be an ongoing effort
# and resolved in a future release. Please use the SysLog support at your own risk.
Expand All @@ -141,11 +141,11 @@ syslog.port=514

#############################################################################
# 12- News/About
# On the OpenClinica login screen, there will be a box to the right of the login section
# On the LibreClinica login screen, there will be a box to the right of the login section
# which can contain an RSS feed. You can configure what RSS feed is used in the rss.rl field.
# If you do not want the RSS feed, please comment out rss.url and rss.more and uncomment
# about.text1 and about.text2. These two fields can be used for any free form text that you
# you want to appear on the OpenClinica login page.
# you want to appear on the LibreClinica login page.
# the default feed is http://clinicalresearch.wordpress.com/feed/
# default value for rss.more http://clinicalresearch.wordpress.com/
#############################################################################
Expand Down Expand Up @@ -192,9 +192,9 @@ org.quartz.threadPool.threadPriority=5
#############################################################################
# 16 - CCTS configuration
#
# This is used for OpenClinica instances that have been modified and configured
# This is used for LibreClinica instances that have been modified and configured
# to work with the Cancer Clinical Trials Suites. This is a caBIG suite of applications.
# The configuration determines how long OpenClinica will hold a transaction from C3PR
# The configuration determines how long LibreClinica will hold a transaction from C3PR
# and will wait for a roll back message before committing it to the database.
#
# NOT REQUIRED
Expand All @@ -204,7 +204,7 @@ ccts.waitBeforeCommit=6000
#############################################################################
# 17 - Facility information
#
# The OpenClinica defaults will be used when creating a new study
# The LibreClinica defaults will be used when creating a new study
# unless you uncomment each property and provide a value next to
# each = sign.
#
Expand Down Expand Up @@ -240,33 +240,33 @@ ccts.waitBeforeCommit=6000
# to be transformed by the XSLT engine. This number can be increased to use higher amounts of memory and
# potentially decrease the amount of wait time. Lower this number if you have an extremely large amount of
# event definitions to reduce the impact on concurrent users in the system at the time of the extract.
# This is a global setting that applies to all extracts in your OpenClinica instance.
# This is a global setting that applies to all extracts in your LibreClinica instance.
#####################################################################################
extract.number=99

#############################################################################
# 19 - Usage statistics configuration
# Usage statistics refers to information automatically sent back to OpenClinica.org
# to help us figure out how well OpenClinica is working and help us improve it in
# Usage statistics refers to information automatically sent back to LibreClinica.org
# to help us figure out how well LibreClinica is working and help us improve it in
# future versions.
# This includes technical information such as the version of OpenClinica installed, the number of studies created and user load. These statistics DO NOT include information such as study or CRF names, study data, or user information. We collect this data in aggregate and use it according to our Privacy Policy [https://community.openclinica.com/privacy-policy] to improve our products and services.
# This includes technical information such as the version of LibreClinica installed, the number of studies created and user load. These statistics DO NOT include information such as study or CRF names, study data, or user information. We collect this data in aggregate and use it according to our Privacy Policy [https://community.openclinica.com/privacy-policy] to improve our products and services.
#
# As part of system configuration, we give you the option to help us improve OpenClinica by sending these usage statistics. If you elect to send this information but later change your mind, you can disable this feature in the datainfo.properties file by changing
# As part of system configuration, we give you the option to help us improve LibreClinica by sending these usage statistics. If you elect to send this information but later change your mind, you can disable this feature in the datainfo.properties file by changing
# 'collectStats' value to 'false'
collectStats=true
usage.stats.host=usage.openclinica.com
usage.stats.port=514
OpenClinica.version=${pom.version}
LibreClinica.version=${pom.version}
#############################################################################
# 20 - Rule Designer configuration
# OpenClinica Enterprise customers are allowed access to a GUI based Rule Designer.
# This configuration allows the OpenClinica instance to contact the Rule Designer for
# access. If you are not an OpenClinica Enterprise customer, your users will be re-directed
# to a landing page and will have to navigate back to their OpenClinica instance.
# LibreClinica Enterprise customers are allowed access to a GUI based Rule Designer.
# This configuration allows the LibreClinica instance to contact the Rule Designer for
# access. If you are not an LibreClinica Enterprise customer, your users will be re-directed
# to a landing page and will have to navigate back to their LibreClinica instance.
# If you do not want to see a link to the Rule Designer on the Build Study page,
# you must delete this configuration option.
#
# To become an OpenClinica Enterprise customer, please contact [email protected]
# To become an LibreClinica Enterprise customer, please contact [email protected]
#############################################################################
designerURL=https://designer13.openclinica.com/
#############################################################################
Expand Down
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
2 changes: 0 additions & 2 deletions core/src/main/filters/integration.properties

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* LibreClinica is distributed under the
* GNU Lesser General Public License (GNU LGPL).
* For details see: https://libreclinica.org/license
* LibreClinica, copyright (C) 2020
*/
package org.akaza.openclinica.bean.admin;

import org.akaza.openclinica.bean.core.EntityBean;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
* OpenClinica is distributed under the
* LibreClinica is distributed under the
* GNU Lesser General Public License (GNU LGPL).
* For details see: http://www.openclinica.org/license
* copyright 2003-2005 Akaza Research
* For details see: https://libreclinica.org/license
* LibreClinica, copyright (C) 2020
*/

/*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
* OpenClinica is distributed under the
* LibreClinica is distributed under the
* GNU Lesser General Public License (GNU LGPL).
* For details see: http://www.openclinica.org/license
* copyright 2003-2005 Akaza Research
* For details see: https://libreclinica.org/license
* LibreClinica, copyright (C) 2020
*/

package org.akaza.openclinica.bean.admin;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/*
* LibreClinica is distributed under the
* GNU Lesser General Public License (GNU LGPL).
* For details see: https://libreclinica.org/license
* LibreClinica, copyright (C) 2020
*/
package org.akaza.openclinica.bean.admin;

import java.util.Date;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/*
* OpenClinica is distributed under the
* LibreClinica is distributed under the
* GNU Lesser General Public License (GNU LGPL).
* For details see: http://www.openclinica.org/license
* copyright 2003-2005 Akaza Research
* For details see: https://libreclinica.org/license
* LibreClinica, copyright (C) 2020
*/

package org.akaza.openclinica.bean.admin;
Expand Down
Loading

0 comments on commit dbf0fe4

Please sign in to comment.