OO-291: remove forgotten debug code, system.out...

src/main/java/org/olat/core/commons/persistence/DBImpl.java

@@ -682,13 +682,6 @@ public class DBImpl extends LogDelegator implements DB, Destroyable {
 	 * Call this to commit a transaction opened by beginTransaction().
 	 */
 	public void commit() {
-//		StackTraceElement[] elems = Thread.currentThread().getStackTrace();
-//		if (elems!=null && elems.length>1) {
-//			if (!elems[2].getClassName().equals("org.olat.commons.coordinate.cluster.ClusterSyncer") &&
-//					!elems[2].getClassName().equals("org.olat.core.util.mtx.ManagedTransaction")) {
-//				System.out.println("--> TRANSACTION RULES BROKEN");
-//			}
-//		}
 		if (isLogDebugEnabled()) logDebug("commit start...", null);
 		try {
 			if (isConnectionOpen() && hasTransaction() && getTransaction().isInTransaction()) {

src/main/java/org/olat/course/CourseFactory.java

@@ -1120,7 +1120,6 @@ public class CourseFactory extends BasicManager {
 			course.setReadAndWrite(true);
 			courseEditSessionMap.put(resourceableId, course);
 			log.debug("getCourseEditSession - put course in courseEditSessionMap: " + resourceableId);
-			//System.out.println("put course in courseEditSessionMap: " + resourceableId);
 		}	
 		return course;
 	}
@@ -1155,7 +1154,6 @@ public class CourseFactory extends BasicManager {
 		  course.setReadAndWrite(false);
 		  courseEditSessionMap.remove(resourceableId);
 		  log.debug("removeCourseEditSession for course: " + resourceableId);
-		  //System.out.println("removeCourseEditSession for course: " + resourceableId);
 		}
 	}
 	

src/main/java/org/olat/course/assessment/EfficiencyStatementManager.java

@@ -236,7 +236,7 @@ public class EfficiencyStatementManager extends BasicManager implements UserData
 	 * LD: Debug method. 
 	 * @param efficiencyStatement
 	 */
-	private void printEfficiencyStatement(EfficiencyStatement efficiencyStatement) {
+	protected void printEfficiencyStatement(EfficiencyStatement efficiencyStatement) {
 		List<Map<String,Object>> assessmentNodes = efficiencyStatement.getAssessmentNodes();
 		if (assessmentNodes != null) {
 			Iterator<Map<String,Object>> iter = assessmentNodes.iterator();
@@ -247,7 +247,7 @@ public class EfficiencyStatementManager extends BasicManager implements UserData
 				Boolean passed = (Boolean)nodeData.get(AssessmentHelper.KEY_PASSED);
 				Integer attempts = (Integer)nodeData.get(AssessmentHelper.KEY_ATTEMPTS);
 				String attemptsStr = attempts==null ? null : String.valueOf(attempts.intValue());				
-				System.out.println("title: " + title + " score: " + score + " passed: " + passed + " attempts: " + attemptsStr);				
+				logInfo("title: " + title + " score: " + score + " passed: " + passed + " attempts: " + attemptsStr);				
 			}
 		}		
 	}

src/main/java/org/olat/course/condition/Condition.java

@@ -419,7 +419,6 @@ public class Condition implements Serializable, Cloneable {
 			// don't use "( )" as a condition!
 			return null;
 		} else {
-			System.out.println(sb.toString());
 			return sb.toString();
 		}
 	}

src/main/java/org/olat/course/condition/ConditionEditController.java

@@ -121,7 +121,6 @@ public class ConditionEditController extends BasicController {
 				//successfully changed condition - get condition - dispose and init cond
 				validatedCondition = conditionEasyCtrllr.getCondition(); 
 				condition = cloneCondition(validatedCondition);
-				System.out.println("Condition: " + condition.getConditionExpression());
 				// Inform all listeners about the changed condition
 				// this event goes to the NodeEditController and from there to the 
 				// CourseEditorController which then saves the condition

src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java

@@ -65,7 +65,6 @@ import org.olat.core.logging.activity.ThreadLocalUserActivityLogger;
 import org.olat.core.util.mail.MailNotificationEditController;
 import org.olat.core.util.mail.MailTemplate;
 import org.olat.core.util.resource.OresHelper;
-import org.olat.core.util.vfs.Quota;
 import org.olat.group.BusinessGroup;
 import org.olat.group.BusinessGroupMembership;
 import org.olat.group.BusinessGroupModule;
@@ -486,11 +485,6 @@ abstract class AbstractBusinessGroupListController extends BasicController imple
 							tools.setToolEnabled(enabledTool, true);
 							if(CollaborationTools.TOOL_FOLDER.equals(enabledTool)) {
 								tools.saveFolderAccess(new Long(configuration.getFolderAccess()));
-								
-								Quota quota = configuration.getQuota();
-								System.out.println(quota);
-								
-								
 							} else if (CollaborationTools.TOOL_CALENDAR.equals(enabledTool)) {
 								tools.saveCalendarAccess(new Long(configuration.getCalendarAccess()));
 							}

src/main/java/org/olat/group/ui/wizard/BGEmailCompositionStepController.java

@@ -122,15 +122,13 @@ public class BGEmailCompositionStepController extends StepFormBasicController
 				success = emailer.sendEmailCC(context, contactForm.getEmailFrom(), contactForm.getSubject(), contactForm.getBody(), attachments);
 			}
 		} catch (AddressException e) {
-			e.printStackTrace();
+			logError(null, e);
 		} catch (MessagingException e) {
-			e.printStackTrace();
+			logError(null, e);
 		}
 		
 		if(success) {
-			System.out.println("Youppi");
+			fireEvent(ureq, StepsEvent.ACTIVATE_NEXT);
 		}
-		
-		fireEvent(ureq, StepsEvent.ACTIVATE_NEXT);
 	}
 }

src/main/java/org/olat/login/OLATAuthenticationController.java

@@ -211,7 +211,6 @@ public class OLATAuthenticationController extends AuthenticationController imple
 			// Check if disclaimer has been accepted
 			if (RegistrationManager.getInstance().needsToConfirmDisclaimer(authenticatedIdentity)) {
 				// accept disclaimer first
-				RegistrationManager.getInstance().setHasConfirmedDislaimer(authenticatedIdentity);
 				
 				removeAsListenerAndDispose(disclaimerCtr);
 				disclaimerCtr = new DisclaimerController(ureq, getWindowControl());

src/main/java/org/olat/notifications/NotificationUIFactory.java

@@ -140,8 +140,7 @@ public class NotificationUIFactory {
 		// Special case update course and group name for calendars (why?) 
 		if (subidentifier.equals(CalendarController.ACTION_CALENDAR_COURSE)) {
 			resName = CourseModule.ORES_TYPE_COURSE;
-		}
-		if (subidentifier.equals(CalendarController.ACTION_CALENDAR_GROUP)) {
+		} else if (subidentifier.equals(CalendarController.ACTION_CALENDAR_GROUP)) {
 			resName = BusinessGroupModule.ORES_TYPE_GROUP;
 		}
 

src/main/java/org/olat/repository/RepositoryEntry.hbm.xml

@@ -96,7 +96,7 @@
 		</property>
 		
 		<property name="statusCode" column="statuscode" unique="false" type="int"/>
-		<!-- 
+		
 		<list name="metaDataElements" table="o_repositorymetadata" lazy="true">
 	   	    <key column="fk_repositoryentry"/>
 	   	    <index column="metadataelement_id"/>
@@ -111,6 +111,6 @@
 				</property>
    	 	    </composite-element>
 		</list>
-		-->
+		
 	</class>
 </hibernate-mapping>

src/main/java/org/olat/restapi/repository/course/CourseAssessmentWebService.java

@@ -53,6 +53,8 @@ import org.olat.core.commons.persistence.DBFactory;
 import org.olat.core.commons.persistence.DBQuery;
 import org.olat.core.id.Identity;
 import org.olat.core.id.IdentityEnvironment;
+import org.olat.core.logging.OLog;
+import org.olat.core.logging.Tracing;
 import org.olat.course.CourseFactory;
 import org.olat.course.ICourse;
 import org.olat.course.assessment.AssessmentManager;
@@ -98,6 +100,8 @@ import org.olat.restapi.support.vo.AssessableResultsVO;
 @Path("repo/courses/{courseId}/assessments")
 public class CourseAssessmentWebService {
 	
+	private static final OLog log = Tracing.createLoggerFor(CourseAssessmentWebService.class);
+	
 	private static final String VERSION  = "1.0";
 	
 	private static final CacheControl cc = new CacheControl();
@@ -389,7 +393,6 @@ public class CourseAssessmentWebService {
 								Info info = navigator.getInfo();
 								if (info.containsError()) {
 									// some items cannot processed twice
-									System.out.println("Error");
 								} else {
 									iips.addItemInput(datas.get(it.getIdent()));
 									navigator.submitItems(iips);
@@ -440,10 +443,10 @@ public class CourseAssessmentWebService {
 				boolean incrementUserAttempts = true;
 				acn.updateUserScoreEvaluation(sceval, userCourseEnv, identity, incrementUserAttempts);
 			} else {
-				System.out.println("Result set already saved");
+				log.error("Result set already saved");
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error("", e);
 		}
 	}
 

src/main/resources/database/mysql/setupDatabase.sql

@@ -512,6 +512,22 @@ create table if not exists o_userrating (
 	primary key (rating_id)
 );
 
+create table o_co_db_entry (
+   id int8 not null,
+   version int8 not null,
+   lastmodified timestamp,
+   creationdate timestamp,
+   courseid int8,
+   identity int8,
+   category varchar(32),
+   name varchar(255) not null,
+   floatvalue decimal(65,30),
+   longvalue int8,
+   stringvalue varchar(255),
+   textvalue TEXT,
+   primary key (id)
+);
+
 create table if not exists o_stat_lastupdated (
 
 	lastupdated datetime not null
@@ -1238,6 +1254,7 @@ alter table o_ep_collect_restriction ENGINE = InnoDB;
 alter table o_ep_struct_el ENGINE = InnoDB;
 alter table o_ep_struct_struct_link ENGINE = InnoDB;
 alter table o_ep_struct_artefact_link ENGINE = InnoDB;
+alter table o_co_db_entry ENGINE = InnoDB;
 alter table o_mail ENGINE = InnoDB;
 alter table o_mail_to_recipient ENGINE = InnoDB;
 alter table o_mail_recipient ENGINE = InnoDB;
@@ -1371,6 +1388,12 @@ alter table o_info_message add constraint FKF85553465A4FA5DC foreign key (fk_aut
 create index imsg_modifier_idx on o_info_message (fk_modifier_id);
 alter table o_info_message add constraint FKF85553465A4FA5EF foreign key (fk_modifier_id) references o_bs_identity (id);
 
+create index o_co_db_course_idx on o_co_db_entry (courseid);
+create index o_co_db_cat_idx on o_co_db_entry (category);
+create index o_co_db_name_idx on o_co_db_entry (name);
+alter table o_co_db_entry add constraint FK_DB_ENTRY_TO_IDENT foreign key (identity) references o_bs_identity (id);
+
+
 alter table o_ep_artefact add constraint FKF26C8375236F28X foreign key (fk_artefact_auth_id) references o_bs_identity (id);
 alter table o_ep_struct_el add constraint FKF26C8375236F26X foreign key (fk_olatresource) references o_olatresource (resource_id);
 alter table o_ep_struct_el add constraint FKF26C8375236F29X foreign key (fk_ownergroup) references o_bs_secgroup (id);

src/main/resources/database/postgresql/setupDatabase.sql

@@ -523,6 +523,22 @@ create table o_info_message (
   primary key (info_id)
 ) ;
 
+create table o_co_db_entry (
+   id int8 not null,
+   version int8 not null,
+   lastmodified timestamp,
+   creationdate timestamp,
+   courseid int8,
+   identity int8,
+   category varchar(32),
+   name varchar(255) not null,
+   floatvalue decimal(65,30),
+   longvalue int8,
+   stringvalue varchar(255),
+   textvalue TEXT,
+   primary key (id)
+);
+
 -- eportfolio arteafcts
 create table o_ep_artefact (
   artefact_id int8 not null,
@@ -1182,6 +1198,107 @@ create or replace view o_re_strict_tutor_v as (
    where re.membersonly=true and re.accesscode=1
 );
 
+create or replace view o_gp_business_v  as (
+   select
+      gp.group_id as group_id,
+      gp.groupname as groupname,
+      gp.lastmodified as lastmodified,
+      gp.creationdate as creationdate,
+      gp.lastusage as lastusage,
+      gp.descr as descr,
+      gp.minparticipants as minparticipants,
+      gp.maxparticipants as maxparticipants,
+      gp.waitinglist_enabled as waitinglist_enabled,
+      gp.autocloseranks_enabled as autocloseranks_enabled,
+      (select count(part.id) from o_bs_membership as part where part.secgroup_id = gp.fk_partipiciantgroup) as num_of_participants,
+      (select count(own.id) from o_bs_membership as own where own.secgroup_id = gp.fk_ownergroup) as num_of_owners,
+      (select count(offer.offer_id) from o_ac_offer as offer 
+         where offer.fk_resource_id = gp.fk_resource
+         and offer.is_valid=true
+         and (offer.validfrom is null or offer.validfrom >= current_timestamp)
+         and (offer.validto is null or offer.validto <= current_timestamp)
+      ) as num_of_valid_offers,
+      (select count(offer.offer_id) from o_ac_offer as offer 
+         where offer.fk_resource_id = gp.fk_resource
+         and offer.is_valid=true
+      ) as num_of_offers,
+      (select count(relation.fk_resource) from o_gp_business_to_resource as relation 
+         where relation.fk_group = gp.group_id
+      ) as num_of_relations,
+      gp.fk_resource as fk_resource,
+      gp.fk_ownergroup as fk_ownergroup,
+      gp.fk_partipiciantgroup as fk_partipiciantgroup,
+      gp.fk_waitinggroup as fk_waitinggroup
+   from o_gp_business as gp
+);
+
+create or replace view o_re_member_v as (
+   select
+      re.repositoryentry_id as re_id,
+      re.membersonly as re_membersonly,
+      re.accesscode as re_accesscode,
+      re_part_member.identity_id as re_part_member_id,
+      re_tutor_member.identity_id as re_tutor_member_id,
+      re_owner_member.identity_id as re_owner_member_id,
+      bg_part_member.identity_id as bg_part_member_id,
+      bg_owner_member.identity_id as bg_owner_member_id
+   from o_repositoryentry as re
+   left join o_bs_membership as re_part_member on (re_part_member.secgroup_id = re.fk_participantgroup)
+   left join o_bs_membership as re_tutor_member on (re_tutor_member.secgroup_id = re.fk_tutorgroup)
+   left join o_bs_membership as re_owner_member on (re_owner_member.secgroup_id = re.fk_ownergroup)
+   left join o_gp_business_to_resource as bgroup_rel on (bgroup_rel.fk_resource = re.fk_olatresource)
+   left join o_gp_business as bgroup on (bgroup.group_id = bgroup_rel.fk_group)
+   left join o_bs_membership as bg_part_member on (bg_part_member.secgroup_id = bgroup.fk_partipiciantgroup)
+   left join o_bs_membership as bg_owner_member on (bg_owner_member.secgroup_id = bgroup.fk_ownergroup)
+);
+
+create or replace view o_re_strict_member_v as (
+   select
+      re.repositoryentry_id as re_id,
+      re_part_member.identity_id as re_part_member_id,
+      re_tutor_member.identity_id as re_tutor_member_id,
+      re_owner_member.identity_id as re_owner_member_id,
+      bg_part_member.identity_id as bg_part_member_id,
+      bg_owner_member.identity_id as bg_owner_member_id
+   from o_repositoryentry as re
+   left join o_bs_membership as re_part_member on (re_part_member.secgroup_id = re.fk_participantgroup)
+   left join o_bs_membership as re_tutor_member on (re_tutor_member.secgroup_id = re.fk_tutorgroup)
+   left join o_bs_membership as re_owner_member on (re_owner_member.secgroup_id = re.fk_ownergroup)
+   left join o_gp_business_to_resource as bgroup_rel on (bgroup_rel.fk_resource = re.fk_olatresource)
+   left join o_gp_business as bgroup on (bgroup.group_id = bgroup_rel.fk_group)
+   left join o_bs_membership as bg_part_member on (bg_part_member.secgroup_id = bgroup.fk_partipiciantgroup)
+   left join o_bs_membership as bg_owner_member on (bg_owner_member.secgroup_id = bgroup.fk_ownergroup)
+   where re.membersonly=true and re.accesscode=1
+);
+
+create or replace view o_re_strict_participant_v as (
+   select
+      re.repositoryentry_id as re_id,
+      re_part_member.identity_id as re_part_member_id,
+      bg_part_member.identity_id as bg_part_member_id
+   from o_repositoryentry as re
+   left join o_bs_membership as re_part_member on (re_part_member.secgroup_id = re.fk_participantgroup)
+   left join o_gp_business_to_resource as bgroup_rel on (bgroup_rel.fk_resource = re.fk_olatresource)
+   left join o_gp_business as bgroup on (bgroup.group_id = bgroup_rel.fk_group)
+   left join o_bs_membership as bg_part_member on (bg_part_member.secgroup_id = bgroup.fk_partipiciantgroup)
+   where re.membersonly=true and re.accesscode=1
+);
+
+create or replace view o_re_strict_tutor_v as (
+   select
+      re.repositoryentry_id as re_id,
+      re_tutor_member.identity_id as re_tutor_member_id,
+      re_owner_member.identity_id as re_owner_member_id,
+      bg_owner_member.identity_id as bg_owner_member_id
+   from o_repositoryentry as re
+   left join o_bs_membership as re_tutor_member on (re_tutor_member.secgroup_id = re.fk_tutorgroup)
+   left join o_bs_membership as re_owner_member on (re_owner_member.secgroup_id = re.fk_ownergroup)
+   left join o_gp_business_to_resource as bgroup_rel on (bgroup_rel.fk_resource = re.fk_olatresource)
+   left join o_gp_business as bgroup on (bgroup.group_id = bgroup_rel.fk_group)
+   left join o_bs_membership as bg_owner_member on (bg_owner_member.secgroup_id = bgroup.fk_ownergroup)
+   where re.membersonly=true and re.accesscode=1
+);
+
 create index userrating_id_idx on o_userrating (resid);
 create index userrating_name_idx on o_userrating (resname);
 create index userrating_subpath_idx on o_userrating (ressubpath);