From 8f39bf14d4c0d321f2a7d283fec6f8a364ae3000 Mon Sep 17 00:00:00 2001 From: Earle Nietzel Date: Mon, 18 Apr 2016 14:02:03 -0400 Subject: [PATCH] SAK-30828 Normalize sakai logging - remove commons-logging (jcl) - add logging to those projects where it was removed - convert System.out to log messages in many projects - add jcl-over-slf4j lib - update many dependencies to inherit from master - update logging for tests - add lombok to global dependency (@Slf4j) --- access/access-impl/impl/pom.xml | 5 - alias/alias-tool/tool/pom.xml | 4 - announcement/announcement-impl/impl/pom.xml | 4 - announcement/announcement-tool/tool/pom.xml | 8 - archive/archive-tool/tool/pom.xml | 8 - .../announcement-handlers/pom.xml | 4 - archive/pom.xml | 6 - assignment/assignment-impl/impl/pom.xml | 4 - .../impl/src/test/resources/log4j.properties | 6 + assignment/assignment-tool/tool/pom.xml | 8 - authz/authz-tool/tool/pom.xml | 4 - basiclti/basiclti-api/pom.xml | 4 - basiclti/basiclti-blis/pom.xml | 9 - basiclti/basiclti-common/pom.xml | 4 - basiclti/basiclti-impl/pom.xml | 4 - basiclti/basiclti-portlet/pom.xml | 4 - basiclti/basiclti-tool/pom.xml | 5 - basiclti/portlet-util/pom.xml | 5 - basiclti/tsugi-util/pom-tsugi.xml | 5 - basiclti/tsugi-util/pom.xml | 5 - basiclti/web-ifp/pom.xml | 4 - calendar/calendar-api/api/pom.xml | 4 - calendar/calendar-impl/impl/pom.xml | 6 - calendar/calendar-summary-tool/tool/pom.xml | 6 - calendar/calendar-tool/tool/pom.xml | 8 - calendar/calendar-util/util/pom.xml | 4 - .../util/src/test/resources/log4j.properties | 6 + chat/chat-impl/impl/pom.xml | 4 - chat/chat-tool/tool/pom.xml | 6 - citations/citations-impl/impl/pom.xml | 6 +- .../impl/src/test/log4j.properties | 6 + citations/citations-osid/web2bridge/pom.xml | 5 - citations/citations-osid/xserver/pom.xml | 4 - citations/citations-servlet/servlet/pom.xml | 5 - citations/citations-tool/tool/pom.xml | 6 - citations/citations-util/util/pom.xml | 5 - cloud-content/impl/pom.xml | 4 - cmprovider/pom.xml | 4 - common/archive-impl/impl2/pom.xml | 8 - common/common-composite-component/pom.xml | 5 - common/impl/pom.xml | 4 - .../import-handlers/content-handlers/pom.xml | 4 - common/import-impl/pom.xml | 4 - common/import-parsers/blackboard_5-5/pom.xml | 6 - .../import-parsers/blackboard_6/impl/pom.xml | 4 - .../import-parsers/common-cartridge/pom.xml | 5 - common/import-util/pom.xml | 4 - common/pack/pom.xml | 5 - common/pom.xml | 5 - common/privacy-comp-impl/pom.xml | 7 - common/privacy-integration-test/pom.xml | 4 - content-review/impl/dao/pom.xml | 5 - content-review/impl/turnitin/pom.xml | 9 - content-review/pom.xml | 6 - .../content-cleanup-impl/pom.xml | 4 - content/content-copyright/impl/pom.xml | 4 - content/content-impl-providers/impl/pom.xml | 4 - content/content-metadata/impl/pom.xml | 4 - content/content-tool/tool/pom.xml | 8 - content/content-types/pom.xml | 4 - .../content/types/FolderType.java | 38 ++++- courier/courier-impl/impl/pom.xml | 4 - courier/courier-tool/tool/pom.xml | 4 - courier/courier-util/util/pom.xml | 4 - dashboard/impl/pom.xml | 17 +- .../dash/dao/mapper/ContextMapper.java | 6 +- dashboard/impl/src/test/log4j.properties | 6 + dashboard/tool/pom.xml | 14 -- dav/dav-server/pom.xml | 4 - dav/dav/pom.xml | 4 - delegatedaccess/api/pom.xml | 6 - delegatedaccess/impl/pom.xml | 9 - delegatedaccess/tool/pom.xml | 16 -- .../cm-impl/hibernate-impl/impl/pom.xml | 12 -- .../gradebook-service/hibernate/pom.xml | 4 - edu-services/gradebook-service/impl/pom.xml | 6 - edu-services/scoring-service/impl/pom.xml | 5 - .../sections-impl/integration-support/pom.xml | 14 -- .../sections-impl/integration-test/pom.xml | 9 - .../sections-impl/sakai/impl/pom.xml | 4 - .../sections-impl/sakai/model/pom.xml | 6 - .../sections-impl/standalone/pom.xml | 10 -- emailtemplateservice/impl/logic/pom.xml | 5 +- emailtemplateservice/tool/pom.xml | 4 - entitybroker/api/pom.xml | 20 --- entitybroker/core-providers/pom.xml | 86 ++-------- .../core-providers/src/test/log4j.properties | 6 + entitybroker/impl/pom.xml | 10 +- .../EntityProviderManagerImpl.java | 19 ++- entitybroker/impl/src/test/log4j.properties | 6 + entitybroker/pom.xml | 78 ++------- entitybroker/project.properties | 1 - entitybroker/rest/pom.xml | 31 +--- .../entitybroker/rest/EntityBatchHandler.java | 21 ++- .../rest/EntityBrokerRESTServiceManager.java | 7 +- .../rest/EntityDescriptionManager.java | 19 ++- .../rest/EntityEncodingManager.java | 8 +- .../entitybroker/rest/EntityHandlerImpl.java | 18 +- .../rest/EntityRESTProviderBase.java | 7 +- .../rest/EntityRedirectsManager.java | 7 +- entitybroker/rest/src/test/log4j.properties | 6 + entitybroker/tool/pom.xml | 44 +---- .../servlet/SakaiDirectServlet.java | 8 +- entitybroker/utils/pom.xml | 34 +--- .../core/AbstractEntityPropertiesService.java | 7 +- .../core/EntityProviderMethodStoreImpl.java | 13 +- .../AbstractDeveloperHelperService.java | 10 +- .../entitybroker/util/http/HttpRESTUtils.java | 9 +- .../util/request/RequestUtils.java | 15 +- .../util/servlet/DirectServlet.java | 8 +- .../util/spring/ResourceFinder.java | 5 +- external-calendaring-service/api/pom.xml | 4 - external-calendaring-service/impl/pom.xml | 5 +- .../impl/src/test/log4j.properties | 6 + feedback/pom.xml | 8 - gradebook/app/business/pom.xml | 12 -- gradebook/app/ui/pom.xml | 15 -- gradebook/grades-rest/pom.xml | 7 - gradebookng/.gitignore | 3 - .../org.eclipse.core.resources.prefs | 6 - .../tool/.settings/org.eclipse.jdt.core.prefs | 12 -- .../tool/.settings/org.eclipse.m2e.core.prefs | 4 - gradebookng/tool/pom.xml | 21 --- .../gradebookng/business/util/Temp.java | 7 +- .../gradebookng/tool/pages/BasePage.java | 7 +- .../importExport/CreateGradeItemStep.java | 14 +- .../GradeImportConfirmationStep.java | 24 +-- .../importExport/GradeImportUploadStep.java | 26 +-- .../GradeItemImportSelectionStep.java | 12 +- .../src/{ => test}/resources/log4j.properties | 0 help/help-component/pom.xml | 6 +- help/help-tool/pom.xml | 4 - hierarchy/impl/pom.xml | 10 +- hierarchy/impl/src/test/log4j.properties | 6 + .../scheduler-component-shared/pom.xml | 12 -- .../scheduler-test-component-shared/pom.xml | 4 - jobscheduler/scheduler-tool/pom.xml | 6 - jsf/jsf-app/pom.xml | 4 - jsf/jsf-spreadsheet/pom.xml | 4 - jsf/jsf-tool-sun/pom.xml | 2 - jsf/jsf-tool/pom.xml | 4 - jsf/jsf-widgets-sun/pom.xml | 4 - jsf/jsf-widgets/pom.xml | 4 - jsf/myfaces-tool/pom.xml | 2 - jsf/myfaces-widgets/pom.xml | 4 - kernel/api/pom.xml | 4 - .../org/sakaiproject/util/ToolListener.java | 11 +- kernel/component-manager/pom.xml | 29 ---- .../src/test/resources/log4j.properties | 6 + kernel/deploy/common/pom.xml | 4 +- kernel/kernel-common/pom.xml | 11 -- .../src/main/config/log4j.properties | 6 +- kernel/kernel-impl/pom.xml | 22 --- .../Type1BlobCollectionConversionHandler.java | 10 +- .../Type1BlobResourcesConversionHandler.java | 9 +- .../content/impl/util/StorageConverter.java | 10 +- .../tool/impl/SessionComponent.java | 45 +++-- .../user/impl/ReEncryptPasswords.java | 10 +- kernel/kernel-storage-util/pom.xml | 4 - kernel/kernel-util/pom.xml | 4 - .../src/test/resources/log4j.properties | 6 + .../model/SimplePageToolDaoImpl.java | 28 ++-- .../service/SimplePageToolService.java | 17 +- lessonbuilder/pom.xml | 15 -- .../ccexport/Assignment2Export.java | 4 +- .../service/Assignment2Entity.java | 14 +- .../service/ScormEntity.java | 12 +- lessonbuilder/tool/pom.xml | 4 - .../lessonbuildertool/cc/AbstractParser.java | 7 +- .../lessonbuildertool/cc/LtiParser.java | 6 +- .../lessonbuildertool/cc/Parser.java | 14 +- .../lessonbuildertool/cc/PrintHandler.java | 27 +-- .../lessonbuildertool/cc/QtiImport.java | 6 +- .../lessonbuildertool/cc/ZipLoader.java | 15 +- .../ccexport/AssignmentExport.java | 2 +- .../lessonbuildertool/ccexport/CCExport.java | 8 +- .../ccexport/SamigoExport.java | 2 +- .../lessonbuildertool/service/AjaxServer.java | 4 +- .../service/AssignmentEntity.java | 4 +- .../service/ForumEntity.java | 38 ++--- .../service/GradebookIfc.java | 10 +- .../service/GroupPermissionsService.java | 8 +- .../service/JForumEntity.java | 31 ++-- .../service/LessonBuilderAccessService.java | 4 +- .../service/LessonBuilderEntityProducer.java | 12 +- .../service/SamigoEntity.java | 22 +-- .../tool/beans/GradingBean.java | 7 +- .../tool/beans/SimplePageBean.java | 38 ++--- .../tool/evolvers/SakaiFCKTextEvolver.java | 7 +- .../producers/AssignmentPickerProducer.java | 8 +- .../tool/producers/BltiPickerProducer.java | 7 +- .../tool/producers/CommentsProducer.java | 5 +- .../tool/producers/EditPageProducer.java | 7 +- .../tool/producers/ForumPickerProducer.java | 6 +- .../tool/producers/IFrameWindowProducer.java | 5 +- .../tool/producers/LinkTrackerProducer.java | 5 +- .../tool/producers/LtiFileItemProducer.java | 5 +- .../tool/producers/PagePickerProducer.java | 15 +- .../tool/producers/PeerEvalStatsProducer.java | 13 +- .../tool/producers/PreviewProducer.java | 5 +- .../tool/producers/QuizPickerProducer.java | 6 +- .../tool/producers/ReorderProducer.java | 5 +- .../producers/ResourcePickerProducer.java | 5 +- .../tool/producers/ShowPageProducer.java | 18 +- .../service/LessonsGradeInfoProvider.java | 20 +-- login/login-authn-tool/tool/pom.xml | 4 - login/login-impl/impl/pom.xml | 5 - login/login-render-engine-impl/impl/pom.xml | 4 - login/login-render-engine-impl/pack/pom.xml | 4 - login/login-tool/tool/pom.xml | 12 -- mailarchive/mailarchive-impl/impl/pom.xml | 4 - .../impl/conversion/ExtractXMLToColumns.java | 10 +- mailarchive/mailarchive-james/james/pom.xml | 4 - mailarchive/mailarchive-subetha/pom.xml | 12 +- .../src/test/log4j.properties | 6 + mailarchive/mailarchive-tool/tool/pom.xml | 8 - mailsender/api/pom.xml | 4 - mailsender/impl/pom.xml | 4 - .../impl/src/test/resources/log4j.properties | 6 + mailsender/tool/pom.xml | 11 -- master/pom.xml | 156 ++++++++++++------ memory/memory-tool/tool/pom.xml | 5 - message/message-tool/tool/pom.xml | 4 - message/message-util/util/pom.xml | 4 - message/search-adapters/impl/pom.xml | 11 -- msgcntr/messageforums-api/pom.xml | 4 - msgcntr/messageforums-app/pom.xml | 26 +-- msgcntr/messageforums-component-impl/pom.xml | 5 - msgcntr/messageforums-hbm/pom.xml | 5 - oauth/api/pom.xml | 8 - oauth/impl/pom.xml | 5 - oauth/pack/pom.xml | 6 - oauth/pom.xml | 50 ------ oauth/tool/pom.xml | 9 - pasystem/pasystem-api/api/pom.xml | 7 - pasystem/pasystem-impl/impl/pom.xml | 16 -- pasystem/pasystem-tool/tool/pom.xml | 14 -- podcasts/podcasts-app/pom.xml | 8 - podcasts/podcasts-impl/pom.xml | 4 - podcasts/podcasts/pom.xml | 4 - polls/impl/pom.xml | 10 +- polls/impl/src/test/log4j.properties | 6 + polls/tool/pom.xml | 9 - .../entityproviders/PollEntityProvider.java | 5 +- .../entityproviders/PollsEntityProvider.java | 26 +-- portal/editor-tool/tool/pom.xml | 4 - portal/pom.xml | 15 +- portal/portal-api/api/pom.xml | 4 - portal/portal-chat/tool/pom.xml | 4 - portal/portal-impl/impl/pom.xml | 8 - .../portal/charon/handlers/SiteHandler.java | 8 +- .../charon/site/PortalSiteHelperImpl.java | 4 +- portal/portal-render-api/api/pom.xml | 4 - portal/portal-render-engine-impl/impl/pom.xml | 8 - portal/portal-render-engine-impl/pack/pom.xml | 4 - portal/portal-render-impl/impl/pom.xml | 12 +- .../impl/src/test/log4j.properties | 6 + portal/portal-service-impl/impl/pom.xml | 4 - portal/portal-tool/tool/pom.xml | 4 - portal/portal-util/util/pom.xml | 4 - postem/postem-app/pom.xml | 4 - presence/presence-impl/impl/pom.xml | 4 - presence/presence-tool/tool/pom.xml | 4 - presence/presence-util/util/pom.xml | 4 - profile2/api/pom.xml | 4 - profile2/impl/pom.xml | 8 - profile2/tool/pom.xml | 18 +- .../models/DetachableMessageThreadModel.java | 4 - profile2/util/pom.xml | 4 - providers/allhands/pom.xml | 14 -- .../authzGroup/AllHandsGroupProvider.java | 4 +- providers/cm-authz-provider/pom.xml | 4 - providers/federating/pom.xml | 13 -- providers/imsent/pom.xml | 14 -- providers/jldap-mock/pom.xml | 16 -- providers/jldap/pom.xml | 13 -- providers/kerberos/pom.xml | 4 - providers/openldap/pom.xml | 13 -- providers/sample/pom.xml | 4 - reset-pass/account-validator-api/pom.xml | 4 - reset-pass/account-validator-impl/pom.xml | 1 - reset-pass/account-validator-tool/pom.xml | 9 - reset-pass/reset-pass/pom.xml | 4 - rights/rights-impl/impl/pom.xml | 8 - rights/rights-tool/tool/pom.xml | 5 - roster2/pom.xml | 8 - rsf/sakai-rsf-core/pom.xml | 14 +- rsf/sakai-rsf-web/evolvers/pom.xml | 4 - rwiki/rwiki-access-tool/pom.xml | 21 --- rwiki/rwiki-impl/impl/pom.xml | 38 +---- .../rwiki-impl/impl/src/test/log4j.properties | 6 + rwiki/rwiki-tool/tool/pom.xml | 8 - rwiki/rwiki-util/radeox/pom.xml | 8 - rwiki/rwiki-util/util/pom.xml | 15 -- samigo/pom.xml | 4 - samigo/samigo-api/pom.xml | 4 - samigo/samigo-app/pom.xml | 9 - samigo/samigo-app/src/test/log4j.properties | 6 + samigo/samigo-cp/pom.xml | 4 - samigo/samigo-hibernate/pom.xml | 8 - samigo/samigo-impl/pom.xml | 9 - samigo/samigo-pack/pom.xml | 4 - samigo/samigo-qti/pom.xml | 11 +- samigo/samigo-services/pom.xml | 13 +- .../CoreAssessmentEntityProviderImpl.java | 1 - samigo/samlite-impl/pom.xml | 12 -- search/elasticsearch/impl/pom.xml | 12 -- search/search-impl/impl/pom.xml | 12 -- search/search-tool/tool/pom.xml | 5 - search/search-util/pom.xml | 4 - sections/sections-app-util/pom.xml | 4 - sections/sections-app/pom.xml | 4 - shortenedurl/impl/pom.xml | 8 - shortenedurl/pom.xml | 6 - shortenedurl/tool/pom.xml | 4 - signup/api/pom.xml | 4 - signup/impl/pom.xml | 8 - .../signup/logic/SignupEmailFacadeImpl.java | 4 +- .../signup/logic/messages/EmailDeliverer.java | 4 +- signup/pom.xml | 6 - signup/tool/pom.xml | 8 - .../entityproviders/EventProcessHandler.java | 4 +- .../tool/jsf/SignupPermissionsUpdateBean.java | 4 +- .../signup/tool/jsf/SignupUIBaseBean.java | 11 +- .../jsf/organizer/OrganizerSignupMBean.java | 6 +- .../signup/tool/util/Utilities.java | 6 +- simple-rss-portlet/pom.xml | 22 +-- .../src/main/resources/log4j.properties | 52 ------ site-manage/pageorder/tool/pom.xml | 4 - .../site-association-impl/impl/pom.xml | 4 - .../site-association-util/util/pom.xml | 4 - .../site-manage-group-helper/tool/pom.xml | 4 - .../pack/pom.xml | 4 - .../tool/pom.xml | 8 - site-manage/site-manage-impl/impl/pom.xml | 8 - site-manage/site-manage-link-helper/pom.xml | 4 - .../site-manage-participant-helper/pom.xml | 5 - site-manage/site-manage-tool/tool/pom.xml | 6 - site-manage/site-manage-util/util/pom.xml | 4 - site/admin-perms-tool/pom.xml | 11 -- site/mergedlist-util/util/pom.xml | 4 - .../sakai-message-bundle-manager-tool/pom.xml | 9 - site/site-tool/tool/pom.xml | 4 - sitestats/pom.xml | 12 -- sitestats/sitestats-api/pom.xml | 4 - sitestats/sitestats-impl-hib/pom.xml | 6 +- sitestats/sitestats-impl/pom.xml | 33 +--- sitestats/sitestats-tool/pom.xml | 16 -- syllabus/syllabus-app/pom.xml | 9 - syllabus/syllabus-impl/pom.xml | 4 - taggable/taggable-impl/impl/pom.xml | 4 - textarea/FCKeditor/connector/pom.xml | 4 - textarea/calendar/pom.xml | 4 - tool/tool-tool/su/pom.xml | 5 - .../user-tool-admin-prefs/admin-prefs/pom.xml | 5 - user/user-tool-prefs/tool/pom.xml | 5 - user/user-tool/tool/pom.xml | 9 - userauditservice/util/pom.xml | 4 - usermembership/impl/pom.xml | 18 -- usermembership/tool/pom.xml | 6 - velocity/tool/pom.xml | 5 - web/web-impl/impl/pom.xml | 4 - web/web-portlet/pom.xml | 7 +- web/web-tool/tool/pom.xml | 10 -- webservices/cxf/pom.xml | 8 - .../cxf/src/test/resources/log4j.properties | 6 + 366 files changed, 869 insertions(+), 2576 deletions(-) create mode 100644 assignment/assignment-impl/impl/src/test/resources/log4j.properties create mode 100644 calendar/calendar-util/util/src/test/resources/log4j.properties create mode 100644 citations/citations-impl/impl/src/test/log4j.properties create mode 100644 dashboard/impl/src/test/log4j.properties create mode 100644 entitybroker/core-providers/src/test/log4j.properties create mode 100644 entitybroker/impl/src/test/log4j.properties delete mode 100644 entitybroker/project.properties create mode 100644 entitybroker/rest/src/test/log4j.properties create mode 100644 external-calendaring-service/impl/src/test/log4j.properties delete mode 100644 gradebookng/.gitignore delete mode 100644 gradebookng/tool/.settings/org.eclipse.core.resources.prefs delete mode 100644 gradebookng/tool/.settings/org.eclipse.jdt.core.prefs delete mode 100644 gradebookng/tool/.settings/org.eclipse.m2e.core.prefs rename gradebookng/tool/src/{ => test}/resources/log4j.properties (100%) create mode 100644 hierarchy/impl/src/test/log4j.properties create mode 100644 kernel/component-manager/src/test/resources/log4j.properties create mode 100644 kernel/kernel-util/src/test/resources/log4j.properties create mode 100644 mailarchive/mailarchive-subetha/src/test/log4j.properties create mode 100644 mailsender/impl/src/test/resources/log4j.properties create mode 100644 polls/impl/src/test/log4j.properties create mode 100644 portal/portal-render-impl/impl/src/test/log4j.properties create mode 100644 rwiki/rwiki-impl/impl/src/test/log4j.properties create mode 100644 samigo/samigo-app/src/test/log4j.properties delete mode 100644 simple-rss-portlet/src/main/resources/log4j.properties create mode 100644 webservices/cxf/src/test/resources/log4j.properties diff --git a/access/access-impl/impl/pom.xml b/access/access-impl/impl/pom.xml index ab0d257956c6..a001ce963dae 100644 --- a/access/access-impl/impl/pom.xml +++ b/access/access-impl/impl/pom.xml @@ -49,11 +49,6 @@ org.sakaiproject.velocity sakai-velocity-tool - - commons-logging - commons-logging - ${sakai.commons-logging.version} - diff --git a/alias/alias-tool/tool/pom.xml b/alias/alias-tool/tool/pom.xml index 7ba3642f9cc2..90eef6b97272 100644 --- a/alias/alias-tool/tool/pom.xml +++ b/alias/alias-tool/tool/pom.xml @@ -33,10 +33,6 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - org.sakaiproject.velocity sakai-velocity-tool-api diff --git a/announcement/announcement-impl/impl/pom.xml b/announcement/announcement-impl/impl/pom.xml index dad525bbd5f1..b3f5dee8ab24 100644 --- a/announcement/announcement-impl/impl/pom.xml +++ b/announcement/announcement-impl/impl/pom.xml @@ -36,10 +36,6 @@ org.sakaiproject.scheduler scheduler-api - - commons-logging - commons-logging - javax.servlet servlet-api diff --git a/announcement/announcement-tool/tool/pom.xml b/announcement/announcement-tool/tool/pom.xml index 9047e965fabb..288e8fea304b 100644 --- a/announcement/announcement-tool/tool/pom.xml +++ b/announcement/announcement-tool/tool/pom.xml @@ -68,10 +68,6 @@ commons-lang commons-lang - - commons-logging - commons-logging - javax.servlet servlet-api @@ -84,10 +80,6 @@ org.springframework spring-beans - - org.projectlombok - lombok - diff --git a/archive/archive-tool/tool/pom.xml b/archive/archive-tool/tool/pom.xml index d5f3f0dd04ab..354a25b2f8e1 100644 --- a/archive/archive-tool/tool/pom.xml +++ b/archive/archive-tool/tool/pom.xml @@ -33,10 +33,6 @@ org.sakaiproject.common archive-api - - commons-logging - commons-logging - org.sakaiproject.velocity sakai-velocity-tool-api @@ -53,10 +49,6 @@ org.sakaiproject.kernel sakai-component-manager - - org.projectlombok - lombok - commons-io commons-io diff --git a/archive/import-handlers/announcement-handlers/pom.xml b/archive/import-handlers/announcement-handlers/pom.xml index 8b128f59a44b..a7a256136aa0 100644 --- a/archive/import-handlers/announcement-handlers/pom.xml +++ b/archive/import-handlers/announcement-handlers/pom.xml @@ -24,10 +24,6 @@ org.sakaiproject.kernel sakai-kernel-api - - commons-logging - commons-logging - org.sakaiproject.common archive-api diff --git a/archive/pom.xml b/archive/pom.xml index 221100bd5170..82bdadc4ae5d 100644 --- a/archive/pom.xml +++ b/archive/pom.xml @@ -59,12 +59,6 @@ ${project.version} provided - - org.projectlombok - lombok - ${sakai.lombok.version} - provided - diff --git a/assignment/assignment-impl/impl/pom.xml b/assignment/assignment-impl/impl/pom.xml index 41f5313a5d6f..fd3d8f078298 100644 --- a/assignment/assignment-impl/impl/pom.xml +++ b/assignment/assignment-impl/impl/pom.xml @@ -76,10 +76,6 @@ org.sakaiproject.taggable sakai-taggable-api - - commons-logging - commons-logging - commons-codec commons-codec diff --git a/assignment/assignment-impl/impl/src/test/resources/log4j.properties b/assignment/assignment-impl/impl/src/test/resources/log4j.properties new file mode 100644 index 000000000000..e78168e1f881 --- /dev/null +++ b/assignment/assignment-impl/impl/src/test/resources/log4j.properties @@ -0,0 +1,6 @@ +log4j.appender.Stdout=org.apache.log4j.ConsoleAppender +log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m%n + +log4j.rootLogger=INFO,Stdout + diff --git a/assignment/assignment-tool/tool/pom.xml b/assignment/assignment-tool/tool/pom.xml index a9ff40a5c41d..db9b7babb985 100644 --- a/assignment/assignment-tool/tool/pom.xml +++ b/assignment/assignment-tool/tool/pom.xml @@ -101,10 +101,6 @@ ant 1.6.5 - - commons-logging - commons-logging - commons-lang commons-lang @@ -117,10 +113,6 @@ org.springframework spring-beans - - org.projectlombok - lombok - org.sakaiproject.scheduler scheduler-api diff --git a/authz/authz-tool/tool/pom.xml b/authz/authz-tool/tool/pom.xml index 399aa7ed76f8..4742f835a816 100644 --- a/authz/authz-tool/tool/pom.xml +++ b/authz/authz-tool/tool/pom.xml @@ -33,10 +33,6 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - org.sakaiproject.velocity sakai-velocity-tool-api diff --git a/basiclti/basiclti-api/pom.xml b/basiclti/basiclti-api/pom.xml index b675205761fd..62275b2b0368 100644 --- a/basiclti/basiclti-api/pom.xml +++ b/basiclti/basiclti-api/pom.xml @@ -35,9 +35,5 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - diff --git a/basiclti/basiclti-blis/pom.xml b/basiclti/basiclti-blis/pom.xml index c8819c139633..17ddc820dc05 100644 --- a/basiclti/basiclti-blis/pom.xml +++ b/basiclti/basiclti-blis/pom.xml @@ -55,10 +55,6 @@ org.sakaiproject.edu-services.gradebook gradebook-service-api - - commons-logging - commons-logging - javax.servlet servlet-api @@ -103,11 +99,6 @@ org.springframework spring-beans - - org.projectlombok - lombok - - diff --git a/basiclti/basiclti-common/pom.xml b/basiclti/basiclti-common/pom.xml index a08eb7954e14..68e0b55e33ff 100644 --- a/basiclti/basiclti-common/pom.xml +++ b/basiclti/basiclti-common/pom.xml @@ -74,10 +74,6 @@ org.springframework spring-beans - - commons-logging - commons-logging - javax.servlet servlet-api diff --git a/basiclti/basiclti-impl/pom.xml b/basiclti/basiclti-impl/pom.xml index a160ba821ed5..6b516e0765fe 100644 --- a/basiclti/basiclti-impl/pom.xml +++ b/basiclti/basiclti-impl/pom.xml @@ -60,10 +60,6 @@ org.springframework spring-jdbc - - commons-logging - commons-logging - commons-configuration commons-configuration diff --git a/basiclti/basiclti-portlet/pom.xml b/basiclti/basiclti-portlet/pom.xml index 46036ecfca84..cd091377da51 100644 --- a/basiclti/basiclti-portlet/pom.xml +++ b/basiclti/basiclti-portlet/pom.xml @@ -47,10 +47,6 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - javax.servlet servlet-api diff --git a/basiclti/basiclti-tool/pom.xml b/basiclti/basiclti-tool/pom.xml index 498ddf2baa6d..1398d3c1b670 100644 --- a/basiclti/basiclti-tool/pom.xml +++ b/basiclti/basiclti-tool/pom.xml @@ -52,11 +52,6 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - ${sakai.commons-logging.version} - ${sakai.velocity.groupId} sakai-velocity-tool-api diff --git a/basiclti/portlet-util/pom.xml b/basiclti/portlet-util/pom.xml index 89610a496a4a..b40955380262 100644 --- a/basiclti/portlet-util/pom.xml +++ b/basiclti/portlet-util/pom.xml @@ -19,11 +19,6 @@ jar - - commons-logging - commons-logging - provided - javax.servlet servlet-api diff --git a/basiclti/tsugi-util/pom-tsugi.xml b/basiclti/tsugi-util/pom-tsugi.xml index 15db5a59878e..623e9d9a3c2d 100644 --- a/basiclti/tsugi-util/pom-tsugi.xml +++ b/basiclti/tsugi-util/pom-tsugi.xml @@ -64,11 +64,6 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - 1.1.1 - junit junit diff --git a/basiclti/tsugi-util/pom.xml b/basiclti/tsugi-util/pom.xml index d882ce7674da..3837065f3a57 100644 --- a/basiclti/tsugi-util/pom.xml +++ b/basiclti/tsugi-util/pom.xml @@ -48,11 +48,6 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - 1.1.1 - junit junit diff --git a/basiclti/web-ifp/pom.xml b/basiclti/web-ifp/pom.xml index a04847201e3b..c074b991a787 100644 --- a/basiclti/web-ifp/pom.xml +++ b/basiclti/web-ifp/pom.xml @@ -36,10 +36,6 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - commons-lang commons-lang diff --git a/calendar/calendar-api/api/pom.xml b/calendar/calendar-api/api/pom.xml index 05f6fa4d3c5e..d99cb368e48f 100644 --- a/calendar/calendar-api/api/pom.xml +++ b/calendar/calendar-api/api/pom.xml @@ -33,9 +33,5 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - diff --git a/calendar/calendar-impl/impl/pom.xml b/calendar/calendar-impl/impl/pom.xml index 9f88c646b8ab..f531d4a83910 100644 --- a/calendar/calendar-impl/impl/pom.xml +++ b/calendar/calendar-impl/impl/pom.xml @@ -110,12 +110,6 @@ net.sf.ehcache ehcache-core - - org.slf4j - slf4j-simple - 1.7.5 - test - junit junit diff --git a/calendar/calendar-summary-tool/tool/pom.xml b/calendar/calendar-summary-tool/tool/pom.xml index 1b8f4878f057..caac8e83fc4a 100644 --- a/calendar/calendar-summary-tool/tool/pom.xml +++ b/calendar/calendar-summary-tool/tool/pom.xml @@ -90,16 +90,10 @@ commons-digester commons-digester - 1.6 commons-beanutils commons-beanutils - 1.7.0 - - - commons-logging - commons-logging joda-time diff --git a/calendar/calendar-tool/tool/pom.xml b/calendar/calendar-tool/tool/pom.xml index 92055aa40d03..7fb04016d578 100644 --- a/calendar/calendar-tool/tool/pom.xml +++ b/calendar/calendar-tool/tool/pom.xml @@ -64,10 +64,6 @@ org.sakaiproject.velocity sakai-velocity-tool - - commons-logging - commons-logging - javax.servlet servlet-api @@ -76,10 +72,6 @@ org.springframework spring-beans - - org.projectlombok - lombok - diff --git a/calendar/calendar-util/util/pom.xml b/calendar/calendar-util/util/pom.xml index e035dc0c6d5e..fc6c73151190 100644 --- a/calendar/calendar-util/util/pom.xml +++ b/calendar/calendar-util/util/pom.xml @@ -48,10 +48,6 @@ org.sakaiproject.site sakai-mergedlist-util - - commons-logging - commons-logging - joda-time joda-time diff --git a/calendar/calendar-util/util/src/test/resources/log4j.properties b/calendar/calendar-util/util/src/test/resources/log4j.properties new file mode 100644 index 000000000000..e78168e1f881 --- /dev/null +++ b/calendar/calendar-util/util/src/test/resources/log4j.properties @@ -0,0 +1,6 @@ +log4j.appender.Stdout=org.apache.log4j.ConsoleAppender +log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m%n + +log4j.rootLogger=INFO,Stdout + diff --git a/chat/chat-impl/impl/pom.xml b/chat/chat-impl/impl/pom.xml index 4fb4de71735f..2a47114d3c96 100644 --- a/chat/chat-impl/impl/pom.xml +++ b/chat/chat-impl/impl/pom.xml @@ -82,10 +82,6 @@ commons-lang commons-lang - - commons-logging - commons-logging - diff --git a/chat/chat-tool/tool/pom.xml b/chat/chat-tool/tool/pom.xml index 42f9857fecd9..308ab08d24e7 100644 --- a/chat/chat-tool/tool/pom.xml +++ b/chat/chat-tool/tool/pom.xml @@ -98,7 +98,6 @@ commons-digester commons-digester - 1.6 commons-collections @@ -107,17 +106,12 @@ commons-beanutils commons-beanutils - 1.7.0 taglibs standard 1.0.4 - - commons-logging - commons-logging - diff --git a/citations/citations-impl/impl/pom.xml b/citations/citations-impl/impl/pom.xml index 80dd45a968b2..2f6dd7bfe004 100644 --- a/citations/citations-impl/impl/pom.xml +++ b/citations/citations-impl/impl/pom.xml @@ -60,11 +60,6 @@ OKI OkiOSID - - commons-logging - commons-logging - ${sakai.commons-logging.version} - commons-lang commons-lang @@ -136,6 +131,7 @@ ${basedir}/src/test **/*.xml + **/log4j.properties diff --git a/citations/citations-impl/impl/src/test/log4j.properties b/citations/citations-impl/impl/src/test/log4j.properties new file mode 100644 index 000000000000..e78168e1f881 --- /dev/null +++ b/citations/citations-impl/impl/src/test/log4j.properties @@ -0,0 +1,6 @@ +log4j.appender.Stdout=org.apache.log4j.ConsoleAppender +log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m%n + +log4j.rootLogger=INFO,Stdout + diff --git a/citations/citations-osid/web2bridge/pom.xml b/citations/citations-osid/web2bridge/pom.xml index 8bf80ea9a82c..ef7f2af4b30a 100644 --- a/citations/citations-osid/web2bridge/pom.xml +++ b/citations/citations-osid/web2bridge/pom.xml @@ -34,11 +34,6 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - ${sakai.commons-logging.version} - OKI OkiOSID diff --git a/citations/citations-osid/xserver/pom.xml b/citations/citations-osid/xserver/pom.xml index 1e58796fc6ca..d05a0d068a71 100644 --- a/citations/citations-osid/xserver/pom.xml +++ b/citations/citations-osid/xserver/pom.xml @@ -38,10 +38,6 @@ org.sakaiproject sakai-citations-util - - commons-logging - commons-logging - OKI OkiOSID diff --git a/citations/citations-servlet/servlet/pom.xml b/citations/citations-servlet/servlet/pom.xml index f7d992f09fc8..bd72e51414cb 100644 --- a/citations/citations-servlet/servlet/pom.xml +++ b/citations/citations-servlet/servlet/pom.xml @@ -67,11 +67,6 @@ org.sakaiproject.velocity sakai-velocity-tool - - commons-logging - commons-logging - ${sakai.commons-logging.version} - savecite diff --git a/citations/citations-tool/tool/pom.xml b/citations/citations-tool/tool/pom.xml index 0633d7e9eada..15e7bd54c0a4 100644 --- a/citations/citations-tool/tool/pom.xml +++ b/citations/citations-tool/tool/pom.xml @@ -82,11 +82,6 @@ org.sakaiproject.velocity sakai-velocity-tool - - commons-logging - commons-logging - ${sakai.commons-logging.version} - com.googlecode.json-simple json-simple @@ -108,7 +103,6 @@ json-lib 2.4 jdk15 - jar diff --git a/citations/citations-util/util/pom.xml b/citations/citations-util/util/pom.xml index 70c5156bd9cb..062faab97952 100644 --- a/citations/citations-util/util/pom.xml +++ b/citations/citations-util/util/pom.xml @@ -26,11 +26,6 @@ cql-java 0.7 - - commons-logging - commons-logging - ${sakai.commons-logging.version} - diff --git a/cloud-content/impl/pom.xml b/cloud-content/impl/pom.xml index dbd273fe6087..72a8aed44c40 100644 --- a/cloud-content/impl/pom.xml +++ b/cloud-content/impl/pom.xml @@ -35,10 +35,6 @@ commons-codec commons-codec - - commons-logging - commons-logging - diff --git a/cmprovider/pom.xml b/cmprovider/pom.xml index 0f3099f51ffa..0fadbfd2df94 100644 --- a/cmprovider/pom.xml +++ b/cmprovider/pom.xml @@ -60,10 +60,6 @@ org.apache.commons commons-lang3 - - commons-logging - commons-logging - org.hibernate hibernate-core diff --git a/common/archive-impl/impl2/pom.xml b/common/archive-impl/impl2/pom.xml index bcad66f3ae58..24c5deb513aa 100644 --- a/common/archive-impl/impl2/pom.xml +++ b/common/archive-impl/impl2/pom.xml @@ -36,14 +36,6 @@ org.sakaiproject.common archive-api - - commons-logging - commons-logging - - org.apache.commons commons-compress diff --git a/common/common-composite-component/pom.xml b/common/common-composite-component/pom.xml index 780b80062a0a..21679563aeae 100644 --- a/common/common-composite-component/pom.xml +++ b/common/common-composite-component/pom.xml @@ -67,11 +67,6 @@ commons-beanutils commons-beanutils - - commons-logging - commons-logging - provided - commons-lang commons-lang diff --git a/common/impl/pom.xml b/common/impl/pom.xml index ba8556c9b040..e29df47dbaf1 100644 --- a/common/impl/pom.xml +++ b/common/impl/pom.xml @@ -41,10 +41,6 @@ org.sakaiproject.common sakai-common-type-api - - commons-logging - commons-logging - diff --git a/common/import-handlers/content-handlers/pom.xml b/common/import-handlers/content-handlers/pom.xml index 535ddb719dfe..33d5e58dd5de 100644 --- a/common/import-handlers/content-handlers/pom.xml +++ b/common/import-handlers/content-handlers/pom.xml @@ -36,10 +36,6 @@ javax.activation activation - - commons-logging - commons-logging - org.sakaiproject.common archive-api diff --git a/common/import-impl/pom.xml b/common/import-impl/pom.xml index 0c3ad1584ba0..92589610f60d 100644 --- a/common/import-impl/pom.xml +++ b/common/import-impl/pom.xml @@ -37,10 +37,6 @@ saxpath 1.0-FCS - - commons-logging - commons-logging - commons-io commons-io diff --git a/common/import-parsers/blackboard_5-5/pom.xml b/common/import-parsers/blackboard_5-5/pom.xml index 76b384533d62..0d34feac90b0 100644 --- a/common/import-parsers/blackboard_5-5/pom.xml +++ b/common/import-parsers/blackboard_5-5/pom.xml @@ -26,12 +26,6 @@ - - commons-logging - commons-logging - 1.1 - - org.sakaiproject.common archive-api diff --git a/common/import-parsers/blackboard_6/impl/pom.xml b/common/import-parsers/blackboard_6/impl/pom.xml index 66169870e2be..da275f924d29 100644 --- a/common/import-parsers/blackboard_6/impl/pom.xml +++ b/common/import-parsers/blackboard_6/impl/pom.xml @@ -82,10 +82,6 @@ junit 3.8.1 - - commons-logging - commons-logging - diff --git a/common/import-parsers/common-cartridge/pom.xml b/common/import-parsers/common-cartridge/pom.xml index 617a3e74b72b..eb40b0cdcd3c 100644 --- a/common/import-parsers/common-cartridge/pom.xml +++ b/common/import-parsers/common-cartridge/pom.xml @@ -43,11 +43,6 @@ saxpath 1.0-FCS - - commons-logging - commons-logging - jar - diff --git a/common/import-util/pom.xml b/common/import-util/pom.xml index db1b7354c2ca..053fafc61ef3 100644 --- a/common/import-util/pom.xml +++ b/common/import-util/pom.xml @@ -36,10 +36,6 @@ javax.activation activation - - commons-logging - commons-logging - org.sakaiproject.common archive-api diff --git a/common/pack/pom.xml b/common/pack/pom.xml index 70a977f841a7..317692829af5 100644 --- a/common/pack/pom.xml +++ b/common/pack/pom.xml @@ -29,11 +29,6 @@ commons-beanutils commons-beanutils - - commons-logging - commons-logging - provided - diff --git a/common/pom.xml b/common/pom.xml index 9c82ad435b57..34587931f81a 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -148,11 +148,6 @@ ${project.version} - - commons-beanutils - commons-beanutils - 1.7.0 - org.apache.commons commons-compress diff --git a/common/privacy-comp-impl/pom.xml b/common/privacy-comp-impl/pom.xml index 440c409f675d..f0a61426afc0 100644 --- a/common/privacy-comp-impl/pom.xml +++ b/common/privacy-comp-impl/pom.xml @@ -44,7 +44,6 @@ org.sakaiproject.kernel sakai-kernel-api - org.sakaiproject.common sakai-privacy-api @@ -53,12 +52,6 @@ org.sakaiproject.common sakai-privacy-hbm - - - commons-logging - commons-logging - - diff --git a/common/privacy-integration-test/pom.xml b/common/privacy-integration-test/pom.xml index 6e0f0fb5876c..ea97e4b30aea 100644 --- a/common/privacy-integration-test/pom.xml +++ b/common/privacy-integration-test/pom.xml @@ -29,10 +29,6 @@ junit 3.8.1 - - commons-logging - commons-logging - diff --git a/content-review/impl/dao/pom.xml b/content-review/impl/dao/pom.xml index ccebe2a3117c..c2370888ef14 100644 --- a/content-review/impl/dao/pom.xml +++ b/content-review/impl/dao/pom.xml @@ -43,11 +43,6 @@ org.springframework spring-context - - - org.slf4j - slf4j-log4j12 - org.hsqldb diff --git a/content-review/impl/turnitin/pom.xml b/content-review/impl/turnitin/pom.xml index df6787904ffa..fe5c3f6825d6 100644 --- a/content-review/impl/turnitin/pom.xml +++ b/content-review/impl/turnitin/pom.xml @@ -58,10 +58,6 @@ ${reflectutils.version} - - commons-logging - commons-logging - org.apache.poi poi @@ -79,7 +75,6 @@ commons-validator commons-validator - 1.5.0 commons-io @@ -129,10 +124,6 @@ spring-orm test - - org.slf4j - slf4j-log4j12 - org.hsqldb hsqldb diff --git a/content-review/pom.xml b/content-review/pom.xml index 58537b448ca7..762e8984fe63 100644 --- a/content-review/pom.xml +++ b/content-review/pom.xml @@ -63,10 +63,4 @@ - - - org.projectlombok - lombok - - diff --git a/content/content-cleanup/content-cleanup-impl/pom.xml b/content/content-cleanup/content-cleanup-impl/pom.xml index e4ff58864778..1f6ba43cabda 100644 --- a/content/content-cleanup/content-cleanup-impl/pom.xml +++ b/content/content-cleanup/content-cleanup-impl/pom.xml @@ -29,10 +29,6 @@ org.quartz-scheduler quartz - - commons-logging - commons-logging - junit junit diff --git a/content/content-copyright/impl/pom.xml b/content/content-copyright/impl/pom.xml index 6d3dbaae8051..7af5faded67e 100644 --- a/content/content-copyright/impl/pom.xml +++ b/content/content-copyright/impl/pom.xml @@ -34,10 +34,6 @@ ${project.version} provided - - commons-logging - commons-logging - diff --git a/content/content-impl-providers/impl/pom.xml b/content/content-impl-providers/impl/pom.xml index c2a2a0912598..38f4218e93ef 100644 --- a/content/content-impl-providers/impl/pom.xml +++ b/content/content-impl-providers/impl/pom.xml @@ -36,10 +36,6 @@ org.sakaiproject.scheduler scheduler-api - - commons-logging - commons-logging - diff --git a/content/content-metadata/impl/pom.xml b/content/content-metadata/impl/pom.xml index e0081f013047..d148ec0480d3 100644 --- a/content/content-metadata/impl/pom.xml +++ b/content/content-metadata/impl/pom.xml @@ -37,10 +37,6 @@ org.codehaus.jackson jackson-mapper-asl - - - commons-logging - commons-logging commons-lang diff --git a/content/content-tool/tool/pom.xml b/content/content-tool/tool/pom.xml index 32b208e80150..5ddf4820fcf1 100644 --- a/content/content-tool/tool/pom.xml +++ b/content/content-tool/tool/pom.xml @@ -37,10 +37,6 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - commons-collections commons-collections @@ -94,10 +90,6 @@ org.springframework spring-beans - - org.projectlombok - lombok - org.sakaiproject.scheduler scheduler-api diff --git a/content/content-types/pom.xml b/content/content-types/pom.xml index 16cd50a98e42..7f778a8c88f7 100644 --- a/content/content-types/pom.xml +++ b/content/content-types/pom.xml @@ -46,9 +46,5 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - diff --git a/content/content-types/src/java/org/sakaiproject/content/types/FolderType.java b/content/content-types/src/java/org/sakaiproject/content/types/FolderType.java index 8557511b3609..da45af88a1cd 100644 --- a/content/content-types/src/java/org/sakaiproject/content/types/FolderType.java +++ b/content/content-types/src/java/org/sakaiproject/content/types/FolderType.java @@ -21,9 +21,28 @@ package org.sakaiproject.content.types; -import static org.sakaiproject.content.api.ResourceToolAction.*; - -import java.util.*; +import static org.sakaiproject.content.api.ResourceToolAction.ACCESS_PROPERTIES; +import static org.sakaiproject.content.api.ResourceToolAction.COLLAPSE; +import static org.sakaiproject.content.api.ResourceToolAction.COMPRESS_ZIP_FOLDER; +import static org.sakaiproject.content.api.ResourceToolAction.COPY; +import static org.sakaiproject.content.api.ResourceToolAction.CREATE; +import static org.sakaiproject.content.api.ResourceToolAction.DELETE; +import static org.sakaiproject.content.api.ResourceToolAction.EXPAND; +import static org.sakaiproject.content.api.ResourceToolAction.MAKE_SITE_PAGE; +import static org.sakaiproject.content.api.ResourceToolAction.MOVE; +import static org.sakaiproject.content.api.ResourceToolAction.PASTE_COPIED; +import static org.sakaiproject.content.api.ResourceToolAction.PASTE_MOVED; +import static org.sakaiproject.content.api.ResourceToolAction.PERMISSIONS; +import static org.sakaiproject.content.api.ResourceToolAction.REORDER; +import static org.sakaiproject.content.api.ResourceToolAction.REVISE_METADATA; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.EnumMap; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import org.sakaiproject.authz.api.PermissionsHelper; import org.sakaiproject.component.cover.ComponentManager; @@ -33,14 +52,14 @@ import org.sakaiproject.content.api.ContentHostingService; import org.sakaiproject.content.api.ExpandableResourceType; import org.sakaiproject.content.api.ResourceToolAction; +import org.sakaiproject.content.api.ResourceToolAction.ActionType; import org.sakaiproject.content.api.ResourceType; import org.sakaiproject.content.api.ServiceLevelAction; -import org.sakaiproject.content.api.ResourceToolAction.ActionType; -import org.sakaiproject.content.util.BaseServiceLevelAction; -import org.sakaiproject.content.util.ZipContentUtil; import org.sakaiproject.content.util.BaseInteractionAction; -import org.sakaiproject.content.util.BaseResourceType; import org.sakaiproject.content.util.BaseResourceAction.Localizer; +import org.sakaiproject.content.util.BaseResourceType; +import org.sakaiproject.content.util.BaseServiceLevelAction; +import org.sakaiproject.content.util.ZipContentUtil; import org.sakaiproject.entity.api.Reference; import org.sakaiproject.entity.api.ResourceProperties; import org.sakaiproject.entity.cover.EntityManager; @@ -49,9 +68,12 @@ import org.sakaiproject.tool.cover.SessionManager; import org.sakaiproject.util.Resource; import org.sakaiproject.util.ResourceLoader; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class FolderType extends BaseResourceType implements ExpandableResourceType { + private static final Logger logger = LoggerFactory.getLogger(FolderType.class); protected String typeId = ResourceType.TYPE_FOLDER; protected String helperId = "sakai.resource.type.helper"; @@ -333,7 +355,7 @@ public void initializeAction(Reference reference) { try { zipUtil.compressFolder(reference); } catch (Exception e) { - System.out.println(e.getMessage()); + logger.warn(e.getMessage()); } } diff --git a/courier/courier-impl/impl/pom.xml b/courier/courier-impl/impl/pom.xml index 6debe8aaf97a..fbaa0a5df8a0 100644 --- a/courier/courier-impl/impl/pom.xml +++ b/courier/courier-impl/impl/pom.xml @@ -36,9 +36,5 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - diff --git a/courier/courier-tool/tool/pom.xml b/courier/courier-tool/tool/pom.xml index 052f9c95f83e..02cf4fc92e34 100644 --- a/courier/courier-tool/tool/pom.xml +++ b/courier/courier-tool/tool/pom.xml @@ -32,10 +32,6 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - javax.servlet servlet-api diff --git a/courier/courier-util/util/pom.xml b/courier/courier-util/util/pom.xml index 1f58d66ee36a..8d1b887569ae 100644 --- a/courier/courier-util/util/pom.xml +++ b/courier/courier-util/util/pom.xml @@ -32,9 +32,5 @@ org.sakaiproject.kernel sakai-kernel-util - - commons-logging - commons-logging - diff --git a/dashboard/impl/pom.xml b/dashboard/impl/pom.xml index 7083d6e5d4cd..db889c0d6e80 100644 --- a/dashboard/impl/pom.xml +++ b/dashboard/impl/pom.xml @@ -129,18 +129,10 @@ commons-lang commons-lang - - commons-logging - commons-logging - commons-pool commons-pool - - log4j - log4j - net.sf.ehcache ehcache-core @@ -156,14 +148,6 @@ guava r09 - - org.projectlombok - lombok - - - org.slf4j - slf4j-api - @@ -212,6 +196,7 @@ ${basedir}/src/test test.xml + log4j.properties diff --git a/dashboard/impl/src/java/org/sakaiproject/dash/dao/mapper/ContextMapper.java b/dashboard/impl/src/java/org/sakaiproject/dash/dao/mapper/ContextMapper.java index 4c9c727d23b5..add07e9780ac 100644 --- a/dashboard/impl/src/java/org/sakaiproject/dash/dao/mapper/ContextMapper.java +++ b/dashboard/impl/src/java/org/sakaiproject/dash/dao/mapper/ContextMapper.java @@ -27,6 +27,9 @@ import org.sakaiproject.dash.model.Context; import org.springframework.jdbc.core.RowMapper; +import lombok.extern.slf4j.Slf4j; + +@Slf4j public class ContextMapper implements RowMapper { @@ -38,8 +41,7 @@ public Object mapRow(ResultSet rs, int rowNum) throws SQLException { context.setContextTitle(rs.getString("site_context_title")); context.setContextUrl(rs.getString("site_context_url")); } catch (Exception e) { - System.out.println("=============== " + e + " ==============="); - e.printStackTrace(System.out); + log.error(e.getMessage(), e); if(e instanceof SQLException) { throw (SQLException) e; } diff --git a/dashboard/impl/src/test/log4j.properties b/dashboard/impl/src/test/log4j.properties new file mode 100644 index 000000000000..e78168e1f881 --- /dev/null +++ b/dashboard/impl/src/test/log4j.properties @@ -0,0 +1,6 @@ +log4j.appender.Stdout=org.apache.log4j.ConsoleAppender +log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m%n + +log4j.rootLogger=INFO,Stdout + diff --git a/dashboard/tool/pom.xml b/dashboard/tool/pom.xml index babd0b18e537..03a67270d261 100644 --- a/dashboard/tool/pom.xml +++ b/dashboard/tool/pom.xml @@ -65,20 +65,6 @@ wicket-spring ${apache.wicket.version} - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - log4j - log4j - net.sf.json-lib json-lib diff --git a/dav/dav-server/pom.xml b/dav/dav-server/pom.xml index 1c1343b9266f..b19317bb06c0 100644 --- a/dav/dav-server/pom.xml +++ b/dav/dav-server/pom.xml @@ -34,10 +34,6 @@ tomcat-catalina-jmx-remote ${sakai.tomcat.version} - - commons-logging - commons-logging - diff --git a/dav/dav/pom.xml b/dav/dav/pom.xml index acb03672304e..ddcef244797c 100644 --- a/dav/dav/pom.xml +++ b/dav/dav/pom.xml @@ -60,10 +60,6 @@ tomcat-${sakai.tomcat.version} --> - - commons-logging - commons-logging - diff --git a/delegatedaccess/api/pom.xml b/delegatedaccess/api/pom.xml index 2c8f40d47c44..469d99c4993a 100644 --- a/delegatedaccess/api/pom.xml +++ b/delegatedaccess/api/pom.xml @@ -33,12 +33,6 @@ org.sakaiproject.entitybroker entitybroker-api - - - - org.projectlombok - lombok - diff --git a/delegatedaccess/impl/pom.xml b/delegatedaccess/impl/pom.xml index e5536e98fc91..5d8b463037f1 100644 --- a/delegatedaccess/impl/pom.xml +++ b/delegatedaccess/impl/pom.xml @@ -66,15 +66,6 @@ - - log4j - log4j - - - org.projectlombok - lombok - - commons-lang commons-lang diff --git a/delegatedaccess/tool/pom.xml b/delegatedaccess/tool/pom.xml index 61f4c41535d7..33b19a726d28 100644 --- a/delegatedaccess/tool/pom.xml +++ b/delegatedaccess/tool/pom.xml @@ -54,22 +54,6 @@ org.apache.wicket wicket-extensions - - org.slf4j - slf4j-log4j12 - - - org.slf4j - slf4j-api - - - log4j - log4j - - - org.projectlombok - lombok - org.sakaiproject.entitybroker entitybroker-api diff --git a/edu-services/cm-service/cm-impl/hibernate-impl/impl/pom.xml b/edu-services/cm-service/cm-impl/hibernate-impl/impl/pom.xml index 1fef4188865a..6c80f5bd7d62 100644 --- a/edu-services/cm-service/cm-impl/hibernate-impl/impl/pom.xml +++ b/edu-services/cm-service/cm-impl/hibernate-impl/impl/pom.xml @@ -38,10 +38,6 @@ org.sakaiproject.edu-services.course-management coursemanagement-hibernate-model - - commons-logging - commons-logging - jdom jdom @@ -51,10 +47,6 @@ org.hibernate hibernate-core - - org.slf4j - slf4j-log4j12 - org.javassist javassist @@ -114,10 +106,6 @@ 1.4 test - - org.projectlombok - lombok - commons-lang commons-lang diff --git a/edu-services/gradebook-service/hibernate/pom.xml b/edu-services/gradebook-service/hibernate/pom.xml index 8b9469011b20..7dc0cbb40935 100644 --- a/edu-services/gradebook-service/hibernate/pom.xml +++ b/edu-services/gradebook-service/hibernate/pom.xml @@ -15,10 +15,6 @@ shared - - commons-logging - commons-logging - commons-lang commons-lang diff --git a/edu-services/gradebook-service/impl/pom.xml b/edu-services/gradebook-service/impl/pom.xml index 1b1f095d50d0..0b956f11a4a8 100644 --- a/edu-services/gradebook-service/impl/pom.xml +++ b/edu-services/gradebook-service/impl/pom.xml @@ -49,10 +49,6 @@ sakai-kernel-api provided - - commons-logging - commons-logging - commons-lang commons-lang @@ -131,12 +127,10 @@ commons-digester commons-digester - 1.6 commons-beanutils commons-beanutils - 1.7.0 dom4j diff --git a/edu-services/scoring-service/impl/pom.xml b/edu-services/scoring-service/impl/pom.xml index f610a95607f7..8712ff1b53b4 100644 --- a/edu-services/scoring-service/impl/pom.xml +++ b/edu-services/scoring-service/impl/pom.xml @@ -19,11 +19,6 @@ org.sakaiproject.edu-services.scoringservice provided - - commons-logging - commons-logging - 1.0.4 - ${sakai.spring.groupId} ${sakai.spring.artifactId} diff --git a/edu-services/sections-service/sections-impl/integration-support/pom.xml b/edu-services/sections-service/sections-impl/integration-support/pom.xml index 82939cf96a73..9aee8abc9c61 100644 --- a/edu-services/sections-service/sections-impl/integration-support/pom.xml +++ b/edu-services/sections-service/sections-impl/integration-support/pom.xml @@ -20,10 +20,6 @@ - - org.slf4j - slf4j-log4j12 - org.hibernate hibernate-core @@ -144,20 +140,10 @@ commons-digester commons-digester - 1.6 commons-beanutils commons-beanutils - 1.7.0 - - - commons-logging - commons-logging - - - log4j - log4j dom4j diff --git a/edu-services/sections-service/sections-impl/integration-test/pom.xml b/edu-services/sections-service/sections-impl/integration-test/pom.xml index a67f09922b17..89bb34506b28 100644 --- a/edu-services/sections-service/sections-impl/integration-test/pom.xml +++ b/edu-services/sections-service/sections-impl/integration-test/pom.xml @@ -27,15 +27,6 @@ junit 3.8.1 - - - commons-logging - commons-logging - - - log4j - log4j - org.sakaiproject.edu-services.sections diff --git a/edu-services/sections-service/sections-impl/sakai/impl/pom.xml b/edu-services/sections-service/sections-impl/sakai/impl/pom.xml index ed1fa2c31560..e91fc838f9fb 100644 --- a/edu-services/sections-service/sections-impl/sakai/impl/pom.xml +++ b/edu-services/sections-service/sections-impl/sakai/impl/pom.xml @@ -24,10 +24,6 @@ org.sakaiproject.kernel sakai-kernel-util - - commons-logging - commons-logging - org.sakaiproject.kernel sakai-kernel-api diff --git a/edu-services/sections-service/sections-impl/sakai/model/pom.xml b/edu-services/sections-service/sections-impl/sakai/model/pom.xml index 1862873d28a7..a62ddfe4b5be 100644 --- a/edu-services/sections-service/sections-impl/sakai/model/pom.xml +++ b/edu-services/sections-service/sections-impl/sakai/model/pom.xml @@ -29,17 +29,11 @@ commons-lang commons-lang - - commons-logging - commons-logging - - org.sakaiproject.kernel sakai-component-manager provided - diff --git a/edu-services/sections-service/sections-impl/standalone/pom.xml b/edu-services/sections-service/sections-impl/standalone/pom.xml index dd933f1ce3fe..55646f86d86a 100644 --- a/edu-services/sections-service/sections-impl/standalone/pom.xml +++ b/edu-services/sections-service/sections-impl/standalone/pom.xml @@ -102,20 +102,10 @@ commons-digester commons-digester - 1.6 commons-beanutils commons-beanutils - 1.7.0 - - - commons-logging - commons-logging - - - log4j - log4j dom4j diff --git a/emailtemplateservice/impl/logic/pom.xml b/emailtemplateservice/impl/logic/pom.xml index dd401161b707..6bf48f9a166c 100644 --- a/emailtemplateservice/impl/logic/pom.xml +++ b/emailtemplateservice/impl/logic/pom.xml @@ -93,10 +93,6 @@ commons-collections commons-collections - - org.slf4j - slf4j-log4j12 - easymock easymock @@ -145,6 +141,7 @@ hibernate-test.xml hibernate.properties + log4j.properties false diff --git a/emailtemplateservice/tool/pom.xml b/emailtemplateservice/tool/pom.xml index 7dbf9e88dce5..2bd4f08295f5 100644 --- a/emailtemplateservice/tool/pom.xml +++ b/emailtemplateservice/tool/pom.xml @@ -60,10 +60,6 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - commons-lang commons-lang diff --git a/entitybroker/api/pom.xml b/entitybroker/api/pom.xml index 4e544240f056..45a3fd90de25 100644 --- a/entitybroker/api/pom.xml +++ b/entitybroker/api/pom.xml @@ -48,25 +48,5 @@ false - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - - org.apache.maven.plugins - maven-rsf-plugin - 1.0 - - diff --git a/entitybroker/core-providers/pom.xml b/entitybroker/core-providers/pom.xml index 4a830d06bdf4..4ca2a0c44969 100644 --- a/entitybroker/core-providers/pom.xml +++ b/entitybroker/core-providers/pom.xml @@ -27,7 +27,7 @@ org.sakaiproject.entitybroker entitybroker-utils - + org.sakaiproject.common sakai-privacy-api @@ -35,7 +35,6 @@ org.azeckoski reflectutils - org.springframework @@ -61,8 +60,6 @@ junit junit - 4.5 - test org.mockito @@ -70,9 +67,6 @@ 1.9.0 test - - - org.sakaiproject.kernel sakai-kernel-api @@ -85,58 +79,7 @@ org.sakaiproject.kernel sakai-kernel-util - - - - - @@ -148,22 +91,13 @@ false - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - + + + ${basedir}/src/test + + log4j.properties + + + + diff --git a/entitybroker/core-providers/src/test/log4j.properties b/entitybroker/core-providers/src/test/log4j.properties new file mode 100644 index 000000000000..e78168e1f881 --- /dev/null +++ b/entitybroker/core-providers/src/test/log4j.properties @@ -0,0 +1,6 @@ +log4j.appender.Stdout=org.apache.log4j.ConsoleAppender +log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m%n + +log4j.rootLogger=INFO,Stdout + diff --git a/entitybroker/impl/pom.xml b/entitybroker/impl/pom.xml index e183065a7f91..c38471e0e0c3 100644 --- a/entitybroker/impl/pom.xml +++ b/entitybroker/impl/pom.xml @@ -66,11 +66,6 @@ org.azeckoski reflectutils - - - commons-logging - commons-logging - org.mortbay.jetty @@ -96,9 +91,7 @@ hsqldb test - - - + org.sakaiproject.kernel sakai-kernel-api @@ -149,6 +142,7 @@ database-test.xml database.properties + log4j.properties diff --git a/entitybroker/impl/src/java/org/sakaiproject/entitybroker/impl/entityprovider/EntityProviderManagerImpl.java b/entitybroker/impl/src/java/org/sakaiproject/entitybroker/impl/entityprovider/EntityProviderManagerImpl.java index a849a23a7411..071149a65fd9 100644 --- a/entitybroker/impl/src/java/org/sakaiproject/entitybroker/impl/entityprovider/EntityProviderManagerImpl.java +++ b/entitybroker/impl/src/java/org/sakaiproject/entitybroker/impl/entityprovider/EntityProviderManagerImpl.java @@ -61,16 +61,19 @@ import org.sakaiproject.entitybroker.providers.EntityRequestHandler; import org.sakaiproject.entitybroker.util.core.EntityProviderMethodStoreImpl; +import lombok.extern.slf4j.Slf4j; + /** * Base implementation of the entity provider manager * * @author Aaron Zeckoski (aaronz@vt.edu) * @author Antranig Basman (antranig@caret.cam.ac.uk) */ +@Slf4j public class EntityProviderManagerImpl implements EntityProviderManager { public void init() { - System.out.println("EntityProviderManagerImpl init"); + log.info("EntityProviderManagerImpl init"); //SAK-27902 list of allowed services (prefixes) (default: all services registered. Only set this property if you want to filter the allowed services) allowedServices = new HashSet(); @@ -94,7 +97,7 @@ public void init() { //must have describe in the list allowedServices.add(EntityRequestHandler.DESCRIBE); - System.out.println("INFO Allowed services: " + allowedServices); + log.info("Allowed services: " + allowedServices); } @@ -198,7 +201,7 @@ public List> getPrefixCapabilities(String prefix } catch (RuntimeException e) { // added because there will be times where we cannot resolve capabilities // because of shifting ClassLoaders or CL visibility and that should not cause this to die - System.out.println("WARN getPrefixCapabilities: Unable to retrieve class for capability bikey ("+bikey+"), skipping this capability"); + log.warn("getPrefixCapabilities: Unable to retrieve class for capability bikey ("+bikey+"), skipping this capability"); } } } @@ -224,7 +227,7 @@ public Map>> getRegisteredEntityCap } catch (RuntimeException e) { // added because there will be times where we cannot resolve capabilities // because of shifting ClassLoaders or CL visibility and that should not cause this to die - System.out.println("WARN getRegisteredEntityCapabilities: Unable to retrieve class for capability bikey ("+bikey+"), skipping this capability"); + log.warn("getRegisteredEntityCapabilities: Unable to retrieve class for capability bikey ("+bikey+"), skipping this capability"); } } return m; @@ -352,7 +355,7 @@ public void registerEntityProvider(EntityProvider entityProvider) { entityProviderMethodStore.addURLRedirects(prefix, redirects); } } - System.out.println("INFO Registered entity provider ("+entityProvider.getClass().getName() + log.info("Registered entity provider ("+entityProvider.getClass().getName() +") prefix ("+prefix+") with "+count+" capabilities"); // call the registered listeners @@ -393,7 +396,7 @@ public String getEntityPrefix() { // clean up the properties cache entityProperties.unloadProperties(prefix); - System.out.println("INFO Unregistered entity provider ("+entityProvider.getClass().getName()+") and "+count+" capabilities"); + log.info("Unregistered entity provider ("+entityProvider.getClass().getName()+") and "+count+" capabilities"); } /* @@ -422,7 +425,7 @@ public void unregisterCapability(String prefix, Class // clean up the redirect URLs record entityProviderMethodStore.removeURLRedirects(prefix); } - System.out.println("INFO Unregistered entity provider capability ("+capability.getName()+") for prefix ("+prefix+")"); + log.info("Unregistered entity provider capability ("+capability.getName()+") for prefix ("+prefix+")"); } /* @@ -439,7 +442,7 @@ public void unregisterEntityProviderByPrefix(String prefix) { prefixMap.remove(bikey); } } - System.out.println("INFO Unregistered entity prefix ("+prefix+")"); + log.info("Unregistered entity prefix ("+prefix+")"); } /** diff --git a/entitybroker/impl/src/test/log4j.properties b/entitybroker/impl/src/test/log4j.properties new file mode 100644 index 000000000000..e78168e1f881 --- /dev/null +++ b/entitybroker/impl/src/test/log4j.properties @@ -0,0 +1,6 @@ +log4j.appender.Stdout=org.apache.log4j.ConsoleAppender +log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m%n + +log4j.rootLogger=INFO,Stdout + diff --git a/entitybroker/pom.xml b/entitybroker/pom.xml index 11ba08019346..6cb00b8c2982 100644 --- a/entitybroker/pom.xml +++ b/entitybroker/pom.xml @@ -25,63 +25,22 @@ The Entity Broker integrates seamlessly with the existing Entity system in Sakai (Entity Producers and Entities) and entities created using entity providers are accessible in Sakai as if they were created using the legacy system. Send feedback - or comments to Aaron Zeckoski (azeckoski@gmail.com, aaronz@vt.edu). + or comments to Aaron Zeckoski (azeckoski@gmail.com, aaronz@vt.edu). + 2.0 UTF-8 - - - - - full - - true - - - api - impl - rest - tool - pack - mocks - utils - core-providers - - - - tool - - rest - tool - - - - rest - - rest - tool - - - - api - - api - - - - utils - - utils - - - - providers - - core-providers - - - + + api + impl + rest + tool + pack + mocks + utils + core-providers + aaronz@vt.edu @@ -110,19 +69,6 @@ 0 - - - - sakai-site - Sakai release Site - scpexe://source.sakaiproject.org/var/www/html/release/entitybroker/${project.version} - - - - JIRA - http://jira.sakaiproject.org/jira/browse/SAK - - Educational Community License, Version 2.0 diff --git a/entitybroker/project.properties b/entitybroker/project.properties deleted file mode 100644 index 32507ebfc859..000000000000 --- a/entitybroker/project.properties +++ /dev/null @@ -1 +0,0 @@ -maven.junit.usefile=false \ No newline at end of file diff --git a/entitybroker/rest/pom.xml b/entitybroker/rest/pom.xml index a0f80d3b7d62..e7f71a2e9c71 100644 --- a/entitybroker/rest/pom.xml +++ b/entitybroker/rest/pom.xml @@ -47,14 +47,12 @@ commons-lang commons-lang - 2.5 org.azeckoski reflectutils - org.mortbay.jetty @@ -69,10 +67,7 @@ junit junit - 4.5 - test - @@ -85,21 +80,13 @@ false - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - + + + ${basedir}/src/test + + log4j.properties + + + + diff --git a/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityBatchHandler.java b/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityBatchHandler.java index 439d7f5a647a..4f5d2d05885b 100644 --- a/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityBatchHandler.java +++ b/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityBatchHandler.java @@ -47,11 +47,13 @@ import org.sakaiproject.entitybroker.util.http.EntityHttpServletResponse; import org.sakaiproject.entitybroker.util.http.HttpClientWrapper; import org.sakaiproject.entitybroker.util.http.HttpRESTUtils; +import org.sakaiproject.entitybroker.util.http.HttpRESTUtils.Method; import org.sakaiproject.entitybroker.util.http.HttpResponse; import org.sakaiproject.entitybroker.util.http.URLData; -import org.sakaiproject.entitybroker.util.http.HttpRESTUtils.Method; import org.sakaiproject.entitybroker.util.request.RequestUtils; +import lombok.extern.slf4j.Slf4j; + /** * This handles batch operations internally as much as possible, @@ -60,6 +62,7 @@ * * @author Aaron Zeckoski (azeckoski @ gmail.com) */ +@Slf4j public class EntityBatchHandler { public static final String CONFIG_BATCH_ENABLE = "entitybroker.batch.enable"; @@ -126,12 +129,12 @@ public String[] getHandledOutputFormats() { } public void destroy() { - System.out.println("INFO: EntityBatchHandler: destroy()"); + log.info("EntityBatchHandler: destroy()"); if (batchEP != null) { try { this.entityBrokerManager.getEntityProviderManager().unregisterEntityProvider(batchEP); } catch (RuntimeException e) { - System.out.println("WARN: EntityBatchHandler: Unable to unregister the batch provider: " + e); + log.warn("EntityBatchHandler: Unable to unregister the batch provider: " + e); } } } @@ -231,7 +234,7 @@ public void handleBatch(EntityView view, HttpServletRequest req, HttpServletResp // NOTE: this duplicate check happens again slightly down below so change both at once if (! Method.POST.equals(method) && processedRefsAndURLs.contains(reference)) { - System.out.println("WARN: EntityBatchHandler: Found a duplicate reference, this will not be processed: " + reference); + log.warn("EntityBatchHandler: Found a duplicate reference, this will not be processed: " + reference); continue; // skip for GET/DELETE/PUT } // fix anything that does not start with a slash or http @@ -280,7 +283,7 @@ public void handleBatch(EntityView view, HttpServletRequest req, HttpServletResp success = true; } catch (IllegalArgumentException e) { String errorMessage = "Failure parsing direct entityURL ("+entityURL+") from reference ("+reference+") from path ("+ud.pathInfo+"): " + e.getMessage() + ":" + e.getCause(); - System.out.println("WARN: EntityBatchHandler: " + errorMessage); + log.warn("EntityBatchHandler: " + errorMessage); result = new ResponseError(reference, entityURL, errorMessage); } @@ -304,7 +307,7 @@ public void handleBatch(EntityView view, HttpServletRequest req, HttpServletResp // NOTE: this duplicate check happens again slightly above so change both at once if (! Method.POST.equals(method) && processedRefsAndURLs.contains(entityURL)) { - System.out.println("WARN: EntityBatchHandler: Found a duplicate entityURL, this will not be processed: " + entityURL); + log.warn("EntityBatchHandler: Found a duplicate entityURL, this will not be processed: " + entityURL); continue; // skip } @@ -427,7 +430,7 @@ private Map> extractReferenceParams( // fix key by removing the ref#. prefix key = key.substring(refKey.length()); if (key.length() == 0) { - System.out.println("WARN: EntityBatchHandler: " + + log.warn("EntityBatchHandler: " + "Skipping invalid reference param name ("+entry.getKey()+"), " + "name must start with ref#. but MUST have the actual name of the param after that"); } else { @@ -535,7 +538,7 @@ private ResponseBase generateInternalResult(String refKey, String reference, Str redirected = false; // assume no redirect } catch (Exception e) { String errorMessage = "Failure attempting to process reference ("+reference+") for url ("+entityURL+"): " + e.getMessage() + ":" + e; - System.out.println("WARN: EntityBatchHandler: " + errorMessage); + log.warn("EntityBatchHandler: " + errorMessage); error = new ResponseError(reference, entityURL, errorMessage); break; // take us out if there is a failure } @@ -650,7 +653,7 @@ private ResponseBase generateExternalResult(String refKey, String reference, Str params, null, guaranteeSSL); } catch (RuntimeException e) { String errorMessage = "Failure attempting to process external URL ("+entityURL+") from reference ("+reference+"): " + e.getMessage() + ":" + e; - System.out.println("WARN: EntityBatchHandler: " + errorMessage); + log.warn("EntityBatchHandler: " + errorMessage); error = new ResponseError(reference, entityURL, errorMessage); } diff --git a/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityBrokerRESTServiceManager.java b/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityBrokerRESTServiceManager.java index 85a959b93b38..d888ff055498 100644 --- a/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityBrokerRESTServiceManager.java +++ b/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityBrokerRESTServiceManager.java @@ -30,6 +30,8 @@ import org.sakaiproject.entitybroker.providers.EntityPropertiesService; import org.sakaiproject.entitybroker.providers.ExternalIntegrationProvider; +import lombok.extern.slf4j.Slf4j; + /** * This creates all the needed services (as if it were a service manager), @@ -40,6 +42,7 @@ * * @author Aaron Zeckoski (azeckoski @ gmail.com) */ +@Slf4j @SuppressWarnings("deprecation") public class EntityBrokerRESTServiceManager { @@ -120,7 +123,7 @@ public EntityBrokerRESTServiceManager(EntityBrokerManager entityBrokerManager, * (i.e. all the required services are set) */ public void init() { - System.out.println("INFO: EntityBrokerRESTServiceManager: init()"); + log.info("EntityBrokerRESTServiceManager: init()"); if (this.entityBrokerManager == null || this.requestGetter == null || this.requestStorage == null @@ -166,7 +169,7 @@ public void shutdown() { * Shuts down all services and cleans up */ public void destroy() { - System.out.println("INFO: EntityBrokerRESTServiceManager: destroy()"); + log.info("EntityBrokerRESTServiceManager: destroy()"); // cleanup everything setInstance(null); this.entityRESTProvider.destroy(); diff --git a/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityDescriptionManager.java b/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityDescriptionManager.java index 2e65ea69fc3f..45c4dcf78971 100644 --- a/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityDescriptionManager.java +++ b/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityDescriptionManager.java @@ -29,6 +29,11 @@ import java.util.Map; import java.util.Map.Entry; +import org.azeckoski.reflectutils.ArrayUtils; +import org.azeckoski.reflectutils.ClassFields; +import org.azeckoski.reflectutils.ClassFields.FieldsFilter; +import org.azeckoski.reflectutils.ConstructorUtils; +import org.azeckoski.reflectutils.ReflectUtils; import org.sakaiproject.entitybroker.EntityBrokerManager; import org.sakaiproject.entitybroker.EntityReference; import org.sakaiproject.entitybroker.EntityView; @@ -57,11 +62,8 @@ import org.sakaiproject.entitybroker.providers.EntityPropertiesService; import org.sakaiproject.entitybroker.providers.EntityRequestHandler; import org.sakaiproject.entitybroker.util.TemplateParseUtil; -import org.azeckoski.reflectutils.ArrayUtils; -import org.azeckoski.reflectutils.ClassFields; -import org.azeckoski.reflectutils.ConstructorUtils; -import org.azeckoski.reflectutils.ReflectUtils; -import org.azeckoski.reflectutils.ClassFields.FieldsFilter; + +import lombok.extern.slf4j.Slf4j; /** @@ -70,6 +72,7 @@ * * @author Aaron Zeckoski (azeckoski @ gmail.com) */ +@Slf4j @SuppressWarnings("deprecation") public class EntityDescriptionManager { @@ -128,7 +131,7 @@ public EntityDescriptionManager( private EntityProvider describeEP = null; public void init() { - System.out.println("INFO: EntityDescriptionManager: init()"); + log.info("EntityDescriptionManager: init()"); // register the describe prefixes to load up descriptions describeEP = new DescribePropertiesable() { public String getEntityPrefix() { @@ -145,13 +148,13 @@ public ClassLoader getResourceClassLoader() { } public void destroy() { - System.out.println("INFO: EntityDescriptionManager: destroy()"); + log.info("EntityDescriptionManager: destroy()"); // NOTE: do not try to unregister describe // if (describeEP != null) { // try { // entityProviderManager.unregisterEntityProvider(describeEP); // } catch (RuntimeException e) { -// System.out.println("WARN: EntityDescriptionManager: Unable to unregister the describe description provider: " + e); +// log.warn("EntityDescriptionManager: Unable to unregister the describe description provider: " + e); // } // } } diff --git a/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityEncodingManager.java b/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityEncodingManager.java index 41eecab8de08..56751130cdb5 100644 --- a/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityEncodingManager.java +++ b/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityEncodingManager.java @@ -36,12 +36,11 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.StringEscapeUtils; - import org.azeckoski.reflectutils.ClassFields; +import org.azeckoski.reflectutils.ClassFields.FieldsFilter; import org.azeckoski.reflectutils.ConstructorUtils; import org.azeckoski.reflectutils.ReflectUtils; import org.azeckoski.reflectutils.StringUtils; -import org.azeckoski.reflectutils.ClassFields.FieldsFilter; import org.azeckoski.reflectutils.map.ArrayOrderedMap; import org.azeckoski.reflectutils.transcoders.HTMLTranscoder; import org.azeckoski.reflectutils.transcoders.JSONTranscoder; @@ -70,6 +69,8 @@ import org.sakaiproject.entitybroker.providers.EntityRequestHandler; import org.sakaiproject.entitybroker.util.EntityDataUtils; +import lombok.extern.slf4j.Slf4j; + /** * This handles the internal encoding (translation and formatting) of entity data, @@ -78,6 +79,7 @@ * * @author Aaron Zeckoski (azeckoski @ gmail.com) */ +@Slf4j public class EntityEncodingManager { public static final String ENTITY_REFERENCE = "entityReference"; @@ -434,7 +436,7 @@ public void internalOutputFormatter(EntityReference ref, String format, List * This handles all the processing of incoming requests (http based) and includes @@ -89,8 +91,10 @@ * * @author Aaron Zeckoski (aaronz@vt.edu) */ +@Slf4j @SuppressWarnings("deprecation") public class EntityHandlerImpl implements EntityRequestHandler { + public static String APP_VERSION = "1.0.1"; public static String SVN_REVISION = "$Revision$"; public static String SVN_LAST_UPDATE = "$Date$"; @@ -125,7 +129,7 @@ public EntityHandlerImpl(EntityProviderManager entityProviderManager, } public void init() { - System.out.println("INFO EntityRequestHandler init complete"); + log.info("EntityRequestHandler init complete"); } private EntityProviderManager entityProviderManager; @@ -198,7 +202,7 @@ public String getServletContext() { public void setServletContext(String servletContext) { if (servletContext != null) { this.servletContext = servletContext; - //System.out.println("Setting the REST servlet context to: " + servletContext); + //log.info("Setting the REST servlet context to: " + servletContext); entityBrokerManager.setServletContext(servletContext); } } @@ -233,7 +237,7 @@ public String handleEntityAccess(HttpServletRequest req, HttpServletResponse res } catch (SecurityException se) { throw new EntityException(se.getMessage(), path, HttpServletResponse.SC_UNAUTHORIZED); } catch (Exception e) { - System.out.println("WARN: EntityRequestHandler: External handleUserSessionKey method failed, continuing...: " + e); + log.warn("EntityRequestHandler: External handleUserSessionKey method failed, continuing...: " + e); } } @@ -311,7 +315,7 @@ public String handleEntityAccess(HttpServletRequest req, HttpServletResponse res res.setStatus(HttpServletResponse.SC_OK); } else { // do the redirect - System.out.println("INFO: EntityRequestHandler: Entity Redirect: redirecting from ("+path+") to ("+redirectURL+")"); + log.info("EntityRequestHandler: Entity Redirect: redirecting from ("+path+") to ("+redirectURL+")"); RequestUtils.handleURLRedirect(redirectURL, true, req, res); } return EntityView.SEPARATOR + prefix; // exit here for redirects @@ -855,7 +859,7 @@ public String handleEntityError(HttpServletRequest req, Throwable error) { } catch (UnsupportedOperationException e) { // nothing to do here, this is OK } catch (Exception e) { - System.out.println("WARN: EntityRequestHandler: External handleEntityError method failed, using default instead: " + e); + log.warn("EntityRequestHandler: External handleEntityError method failed, using default instead: " + e); } } return msg; @@ -1098,7 +1102,7 @@ private Long makeLastModified(Object lm) { // nothing to do here } } else { - System.out.println("WARN: EntityRequestHandler: Unknown type returned for 'lastModified' (not Date, Long, String): " + lm.getClass() + ", using the default value of current time instead"); + log.warn("EntityRequestHandler: Unknown type returned for 'lastModified' (not Date, Long, String): " + lm.getClass() + ", using the default value of current time instead"); } } return lastModified; diff --git a/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityRESTProviderBase.java b/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityRESTProviderBase.java index 195fb5844fc0..28094ca341ea 100644 --- a/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityRESTProviderBase.java +++ b/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityRESTProviderBase.java @@ -34,6 +34,8 @@ import org.sakaiproject.entitybroker.providers.EntityRESTProvider; import org.sakaiproject.entitybroker.util.EntityResponse; +import lombok.extern.slf4j.Slf4j; + /** * This is the standard entity REST provider which will be created and set in the entity broker manager, @@ -42,6 +44,7 @@ * * @author Aaron Zeckoski (azeckoski @ gmail.com) */ +@Slf4j public class EntityRESTProviderBase implements EntityRESTProvider { protected EntityRESTProviderBase() { } @@ -76,13 +79,13 @@ public void setEntityRequestHandler(EntityHandlerImpl entityRequestHandler) { } public void init() { - System.out.println("INFO EntityRESTProviderBase init"); + log.info("EntityRESTProviderBase init"); // register with the entity broker manager this.entityBrokerManager.setEntityRESTProvider(this); } public void destroy() { - System.out.println("INFO EntityRESTProviderBase destroy"); + log.info("EntityRESTProviderBase destroy"); // unregister this.entityBrokerManager.setEntityRESTProvider(null); } diff --git a/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityRedirectsManager.java b/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityRedirectsManager.java index 0eb09bd5859c..59d329d3948d 100644 --- a/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityRedirectsManager.java +++ b/entitybroker/rest/src/java/org/sakaiproject/entitybroker/rest/EntityRedirectsManager.java @@ -41,12 +41,15 @@ import org.sakaiproject.entitybroker.util.TemplateParseUtil.PreProcessedTemplate; import org.sakaiproject.entitybroker.util.TemplateParseUtil.ProcessedTemplate; +import lombok.extern.slf4j.Slf4j; + /** * Handles everything related the URL redirects handling and processing * * @author Aaron Zeckoski (azeckoski @ gmail.com) */ +@Slf4j public class EntityRedirectsManager { /** @@ -144,7 +147,7 @@ public String checkForTemplateMatch(EntityProvider entityProvider, String incomi try { requestStorage.setStoredValue(entry.getKey(), entry.getValue()); } catch (IllegalArgumentException e) { - System.out.println("WARN: EntityRedirectsManager: Had to skip key (" + entry.getKey() + ") while adding keys to request storage: " + e); + log.warn("EntityRedirectsManager: Had to skip key (" + entry.getKey() + ") while adding keys to request storage: " + e); } } // do the redirect @@ -227,7 +230,7 @@ public String checkForTemplateMatch(EntityProvider entityProvider, String incomi targetURL = TemplateParseUtil.mergeTemplate(redirect.outgoingTemplate, segmentValues); } catch (IllegalArgumentException e) { targetURL = null; - System.out.println("WARN: EntityRedirectsManager: Unable to merge target template ("+redirect.outgoingTemplate+") with available variables: " + e); + log.warn("EntityRedirectsManager: Unable to merge target template ("+redirect.outgoingTemplate+") with available variables: " + e); } } else { // should never get here diff --git a/entitybroker/rest/src/test/log4j.properties b/entitybroker/rest/src/test/log4j.properties new file mode 100644 index 000000000000..e78168e1f881 --- /dev/null +++ b/entitybroker/rest/src/test/log4j.properties @@ -0,0 +1,6 @@ +log4j.appender.Stdout=org.apache.log4j.ConsoleAppender +log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m%n + +log4j.rootLogger=INFO,Stdout + diff --git a/entitybroker/tool/pom.xml b/entitybroker/tool/pom.xml index e4b9a392a85f..5cd5ef5660c6 100644 --- a/entitybroker/tool/pom.xml +++ b/entitybroker/tool/pom.xml @@ -38,10 +38,6 @@ javax.servlet servlet-api - - commons-logging - commons-logging - org.sakaiproject.oauth @@ -49,9 +45,7 @@ 1.2-SNAPSHOT provided - - - + org.sakaiproject.kernel sakai-kernel-api @@ -64,31 +58,7 @@ org.sakaiproject.kernel sakai-kernel-util - - - - - @@ -106,17 +76,5 @@ false - diff --git a/entitybroker/tool/src/java/org/sakaiproject/entitybroker/servlet/SakaiDirectServlet.java b/entitybroker/tool/src/java/org/sakaiproject/entitybroker/servlet/SakaiDirectServlet.java index 5f2231166900..ddf583eced11 100644 --- a/entitybroker/tool/src/java/org/sakaiproject/entitybroker/servlet/SakaiDirectServlet.java +++ b/entitybroker/tool/src/java/org/sakaiproject/entitybroker/servlet/SakaiDirectServlet.java @@ -42,6 +42,8 @@ import org.sakaiproject.util.Validator; import org.sakaiproject.util.Web; +import lombok.extern.slf4j.Slf4j; + /** * Direct servlet allows unfettered access to entity URLs within Sakai, it also handles * authentication (login) if required (without breaking an entity URL)
@@ -52,11 +54,11 @@ * @author Antranig Basman (antranig@caret.cam.ac.uk) * @author Sakai Software Development Team */ +@Slf4j @SuppressWarnings("deprecation") public class SakaiDirectServlet extends DirectServlet { private static final long serialVersionUID = 1L; - private transient EntityBrokerRESTServiceManager entityRESTServiceManager; private transient BasicAuth basicAuth; @@ -112,14 +114,14 @@ public void handleUserLogin(HttpServletRequest req, HttpServletResponse res, Str // defines where to go after login succeeds helperURLSet = true; String returnURL = Web.returnUrl( req, Validator.escapeUrl(path) ); - System.out.println("INFO: Direct Login: Setting session ("+session.getId()+") helper URL ("+Tool.HELPER_DONE_URL+") to "+returnURL); + log.info("Direct Login: Setting session ("+session.getId()+") helper URL ("+Tool.HELPER_DONE_URL+") to "+returnURL); session.setAttribute(Tool.HELPER_DONE_URL, returnURL); } // check that we have a return path set; might have been done earlier if (! helperURLSet && session.getAttribute(Tool.HELPER_DONE_URL) == null) { session.setAttribute(Tool.HELPER_DONE_URL, "/direct/describe"); - System.out.println("INFO: doLogin - no HELPER_DONE_URL found, proceeding with default HELPER_DONE_URL: " + "/direct/describe"); + log.info("doLogin - no HELPER_DONE_URL found, proceeding with default HELPER_DONE_URL: " + "/direct/describe"); } // map the request to the helper, leaving the path after ".../options" for the helper diff --git a/entitybroker/utils/pom.xml b/entitybroker/utils/pom.xml index 6c356e5c6daa..c34070291987 100644 --- a/entitybroker/utils/pom.xml +++ b/entitybroker/utils/pom.xml @@ -10,11 +10,10 @@ 2007 jar - entitybroker org.sakaiproject - 12-SNAPSHOT + 12-SNAPSHOT @@ -43,23 +42,10 @@ org.springframework spring-context-support - - - - org.sakaiproject.kernel sakai-component-manager - - - - org.azeckoski @@ -80,8 +66,6 @@ junit junit - 4.5 - test @@ -106,21 +90,5 @@ false - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - org.apache.maven.plugins - maven-rsf-plugin - 1.0 - - diff --git a/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/core/AbstractEntityPropertiesService.java b/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/core/AbstractEntityPropertiesService.java index c4b7611bb92b..7388ca0a4c54 100644 --- a/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/core/AbstractEntityPropertiesService.java +++ b/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/core/AbstractEntityPropertiesService.java @@ -28,6 +28,8 @@ import org.sakaiproject.entitybroker.providers.EntityPropertiesService; +import lombok.extern.slf4j.Slf4j; + /** * This service allows us to track all the properties files related to describing the capabilities * of our entities and the entities themselves, it allows lookup of strings as well
@@ -35,6 +37,7 @@ * * @author Aaron Zeckoski (azeckoski @ gmail.com) */ +@Slf4j public abstract class AbstractEntityPropertiesService implements EntityPropertiesService { public static interface MessageBundle { @@ -106,9 +109,9 @@ public void loadProperties(String prefix, String baseName, ClassLoader classLoad } List keys = registerLocaleMessages(prefix, baseName, locale, classLoader); if (keys.size() > 0) { - System.out.println("INFO EntityPropertiesService: Added "+keys.size()+" properties for entity prefix (" + prefix + ") and basename ("+baseName+")"); + log.info("EntityPropertiesService: Added "+keys.size()+" properties for entity prefix (" + prefix + ") and basename ("+baseName+")"); } else { - System.out.println("INFO EntityPropertiesService: No properties to load for entity prefix (" + prefix + ") and basename ("+baseName+")"); + log.info("EntityPropertiesService: No properties to load for entity prefix (" + prefix + ") and basename ("+baseName+")"); } } diff --git a/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/core/EntityProviderMethodStoreImpl.java b/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/core/EntityProviderMethodStoreImpl.java index 8b4c77d154f4..a14647143f8f 100644 --- a/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/core/EntityProviderMethodStoreImpl.java +++ b/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/core/EntityProviderMethodStoreImpl.java @@ -32,7 +32,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.azeckoski.reflectutils.ReflectUtils; - import org.sakaiproject.entitybroker.EntityReference; import org.sakaiproject.entitybroker.EntityView; import org.sakaiproject.entitybroker.entityprovider.EntityProvider; @@ -47,9 +46,10 @@ import org.sakaiproject.entitybroker.entityprovider.extension.TemplateMap; import org.sakaiproject.entitybroker.entityprovider.extension.URLRedirect; import org.sakaiproject.entitybroker.entityprovider.search.Search; - import org.sakaiproject.entitybroker.util.TemplateParseUtil; +import lombok.extern.slf4j.Slf4j; + /** * This stores the various methods used to track different methods allowed for providers @@ -57,6 +57,7 @@ * * @author Aaron Zeckoski (azeckoski @ gmail.com) */ +@Slf4j public class EntityProviderMethodStoreImpl implements EntityProviderMethodStore { private HashSet reservedActions = null; @@ -110,7 +111,7 @@ public CustomAction[] findCustomActions(EntityProvider entityProvider, boolean i try { ca.methodArgTypes = validateActionParamTypes(method.getParameterTypes(), method.getName()); } catch (IllegalArgumentException e) { - System.out.println("WARN A method ("+method.getName()+") in the entity provider for prefix (" + log.warn("A method ("+method.getName()+") in the entity provider for prefix (" + entityProvider.getEntityPrefix()+") appears to be a custom action method but" + "does not have a valid set of parameter types, this may be ok but should be checked on: " + e.getMessage()); continue; @@ -153,7 +154,7 @@ public void setCustomActions(String prefix, Map actions) { cas.put(ca.getKey(), action.copy()); // make a copy to avoid holding objects from another ClassLoader } entityActions.put(prefix, actions); - System.out.println("INFO Registered "+actions.size()+" custom actions for entity prefix ("+prefix+"): " + sb.toString()); + log.info("Registered "+actions.size()+" custom actions for entity prefix ("+prefix+"): " + sb.toString()); } /* (non-Javadoc) @@ -267,7 +268,7 @@ public void addURLRedirects(String prefix, URLRedirect[] redirects) { sb.append(redirect.template); } entityRedirects.put(prefix, urlRedirects); - System.out.println("INFO Registered "+redirects.length+" url redirects for entity prefix ("+prefix+"): " + sb.toString()); + log.info("Registered "+redirects.length+" url redirects for entity prefix ("+prefix+"): " + sb.toString()); } } @@ -409,7 +410,7 @@ public static URLRedirect[] validateDefineableTemplates(RedirectDefinable config TemplateMap[] urlMappings = configDefinable.defineURLMappings(); if (urlMappings == null || urlMappings.length == 0) { // this is ok then, or is it? - System.out.println("WARN RedirectDefinable: no templates defined for url redirect"); + log.warn("RedirectDefinable: no templates defined for url redirect"); } else { for (TemplateMap templateMap : urlMappings) { String incomingTemplate = templateMap.getIncomingTemplate(); diff --git a/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/devhelper/AbstractDeveloperHelperService.java b/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/devhelper/AbstractDeveloperHelperService.java index fc0ba3dd625a..4c55aaa8c6e7 100644 --- a/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/devhelper/AbstractDeveloperHelperService.java +++ b/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/devhelper/AbstractDeveloperHelperService.java @@ -31,7 +31,6 @@ import org.azeckoski.reflectutils.transcoders.JSONTranscoder; import org.azeckoski.reflectutils.transcoders.Transcoder; import org.azeckoski.reflectutils.transcoders.XMLTranscoder; - import org.sakaiproject.entitybroker.DeveloperHelperService; import org.sakaiproject.entitybroker.EntityBroker; import org.sakaiproject.entitybroker.EntityBrokerManager; @@ -41,12 +40,15 @@ import org.sakaiproject.entitybroker.providers.EntityPropertiesService; import org.sakaiproject.entitybroker.providers.EntityRESTProvider; +import lombok.extern.slf4j.Slf4j; + /** * implementation of the helper service methods which are internal only * NOTE: you should probably override encode and decode data rather than simply using the current impl * * @author Aaron Zeckoski (aaron@caret.cam.ac.uk) */ +@Slf4j public abstract class AbstractDeveloperHelperService implements DeveloperHelperService { /** @@ -97,7 +99,7 @@ public Map decodeData(String data, String format) { } Map decoded = new HashMap(0); if (getEntityRESTProvider() == null) { - System.out.println("WARN No entityRESTProvider available for decoding, using basic internal decoder"); + log.warn("No entityRESTProvider available for decoding, using basic internal decoder"); if (data != null) { Transcoder transcoder = getTranscoder(format); try { @@ -122,7 +124,7 @@ public String encodeData(Object data, String format, String name, Map entry : params.entrySet()) { if (entry.getKey() == null || entry.getValue() == null) { - System.out.println("WARN: null value supplied for param name ("+entry.getKey()+") or value (" + log.warn("null value supplied for param name ("+entry.getKey()+") or value (" +entry.getValue()+") (org.sakaiproject.entitybroker.util.http.HttpUtils#fireRequest)"); } pm.addParameter(entry.getKey(), entry.getValue()); @@ -226,7 +229,7 @@ public static HttpResponse fireRequest(HttpClientWrapper httpClientWrapper, Stri dm.setQueryString( mergeQueryStringWithParams(dm.getQueryString(), params) ); // warn about data being set if (data != null) { - System.out.println("WARN: data cannot be passed in DELETE requests, data will be ignored (org.sakaiproject.entitybroker.util.http.HttpUtils#fireRequest)"); + log.warn("Data cannot be passed in DELETE requests, data will be ignored (org.sakaiproject.entitybroker.util.http.HttpUtils#fireRequest)"); } httpMethod = dm; } else { diff --git a/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/request/RequestUtils.java b/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/request/RequestUtils.java index 08f6a7326cee..0817965e10e6 100644 --- a/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/request/RequestUtils.java +++ b/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/request/RequestUtils.java @@ -46,12 +46,15 @@ import org.sakaiproject.entitybroker.providers.EntityRequestHandler; import org.sakaiproject.entitybroker.util.TemplateParseUtil; +import lombok.extern.slf4j.Slf4j; + /** * Contains a set of static utility methods for working with requests * * @author Aaron Zeckoski (azeckoski @ gmail.com) */ +@Slf4j public class RequestUtils { private static final String DIVIDER = "||"; @@ -409,7 +412,7 @@ public static Search makeSearchFromRequestParams(Map params) { limit = Integer.valueOf(value.toString()).intValue(); search.setLimit(limit); } catch (NumberFormatException e) { - System.out.println("WARN Invalid non-number passed in for _limit/_perpage param: " + value + ":" + e); + log.warn("Invalid non-number passed in for _limit/_perpage param: " + value + ":" + e); } continue; } else if ("_start".equals(key) @@ -418,7 +421,7 @@ public static Search makeSearchFromRequestParams(Map params) { int start = Integer.valueOf(value.toString()).intValue(); search.setStart(start); } catch (NumberFormatException e) { - System.out.println("WARN Invalid non-number passed in for '_start' param: " + value + ":" + e); + log.warn("Invalid non-number passed in for '_start' param: " + value + ":" + e); } continue; } else if ("_page".equals(key) @@ -427,7 +430,7 @@ public static Search makeSearchFromRequestParams(Map params) { try { page = Integer.valueOf(value.toString()).intValue(); } catch (NumberFormatException e) { - System.out.println("WARN Invalid non-number passed in for '_page' param: " + value + ":" + e); + log.warn("Invalid non-number passed in for '_page' param: " + value + ":" + e); } continue; } else if ("_order".equals(key) @@ -454,7 +457,7 @@ public static Search makeSearchFromRequestParams(Map params) { } } } catch (RuntimeException e) { - System.out.println("WARN Failed while getting the sort/order param: " + val + ":" + e); + log.warn("WARN Failed while getting the sort/order param: " + val + ":" + e); } } continue; @@ -474,14 +477,14 @@ public static Search makeSearchFromRequestParams(Map params) { } } catch (Exception e) { // failed to translate the request to a search, not really much to do here - System.out.println("WARN Could not translate entity request into search params: " + e.getMessage() + ":" + e); + log.warn("Could not translate entity request into search params: " + e.getMessage() + ":" + e); } // translate page into start/limit if (page > 0) { if (limit <= -1) { limit = 10; // set to a default value search.setLimit(limit); - System.out.println("WARN page is set without a limit per page, setting per page limit to default value of 10"); + log.warn("Page is set without a limit per page, setting per page limit to default value of 10"); } search.setStart( (page-1) * limit ); } diff --git a/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/servlet/DirectServlet.java b/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/servlet/DirectServlet.java index 2e33fae15ab4..91b1adeb4f42 100644 --- a/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/servlet/DirectServlet.java +++ b/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/servlet/DirectServlet.java @@ -31,6 +31,8 @@ import org.sakaiproject.entitybroker.exception.EntityException; import org.sakaiproject.entitybroker.providers.EntityRequestHandler; +import lombok.extern.slf4j.Slf4j; + /** * This is the core abstract DirectServlet class which is meant to extended, * extend this to plugin whatever system you have for initiating/retrieving the EB services @@ -41,10 +43,10 @@ * * @author Aaron Zeckoski (aaron@caret.cam.ac.uk) */ +@Slf4j public abstract class DirectServlet extends HttpServlet { private static final long serialVersionUID = 1L; - protected transient EntityRequestHandler entityRequestHandler; public void setEntityRequestHandler(EntityRequestHandler entityRequestHandler) { this.entityRequestHandler = entityRequestHandler; @@ -186,7 +188,7 @@ public void dispatch(HttpServletRequest req, HttpServletResponse res) throws Ser try { entityRequestHandler.handleEntityAccess(req, res, path); } catch (EntityException e) { - System.out.println("INFO Could not process entity: "+e.entityReference+" ("+e.responseCode+")["+e.getCause()+"]: "+e.getMessage()); + log.info("Could not process entity: "+e.entityReference+" ("+e.responseCode+")["+e.getCause()+"]: "+e.getMessage()); // no longer catching FORBIDDEN or UNAUTHORIZED here // if (e.responseCode == HttpServletResponse.SC_UNAUTHORIZED || // e.responseCode == HttpServletResponse.SC_FORBIDDEN) { @@ -208,7 +210,7 @@ public void dispatch(HttpServletRequest req, HttpServletResponse res) throws Ser } // otherwise reject the request String msg = "Security exception accessing entity URL: " + path + " (current user not allowed): " + e.getMessage(); - System.out.println("INFO " + msg); + log.info(msg); sendError(res, HttpServletResponse.SC_FORBIDDEN, msg); } catch (Exception e) { // all other cases diff --git a/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/spring/ResourceFinder.java b/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/spring/ResourceFinder.java index ec53b9e189da..b27b8b38fade 100644 --- a/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/spring/ResourceFinder.java +++ b/entitybroker/utils/src/java/org/sakaiproject/entitybroker/util/spring/ResourceFinder.java @@ -30,6 +30,8 @@ import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; +import lombok.extern.slf4j.Slf4j; + /** * Takes a path or list of paths to resources and turns them into different things (file/IS/resource), * this also allows us to look on a relative or absolute path and will automatically @@ -63,6 +65,7 @@ * * @author Aaron Zeckoski (aaron@caret.cam.ac.uk) */ +@Slf4j public class ResourceFinder { public static String relativePath = "sakai/"; @@ -77,7 +80,7 @@ private static List makeResources(List paths) { rs.add(r); } catch (IllegalArgumentException e) { // do not add if not found, just skip - System.out.println("WARN: " + e.getMessage() + ", continuing..."); + log.warn(e.getMessage() + ", continuing..."); } } } diff --git a/external-calendaring-service/api/pom.xml b/external-calendaring-service/api/pom.xml index 7382c7b291b9..b632eb1ea17d 100644 --- a/external-calendaring-service/api/pom.xml +++ b/external-calendaring-service/api/pom.xml @@ -38,10 +38,6 @@ commons-lang commons-lang - - org.projectlombok - lombok - org.mnode.ical4j ical4j diff --git a/external-calendaring-service/impl/pom.xml b/external-calendaring-service/impl/pom.xml index 3832c3718012..7da8ab9cc47a 100644 --- a/external-calendaring-service/impl/pom.xml +++ b/external-calendaring-service/impl/pom.xml @@ -34,10 +34,6 @@ org.sakaiproject.calendar sakai-calendar-api - - org.projectlombok - lombok - org.springframework spring-core @@ -120,6 +116,7 @@ ${basedir}/src/test test-components.xml + log4j.properties diff --git a/external-calendaring-service/impl/src/test/log4j.properties b/external-calendaring-service/impl/src/test/log4j.properties new file mode 100644 index 000000000000..e78168e1f881 --- /dev/null +++ b/external-calendaring-service/impl/src/test/log4j.properties @@ -0,0 +1,6 @@ +log4j.appender.Stdout=org.apache.log4j.ConsoleAppender +log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m%n + +log4j.rootLogger=INFO,Stdout + diff --git a/feedback/pom.xml b/feedback/pom.xml index 4cd42e0f68ef..cde55a844778 100644 --- a/feedback/pom.xml +++ b/feedback/pom.xml @@ -58,14 +58,6 @@ standard 1.1.2 compile - - - log4j - log4j - - - org.projectlombok - lombok org.sakaiproject.kernel diff --git a/gradebook/app/business/pom.xml b/gradebook/app/business/pom.xml index b01c6ddc4a60..6f958edfae60 100644 --- a/gradebook/app/business/pom.xml +++ b/gradebook/app/business/pom.xml @@ -156,28 +156,16 @@ commons-digester commons-digester - 1.6 commons-beanutils commons-beanutils - 1.7.0 - - - commons-logging - commons-logging - ${sakai.commons-logging.version} commons-io commons-io 1.2 - - log4j - log4j - 1.2.9 - dom4j dom4j diff --git a/gradebook/app/ui/pom.xml b/gradebook/app/ui/pom.xml index 278df7270eef..6ec3da6dd54d 100644 --- a/gradebook/app/ui/pom.xml +++ b/gradebook/app/ui/pom.xml @@ -186,26 +186,16 @@ commons-digester commons-digester - 1.6 commons-beanutils commons-beanutils - 1.7.0 - - - commons-logging - commons-logging commons-io commons-io 1.2 - - log4j - log4j - dom4j dom4j @@ -270,11 +260,6 @@ org.sakaiproject.jsf jsf-spreadsheet - - - org.projectlombok - lombok - org.apache.poi poi diff --git a/gradebook/grades-rest/pom.xml b/gradebook/grades-rest/pom.xml index d16bd856a202..bc8be07e7b17 100644 --- a/gradebook/grades-rest/pom.xml +++ b/gradebook/grades-rest/pom.xml @@ -78,13 +78,6 @@ joda-time ${joda.time.version} - - - - commons-logging - commons-logging - - diff --git a/gradebookng/.gitignore b/gradebookng/.gitignore deleted file mode 100644 index d26ec3047ecf..000000000000 --- a/gradebookng/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -target/ -tool/.classpath -bin diff --git a/gradebookng/tool/.settings/org.eclipse.core.resources.prefs b/gradebookng/tool/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 7f9379955179..000000000000 --- a/gradebookng/tool/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,6 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/java=UTF-8 -encoding//src/resources=UTF-8 -encoding//src/test=UTF-8 -encoding//src/test/resources=UTF-8 -encoding/=UTF-8 diff --git a/gradebookng/tool/.settings/org.eclipse.jdt.core.prefs b/gradebookng/tool/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 672496e107ed..000000000000 --- a/gradebookng/tool/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,12 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.8 diff --git a/gradebookng/tool/.settings/org.eclipse.m2e.core.prefs b/gradebookng/tool/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb23..000000000000 --- a/gradebookng/tool/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/gradebookng/tool/pom.xml b/gradebookng/tool/pom.xml index b591911eac79..5bcdf8a32540 100644 --- a/gradebookng/tool/pom.xml +++ b/gradebookng/tool/pom.xml @@ -25,22 +25,6 @@ org.apache.wicket wicket-extensions - - org.slf4j - slf4j-log4j12 - - - org.slf4j - slf4j-api - - - log4j - log4j - - - org.projectlombok - lombok - javax.servlet servlet-api @@ -77,14 +61,9 @@ commons-lang commons-lang - - commons-logging - commons-logging - commons-validator commons-validator - 1.4.1 net.sf.opencsv diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/util/Temp.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/util/Temp.java index d88c68c19a4f..b1fab13dd249 100644 --- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/util/Temp.java +++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/util/Temp.java @@ -1,12 +1,15 @@ package org.sakaiproject.gradebookng.business.util; +import lombok.extern.slf4j.Slf4j; + +@Slf4j public class Temp { public static void time(final String msg, final long time) { - System.out.println("Time for [" + msg + "] was: " + time + "ms"); + log.info("Time for [" + msg + "] was: " + time + "ms"); } public static void timeWithContext(final String context, final String msg, final long time) { - System.out.println("Time for [" + context + "].[" + msg + "] was: " + time + "ms"); + log.info("Time for [" + context + "].[" + msg + "] was: " + time + "ms"); } } diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/BasePage.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/BasePage.java index 202c5c4ca1f5..90481b07e78a 100644 --- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/BasePage.java +++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/BasePage.java @@ -4,7 +4,6 @@ import javax.servlet.http.HttpServletRequest; -import org.apache.log4j.Logger; import org.apache.wicket.AttributeModifier; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.head.IHeaderResponse; @@ -22,7 +21,8 @@ import org.sakaiproject.gradebookng.business.GbRole; import org.sakaiproject.gradebookng.business.GradebookNgBusinessService; import org.sakaiproject.gradebookng.tool.component.GbFeedbackPanel; -import org.sakaiproject.service.gradebook.shared.PermissionDefinition; + +import lombok.extern.slf4j.Slf4j; /** * Base page for our app @@ -30,12 +30,11 @@ * @author Steve Swinsburg (steve.swinsburg@gmail.com) * */ +@Slf4j public class BasePage extends WebPage { private static final long serialVersionUID = 1L; - private static final Logger log = Logger.getLogger(BasePage.class); - @SpringBean(name = "org.sakaiproject.gradebookng.business.GradebookNgBusinessService") protected GradebookNgBusinessService businessService; diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/CreateGradeItemStep.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/CreateGradeItemStep.java index a4199ac85006..4e7af6daed6a 100644 --- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/CreateGradeItemStep.java +++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/CreateGradeItemStep.java @@ -1,6 +1,8 @@ package org.sakaiproject.gradebookng.tool.panels.importExport; -import org.apache.log4j.Logger; +import java.util.ArrayList; +import java.util.List; + import org.apache.wicket.Component; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.Button; @@ -14,16 +16,14 @@ import org.sakaiproject.gradebookng.tool.panels.AddOrEditGradeItemPanelContent; import org.sakaiproject.service.gradebook.shared.Assignment; -import java.util.ArrayList; -import java.util.List; +import lombok.extern.slf4j.Slf4j; /** * Created by chmaurer on 2/15/15. */ +@Slf4j public class CreateGradeItemStep extends Panel { - private static final Logger LOG = Logger.getLogger(CreateGradeItemStep.class); - private String panelId; private IModel model; @@ -61,7 +61,7 @@ protected void onSubmit() if (assignment != null) assignmentsToCreate.add(assignment); - LOG.debug("Assignment: " + assignment); + log.debug("Assignment: " + assignment); // info("assignment: " + getDefaultModelObjectAsString()); //Figure out if there are more steps //If so, go to the next step @@ -85,7 +85,7 @@ protected void onSubmit() Button backButton = new Button("backbutton") { @Override public void onSubmit() { - LOG.debug("Clicking back button..."); + log.debug("Clicking back button..."); Component newPanel = null; if (step > 1) { importWizardModel.setStep(step-1); diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportConfirmationStep.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportConfirmationStep.java index d92fea5ccc7e..c2f60ca7e5fb 100644 --- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportConfirmationStep.java +++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportConfirmationStep.java @@ -1,7 +1,11 @@ package org.sakaiproject.gradebookng.tool.panels.importExport; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import org.apache.wicket.Component; import org.apache.wicket.behavior.Behavior; import org.apache.wicket.markup.html.WebMarkupContainer; @@ -23,18 +27,14 @@ import org.sakaiproject.gradebookng.tool.pages.GradebookPage; import org.sakaiproject.service.gradebook.shared.Assignment; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import lombok.extern.slf4j.Slf4j; /** * Created by chmaurer on 2/10/15. */ +@Slf4j public class GradeImportConfirmationStep extends Panel { - private static final Logger LOG = Logger.getLogger(GradeImportConfirmationStep.class); - @SpringBean(name="org.sakaiproject.gradebookng.business.GradebookNgBusinessService") protected GradebookNgBusinessService businessService; @@ -75,9 +75,9 @@ protected void onSubmit() itemsToSave.addAll(itemsToUpdate); itemsToSave.addAll(itemsToCreate); for (ProcessedGradeItem processedGradeItem : itemsToSave) { - LOG.debug("Looping through items to save"); + log.debug("Looping through items to save"); for (ProcessedGradeItemDetail processedGradeItemDetail : processedGradeItem.getProcessedGradeItemDetails()) { - LOG.debug("Looping through detail items to save"); + log.debug("Looping through detail items to save"); Long assignmentId = processedGradeItem.getItemId(); if (assignmentId == null) { //Should be a newly created gn item @@ -96,7 +96,7 @@ protected void onSubmit() if (!StringUtils.equals(currentComment, newComment)) { boolean success = businessService.updateAssignmentGradeComment(assignmentId, processedGradeItemDetail.getStudentUuid(), newComment); - LOG.info("Saving comment: " + success + ", " + assignmentId + ", " + processedGradeItemDetail.getStudentEid() + ", " + + log.info("Saving comment: " + success + ", " + assignmentId + ", " + processedGradeItemDetail.getStudentEid() + ", " + processedGradeItemDetail.getComment()); if (!success) { errors = true; @@ -106,7 +106,7 @@ protected void onSubmit() //Anything other than OK is bad errors = true; } - LOG.info("Saving grade: " + saved + ", " + assignmentId + ", " + processedGradeItemDetail.getStudentEid() + ", " + + log.info("Saving grade: " + saved + ", " + assignmentId + ", " + processedGradeItemDetail.getStudentEid() + ", " + processedGradeItemDetail.getGrade() + ", " + processedGradeItemDetail.getComment()); } } @@ -124,7 +124,7 @@ protected void onSubmit() Button backButton = new Button("backbutton") { @Override public void onSubmit() { - LOG.debug("Clicking back button..."); + log.debug("Clicking back button..."); Component newPanel = null; if (assignmentsToCreate.size() > 0) newPanel = new CreateGradeItemStep(panelId, Model.of(importWizardModel)); diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportUploadStep.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportUploadStep.java index 73cc55f127e2..533da28949f5 100644 --- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportUploadStep.java +++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportUploadStep.java @@ -1,9 +1,16 @@ package org.sakaiproject.gradebookng.tool.panels.importExport; -import au.com.bytecode.opencsv.CSVWriter; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import org.apache.commons.lang.ArrayUtils; import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; import org.apache.wicket.Component; import org.apache.wicket.markup.html.form.Button; import org.apache.wicket.markup.html.form.Form; @@ -26,22 +33,15 @@ import org.sakaiproject.gradebookng.tool.pages.GradebookPage; import org.sakaiproject.service.gradebook.shared.Assignment; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import au.com.bytecode.opencsv.CSVWriter; +import lombok.extern.slf4j.Slf4j; /** * Created by chmaurer on 1/22/15. */ +@Slf4j public class GradeImportUploadStep extends Panel { - private static final Logger log = Logger.getLogger(GradeImportUploadStep.class); - //list of mimetypes for each category. Must be compatible with the parser private static final String[] XLS_MIME_TYPES={"application/vnd.ms-excel","application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"}; private static final String[] CSV_MIME_TYPES={"text/csv"}; @@ -181,7 +181,7 @@ public void onSubmit() { error(getString("error.parse.upload")); } else { //GO TO NEXT PAGE - log.debug(processedGradeItems.size()); + log.debug(Integer.toString(processedGradeItems.size())); //repaint panel ImportWizardModel importWizardModel = new ImportWizardModel(); diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeItemImportSelectionStep.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeItemImportSelectionStep.java index 11e3f130a393..203207b92bd2 100644 --- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeItemImportSelectionStep.java +++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeItemImportSelectionStep.java @@ -1,6 +1,9 @@ package org.sakaiproject.gradebookng.tool.panels.importExport; -import org.apache.log4j.Logger; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; import org.apache.wicket.behavior.AttributeAppender; @@ -23,17 +26,14 @@ import org.sakaiproject.gradebookng.business.model.ProcessedGradeItemStatus; import org.sakaiproject.gradebookng.tool.model.ImportWizardModel; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import lombok.extern.slf4j.Slf4j; /** * Created by chmaurer on 1/22/15. */ +@Slf4j public class GradeItemImportSelectionStep extends Panel { - private static final Logger log = Logger.getLogger(GradeItemImportSelectionStep.class); - private String panelId; private IModel model; diff --git a/gradebookng/tool/src/resources/log4j.properties b/gradebookng/tool/src/test/resources/log4j.properties similarity index 100% rename from gradebookng/tool/src/resources/log4j.properties rename to gradebookng/tool/src/test/resources/log4j.properties diff --git a/help/help-component/pom.xml b/help/help-component/pom.xml index 17fc0b9b7435..7d0b750ade69 100644 --- a/help/help-component/pom.xml +++ b/help/help-component/pom.xml @@ -84,10 +84,6 @@ lucene-analyzers-common provided - - commons-logging - commons-logging - commons-lang commons-lang @@ -104,7 +100,7 @@ commons-configuration commons-configuration - 1.6 + 1.6 diff --git a/help/help-tool/pom.xml b/help/help-tool/pom.xml index 7d802710616d..3c94d431465e 100644 --- a/help/help-tool/pom.xml +++ b/help/help-tool/pom.xml @@ -50,10 +50,6 @@ org.sakaiproject sakai-help-api - - - commons-logging - commons-logging commons-codec diff --git a/hierarchy/impl/pom.xml b/hierarchy/impl/pom.xml index 3a72647e9f88..86874c8865ef 100644 --- a/hierarchy/impl/pom.xml +++ b/hierarchy/impl/pom.xml @@ -26,11 +26,6 @@ hibernate-core - - org.slf4j - slf4j-api - test - org.javassist javassist @@ -107,10 +102,6 @@ org.sakaiproject.kernel sakai-kernel-util - - commons-logging - commons-logging - org.hsqldb hsqldb @@ -209,6 +200,7 @@ hibernate-test.xml hibernate.properties + log4j.properties diff --git a/hierarchy/impl/src/test/log4j.properties b/hierarchy/impl/src/test/log4j.properties new file mode 100644 index 000000000000..e78168e1f881 --- /dev/null +++ b/hierarchy/impl/src/test/log4j.properties @@ -0,0 +1,6 @@ +log4j.appender.Stdout=org.apache.log4j.ConsoleAppender +log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m%n + +log4j.rootLogger=INFO,Stdout + diff --git a/jobscheduler/scheduler-component-shared/pom.xml b/jobscheduler/scheduler-component-shared/pom.xml index 2c93d9da0fbd..3ae7e08c4729 100644 --- a/jobscheduler/scheduler-component-shared/pom.xml +++ b/jobscheduler/scheduler-component-shared/pom.xml @@ -51,10 +51,6 @@ 4.7 test - - commons-logging - commons-logging - org.quartz-scheduler quartz @@ -110,14 +106,6 @@ 5.1.9 test - - org.slf4j - slf4j-log4j12 - - - org.projectlombok - lombok - diff --git a/jobscheduler/scheduler-test-component-shared/pom.xml b/jobscheduler/scheduler-test-component-shared/pom.xml index 6ebca24eac34..41c394884411 100644 --- a/jobscheduler/scheduler-test-component-shared/pom.xml +++ b/jobscheduler/scheduler-test-component-shared/pom.xml @@ -40,10 +40,6 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - org.quartz-scheduler quartz diff --git a/jobscheduler/scheduler-tool/pom.xml b/jobscheduler/scheduler-tool/pom.xml index 57c30c12815a..087aa7207a67 100644 --- a/jobscheduler/scheduler-tool/pom.xml +++ b/jobscheduler/scheduler-tool/pom.xml @@ -47,10 +47,6 @@ org.quartz-scheduler quartz - - commons-logging - commons-logging - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-antrun-plugin - [1.2,) - - run - - - - - - - - - - - - diff --git a/kernel/component-manager/src/test/resources/log4j.properties b/kernel/component-manager/src/test/resources/log4j.properties new file mode 100644 index 000000000000..e78168e1f881 --- /dev/null +++ b/kernel/component-manager/src/test/resources/log4j.properties @@ -0,0 +1,6 @@ +log4j.appender.Stdout=org.apache.log4j.ConsoleAppender +log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m%n + +log4j.rootLogger=INFO,Stdout + diff --git a/kernel/deploy/common/pom.xml b/kernel/deploy/common/pom.xml index 06ce223e6164..48f0bcb509b9 100644 --- a/kernel/deploy/common/pom.xml +++ b/kernel/deploy/common/pom.xml @@ -36,8 +36,8 @@ compile - commons-logging - commons-logging + org.slf4j + jcl-over-slf4j compile diff --git a/kernel/kernel-common/pom.xml b/kernel/kernel-common/pom.xml index 2eb933a771a3..2fcb6f7cbb9b 100644 --- a/kernel/kernel-common/pom.xml +++ b/kernel/kernel-common/pom.xml @@ -20,15 +20,4 @@ common - - - - commons-logging - commons-logging - - - log4j - log4j - - diff --git a/kernel/kernel-common/src/main/config/log4j.properties b/kernel/kernel-common/src/main/config/log4j.properties index f01042576924..ef7d79b27ff2 100644 --- a/kernel/kernel-common/src/main/config/log4j.properties +++ b/kernel/kernel-common/src/main/config/log4j.properties @@ -6,10 +6,12 @@ log4j.rootLogger=WARN, Sakai # Configuration for standard output ("catalina.out" in Tomcat). log4j.appender.Sakai=org.apache.log4j.ConsoleAppender log4j.appender.Sakai.layout=org.apache.log4j.PatternLayout -#log4j.appender.Sakai.layout.ConversionPattern=%p: %m (%d %t_%c)%n + +# A compatible tomcat-juli format +log4j.appender.Sakai.layout.ConversionPattern=%d{dd-MMM-yyyy HH:mm:ss.SSS} %p [%t] %c.%M %m%n # A more descriptive but lower performance logging pattern -log4j.appender.Sakai.layout.ConversionPattern=%d{ISO8601} %5p %t %c - %m%n +#log4j.appender.Sakai.layout.ConversionPattern=%d{ISO8601} %5p %t %c - %m%n # Configuration for a rolling log file ("tomcat.log") #log4j.appender.Sakai=org.apache.log4j.DailyRollingFileAppender diff --git a/kernel/kernel-impl/pom.xml b/kernel/kernel-impl/pom.xml index f5e5a645a042..96df60a2ceea 100644 --- a/kernel/kernel-impl/pom.xml +++ b/kernel/kernel-impl/pom.xml @@ -115,10 +115,6 @@ ${project.version} test - - commons-logging - commons-logging - commons-codec commons-codec @@ -138,7 +134,6 @@ commons-validator commons-validator - 1.4.1 @@ -146,23 +141,11 @@ opencsv 2.3 - - org.slf4j - slf4j-log4j12 - - - org.slf4j - slf4j-api - org.hsqldb hsqldb test - - log4j - log4j - javax.servlet servlet-api @@ -288,7 +271,6 @@ org.owasp.antisamy antisamy 1.5.3 - jar @@ -319,10 +301,6 @@ 3.1.6 test - - junit - junit - org.jmock jmock diff --git a/kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/serialize/impl/conversion/Type1BlobCollectionConversionHandler.java b/kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/serialize/impl/conversion/Type1BlobCollectionConversionHandler.java index 5fd0b6cb2a95..a0cbff1f34db 100644 --- a/kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/serialize/impl/conversion/Type1BlobCollectionConversionHandler.java +++ b/kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/serialize/impl/conversion/Type1BlobCollectionConversionHandler.java @@ -31,17 +31,17 @@ import java.sql.SQLException; import java.sql.Types; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.sakaiproject.content.impl.serialize.impl.Type1BaseContentCollectionSerializer; import org.sakaiproject.util.conversion.SchemaConversionHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author ieb */ public class Type1BlobCollectionConversionHandler implements SchemaConversionHandler { - private static final Log log = LogFactory.getLog(Type1BlobCollectionConversionHandler.class); + private static final Logger log = LoggerFactory.getLogger(Type1BlobCollectionConversionHandler.class); /* * (non-Javadoc) @@ -120,7 +120,7 @@ public boolean convertSource(String id, Object source, PreparedStatement updateR if(result == null) { - System.out.println("convertSource(" + id + ") result is NULL");; + log.info("convertSource(" + id + ") result is NULL");; } else { @@ -182,7 +182,7 @@ public Object getValidateSource(String id, ResultSet rs) throws SQLException } else { - System.out.println("getValidateSource(" + id + ") blob is null" ); + log.info("getValidateSource(" + id + ") blob is null" ); } break; case Types.CLOB: diff --git a/kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/serialize/impl/conversion/Type1BlobResourcesConversionHandler.java b/kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/serialize/impl/conversion/Type1BlobResourcesConversionHandler.java index 71159a6c0e4b..b736db05392d 100644 --- a/kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/serialize/impl/conversion/Type1BlobResourcesConversionHandler.java +++ b/kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/serialize/impl/conversion/Type1BlobResourcesConversionHandler.java @@ -31,10 +31,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.sakaiproject.content.impl.serialize.impl.Type1BaseContentResourceSerializer; import org.sakaiproject.util.conversion.SchemaConversionHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author ieb @@ -42,8 +42,7 @@ public class Type1BlobResourcesConversionHandler implements SchemaConversionHandler { - private static final Log log = LogFactory - .getLog(Type1BlobResourcesConversionHandler.class); + private static final Logger log = LoggerFactory.getLogger(Type1BlobResourcesConversionHandler.class); private Pattern contextPattern = Pattern.compile("\\A/(group/|user/|~)(.+?)/"); @@ -188,7 +187,7 @@ public Object getValidateSource(String id, ResultSet rs) throws SQLException } else { - System.out.println("getValidateSource(" + id + ") blob is null" ); + log.info("getValidateSource(" + id + ") blob is null" ); } break; case Types.CLOB: diff --git a/kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/util/StorageConverter.java b/kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/util/StorageConverter.java index a8780f315ebd..7ad8148da6c0 100644 --- a/kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/util/StorageConverter.java +++ b/kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/util/StorageConverter.java @@ -12,13 +12,15 @@ import java.util.Enumeration; import java.util.Properties; import java.util.concurrent.atomic.AtomicInteger; + import javax.sql.DataSource; + import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.MethodUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.sakaiproject.content.api.FileSystemHandler; import org.sakaiproject.content.impl.ContentServiceSqlDefault; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowCallbackHandler; import org.springframework.jdbc.datasource.SimpleDriverDataSource; @@ -31,7 +33,7 @@ * @author Jaques */ public class StorageConverter { - private static final Log log = LogFactory.getLog(StorageConverter.class); + private static final Logger log = LoggerFactory.getLogger(StorageConverter.class); /** * The datasource for the database connections. @@ -404,6 +406,6 @@ private static void printHelp(){ * Print the text to the screen. */ private static void print(String text){ - System.out.println(text); + log.info(text); } } diff --git a/kernel/kernel-impl/src/main/java/org/sakaiproject/tool/impl/SessionComponent.java b/kernel/kernel-impl/src/main/java/org/sakaiproject/tool/impl/SessionComponent.java index 59520a36eed3..4dad49057511 100644 --- a/kernel/kernel-impl/src/main/java/org/sakaiproject/tool/impl/SessionComponent.java +++ b/kernel/kernel-impl/src/main/java/org/sakaiproject/tool/impl/SessionComponent.java @@ -21,25 +21,40 @@ package org.sakaiproject.tool.impl; -import org.apache.commons.lang.mutable.MutableLong; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.sakaiproject.cluster.api.ClusterService; -import org.sakaiproject.component.cover.ComponentManager; -import org.sakaiproject.id.api.IdManager; -import org.sakaiproject.thread_local.api.ThreadLocalManager; -import org.sakaiproject.tool.api.*; -import org.springframework.util.StringUtils; - -import javax.servlet.http.HttpServletRequest; import java.io.UnsupportedEncodingException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.Principal; import java.security.SecureRandom; -import java.util.*; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.concurrent.ConcurrentHashMap; +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.lang.mutable.MutableLong; +import org.sakaiproject.cluster.api.ClusterService; +import org.sakaiproject.component.cover.ComponentManager; +import org.sakaiproject.id.api.IdManager; +import org.sakaiproject.thread_local.api.ThreadLocalManager; +import org.sakaiproject.tool.api.ClosingException; +import org.sakaiproject.tool.api.NonPortableSession; +import org.sakaiproject.tool.api.RebuildBreakdownService; +import org.sakaiproject.tool.api.Session; +import org.sakaiproject.tool.api.SessionAttributeListener; +import org.sakaiproject.tool.api.SessionManager; +import org.sakaiproject.tool.api.SessionStore; +import org.sakaiproject.tool.api.Tool; +import org.sakaiproject.tool.api.ToolManager; +import org.sakaiproject.tool.api.ToolSession; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.util.StringUtils; + /** *

* Standard implementation of the Sakai SessionManager. @@ -54,7 +69,7 @@ public abstract class SessionComponent implements SessionManager, SessionStore /** Key in the ThreadLocalManager for access to the current servlet context (from tool-util/servlet/RequestFilter). */ protected final static String CURRENT_SERVLET_CONTEXT = "org.sakaiproject.util.RequestFilter.servlet_context"; /** Our log (commons). */ - private static Log M_log = LogFactory.getLog(SessionComponent.class); + private static Logger M_log = LoggerFactory.getLogger(SessionComponent.class); /** The sessions - keyed by session id. */ protected Map m_sessions = new ConcurrentHashMap(); /** @@ -129,7 +144,7 @@ public void setInactiveInterval(String value) } catch (Exception t) { - System.out.println(t); + M_log.warn(t.getMessage(), t); } } @@ -172,7 +187,7 @@ public void setCheckEvery(String value) } catch (Exception t) { - System.out.println(t); + M_log.warn(t.getMessage(), t); } } diff --git a/kernel/kernel-impl/src/main/java/org/sakaiproject/user/impl/ReEncryptPasswords.java b/kernel/kernel-impl/src/main/java/org/sakaiproject/user/impl/ReEncryptPasswords.java index b78d8a890070..2c2e53a6c2e7 100644 --- a/kernel/kernel-impl/src/main/java/org/sakaiproject/user/impl/ReEncryptPasswords.java +++ b/kernel/kernel-impl/src/main/java/org/sakaiproject/user/impl/ReEncryptPasswords.java @@ -29,8 +29,12 @@ import java.sql.SQLException; import java.util.Properties; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class ReEncryptPasswords { + private static final Logger log = LoggerFactory.getLogger(ReEncryptPasswords.class); private static Properties props; /** @@ -49,13 +53,13 @@ public static void main(String[] args) throws Exception { location = System.getProperty("local.properties", "local.properties"); props.load(new FileInputStream(location)); } catch (Exception e) { - System.out.println("Didn't load local.properties: "+ location); + log.warn("Didn't load local.properties: "+ location); } try { location = System.getProperty("security.properties", "security.properties"); props.load(new FileInputStream(location)); } catch (Exception e) { - System.out.println("Didn't load security.properties: "+ location); + log.warn("Didn't load security.properties: "+ location); } String url, username, password, driver; @@ -91,7 +95,7 @@ public static void main(String[] args) throws Exception { } } conn.commit(); - System.out.println(" Users processed: "+ total+ " updated: "+ updated); + log.info(" Users processed: "+ total+ " updated: "+ updated); } /** diff --git a/kernel/kernel-storage-util/pom.xml b/kernel/kernel-storage-util/pom.xml index 29426dee0425..1b11e5c4d6fc 100644 --- a/kernel/kernel-storage-util/pom.xml +++ b/kernel/kernel-storage-util/pom.xml @@ -36,10 +36,6 @@ sakai-kernel-util ${project.version} - - commons-logging - commons-logging - commons-dbcp commons-dbcp diff --git a/kernel/kernel-util/pom.xml b/kernel/kernel-util/pom.xml index fb2efc6186cc..bffc0f374ba4 100644 --- a/kernel/kernel-util/pom.xml +++ b/kernel/kernel-util/pom.xml @@ -29,10 +29,6 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - javax.servlet servlet-api diff --git a/kernel/kernel-util/src/test/resources/log4j.properties b/kernel/kernel-util/src/test/resources/log4j.properties new file mode 100644 index 000000000000..e78168e1f881 --- /dev/null +++ b/kernel/kernel-util/src/test/resources/log4j.properties @@ -0,0 +1,6 @@ +log4j.appender.Stdout=org.apache.log4j.ConsoleAppender +log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m%n + +log4j.rootLogger=INFO,Stdout + diff --git a/lessonbuilder/components/src/java/org/sakaiproject/lessonbuildertool/model/SimplePageToolDaoImpl.java b/lessonbuilder/components/src/java/org/sakaiproject/lessonbuildertool/model/SimplePageToolDaoImpl.java index 456684050266..0f19ec4efdf0 100644 --- a/lessonbuilder/components/src/java/org/sakaiproject/lessonbuildertool/model/SimplePageToolDaoImpl.java +++ b/lessonbuilder/components/src/java/org/sakaiproject/lessonbuildertool/model/SimplePageToolDaoImpl.java @@ -23,6 +23,7 @@ package org.sakaiproject.lessonbuildertool.model; +import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; @@ -30,23 +31,20 @@ import java.util.Collections; import java.util.Comparator; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.HashMap; - -import java.sql.Connection; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.hibernate.criterion.DetachedCriteria; -import org.hibernate.criterion.Restrictions; import org.hibernate.Query; import org.hibernate.Session; -import org.hibernate.HibernateException; import org.hibernate.Transaction; -import org.springframework.orm.hibernate3.HibernateCallback; -import org.sakaiproject.authz.api.SecurityService; +import org.hibernate.criterion.DetachedCriteria; +import org.hibernate.criterion.Restrictions; +import org.json.simple.JSONArray; +import org.json.simple.JSONObject; +import org.json.simple.JSONValue; import org.sakaiproject.authz.api.AuthzGroupService; +import org.sakaiproject.authz.api.SecurityService; import org.sakaiproject.db.api.SqlReader; import org.sakaiproject.db.api.SqlService; import org.sakaiproject.event.cover.EventTrackingService; @@ -82,15 +80,13 @@ import org.sakaiproject.tool.api.ToolManager; import org.sakaiproject.user.cover.UserDirectoryService; import org.springframework.dao.DataAccessException; -import org.springframework.orm.hibernate3.support.HibernateDaoSupport; import org.springframework.orm.hibernate3.HibernateTemplate; +import org.springframework.orm.hibernate3.support.HibernateDaoSupport; -import org.json.simple.JSONObject; -import org.json.simple.JSONValue; -import org.json.simple.JSONArray; +import lombok.extern.slf4j.Slf4j; +@Slf4j public class SimplePageToolDaoImpl extends HibernateDaoSupport implements SimplePageToolDao { - private static Log log = LogFactory.getLog(SimplePageToolDaoImpl.class); private ToolManager toolManager; private SecurityService securityService; @@ -1372,7 +1368,7 @@ public int clearNeedsFixup(String siteId) { try { conn.setAutoCommit(wasCommit); } catch (Exception e) { - System.out.println("transact: (setAutoCommit): " + e); + log.info("transact: (setAutoCommit): " + e); } sqlService.returnConnection(conn); diff --git a/lessonbuilder/components/src/java/org/sakaiproject/lessonbuildertool/service/SimplePageToolService.java b/lessonbuilder/components/src/java/org/sakaiproject/lessonbuildertool/service/SimplePageToolService.java index 6ec5681440b4..fc9cd182c1e8 100644 --- a/lessonbuilder/components/src/java/org/sakaiproject/lessonbuildertool/service/SimplePageToolService.java +++ b/lessonbuilder/components/src/java/org/sakaiproject/lessonbuildertool/service/SimplePageToolService.java @@ -23,23 +23,20 @@ package org.sakaiproject.lessonbuildertool.service; -import java.util.List; import java.io.File; -import java.io.InputStream; +import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.sakaiproject.authz.cover.FunctionManager; import org.sakaiproject.db.api.SqlService; import org.sakaiproject.entity.api.HttpAccess; - +import org.sakaiproject.lessonbuildertool.LessonBuilderAccessAPI; +import org.sakaiproject.lessonbuildertool.SimplePage; +import org.sakaiproject.lessonbuildertool.ToolApi; import org.springframework.context.ResourceLoaderAware; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; -import org.sakaiproject.lessonbuildertool.SimplePage; -import org.sakaiproject.lessonbuildertool.LessonBuilderAccessAPI; -import org.sakaiproject.lessonbuildertool.ToolApi; +import lombok.extern.slf4j.Slf4j; /** * Currently, the sole purpose of this service is to register our edit permission, and create table @@ -48,8 +45,8 @@ * @author Maarten van Hoof * */ +@Slf4j public class SimplePageToolService implements ResourceLoaderAware, LessonBuilderAccessAPI { - private static Log log = LogFactory.getLog(SimplePageToolService.class); SqlService sqlService = null; boolean autoDdl = false; @@ -87,7 +84,7 @@ public void setAutoDdl(boolean autoDdl) { } public String loadCartridge(File f, String d, String siteId) { - System.out.println("loadcart in simplepagetoolservice " + f + " " + d + " " + siteId); + log.info("loadcart in simplepagetoolservice " + f + " " + d + " " + siteId); return toolApi.loadCartridge(f, d, siteId); } diff --git a/lessonbuilder/pom.xml b/lessonbuilder/pom.xml index 9a5805ece914..a8e637335676 100644 --- a/lessonbuilder/pom.xml +++ b/lessonbuilder/pom.xml @@ -99,7 +99,6 @@ org.springframework spring-tx - @@ -116,7 +115,6 @@ src29 src28-9 org.sakaiproject.assignment - 1.12.4 @@ -147,12 +145,6 @@ samigo-qti ${sakai.samigo.version} - - - org.projectlombok - lombok - ${sakai.lombok.version} - @@ -182,7 +174,6 @@ UTF-8 2.0.0 - 1.12.4 @@ -220,12 +211,6 @@ ${sakai.msgcntr.version} provided - - - org.projectlombok - lombok - ${sakai.lombok.version} - diff --git a/lessonbuilder/tool/opt-src/java/org/sakaiproject/lessonbuildertool/ccexport/Assignment2Export.java b/lessonbuilder/tool/opt-src/java/org/sakaiproject/lessonbuildertool/ccexport/Assignment2Export.java index 2b7408811377..dae4d657efa6 100644 --- a/lessonbuilder/tool/opt-src/java/org/sakaiproject/lessonbuildertool/ccexport/Assignment2Export.java +++ b/lessonbuilder/tool/opt-src/java/org/sakaiproject/lessonbuildertool/ccexport/Assignment2Export.java @@ -121,7 +121,7 @@ public void init () { if (ComponentManager.get("org.sakaiproject.assignment2.service.api.Assignment2Service") != null) haveA2 = true; - System.out.println("Assignment2Export init: haveA2 = " + haveA2); + log.info("Assignment2Export init: haveA2 = " + haveA2); log.info("init()"); @@ -258,7 +258,7 @@ public Object readSqlResultRecord(ResultSet result) ret.attachments = SqlService.dbRead(connection, sql, fields, null); } catch (Exception e) { - System.out.println("error reading assignment2 " + e); + log.info("error reading assignment2 " + e); // leave ret as null list } finally { try { diff --git a/lessonbuilder/tool/opt-src/java/org/sakaiproject/lessonbuildertool/service/Assignment2Entity.java b/lessonbuilder/tool/opt-src/java/org/sakaiproject/lessonbuildertool/service/Assignment2Entity.java index ee14360a6e6d..e8b07a43ff90 100644 --- a/lessonbuilder/tool/opt-src/java/org/sakaiproject/lessonbuildertool/service/Assignment2Entity.java +++ b/lessonbuilder/tool/opt-src/java/org/sakaiproject/lessonbuildertool/service/Assignment2Entity.java @@ -182,7 +182,7 @@ public void init () { try { saveMethod = dao.getClass().getMethod("save", Object.class); } catch (Exception f) { - System.out.println("assignment2 lessons interface unable to get save method from A2 dao " + f); + log.info("assignment2 lessons interface unable to get save method from A2 dao " + f); }; //try { @@ -194,7 +194,7 @@ public void init () { // } // } // } catch (Exception e) { - // System.out.println("getmethod failed " + e); + // log.info("getmethod failed " + e); // } String vendor = SqlService.getVendor(); @@ -288,7 +288,7 @@ public Object readSqlResultRecord(ResultSet result) } } catch (Exception e) { - System.out.println("Assignment2Entity Eexception " + e); + log.info("Assignment2Entity Eexception " + e); ret = null; } finally { try { @@ -802,7 +802,7 @@ public String importObject(String title, String href, String mime, boolean hide) contextId, toolTitle, type, content, properties); newAttRef = newResource.getId(); } catch (Exception e) { - System.out.println("unable to make attachment resource " + e); + log.info("unable to make attachment resource " + e); } } newAttRef = href; @@ -817,7 +817,7 @@ public String importObject(String title, String href, String mime, boolean hide) return "/assignment2/" + assignment.getId(); } catch (Exception e) { - System.out.println("invoke failed " + e); + log.info("invoke failed " + e); } return null; @@ -891,7 +891,7 @@ public String importObject(Element resource, Namespace ns, String base, String b try { saveMethod.invoke(dao, assignment); } catch (Exception e) { - System.out.println("invoke failed " + e); + log.info("invoke failed " + e); return null; } @@ -901,7 +901,7 @@ public String importObject(Element resource, Namespace ns, String base, String b try { saveMethod.invoke(dao, attachment); } catch (Exception e) { - System.out.println("invoke failed " + e); + log.info("invoke failed " + e); } } } diff --git a/lessonbuilder/tool/opt-src/java/org/sakaiproject/lessonbuildertool/service/ScormEntity.java b/lessonbuilder/tool/opt-src/java/org/sakaiproject/lessonbuildertool/service/ScormEntity.java index 2c02ad218cee..ab3c465222d2 100644 --- a/lessonbuilder/tool/opt-src/java/org/sakaiproject/lessonbuildertool/service/ScormEntity.java +++ b/lessonbuilder/tool/opt-src/java/org/sakaiproject/lessonbuildertool/service/ScormEntity.java @@ -246,7 +246,7 @@ public List getEntitiesInSite(final SimplePageBean bean) { String siteId = ToolManager.getCurrentPlacement().getContext(); List packages = dao.find(siteId); - System.out.println("pckages " + packages.size()); + log.info("pckages " + packages.size()); for (ContentPackage contentPackage: packages) { if (contentPackage.isDeleted()) @@ -288,7 +288,7 @@ public String getTitle() { assignment = getAssignment(id); if (assignment == null) return null; - System.out.println("title " + assignment.getTitle()); + log.info("title " + assignment.getTitle()); return assignment.getTitle(); } @@ -299,10 +299,10 @@ public String getUrl() { if (assignment == null) return null; - System.out.println("simplepagebean " + simplePageBean); - System.out.println(simplePageBean.getCurrentTool("sakai.scorm.tool")); - System.out.println(assignment.getResourceId()); - System.out.println(assignment.getTitle()); + log.info("simplepagebean " + simplePageBean); + log.info(simplePageBean.getCurrentTool("sakai.scorm.tool")); + log.info(assignment.getResourceId()); + log.info(assignment.getTitle()); return ServerConfigurationService.getToolUrl() + "/" + simplePageBean.getCurrentTool("sakai.scorm.tool") + "/?wicket:bookmarkablePage=ScormPlayer:org.sakaiproject.scorm.ui.player.pages.PlayerPage&contentPackageId=" + id + "&resourceId=" + assignment.getResourceId() + "&title=" + assignment.getTitle(); } diff --git a/lessonbuilder/tool/pom.xml b/lessonbuilder/tool/pom.xml index 598dafa8ac57..7f49630c22da 100644 --- a/lessonbuilder/tool/pom.xml +++ b/lessonbuilder/tool/pom.xml @@ -197,10 +197,6 @@ commons-fileupload commons-fileupload - - org.projectlombok - lombok - net.sf.opencsv opencsv diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/AbstractParser.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/AbstractParser.java index 083c6b5143e9..f2de489c18fc 100755 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/AbstractParser.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/AbstractParser.java @@ -46,6 +46,8 @@ import java.io.IOException; import java.util.Iterator; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.jdom.Element; import org.jdom.JDOMException; import org.jdom.Namespace; @@ -60,6 +62,7 @@ public abstract class AbstractParser { + private static final Log log = LogFactory.getLog(AbstractParser.class); private static final String RESOURCE_QUERY="ims:resource[@identifier='xxx']"; private static final String MD_ROOT="lom"; private static final String METADATA="metadata"; @@ -157,9 +160,9 @@ public InputSource resolveEntity(String publicId, String systemId) { } catch (Exception e) { e.printStackTrace(); if (the_resource == null) - System.out.println("processresouce the item null"); + log.info("processresouce the item null"); else - System.out.println("processresource failed " + the_resource.getAttributeValue(ID)); + log.info("processresource failed " + the_resource.getAttributeValue(ID)); }; } diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/LtiParser.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/LtiParser.java index 50f449e40bb5..e9e3dc9a4a19 100755 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/LtiParser.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/LtiParser.java @@ -44,6 +44,8 @@ import java.io.IOException; import java.util.Iterator; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.jdom.Attribute; import org.jdom.Element; import org.jdom.JDOMException; @@ -51,7 +53,7 @@ import org.jdom.xpath.XPath; public class LtiParser extends AbstractParser implements ContentParser { - + private static final Log log = LogFactory.getLog(LtiParser.class); private static final Namespace LT_NS = Namespace.getNamespace("dt", "http://www.imsglobal.org/xsd/imsbasiclti_v1p0"); private static final String FILE="file"; @@ -68,7 +70,7 @@ public class LtiParser extends AbstractParser implements ContentParser { try { //ok, so we're looking at a discussion topic here... Element blti = getXML(the_cartridge, ((Element)the_resource.getChildren(FILE, the_handler.getNs().cc_ns()).get(0)).getAttributeValue(HREF)); -System.out.println("blti="+blti); +log.info("blti="+blti); Namespace topicNs = the_handler.getNs().blti_ns(); the_handler.startLti(blti.getChildText(TITLE, topicNs), blti.getChild(TEXT, topicNs).getAttributeValue(TEXTTYPE), diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/Parser.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/Parser.java index cb3a4c9edcbb..2d9fd2fd31af 100755 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/Parser.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/Parser.java @@ -47,6 +47,8 @@ import java.util.Iterator; import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.jdom.Element; import org.jdom.JDOMException; import org.jdom.Namespace; @@ -74,7 +76,7 @@ */ public class Parser extends AbstractParser { - + private static final Log log = LogFactory.getLog(Parser.class); CartridgeLoader utils; private static final String IMS_MANIFEST="imsmanifest.xml"; @@ -118,7 +120,7 @@ public class Parser extends AbstractParser { processManifest(manifest, the_handler); } catch (Exception e) { the_handler.getSimplePageBean().setErrKey("simplepage.cc-error", ""); - System.out.println("parse error, stack trace follows " + e); + log.info("parse error, stack trace follows " + e); e.printStackTrace(); // throw new ParseException(e.getMessage(),e); } @@ -142,7 +144,7 @@ public class Parser extends AbstractParser { return; } - //System.out.println("Found version " + ns.cc_ns()); + //log.info("Found version " + ns.cc_ns()); the_handler.startManifest(); the_handler.setManifestXml(the_manifest); @@ -239,7 +241,7 @@ public class Parser extends AbstractParser { the_handler.getSimplePageBean().setErrKey("simplepage.cc-noresource", the_item.getAttributeValue(CC_ITEM_IDREF)); return; } - // System.out.println("process item " + the_item + " resources " + the_resources + " resource " + resource); + // log.info("process item " + the_item + " resources " + the_resources + " resource " + resource); the_handler.startCCItem(the_item.getAttributeValue(CC_ITEM_ID), the_item.getChildText(CC_ITEM_TITLE, ns.cc_ns())); @@ -257,9 +259,9 @@ public class Parser extends AbstractParser { } catch (Exception e) { e.printStackTrace(); if (the_item == null) - System.out.println("processitem the item null"); + log.info("processitem the item null"); else - System.out.println("processitem failed " + the_item.getAttributeValue(CC_ITEM_IDREF)); + log.info("processitem failed " + the_item.getAttributeValue(CC_ITEM_IDREF)); } } diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/PrintHandler.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/PrintHandler.java index 245e87dc527c..1ba7b3aade03 100755 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/PrintHandler.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/PrintHandler.java @@ -1,5 +1,8 @@ package org.sakaiproject.lessonbuildertool.cc; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + /*********** * This code is based on a reference implementation done for the IMS Consortium. * The copyright notice for that implementation is included below. @@ -105,7 +108,7 @@ public class PrintHandler extends DefaultHandler implements AssessmentHandler, DiscussionHandler, AuthorizationHandler, MetadataHandler, LearningApplicationResourceHandler, QuestionBankHandler, WebContentHandler, WebLinkHandler{ - + private static final Log log = LogFactory.getLog(PrintHandler.class); private static final String HREF="href"; private static final String TYPE="type"; private static final String FILE="file"; @@ -476,11 +479,11 @@ public void setCCItemXml(Element the_xml, Element resource, AbstractParser parse break; Element valueElt = propertiesIt.next(); if (!"source".equals(nameElt.getName())) { - System.out.println("first item in structure not source " + nameElt.getName()); + log.info("first item in structure not source " + nameElt.getName()); break; } if (!"value".equals(valueElt.getName())) { - System.out.println("second item in structure not source " + valueElt.getName()); + log.info("second item in structure not source " + valueElt.getName()); break; } String name = nameElt.getText(); @@ -568,7 +571,7 @@ else if ("mmDisplayType.lessonbuilder.sakaiproject.org".equals(name)) int offset = Integer.parseInt(fixup); htmlString = htmlString.substring(0, offset) + baseUrl + htmlString.substring(offset+3); } catch (Exception e) { - System.out.println("exception " + e); + log.info("exception " + e); } } } @@ -759,7 +762,7 @@ else if (assigntool != null && intendedUse.equals("assignment")) { if (nopage) title = simplePageBean.getMessageLocator().getMessage("simplepage.cc-defaultforum"); - // System.out.println("about to call forum import base " + base); + // log.info("about to call forum import base " + base); // title is for the cartridge. That will be used as the forum // if already added, don't do it again String sakaiId = itemsAdded.get(filename); @@ -771,13 +774,13 @@ else if (assigntool != null && intendedUse.equals("assignment")) { } if (!hide) { - // System.out.println("about to add formum item"); + // log.info("about to add formum item"); SimplePageItem item = simplePageToolDao.makeItem(page.getPageId(), seq, SimplePageItem.FORUM, sakaiId, title); simplePageBean.saveItem(item); if (roles.size() > 0) simplePageBean.setItemGroups(item, roles.toArray(new String[0])); sequences.set(top, seq+1); - // System.out.println("finished with forum item"); + // log.info("finished with forum item"); } } } else if (type.equals(ASSESSMENT) || type.equals(QUESTION_BANK)) { @@ -845,7 +848,7 @@ else if (assigntool != null && intendedUse.equals("assignment")) { sakaiId = SimplePageItem.DUMMY; } catch (Exception e) { - System.out.println("CC import error creating or parsing QTI file " + fileName + " " + e); + log.info("CC import error creating or parsing QTI file " + fileName + " " + e); simplePageBean.setErrKey("simplepage.create.object.failed", e.toString()); } @@ -909,7 +912,7 @@ else if (assigntool != null && intendedUse.equals("assignment")) { if (!hide) { if ( sakaiId != null) { - // System.out.println("Adding LTI content item "+sakaiId); + // log.info("Adding LTI content item "+sakaiId); SimplePageItem item = simplePageToolDao.makeItem(page.getPageId(), seq, SimplePageItem.BLTI, sakaiId, title); item.setHeight(""); // default depends upon format, so it's supplied at runtime simplePageBean.saveItem(item); @@ -917,7 +920,7 @@ else if (assigntool != null && intendedUse.equals("assignment")) { simplePageBean.setItemGroups(item, roles.toArray(new String[0])); sequences.set(top, seq+1); } else { - System.out.println("LTI Import Failed.."); + log.info("LTI Import Failed.."); } } } @@ -1125,10 +1128,10 @@ public void addFile(String the_file_id) { } } simplePageBean.setErrKey("simplepage.create.resource.failed", e + ": " + the_file_id); - System.out.println("CC loader: unable to get file " + the_file_id + " error: " + e); + log.info("CC loader: unable to get file " + the_file_id + " error: " + e); } catch (Exception e) { simplePageBean.setErrKey("simplepage.create.resource.failed", e + ": " + the_file_id); - System.out.println("CC loader: unable to get file " + the_file_id + " error: " + e); + log.info("CC loader: unable to get file " + the_file_id + " error: " + e); } break; // if we get to the end, no need to retry; really a goto would be clearer } diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/QtiImport.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/QtiImport.java index a63c899d4006..24874895da38 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/QtiImport.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/QtiImport.java @@ -418,12 +418,12 @@ boolean procmatch(Node item)throws IOException { while (decvar != null) { try { String varname = getAttribute(decvar, "varname"); - // System.out.println("decvar " + varname); + // log.info("decvar " + varname); String maxval = getAttribute(decvar, "maxvalue"); Double numval = Double.parseDouble(maxval); if (varname != null && varname.equals("que_score") && numval > score) { score = numval; - // System.out.println("scoreset " + numval + " " + maxval); + // log.info("scoreset " + numval + " " + maxval); scoreset = true; break; } @@ -461,7 +461,7 @@ boolean procmatch(Node item)throws IOException { } else if (action.equalsIgnoreCase("Add")) { if (numval > 0.0) score = score + numval; - // System.out.println("add " + score + " " + numval); + // log.info("add " + score + " " + numval); } } catch (Exception ignore) {}; diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/ZipLoader.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/ZipLoader.java index 4d2c4bee390d..7c2af07216d6 100755 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/ZipLoader.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/cc/ZipLoader.java @@ -54,6 +54,9 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + /** * * This is a simple example of a cartridge loader. This class needs to provide access to files within a cartridge. The @@ -72,7 +75,7 @@ */ public class ZipLoader implements CartridgeLoader { - + private static final Log log = LogFactory.getLog(ZipLoader.class); private File root; private String rootPath; private File cc; @@ -107,11 +110,11 @@ public class ZipLoader implements CartridgeLoader { fis = cc_inputStream; else fis = new FileInputStream(cc); - System.out.println("unzip fis " + fis); + log.info("unzip fis " + fis); zis = new ZipInputStream(new BufferedInputStream(fis)); ZipEntry entry; while ((entry = zis.getNextEntry())!=null) { - System.out.println("zip name " + entry.getName()); + log.info("zip name " + entry.getName()); File target=new File(root, entry.getName()); // not sure if you can put things like .. into a zip file, but be careful if (!target.getCanonicalPath().startsWith(rootPath)) @@ -133,11 +136,11 @@ public class ZipLoader implements CartridgeLoader { dest.flush(); dest.close(); dest = null; - System.out.println("wrote file " + target); + log.info("wrote file " + target); } } } catch (Exception x) { - System.out.println("exception " + x); + log.info("exception " + x); } finally { if (zis != null) { try {zis.close();} catch (Exception ignore) {} @@ -159,7 +162,7 @@ public class ZipLoader implements CartridgeLoader { public InputStream getFile(String the_target) throws FileNotFoundException, IOException { unzip(); - // System.out.println("getfile " + root + "::" + the_target + "::" + (new File(root, the_target)).getCanonicalPath()); + // log.info("getfile " + root + "::" + the_target + "::" + (new File(root, the_target)).getCanonicalPath()); File f = new File(root, the_target); // check for people using .. or other tricks if (!f.getCanonicalPath().startsWith(rootPath)) diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/ccexport/AssignmentExport.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/ccexport/AssignmentExport.java index 5bc1358dd770..e5d15968c890 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/ccexport/AssignmentExport.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/ccexport/AssignmentExport.java @@ -244,7 +244,7 @@ public AssignmentItem getContents(String assignmentRef) { try { assignment = AssignmentService.getAssignment(assignmentId); } catch (Exception e) { - System.out.println("failed to find " + assignmentId); + log.info("failed to find " + assignmentId); return null; } diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/ccexport/CCExport.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/ccexport/CCExport.java index 641202ade103..66f1517ab022 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/ccexport/CCExport.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/ccexport/CCExport.java @@ -1254,7 +1254,7 @@ public String fixup (String s, Resource resource) { try { sitepart = URLDecoder.decode(s.substring(startsite, last), "UTF-8"); } catch (Exception e) { - System.out.println("decode failed in CCExport " + e); + log.info("decode failed in CCExport " + e); } if (!siteId.equals(sitepart)) continue; @@ -1280,7 +1280,7 @@ public String fixup (String s, Resource resource) { try { sakaiId = removeDotDot(URLDecoder.decode(s.substring(sakaistart, sakaiend), "UTF-8")); } catch (Exception e) { - System.out.println("Exception in CCExport URLDecoder " + e); + log.info("Exception in CCExport URLDecoder " + e); } ret.append(s.substring(index, start)); ret.append("$IMS-CC-FILEBASE$.."); @@ -1353,7 +1353,7 @@ public String relFixup (String s, Resource resource, StringBuilder fixups) { try { sitepart = URLDecoder.decode(s.substring(startsite, last), "UTF-8"); } catch (Exception e) { - System.out.println("decode failed in CCExport " + e); + log.info("decode failed in CCExport " + e); } if (!siteId.equals(sitepart)) continue; @@ -1376,7 +1376,7 @@ public String relFixup (String s, Resource resource, StringBuilder fixups) { try { sakaiId = removeDotDot(URLDecoder.decode(s.substring(sakaistart, sakaiend), "UTF-8")); } catch (Exception e) { - System.out.println("Exception in CCExport URLDecoder " + e); + log.info("Exception in CCExport URLDecoder " + e); } // do the mapping. resource.location is a relative URL of the page we're looking at // sakaiid is the URL of the object, starting /group/ diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/ccexport/SamigoExport.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/ccexport/SamigoExport.java index 21db2f641b7c..5a14afbd812b 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/ccexport/SamigoExport.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/ccexport/SamigoExport.java @@ -282,7 +282,7 @@ public boolean outputBank(Long poolId, ZipPrintStream out, PrintStream errStream // older. all pools at once Listpools = questionPoolFacadeQueries.getBasicInfoOfAllPools(UserDirectoryService.getCurrentUser().getId()); - System.out.println("pools " + pools.size()); + log.info("pools " + pools.size()); if (pools != null && pools.size() > 0) { int poolno = 1; diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/AjaxServer.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/AjaxServer.java index d755fc1157f4..47b216cdc9d7 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/AjaxServer.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/AjaxServer.java @@ -104,7 +104,7 @@ public class AjaxServer extends HttpServlet private static SimplePageToolDao simplePageToolDao; public void setSimplePageToolDao(Object dao) { - System.out.println("setdao " + dao); + log.info("setdao " + dao); simplePageToolDao = (SimplePageToolDao) dao; } @@ -306,7 +306,7 @@ public static String filterHtml(String contents) { // simplepagebean checks filterHtml property of tool. We can't really do that. String filterSpec = filterHtml; - System.out.println("filterspec " + filterSpec); + log.info("filterspec " + filterSpec); if (filterSpec == null) // should never be null. unspeciifed should give "" filter = FILTER_DEFAULT; // old specifications diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/AssignmentEntity.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/AssignmentEntity.java index 47a7c0998e2a..a33feec34cc6 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/AssignmentEntity.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/AssignmentEntity.java @@ -813,7 +813,7 @@ public String importObject(String title, String href, String mime, boolean hide) AssignmentService.commitEdit(a); return "/assignment/" + a.getId(); } catch (Exception e) { - System.out.println("can't create assignment " + e); + log.info("can't create assignment " + e); }; return null; } @@ -957,7 +957,7 @@ public String importObject(Element resource, Namespace ns, String base, String b return "/assignment/" + a.getId(); } catch (Exception e) { - System.out.println("can't create assignment " + e); + log.info("can't create assignment " + e); }; return null; } diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/ForumEntity.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/ForumEntity.java index c85eaf876d32..d1c29c233ff4 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/ForumEntity.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/ForumEntity.java @@ -163,7 +163,7 @@ public void setAuthzGroupService(AuthzGroupService service) { private static SimplePageToolDao simplePageToolDao; public void setSimplePageToolDao(Object dao) { - // System.out.println("set dao " + dao); + // log.info("set dao " + dao); simplePageToolDao = (SimplePageToolDao) dao; } @@ -586,7 +586,7 @@ public boolean addEntityControl(String siteId, String groupId) throws IOExceptio groupName = site.getGroup(groupId).getTitle(); maintainRole = authzGroupService.getAuthzGroup("/site/" + site.getId()).getMaintainRole(); } catch (Exception e) { - System.out.println("Unable to get site info for AddEntityControl " + e); + log.info("Unable to get site info for AddEntityControl " + e); } PermissionLevel ownerLevel = permissionLevelManager. @@ -659,7 +659,7 @@ public boolean removeEntityControl(String siteId, String groupId) throws IOExcep groupName = site.getGroup(groupId).getTitle(); maintainRole = authzGroupService.getAuthzGroup("/site/" + site.getId()).getMaintainRole(); } catch (Exception e) { - System.out.println("Unable to get site info for AddEntityControl " + e); + log.info("Unable to get site info for AddEntityControl " + e); } PermissionLevel ownerLevel = permissionLevelManager. @@ -795,7 +795,7 @@ public String importObject(String title, String topicTitle, String text, boolean if (ourForum == null) { if (forumtry > 0) { - System.out.println("oops, forum still not there the second time"); + log.info("oops, forum still not there the second time"); return null; } forumtry ++; @@ -827,7 +827,7 @@ public String importObject(String title, String topicTitle, String text, boolean break; if (topictry > 0) { - System.out.println("oops, topic still not there the second time"); + log.info("oops, topic still not there the second time"); return null; } topictry ++; @@ -940,7 +940,7 @@ public List getGroups(boolean nocache) { Site site = SiteService.getSite(ToolManager.getCurrentPlacement().getContext()); groups = site.getGroups(); } catch (Exception e) { - System.out.println("Unable to get site info for getGroups " + e); + log.info("Unable to get site info for getGroups " + e); } // now change any existing ones into null @@ -979,10 +979,10 @@ public void setGroups(Collection groups) { setMasks(); - //System.out.println("topic 1 " + topic + " " + groups); + //log.info("topic 1 " + topic + " " + groups); // if (topic == null) topic = getTopicById(true, id); - //System.out.println("topic 2 " + topic); + //log.info("topic 2 " + topic); if (topic == null) return; @@ -990,7 +990,7 @@ public void setGroups(Collection groups) { try { site = SiteService.getSite(ToolManager.getCurrentPlacement().getContext()); } catch (Exception e) { - System.out.println("Unable to get site info for AddEntityControl " + e); + log.info("Unable to get site info for AddEntityControl " + e); return; } @@ -1015,8 +1015,8 @@ public void setGroups(Collection groups) { groupNames.add(site.getGroup(groupId).getTitle()); addGroupNames.add(site.getGroup(groupId).getTitle()); } - // System.out.println("groups " + groups + " " + groupNames + " " + addGroupNames); - // System.out.println("oldMembership " + oldMembershipItemSet.size()); + // log.info("groups " + groups + " " + groupNames + " " + addGroupNames); + // log.info("oldMembership " + oldMembershipItemSet.size()); // delete groups from here as they are done. @@ -1032,9 +1032,9 @@ public void setGroups(Collection groups) { for (DBMembershipItem item: oldMembershipItemSet) { // kill everything except our own groups // this will leave the owner but remove all other roles - //System.out.println("item " + item.getType() + " " + item.getName() + " " + item.getPermissionLevelName()); + //log.info("item " + item.getType() + " " + item.getName() + " " + item.getPermissionLevelName()); if (item.getType().equals(MembershipItem.TYPE_GROUP) && groupNames.contains(item.getName())) { - // System.out.println("found group " + item.getName()); + // log.info("found group " + item.getName()); addGroupNames.remove(item.getName()); // we've seen it // if it's one of our groups make it a contributor if it's not already an owner if (!item.getPermissionLevelName().equals("Contributor") && @@ -1050,8 +1050,8 @@ public void setGroups(Collection groups) { } } else if (!item.getPermissionLevelName().equals("Owner")) { // only group members are contributors // remove contributor from anything else, both groups and roles - //System.out.println("set none"); - // System.out.println("setgroups make none " + item.getName()); + //log.info("set none"); + // log.info("setgroups make none " + item.getName()); PermissionLevel noneLevel = permissionLevelManager. createPermissionLevel("None", IdManager.createUuid(), noneMask); permissionLevelManager.savePermissionLevel(noneLevel); @@ -1062,7 +1062,7 @@ public void setGroups(Collection groups) { } } for (String newGroupName: addGroupNames) { - //System.out.println("addgroup " + newGroupName); + //log.info("addgroup " + newGroupName); changed = true; PermissionLevel contributorLevel = permissionLevelManager. createPermissionLevel("Contributor", IdManager.createUuid(), contributorMask); @@ -1106,7 +1106,7 @@ public void setGroups(Collection groups) { } if (changed) { - //System.out.println("changed"); + //log.info("changed"); // have to refresh the topic or the save won't work topic = getTopicById(true, id); topic.setMembershipItemSet(oldMembershipItemSet); @@ -1114,10 +1114,10 @@ public void setGroups(Collection groups) { // topic.setVersion(null); // try { - // System.out.println("simplepagetool dao " + simplePageToolDao); + // log.info("simplepagetool dao " + simplePageToolDao); // hibernateTemplate.merge(topic); // } catch (Exception e){ - // System.out.println("Unable to save forum topic " + e); + // log.info("Unable to save forum topic " + e); // } } diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/GradebookIfc.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/GradebookIfc.java index d96660fc0972..92b9dc53b90d 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/GradebookIfc.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/GradebookIfc.java @@ -23,8 +23,11 @@ package org.sakaiproject.lessonbuildertool.service; -import java.util.Map; import java.util.Date; +import java.util.Map; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.sakaiproject.service.gradebook.shared.GradebookExternalAssessmentService; /** @@ -35,6 +38,7 @@ */ public class GradebookIfc { + private static final Log log = LogFactory.getLog(GradebookIfc.class); private static GradebookExternalAssessmentService gbExternalService = null; public void setGradebookExternalAssessmentService (GradebookExternalAssessmentService s) { @@ -49,7 +53,7 @@ public boolean addExternalAssessment(final String gradebookUid, final String ext // already exists. Say it worked return true; } catch (Exception e) { - System.out.println("failed add " + e); + log.info("failed add " + e); return false; } return true; @@ -71,7 +75,7 @@ public boolean removeExternalAssessment(final String gradebookUid, final String try { gbExternalService.removeExternalAssessment(gradebookUid, externalId); } catch (Exception e) { - System.out.println("failed remove " + e); + log.info("failed remove " + e); return false; } return true; diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/GroupPermissionsService.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/GroupPermissionsService.java index 053a95da0db0..f8c3706ffce2 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/GroupPermissionsService.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/GroupPermissionsService.java @@ -250,7 +250,7 @@ public LessonEntity getEntity(String sakaiId) { int i = sakaiId.indexOf("/",1); if (i > 0) { prefix = sakaiId.substring(1, i); - System.out.println("prefix " + prefix); + log.info("prefix " + prefix); if (prefix.equals(LessonEntity.ASSIGNMENT) || prefix.equals(LessonEntity.ASSIGNMENT2)) lessonEntity = assignmentEntity.getEntity(sakaiId); @@ -299,12 +299,12 @@ public SecurityAdvice isAllowed(String userId, String function, String reference try { for (String sakaiId: sakaiIds) { String siteId = null; - System.out.println("sakaiid " + sakaiId); + log.info("sakaiid " + sakaiId); LessonEntity lessonEntity = getEntity(sakaiId); - System.out.println("entity " + lessonEntity); + log.info("entity " + lessonEntity); if (lessonEntity != null) { siteId = lessonEntity.getSiteId(); - System.out.println("siteid " + siteId); + log.info("siteid " + siteId); } if (siteId == null) siteId = "--"; diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/JForumEntity.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/JForumEntity.java index 0265b16d141c..fc1d465b4a91 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/JForumEntity.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/JForumEntity.java @@ -44,7 +44,9 @@ import org.sakaiproject.tool.api.ActiveTool; import org.sakaiproject.tool.cover.ActiveToolManager; import org.sakaiproject.site.cover.SiteService; -import org.sakaiproject.component.cover.ServerConfigurationService; +import org.sakaiproject.component.cover.ServerConfigurationService; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.sakaiproject.component.cover.ComponentManager; import org.sakaiproject.lessonbuildertool.service.LessonSubmission; @@ -75,6 +77,7 @@ public class JForumEntity implements LessonEntity, ForumInterface { + private static final Log log = LogFactory.getLog(JForumEntity.class); static boolean initdone = false; static boolean haveJforum = false; @@ -84,7 +87,7 @@ public void init() { if (ComponentManager.get("org.etudes.api.app.jforum.JforumService") != null || ComponentManager.get("org.etudes.api.app.jforum.JForumService") != null) haveJforum = true; - System.out.println("JforumEntity init: haveJforum = " + haveJforum); + log.info("JforumEntity init: haveJforum = " + haveJforum); } // to create bean. the bean is used only to call the pseudo-static @@ -213,7 +216,7 @@ public List getEntitiesInSite(SimplePageBean bean) { // String toolid = "8f83cd4b-74ca-4428-0055-85ddd19a8d00"; } catch (Exception e) { - System.out.println("tool problem " + e); + log.info("tool problem " + e); } Connection connection = null; @@ -285,7 +288,7 @@ public Object readSqlResultRecord(ResultSet result) } } } catch (Exception e) { - System.out.println("JForum Lesson Builder find all in site error " + e); + log.info("JForum Lesson Builder find all in site error " + e); } finally { try { if (connection != null) @@ -369,7 +372,7 @@ public Object readSqlResultRecord(ResultSet result) name = titles.get(0); } catch (Exception e) { - System.out.println("JForum Lesson Builder get name error " + e); + log.info("JForum Lesson Builder get name error " + e); } finally { try { if (connection != null) @@ -407,7 +410,7 @@ public String getUrl() { prefix = ServerConfigurationService.getToolUrl() + "/" + siteTool.getId(); // String toolid = "8f83cd4b-74ca-4428-0055-85ddd19a8d00"; } catch (Exception e) { - System.out.println("tool problem " + e); + log.info("tool problem " + e); return null; } @@ -482,7 +485,7 @@ public Object readSqlResultRecord(ResultSet result) } } catch (Exception e) { - System.out.println("JForum Lesson Builder get name error " + e); + log.info("JForum Lesson Builder get name error " + e); } finally { try { if (connection != null) @@ -589,14 +592,14 @@ public Object readSqlResultRecord(ResultSet result) JForumTitle title = titles.get(0); - // System.out.println("object " + "jforum_topic/" + title.category + "\n" + title.forum + "\n" + title.topic); + // log.info("object " + "jforum_topic/" + title.category + "\n" + title.forum + "\n" + title.topic); return "jforum_topic/" + title.category + "\n" + title.forum + "\n" + title.topic; } // objectid is titles of category, forum, topic. find the topic and return a string with its ID public String findObject(String objectid, MapobjectMap, String siteid) { - // System.out.println("findobject " + objectid); + // log.info("findobject " + objectid); if (!haveJforum || !objectid.startsWith("jforum_topic/")) { if (nextEntity != null) return nextEntity.findObject(objectid, objectMap, siteid); @@ -631,7 +634,7 @@ public String findObject(String objectid, MapobjectMap, String si // unfortunately we have to search the topic tree to find it. - // System.out.println("parsed " + category + ">" + forum +">" + topic); + // log.info("parsed " + category + ">" + forum +">" + topic); Listret = new ArrayList(); @@ -651,7 +654,7 @@ public Object readSqlResultRecord(ResultSet result) } }); - // System.out.println("found categories" + categories); + // log.info("found categories" + categories); if (categories == null || categories.size() < 1) return null; @@ -677,7 +680,7 @@ public Object readSqlResultRecord(ResultSet result) } } - // System.out.println("found forums " + forums); + // log.info("found forums " + forums); if (forums == null || forums.size() < 1) return null; @@ -704,14 +707,14 @@ public Object readSqlResultRecord(ResultSet result) } } - // System.out.println("topics " + topics); + // log.info("topics " + topics); if (topics == null || topics.size() < 1) return null; // there will be only one non-null topic for (Integer t: topics) { if (t != null) { - //System.out.println("return " + "/jforum_topic/" + t); + //log.info("return " + "/jforum_topic/" + t); return "/jforum_topic/" + t; } } diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/LessonBuilderAccessService.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/LessonBuilderAccessService.java index a88a70c5715f..2b2b60c5c8a9 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/LessonBuilderAccessService.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/LessonBuilderAccessService.java @@ -282,7 +282,7 @@ public void init() { prop = simplePageToolDao.makeProperty("accessCryptoKey", DatatypeConverter.printHexBinary(keyBytes)); simplePageToolDao.quickSaveItem(prop); } catch (Exception e) { - System.out.println("unable to init cipher for session " + e); + M_log.info("unable to init cipher for session " + e); // in case of race condition, our save will fail, but we'll be able to get a value // saved by someone else simplePageToolDao.flush(); @@ -378,7 +378,7 @@ public void handleAccess(HttpServletRequest req, HttpServletResponse res, Refere } } catch (Exception e) { - System.out.println("unable to decode lb.session " + e); + M_log.info("unable to decode lb.session " + e); } } diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/LessonBuilderEntityProducer.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/LessonBuilderEntityProducer.java index 6e9011b0a993..ff7511ae9ca4 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/LessonBuilderEntityProducer.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/LessonBuilderEntityProducer.java @@ -243,8 +243,8 @@ public void init() { if (linkMigrationHelper != null) migrateAllLinks = linkMigrationHelper.getMethod("migrateAllLinks", new Class[] { Set.class, String.class }); } catch (Exception e) { - System.out.println("Exception in introspection " + e); - System.out.println("loader " + RequestFilter.class.getClassLoader()); + logger.info("Exception in introspection " + e); + logger.info("loader " + RequestFilter.class.getClassLoader()); } // Builds a Regexp selector. @@ -284,7 +284,7 @@ public void init() { servers.add("localhost"); // if neither is defined we're in trouble; if (servers.size() == 0) - System.out.println("LessonBuilderEntityProducer ERROR: neither servername nor serverid defined in sakai.properties"); + logger.info("LessonBuilderEntityProducer ERROR: neither servername nor serverid defined in sakai.properties"); // this slightly odd code is for testing. It lets us test by reloading just lesson builder. // otherwise we have to restart sakai, since the entity stuff can't be restarted @@ -319,7 +319,7 @@ public SecurityAdvice isAllowed(String userId, String function, String reference } catch (Exception e) { - System.out.println(e); + logger.info(e); } finally { securityService.popAdvisor(); } @@ -2006,7 +2006,7 @@ public String loadCartridge(File cartFile, String unzippedDir, String siteId) { // don't set until we know the save worked dummyPageId = page.getId(); } catch (Exception e) { - System.out.println("can't add dummy page to site " + e); + logger.info("can't add dummy page to site " + e); } toolSession = ses.getToolSession(tool.getId()); sessionManager.setCurrentToolSession(toolSession); @@ -2052,7 +2052,7 @@ public String loadCartridge(File cartFile, String unzippedDir, String siteId) { return ret; } catch (Exception e) { - System.out.println("exception in createentity " + e); + logger.info("exception in createentity " + e); e.printStackTrace(); return "exception in createentity " + e; } finally { diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/SamigoEntity.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/SamigoEntity.java index 7ca61da7c07d..6b12be1015b5 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/SamigoEntity.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/SamigoEntity.java @@ -138,7 +138,7 @@ public void init () { samigo_linked = ServerConfigurationService.getBoolean("lessonbuilder.samigo.editlink", true); - System.out.println("SamigoEntity edit link " + samigo_linked); + log.info("SamigoEntity edit link " + samigo_linked); log.info("init()"); @@ -252,22 +252,22 @@ public List getEntitiesInSite(SimplePageBean bean) { } if (false) { // testing - System.out.println(entity.getGroups(true)); + log.info(entity.getGroups(true)); List oldGroups = entity.getGroups(true); //5c51c1fb-bf48-475f-99a6-a303f5ad9520 //d579a252-204e-46cd-9720-7eca7bd47630 entity.setGroups(null); - System.out.println("null " + entity.getGroups(true)); + log.info("null " + entity.getGroups(true)); entity.setGroups(null); - System.out.println("null " + entity.getGroups(true)); + log.info("null " + entity.getGroups(true)); entity.setGroups(Arrays.asList("5c51c1fb-bf48-475f-99a6-a303f5ad9520")); - System.out.println("5c51 " + entity.getGroups(true)); + log.info("5c51 " + entity.getGroups(true)); entity.setGroups(Arrays.asList("5c51c1fb-bf48-475f-99a6-a303f5ad9520","d579a252-204e-46cd-9720-7eca7bd47630")); - System.out.println("5c51,d579 " + entity.getGroups(true)); + log.info("5c51,d579 " + entity.getGroups(true)); entity.setGroups(null); - System.out.println("null " + entity.getGroups(true)); + log.info("null " + entity.getGroups(true)); entity.setGroups(oldGroups); - System.out.println(oldGroups + " " + entity.getGroups(true)); + log.info(oldGroups + " " + entity.getGroups(true)); } } @@ -352,7 +352,7 @@ public String getAssessmentAlias(Long publishedId) { else return a.getAssessmentMetaDataByLabel("ALIAS"); } catch (Exception ex) { - System.out.println("exception " + ex); + log.info("exception " + ex); return null; } } @@ -577,7 +577,7 @@ public String editItemUrl(SimplePageBean bean) { String aid = assessment.getAssessmentId().toString(); Document doc = exportObject(aid); - System.out.println("foo " + doc.getElementsByTagName("questestinterop")); + log.info("foo " + doc.getElementsByTagName("questestinterop")); } if (samigo_linked) @@ -607,7 +607,7 @@ public Document exportObject(String assessmentId) { QTIService qtiService = new QTIService(); return qtiService.getExportedAssessment(assessmentId, QTIVersion.VERSION_1_2); } catch (Exception e) { - System.out.println("exception in exportobject " + e); + log.info("exception in exportobject " + e); return null; } } diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/GradingBean.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/GradingBean.java index 429f23a140e1..b51fa828119c 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/GradingBean.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/GradingBean.java @@ -16,11 +16,14 @@ import org.sakaiproject.lessonbuildertool.service.GradebookIfc; import org.sakaiproject.authz.api.AuthzGroupService; import org.sakaiproject.authz.api.Member; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.sakaiproject.authz.api.AuthzGroup; import org.sakaiproject.tool.cover.SessionManager; public class GradingBean { + private static final Log log = LogFactory.getLog(GradingBean.class); public String id; public String points; public String jsId; @@ -179,7 +182,7 @@ private boolean gradeStudentPage() { m.getUserId(), Double.toString(newpoints)); } }catch(Exception ex) { - System.out.println("Exception updating grade " + ex); + log.info("Exception updating grade " + ex); } if(r) { @@ -204,7 +207,7 @@ private boolean gradeQuestion() { try { r = gradebookIfc.updateExternalAssessmentScore(simplePageBean.getCurrentSiteId(), questionItem.getGradebookId(), response.getUserId(), Double.toString(newpoints)); }catch(Exception ex) { - System.out.println("Exception updating grade " + ex); + log.info("Exception updating grade " + ex); } if(r) { diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean.java index c8a150c4337d..60fe4006b5cb 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean.java @@ -323,7 +323,7 @@ public void setPeerEvalDueDate(String date){ date = date.substring(0,19); this.peerEvalDueDate = isoDateFormat.parse(date); } catch (Exception e) { - System.out.println(e + "bad format duedate " + date); + log.info(e + "bad format duedate " + date); } } @@ -336,7 +336,7 @@ public void setPeerEvalOpenDate(String date) { date = date.substring(0,19); this.peerEvalOpenDate = isoDateFormat.parse(date); } catch (Exception e) { - System.out.println(e + "bad format duedate " + date); + log.info(e + "bad format duedate " + date); } } @@ -439,22 +439,22 @@ public static Map initBltiTools() { try { items = csvParser.parseLine(bltiToolLines[i]); } catch (Exception e) { - System.out.println("bad blti tool spec in lessonbuilder.blti_tools " + i + " " + bltiToolLines[i]); + log.info("bad blti tool spec in lessonbuilder.blti_tools " + i + " " + bltiToolLines[i]); continue; } if (items.length < 5) { - System.out.println("bad blti tool spec in lessonbuilder.blti_tools " + i + " " + bltiToolLines[i]); + log.info("bad blti tool spec in lessonbuilder.blti_tools " + i + " " + bltiToolLines[i]); continue; } BltiTool bltiTool = new BltiTool(); try { bltiTool.id = Integer.parseInt(items[0]); } catch (Exception e) { - System.out.println("first item in line not integer in lessonbuilder.blti_tools " + i + " " + bltiToolLines[i]); + log.info("first item in line not integer in lessonbuilder.blti_tools " + i + " " + bltiToolLines[i]); continue; } if (items[1] == null || items[1].length() == 0) { - System.out.println("second item in line missing in lessonbuilder.blti_tools " + i + " " + bltiToolLines[i]); + log.info("second item in line missing in lessonbuilder.blti_tools " + i + " " + bltiToolLines[i]); continue; } bltiTool.title = items[1]; @@ -464,7 +464,7 @@ public static Map initBltiTools() { else bltiTool.description = items[2]; if (items[3] == null || items[3].length() == 0) { - System.out.println("third item in line missing in lessonbuilder.blti_tools " + i + " " + bltiToolLines[i]); + log.info("third item in line missing in lessonbuilder.blti_tools " + i + " " + bltiToolLines[i]); continue; } bltiTool.addText = items[3]; @@ -476,7 +476,7 @@ public static Map initBltiTools() { ret.put(bltiTool.id, bltiTool); } for (BltiTool tool: ret.values()) { - System.out.println(tool.id + " " + tool.title + " " + tool.description + " " + tool.addText); + log.info(tool.id + " " + tool.title + " " + tool.description + " " + tool.addText); } return ret; } @@ -673,7 +673,7 @@ public List errMessages() { public void setErrMessage(String s) { ToolSession toolSession = sessionManager.getCurrentToolSession(); if (toolSession == null) { - System.out.println("Lesson Builder error not in tool: " + s); + log.info("Lesson Builder error not in tool: " + s); return; } List errors = (List)toolSession.getAttribute("lessonbuilder.errors"); @@ -776,7 +776,7 @@ public void setReleaseDate(String date) { date = date.substring(0,19); this.releaseDate = isoDateFormat.parse(date); } catch (Exception e) { - System.out.println(e + "bad format releasedate " + date); + log.info(e + "bad format releasedate " + date); } } @@ -2689,7 +2689,7 @@ public String deleteOrphanPages() { // this adds everything you can find from top level pages to entries for (SimplePageItem sitePageItem : sitePages) { - // System.out.println("findallpages " + sitePageItem.getName() + " " + true); + // log.info("findallpages " + sitePageItem.getName() + " " + true); pagePickerProducer().findAllPages(sitePageItem, entries, pageMap, topLevelPages, sharedPages, 0, true, true); } @@ -5331,7 +5331,7 @@ public boolean isItemAvailable(SimplePageItem item, long pageId) { List items = getItemsOnPage(pageId); for (SimplePageItem i : items) { - // System.out.println(i.getSequence() + " " + i.isRequired() + " " + isItemVisible(i) + " " + isItemComplete(i)); + // log.info(i.getSequence() + " " + i.isRequired() + " " + isItemVisible(i) + " " + isItemComplete(i)); if (i.getSequence() >= item.getSequence()) { break; } else if (i.isRequired() && isItemVisible(i)) { @@ -6116,7 +6116,7 @@ else if (multimediaDisplayType == 3) { // else update(item); } catch (Exception e) { - System.out.println("save error " + e); + log.info("save error " + e); // saveItem and update produce the errors } }catch(Exception ex) { @@ -6178,7 +6178,7 @@ public void handleFileItem() { e.printStackTrace(); return; } - // System.out.println("contentItem="+contentItem); + // log.info("contentItem="+contentItem); // Extract the content item data Map item = (Map) contentItem.getItemOfType(ContentItem.TYPE_FILEITEM); @@ -6188,7 +6188,7 @@ public void handleFileItem() { } String localUrl = (String) item.get("url"); - // System.out.println("localUrl="+localUrl); + // log.info("localUrl="+localUrl); InputStream fis = null; if ( localUrl != null && localUrl.length() > 1 ) { @@ -6202,7 +6202,7 @@ public void handleFileItem() { return; } - // System.out.println("Importing..."); + // log.info("Importing..."); long length = importCcFromStream(fis); if ( length > 0 && toolSession != null) { String successMessage = messageLocator.getMessage("simplepage.lti-import-success-length").replace("{}", length+""); @@ -7402,7 +7402,7 @@ private void regradeStudentPages(SimplePageItem pageItem) { m.getUserId(), String.valueOf(c.getPoints())); } } catch (Exception e) { - System.out.println("unable to get members of group " + group); + log.info("unable to get members of group " + group); } } } @@ -7895,7 +7895,7 @@ public String savePeerEvalResult() { evalTargets.add(m.getUserId()); } } catch (Exception e) { - System.out.println("unable to get members of group " + group); + log.info("unable to get members of group " + group); } } else { evalTargets.add(getCurrentPage().getOwner()); @@ -7962,7 +7962,7 @@ public String savePeerEvalResult() { groupMembers.add(m.getUserId()); } } catch (Exception e) { - System.out.println("unable to get members of group " + group); + log.info("unable to get members of group " + group); } } return groupMembers; diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/evolvers/SakaiFCKTextEvolver.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/evolvers/SakaiFCKTextEvolver.java index 3715fc781b5f..a034708e34f8 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/evolvers/SakaiFCKTextEvolver.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/evolvers/SakaiFCKTextEvolver.java @@ -9,6 +9,8 @@ import java.util.Iterator; import org.sakaiproject.content.api.ContentHostingService; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.sakaiproject.component.cover.ServerConfigurationService; import uk.org.ponder.htmlutil.HTMLUtil; @@ -22,6 +24,7 @@ import uk.org.ponder.rsf.evolvers.TextInputEvolver; public class SakaiFCKTextEvolver implements TextInputEvolver { + private static final Log log = LogFactory.getLog(SakaiFCKTextEvolver.class); public static final String COMPONENT_ID = "sakai-FCKEditor:"; private String context; private ContentHostingService contentHostingService; @@ -82,9 +85,9 @@ private static boolean isNewEditor() { // samigo starting with 2.8.0 has the new editor calling protocol if (version > 2 || (version == 2 && major >= 8)) isNew = true; - System.out.println("EditPage thinks Sakai version is " + version + " major " + major + " isNew=" + isNew); + log.info("EditPage thinks Sakai version is " + version + " major " + major + " isNew=" + isNew); } - //System.out.println("isnew " + isNew); + //log.info("isnew " + isNew); return isNew; } diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/AssignmentPickerProducer.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/AssignmentPickerProducer.java index 6d8c8855d905..59b4f096f2ef 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/AssignmentPickerProducer.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/AssignmentPickerProducer.java @@ -30,7 +30,8 @@ import org.sakaiproject.lessonbuildertool.service.LessonEntity; import org.sakaiproject.tool.cover.SessionManager; - +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.sakaiproject.lessonbuildertool.SimplePage; import org.sakaiproject.lessonbuildertool.SimplePageItem; import org.sakaiproject.lessonbuildertool.tool.beans.SimplePageBean; @@ -68,6 +69,7 @@ * */ public class AssignmentPickerProducer implements ViewComponentProducer, NavigationCaseReporter, ViewParamsReporter { + private static final Log log = LogFactory.getLog(AssignmentPickerProducer.class); public static final String VIEW_ID = "AssignmentPicker"; private SimplePageBean simplePageBean; @@ -99,7 +101,7 @@ public void fillComponents(UIContainer tofill, ViewParameters viewparams, Compon try { simplePageBean.updatePageObject(((GeneralViewParameters) viewparams).getSendingPage()); } catch (Exception e) { - System.out.println("AssignmentPicker permission exception " + e); + log.info("AssignmentPicker permission exception " + e); return; } } @@ -146,7 +148,7 @@ public void fillComponents(UIContainer tofill, ViewParameters viewparams, Compon UIInput.make(form, "csrf", "simplePageBean.csrfToken", sessionToken.toString()); if (createLinks.size() == 0) { - System.out.println("creatlinks " + createLinks.size()); + log.info("creatlinks " + createLinks.size()); UIOutput.make(tofill, "error-div"); UIOutput.make(tofill, "error", messageLocator.getMessage("simplepage.no_assignment_tools")); UICommand.make(tofill, "cancel", messageLocator.getMessage("simplepage.cancel"), "#{simplePageBean.cancel}"); diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/BltiPickerProducer.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/BltiPickerProducer.java index 24ff21b97bdb..38338330b3d5 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/BltiPickerProducer.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/BltiPickerProducer.java @@ -41,6 +41,8 @@ import org.sakaiproject.tool.cover.SessionManager; import org.sakaiproject.tool.cover.ToolManager; import org.sakaiproject.lessonbuildertool.model.SimplePageToolDao; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.sakaiproject.component.cover.ServerConfigurationService; import org.sakaiproject.portal.util.ToolUtils; @@ -77,6 +79,7 @@ * */ public class BltiPickerProducer implements ViewComponentProducer, NavigationCaseReporter, ViewParamsReporter { + private static final Log log = LogFactory.getLog(BltiPickerProducer.class); public static final String VIEW_ID = "BltiPicker"; private SimplePageBean simplePageBean; @@ -109,7 +112,7 @@ public void fillComponents(UIContainer tofill, ViewParameters viewparams, Compon try { simplePageBean.updatePageObject(((GeneralViewParameters) viewparams).getSendingPage()); } catch (Exception e) { - System.out.println("QuizPicker permission exception " + e); + log.info("QuizPicker permission exception " + e); return; } } @@ -144,7 +147,7 @@ public void fillComponents(UIContainer tofill, ViewParameters viewparams, Compon if ( bltiEntity instanceof BltiEntity ) ( (BltiEntity) bltiEntity).setReturnUrl(comeBack); // here is a URL to return to the main lesson builder page - // System.out.println("/portal/tool/" + ToolManager.getCurrentPlacement().getId() + "/ShowPage?"); + // log.info("/portal/tool/" + ToolManager.getCurrentPlacement().getId() + "/ShowPage?"); if (simplePageBean.canEditPage()) { diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/CommentsProducer.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/CommentsProducer.java index 019c8eef74b3..d29f1661f1cd 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/CommentsProducer.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/CommentsProducer.java @@ -14,6 +14,8 @@ import org.sakaiproject.lessonbuildertool.SimplePageComment; import org.sakaiproject.lessonbuildertool.SimplePageItem; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.sakaiproject.lessonbuildertool.SimplePage; import org.sakaiproject.lessonbuildertool.SimplePageLogEntry; import org.sakaiproject.lessonbuildertool.SimpleStudentPage; @@ -48,6 +50,7 @@ import uk.org.ponder.rsf.viewstate.ViewParamsReporter; public class CommentsProducer implements ViewComponentProducer, ViewParamsReporter, NavigationCaseReporter { + private static final Log log = LogFactory.getLog(CommentsProducer.class); public static final String VIEW_ID = "Comments"; private SimplePageBean simplePageBean; @@ -327,7 +330,7 @@ else if (comments.get(i).getTimePosted().after(lastViewed)) } catch (Exception e) { e.printStackTrace(); - System.out.println("comments error " + e); + log.info("comments error " + e); }; } diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/EditPageProducer.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/EditPageProducer.java index a0c1b5ab18ea..21ed71be962b 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/EditPageProducer.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/EditPageProducer.java @@ -65,6 +65,8 @@ import uk.org.ponder.rsf.viewstate.ViewParameters; import uk.org.ponder.rsf.viewstate.ViewParamsReporter; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.sakaiproject.component.cover.ServerConfigurationService; import org.sakaiproject.content.cover.ContentHostingService; import org.sakaiproject.exception.IdUnusedException; @@ -78,6 +80,7 @@ */ public class EditPageProducer implements ViewComponentProducer, NavigationCaseReporter, ViewParamsReporter { + private static final Log log = LogFactory.getLog(EditPageProducer.class); private TextInputEvolver richTextEvolver; private SimplePageBean simplePageBean; private ShowPageProducer showPageProducer; @@ -104,7 +107,7 @@ public void fillComponents(UIContainer tofill, ViewParameters viewparams, Compon try { simplePageBean.updatePageObject(gparams.getSendingPage()); } catch (Exception e) { - System.out.println("EditPage permission exception " + e); + log.info("EditPage permission exception " + e); return; } } @@ -120,7 +123,7 @@ public void fillComponents(UIContainer tofill, ViewParameters viewparams, Compon if (itemId != null && itemId != -1) { SimplePageItem i = simplePageBean.findItem(itemId); if (i.getPageId() != page.getPageId()) { - System.out.println("EditPage asked to edit item not in current page"); + log.info("EditPage asked to edit item not in current page"); return; } try { diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ForumPickerProducer.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ForumPickerProducer.java index 3b224ad23e40..a3360e7c488c 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ForumPickerProducer.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ForumPickerProducer.java @@ -28,7 +28,8 @@ import java.util.List; import org.sakaiproject.lessonbuildertool.service.LessonEntity; - +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.sakaiproject.lessonbuildertool.SimplePage; import org.sakaiproject.lessonbuildertool.SimplePageItem; import org.sakaiproject.lessonbuildertool.tool.beans.SimplePageBean; @@ -65,6 +66,7 @@ * */ public class ForumPickerProducer implements ViewComponentProducer, NavigationCaseReporter, ViewParamsReporter { + private static final Log log = LogFactory.getLog(ForumPickerProducer.class); public static final String VIEW_ID = "ForumPicker"; private SimplePageBean simplePageBean; @@ -96,7 +98,7 @@ public void fillComponents(UIContainer tofill, ViewParameters viewparams, Compon try { simplePageBean.updatePageObject(((GeneralViewParameters) viewparams).getSendingPage()); } catch (Exception e) { - System.out.println("AssignmentPicker permission exception " + e); + log.info("AssignmentPicker permission exception " + e); return; } } diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/IFrameWindowProducer.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/IFrameWindowProducer.java index 77334a5aeb65..0e1337865636 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/IFrameWindowProducer.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/IFrameWindowProducer.java @@ -24,6 +24,8 @@ package org.sakaiproject.lessonbuildertool.tool.producers; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.sakaiproject.lessonbuildertool.tool.beans.SimplePageBean; import org.sakaiproject.lessonbuildertool.tool.view.GeneralViewParameters; @@ -44,6 +46,7 @@ */ public class IFrameWindowProducer implements ViewComponentProducer, ViewParamsReporter { + private static final Log log = LogFactory.getLog(IFrameWindowProducer.class); private SimplePageBean simplePageBean; public LocaleGetter localeGetter; @@ -64,7 +67,7 @@ public void fillComponents(UIContainer tofill, ViewParameters params, ComponentC try { simplePageBean.updatePageObject(((GeneralViewParameters) params).getSendingPage()); } catch (Exception e) { - System.out.println("IFrameWindowsProducer permission exception " + e); + log.info("IFrameWindowsProducer permission exception " + e); return; } } diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/LinkTrackerProducer.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/LinkTrackerProducer.java index 127016913f84..7e6f9d9b932d 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/LinkTrackerProducer.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/LinkTrackerProducer.java @@ -44,9 +44,12 @@ import uk.org.ponder.rsf.viewstate.ViewParameters; import uk.org.ponder.rsf.viewstate.ViewParamsReporter; import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; public class LinkTrackerProducer implements ViewComponentProducer, ViewParamsReporter { + private static final Log log = LogFactory.getLog(LinkTrackerProducer.class); public static final String VIEW_ID = "LinkTracker"; public String getViewID() { @@ -96,7 +99,7 @@ public void fillComponents(UIContainer tofill, ViewParameters viewparams, Compon SimplePage page = simplePageBean.getCurrentPage(); if (i.getPageId() != page.getPageId()) { - System.out.println("LinkTracker asked to track item not in current page"); + log.info("LinkTracker asked to track item not in current page"); return; } diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/LtiFileItemProducer.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/LtiFileItemProducer.java index 1be5904fa08a..b8c643e7b5d7 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/LtiFileItemProducer.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/LtiFileItemProducer.java @@ -47,6 +47,8 @@ import org.sakaiproject.portal.util.ToolUtils; import org.sakaiproject.lti.api.LTIService; import org.tsugi.lti2.ContentItem; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.sakaiproject.basiclti.util.SakaiBLTIUtil; import org.sakaiproject.tool.api.ToolManager; import org.sakaiproject.tool.api.Placement; @@ -83,6 +85,7 @@ * */ public class LtiFileItemProducer implements ViewComponentProducer, NavigationCaseReporter, ViewParamsReporter { + private static final Log log = LogFactory.getLog(LtiFileItemProducer.class); public static final String VIEW_ID = "LtiFileItem"; private SimplePageBean simplePageBean; @@ -124,7 +127,7 @@ public void fillComponents(UIContainer tofill, ViewParameters viewparams, Compon try { simplePageBean.updatePageObject(((GeneralViewParameters) viewparams).getSendingPage()); } catch (Exception e) { - System.out.println("LtiFileItemProducer permission exception " + e); + log.info("LtiFileItemProducer permission exception " + e); return; } } diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/PagePickerProducer.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/PagePickerProducer.java index 5ca288326114..8ab59ddce0e4 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/PagePickerProducer.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/PagePickerProducer.java @@ -43,6 +43,8 @@ import org.sakaiproject.lessonbuildertool.tool.beans.SimplePageBean; import org.sakaiproject.lessonbuildertool.tool.view.GeneralViewParameters; import org.sakaiproject.lessonbuildertool.model.SimplePageToolDao; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.sakaiproject.component.cover.ServerConfigurationService; import org.sakaiproject.content.cover.ContentTypeImageService; import org.sakaiproject.tool.api.ToolManager; @@ -84,6 +86,7 @@ * */ public class PagePickerProducer implements ViewComponentProducer, NavigationCaseReporter, ViewParamsReporter { + private static final Log log = LogFactory.getLog(PagePickerProducer.class); public static final String VIEW_ID = "PagePicker"; private static String SITE_UPD = "site.upd"; @@ -142,7 +145,7 @@ public String getViewID() { // that lets us find at the end anything that hasn't been shown public void findAllPages(SimplePageItem pageItem, Listentries, Map pageMap, SettopLevelPages, SetsharedPages, int level, boolean toplevel, boolean canEditPage) { - // System.out.println("in findallpages " + pageItem.getName() + " " + toplevel); + // log.info("in findallpages " + pageItem.getName() + " " + toplevel); Long pageId = Long.valueOf(pageItem.getSakaiId()); if (pageId == 0L) @@ -177,7 +180,7 @@ public void findAllPages(SimplePageItem pageItem, Listentries, Mapentries, Mapentries, Map getGraders(Long pageId, String owner, String o } } //else - // System.out.println("evaluations is empty/null;"); + // log.info("evaluations is empty/null;"); return myEvaluations; } diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/PreviewProducer.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/PreviewProducer.java index 4a1901bfd942..d4a0938dbd2c 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/PreviewProducer.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/PreviewProducer.java @@ -26,6 +26,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.sakaiproject.lessonbuildertool.SimplePage; import org.sakaiproject.lessonbuildertool.SimplePageItem; import org.sakaiproject.lessonbuildertool.model.SimplePageToolDao; @@ -59,6 +61,7 @@ * */ public class PreviewProducer implements ViewComponentProducer, NavigationCaseReporter, ViewParamsReporter { + private static final Log log = LogFactory.getLog(PreviewProducer.class); private SimplePageBean simplePageBean; private SimplePageToolDao simplePageToolDao; private ShowPageProducer showPageProducer; @@ -93,7 +96,7 @@ public void fillComponents(UIContainer tofill, ViewParameters params, ComponentC // page should always be in this site, or someone is gaming us if (!page.getSiteId().equals(siteId)) { - System.out.println("attempt to preview page not in the site"); + log.info("attempt to preview page not in the site"); return; } diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/QuizPickerProducer.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/QuizPickerProducer.java index ea029f4d5692..88e72c64c07d 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/QuizPickerProducer.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/QuizPickerProducer.java @@ -28,7 +28,8 @@ import org.sakaiproject.lessonbuildertool.service.LessonEntity; import org.sakaiproject.tool.cover.SessionManager; - +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.sakaiproject.lessonbuildertool.SimplePage; import org.sakaiproject.lessonbuildertool.SimplePageItem; import org.sakaiproject.lessonbuildertool.tool.beans.SimplePageBean; @@ -68,6 +69,7 @@ * */ public class QuizPickerProducer implements ViewComponentProducer, NavigationCaseReporter, ViewParamsReporter { + private static final Log log = LogFactory.getLog(QuizPickerProducer.class); public static final String VIEW_ID = "QuizPicker"; private SimplePageBean simplePageBean; @@ -99,7 +101,7 @@ public void fillComponents(UIContainer tofill, ViewParameters viewparams, Compon try { simplePageBean.updatePageObject(((GeneralViewParameters) viewparams).getSendingPage()); } catch (Exception e) { - System.out.println("QuizPicker permission exception " + e); + log.info("QuizPicker permission exception " + e); return; } } diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ReorderProducer.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ReorderProducer.java index bbd5237a1b82..8ba384f140a2 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ReorderProducer.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ReorderProducer.java @@ -27,6 +27,8 @@ import java.util.List; import org.sakaiproject.util.FormattedText; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.sakaiproject.lessonbuildertool.SimplePage; import org.sakaiproject.lessonbuildertool.SimplePageItem; import org.sakaiproject.lessonbuildertool.model.SimplePageToolDao; @@ -65,6 +67,7 @@ * */ public class ReorderProducer implements ViewComponentProducer, NavigationCaseReporter, ViewParamsReporter { + private static final Log log = LogFactory.getLog(ReorderProducer.class); private SimplePageBean simplePageBean; private SimplePageToolDao simplePageToolDao; private ShowPageProducer showPageProducer; @@ -85,7 +88,7 @@ public void fillComponents(UIContainer tofill, ViewParameters params, ComponentC try { simplePageBean.updatePageObject(((GeneralViewParameters) params).getSendingPage()); } catch (Exception e) { - System.out.println("Reorder permission exception " + e); + log.info("Reorder permission exception " + e); return; } } diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ResourcePickerProducer.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ResourcePickerProducer.java index efc2f7c74fc4..f07cdb418cdf 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ResourcePickerProducer.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ResourcePickerProducer.java @@ -27,6 +27,8 @@ import java.util.ArrayList; import java.util.List; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.sakaiproject.component.cover.ServerConfigurationService; import org.sakaiproject.content.api.ContentHostingService; import org.sakaiproject.content.api.FilePickerHelper; @@ -61,6 +63,7 @@ * */ public class ResourcePickerProducer implements ViewComponentProducer, ViewParamsReporter, NavigationCaseReporter { + private static final Log log = LogFactory.getLog(ResourcePickerProducer.class); public static final String VIEW_ID = "ResourcePicker"; public String getViewID() { @@ -108,7 +111,7 @@ public void fillComponents(UIContainer tofill, ViewParameters viewparams, Compon try { simplePageBean.updatePageObject(((FilePickerViewParameters) viewparams).getSender()); } catch (Exception e) { - System.out.println("ResourcePicker permission exception " + e); + log.info("ResourcePicker permission exception " + e); return; } } diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java index 594b8d33c36e..0e428fa8ef6f 100644 --- a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java +++ b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java @@ -1301,7 +1301,7 @@ public int compare(SimpleStudentPage o1, SimpleStudentPage o2) { if (j >= 0) s = s.substring(j+1); mimeType = ContentTypeImageService.getContentType(s); - // System.out.println("type " + s + ">" + mimeType); + // log.info("type " + s + ">" + mimeType); } String src = null; @@ -2316,7 +2316,7 @@ class Target { evalTargets.add(new Target(m.getUserId())); } } catch (Exception e) { - System.out.println("unable to get members of group " + group); + log.info("unable to get members of group " + group); } // no need to sort for other alternative, when there's only one Collections.sort(evalTargets, new Comparator() { @@ -2649,7 +2649,7 @@ public int compare(SimpleStudentPage o1, SimpleStudentPage o2) { dateStr = isoDateFormat.format(peerevalcal.getTime()); - //System.out.println("Setting date to " + dateStr + " and time to " + timeStr); + //log.info("Setting date to " + dateStr + " and time to " + timeStr); UIOutput.make(tableRow, "peer-eval-due-date", dateStr); UIOutput.make(tableRow, "peer-eval-allow-self", i.getAttribute("rubricAllowSelfGrade")); @@ -3102,7 +3102,7 @@ public String getSessionParameter(String url) { sessionParam = DatatypeConverter.printHexBinary(sessionBytes); return sessionParam; } catch (Exception e) { - System.out.println("unable to generate encrypted session id " + e); + log.info("unable to generate encrypted session id " + e); return null; } } @@ -4162,7 +4162,7 @@ private void createEditTitleDialog(UIContainer tofill, SimplePage page, SimplePa try { releaseDateString = isoDateFormat.format(releaseDate); } catch (Exception e) { - System.out.println(e + "bad format releasedate " + releaseDate); + log.info(e + "bad format releasedate " + releaseDate); } } @@ -4758,9 +4758,9 @@ private String getItemPath(SimplePageItem i) private void makePeerRubric(UIContainer parent, SimplePageItem i, String[] peerReviewRsfIds, Map selectedCells, Map> dataMap, boolean allowSubmit) { - //System.out.println("makePeerRubric(): i.getAttributesString() " + i.getAttributeString()); - //System.out.println("makePeerRubric(): i.getAttribute(\"rubricTitle\") " + i.getAttribute("rubricTitle")); - //System.out.println("makePeerRubric(): i.getJsonAttribute(\"rows\") " + i.getJsonAttribute("rows")); + //log.info("makePeerRubric(): i.getAttributesString() " + i.getAttributeString()); + //log.info("makePeerRubric(): i.getAttribute(\"rubricTitle\") " + i.getAttribute("rubricTitle")); + //log.info("makePeerRubric(): i.getJsonAttribute(\"rows\") " + i.getJsonAttribute("rows")); if (peerReviewRsfIds[0] != null) UIOutput.make(parent, peerReviewRsfIds[0], String.valueOf(i.getAttribute("rubricTitle"))); @@ -4789,7 +4789,7 @@ public int compareTo(Object o){ rows.add(new RubricRow(rowId, rowText)); } } - //else{System.out.println("This rubric has no rows.");} + //else{log.info("This rubric has no rows.");} Collections.sort(rows); diff --git a/lessonbuilder/tool/src29/java/org/sakaiproject/lessonbuildertool/service/LessonsGradeInfoProvider.java b/lessonbuilder/tool/src29/java/org/sakaiproject/lessonbuildertool/service/LessonsGradeInfoProvider.java index 03a74c092ea4..1a0d4f832d68 100644 --- a/lessonbuilder/tool/src29/java/org/sakaiproject/lessonbuildertool/service/LessonsGradeInfoProvider.java +++ b/lessonbuilder/tool/src29/java/org/sakaiproject/lessonbuildertool/service/LessonsGradeInfoProvider.java @@ -321,19 +321,19 @@ public List getExternalAssignmentsForCurrentUser(String gradebookUid) { } public Map> getAllExternalAssignments(String gradebookUid, Collection studentIds) { - //System.out.println("isassignmentgrouped lesson-builder:1788 " + isAssignmentGrouped("lesson-builder:1788")); - //System.out.println("isassignmentgrouped lesson-builder:comment:7289 " + isAssignmentGrouped("lesson-builder:comment:7289")); - //System.out.println("isUserInPath " + isUserInPath("c08d3ac9-c717-472a-ad91-7ce0b434f42f", lessonsAccess.getPagePaths(1788L,false),"60c04ab8-40e5-4eb6-9f8d-7006ed023109")); - //System.out.println("isUserInPath " + isUserInPath("c08d3ac9-c717-472a-ad91-7ce0b434f42f", lessonsAccess.getItemPaths(7289L),"60c04ab8-40e5-4eb6-9f8d-7006ed023109")); + //log.info("isassignmentgrouped lesson-builder:1788 " + isAssignmentGrouped("lesson-builder:1788")); + //log.info("isassignmentgrouped lesson-builder:comment:7289 " + isAssignmentGrouped("lesson-builder:comment:7289")); + //log.info("isUserInPath " + isUserInPath("c08d3ac9-c717-472a-ad91-7ce0b434f42f", lessonsAccess.getPagePaths(1788L,false),"60c04ab8-40e5-4eb6-9f8d-7006ed023109")); + //log.info("isUserInPath " + isUserInPath("c08d3ac9-c717-472a-ad91-7ce0b434f42f", lessonsAccess.getItemPaths(7289L),"60c04ab8-40e5-4eb6-9f8d-7006ed023109")); //HashSet userset = new HashSet(); //userset.add("c08d3ac9-c717-472a-ad91-7ce0b434f42f"); //userset.add("9d1a25ba-4735-48c4-bd5e-ff329f9f7749"); - //System.out.println("usersInPath " + usersInPath(userset, lessonsAccess.getPagePaths(1788L,false),"60c04ab8-40e5-4eb6-9f8d-7006ed023109")); - //System.out.println("userInPath " + usersInPath(userset, lessonsAccess.getItemPaths(7289L),"60c04ab8-40e5-4eb6-9f8d-7006ed023109")); - //System.out.println(isAssignmentVisible("lesson-builder:1788", "c08d3ac9-c717-472a-ad91-7ce0b434f42f")); - //System.out.println(isAssignmentVisible("lesson-builder:comment:7289", "c08d3ac9-c717-472a-ad91-7ce0b434f42f")); - //System.out.println(getExternalAssignmentsForCurrentUser("60c04ab8-40e5-4eb6-9f8d-7006ed023109")); + //log.info("usersInPath " + usersInPath(userset, lessonsAccess.getPagePaths(1788L,false),"60c04ab8-40e5-4eb6-9f8d-7006ed023109")); + //log.info("userInPath " + usersInPath(userset, lessonsAccess.getItemPaths(7289L),"60c04ab8-40e5-4eb6-9f8d-7006ed023109")); + //log.info(isAssignmentVisible("lesson-builder:1788", "c08d3ac9-c717-472a-ad91-7ce0b434f42f")); + //log.info(isAssignmentVisible("lesson-builder:comment:7289", "c08d3ac9-c717-472a-ad91-7ce0b434f42f")); + //log.info(getExternalAssignmentsForCurrentUser("60c04ab8-40e5-4eb6-9f8d-7006ed023109")); Map> allExternals = new HashMap>(); @@ -407,7 +407,7 @@ public Map> getAllExternalAssignments(String gradebookUid, } } } - //System.out.println("getAllExternalAssignments " + studentIds + " " + allExternals); + //log.info("getAllExternalAssignments " + studentIds + " " + allExternals); return allExternals; } diff --git a/login/login-authn-tool/tool/pom.xml b/login/login-authn-tool/tool/pom.xml index 9f88d966bd68..ec3427ee7931 100644 --- a/login/login-authn-tool/tool/pom.xml +++ b/login/login-authn-tool/tool/pom.xml @@ -33,10 +33,6 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - diff --git a/login/login-impl/impl/pom.xml b/login/login-impl/impl/pom.xml index 26fa349b45b0..363d4b706c81 100644 --- a/login/login-impl/impl/pom.xml +++ b/login/login-impl/impl/pom.xml @@ -36,11 +36,6 @@ org.sakaiproject.login login-api - - commons-logging - commons-logging - - javax.servlet servlet-api diff --git a/login/login-render-engine-impl/impl/pom.xml b/login/login-render-engine-impl/impl/pom.xml index 99196f05e9b3..d9a150084205 100644 --- a/login/login-render-engine-impl/impl/pom.xml +++ b/login/login-render-engine-impl/impl/pom.xml @@ -36,10 +36,6 @@ org.sakaiproject.kernel sakai-kernel-util - - commons-logging - commons-logging - javax.servlet servlet-api diff --git a/login/login-render-engine-impl/pack/pom.xml b/login/login-render-engine-impl/pack/pom.xml index dfdd87ce16ea..79a6c88c792c 100644 --- a/login/login-render-engine-impl/pack/pom.xml +++ b/login/login-render-engine-impl/pack/pom.xml @@ -22,10 +22,6 @@ login-render-engine-impl ${project.version} - - commons-logging - commons-logging - diff --git a/login/login-tool/tool/pom.xml b/login/login-tool/tool/pom.xml index d16320dd7a40..e25196f3ee2a 100644 --- a/login/login-tool/tool/pom.xml +++ b/login/login-tool/tool/pom.xml @@ -33,11 +33,6 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - ${sakai.commons-logging.version} - org.sakaiproject.login login-api @@ -70,13 +65,6 @@ 1.8.5 jar test - - - log4j - log4j - 1.2.16 - jar - test org.springframework.security.extensions diff --git a/mailarchive/mailarchive-impl/impl/pom.xml b/mailarchive/mailarchive-impl/impl/pom.xml index 7f9c2243c0f0..0e55e3753c42 100644 --- a/mailarchive/mailarchive-impl/impl/pom.xml +++ b/mailarchive/mailarchive-impl/impl/pom.xml @@ -52,10 +52,6 @@ org.sakaiproject.message sakai-message-util - - commons-logging - commons-logging - commons-codec commons-codec diff --git a/mailarchive/mailarchive-impl/impl/src/java/org/sakaiproject/mailarchive/impl/conversion/ExtractXMLToColumns.java b/mailarchive/mailarchive-impl/impl/src/java/org/sakaiproject/mailarchive/impl/conversion/ExtractXMLToColumns.java index cb6c3053a375..b1776da55f87 100644 --- a/mailarchive/mailarchive-impl/impl/src/java/org/sakaiproject/mailarchive/impl/conversion/ExtractXMLToColumns.java +++ b/mailarchive/mailarchive-impl/impl/src/java/org/sakaiproject/mailarchive/impl/conversion/ExtractXMLToColumns.java @@ -30,18 +30,16 @@ import java.sql.Types; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.sakaiproject.util.conversion.SchemaConversionHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author ieb */ public class ExtractXMLToColumns implements SchemaConversionHandler { - - private static final Log log = LogFactory - .getLog(ExtractXMLToColumns.class); + private static final Logger log = LoggerFactory.getLogger(ExtractXMLToColumns.class); /* * (non-Javadoc) @@ -173,7 +171,7 @@ public Object getValidateSource(String id, ResultSet rs) throws SQLException } else { - System.out.println("getValidateSource(" + id + ") blob == null" ); + log.info("getValidateSource(" + id + ") blob == null" ); } break; case Types.CLOB: diff --git a/mailarchive/mailarchive-james/james/pom.xml b/mailarchive/mailarchive-james/james/pom.xml index 1103db8550f0..00b6ecbc7ebc 100644 --- a/mailarchive/mailarchive-james/james/pom.xml +++ b/mailarchive/mailarchive-james/james/pom.xml @@ -53,10 +53,6 @@ javax.mail mail - - commons-logging - commons-logging - commons-lang commons-lang diff --git a/mailarchive/mailarchive-subetha/pom.xml b/mailarchive/mailarchive-subetha/pom.xml index 8a1d989e2677..d01e28ae636f 100644 --- a/mailarchive/mailarchive-subetha/pom.xml +++ b/mailarchive/mailarchive-subetha/pom.xml @@ -53,10 +53,6 @@ javax.mail mail - - commons-logging - commons-logging - commons-lang commons-lang @@ -80,13 +76,6 @@ 1.9.0 test - - - org.slf4j - slf4j-simple - 1.7.12 - test - @@ -103,6 +92,7 @@ ${basedir}/src/test **/*.txt + **/log4j.properties diff --git a/mailarchive/mailarchive-subetha/src/test/log4j.properties b/mailarchive/mailarchive-subetha/src/test/log4j.properties new file mode 100644 index 000000000000..e78168e1f881 --- /dev/null +++ b/mailarchive/mailarchive-subetha/src/test/log4j.properties @@ -0,0 +1,6 @@ +log4j.appender.Stdout=org.apache.log4j.ConsoleAppender +log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m%n + +log4j.rootLogger=INFO,Stdout + diff --git a/mailarchive/mailarchive-tool/tool/pom.xml b/mailarchive/mailarchive-tool/tool/pom.xml index b64ecbd6ab9b..81c60a47d3d8 100644 --- a/mailarchive/mailarchive-tool/tool/pom.xml +++ b/mailarchive/mailarchive-tool/tool/pom.xml @@ -56,10 +56,6 @@ org.sakaiproject.velocity sakai-velocity-tool - - commons-logging - commons-logging - javax.servlet servlet-api @@ -72,10 +68,6 @@ org.springframework spring-beans - - org.projectlombok - lombok - org.sakaiproject.site sakai-mergedlist-util diff --git a/mailsender/api/pom.xml b/mailsender/api/pom.xml index 84b56f5518b9..9b0c882c01e8 100644 --- a/mailsender/api/pom.xml +++ b/mailsender/api/pom.xml @@ -41,10 +41,6 @@ org.sakaiproject.kernel sakai-kernel-util - - commons-logging - commons-logging - org.springframework spring-core diff --git a/mailsender/impl/pom.xml b/mailsender/impl/pom.xml index e199d0efdc60..356748eb235b 100644 --- a/mailsender/impl/pom.xml +++ b/mailsender/impl/pom.xml @@ -66,10 +66,6 @@ - - commons-logging - commons-logging - commons-lang commons-lang diff --git a/mailsender/impl/src/test/resources/log4j.properties b/mailsender/impl/src/test/resources/log4j.properties new file mode 100644 index 000000000000..e78168e1f881 --- /dev/null +++ b/mailsender/impl/src/test/resources/log4j.properties @@ -0,0 +1,6 @@ +log4j.appender.Stdout=org.apache.log4j.ConsoleAppender +log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m%n + +log4j.rootLogger=INFO,Stdout + diff --git a/mailsender/tool/pom.xml b/mailsender/tool/pom.xml index 18e63d601716..43e0f7290970 100644 --- a/mailsender/tool/pom.xml +++ b/mailsender/tool/pom.xml @@ -109,16 +109,5 @@ ${project.version} war - - - - commons-logging - commons-logging - - - - - - diff --git a/master/pom.xml b/master/pom.xml index f8a50ff2bfaa..7961bc65d7f6 100644 --- a/master/pom.xml +++ b/master/pom.xml @@ -83,7 +83,6 @@ 2.6 3.4 - 1.2 1.3.1 2.2 net.sf.ehcache @@ -96,7 +95,7 @@ 1.0 1.1.2 1.13 - 1.12.6 + 1.16.8 2.3.5 4.10.4 1.1.7 @@ -120,7 +119,7 @@ 2.6.2 2.6.2 1.2.17 - 1.7.5 + 1.7.21 3.14 2.0 2.9.3 @@ -361,30 +360,6 @@ 2.0.2 provided - - log4j - log4j - ${sakai.log4j.version} - provided - - - javax.mail - mail - - - javax.jms - jms - - - com.sun.jdmk - jmxtools - - - com.sun.jmx - jmxri - - - @@ -530,12 +505,6 @@ ${sakai.commons.lang.version} provided - - commons-logging - commons-logging - 1.2 - provided - commons-pool commons-pool @@ -548,6 +517,21 @@ 1.8 provided + + commons-beanutils + commons-beanutils + 1.7.0 + + + commons-digester + commons-digester + 1.8 + + + commons-validator + commons-validator + 1.5.0 + org.apache.commons commons-lang3 @@ -585,18 +569,73 @@ provided + + + + org.slf4j + slf4j-api + ${sakai.slf4j.version} + provided + + org.slf4j slf4j-log4j12 ${sakai.slf4j.version} + runtime + + + + + log4j + log4j + ${sakai.log4j.version} provided + + + javax.mail + mail + + + javax.jms + jms + + + com.sun.jdmk + jmxtools + + + com.sun.jmx + jmxri + + + + + log4j + apache-log4j-extras + ${sakai.log4j.version} + runtime + + org.slf4j - slf4j-api + jcl-over-slf4j ${sakai.slf4j.version} provided + + + commons-logging + commons-logging + [1.0,1.2] + provided + + org.hibernate hibernate-core @@ -733,6 +772,14 @@ org.ow2.asm asm-debug-all + + commons-logging + commons-logging + + + commons-logging + commons-logging-api + @@ -957,12 +1004,6 @@ ${sakai.groovy.version} provided - - log4j - apache-log4j-extras - ${sakai.log4j.version} - provided - org.sakaiproject.accountvalidator @@ -1552,11 +1593,10 @@ 4.11 - org.projectlombok lombok ${sakai.lombok.version} - provided + provided mysql @@ -1571,13 +1611,32 @@ - + + + + org.slf4j + slf4j-api + + + org.slf4j + slf4j-log4j12 + + + org.slf4j + jcl-over-slf4j + + + log4j + log4j + + + org.projectlombok + lombok + junit junit - - test @@ -1721,7 +1780,7 @@ org.apache.maven.plugins maven-surefire-plugin - 2.18.1 + 2.19.1 org.apache.maven.plugins @@ -1813,7 +1872,6 @@ org.apache.maven.plugins maven-surefire-report-plugin - 2.18.1 net.sourceforge.maven-taglib @@ -1904,7 +1962,7 @@ true org.apache.maven.plugins maven-compiler-plugin - 3.3 + 3.5.1 ${sakai.jdk.version} @@ -1935,6 +1993,8 @@ maven-surefire-plugin + + true ${maven.tomcat.home} diff --git a/memory/memory-tool/tool/pom.xml b/memory/memory-tool/tool/pom.xml index 18148b520248..1ec0cb5c1740 100644 --- a/memory/memory-tool/tool/pom.xml +++ b/memory/memory-tool/tool/pom.xml @@ -29,11 +29,6 @@ org.sakaiproject.kernel sakai-kernel-api - - commons-logging - commons-logging - ${sakai.commons-logging.version} - org.sakaiproject.velocity sakai-velocity-tool-api diff --git a/message/message-tool/tool/pom.xml b/message/message-tool/tool/pom.xml index 0b9b22cba1bc..647dea132830 100644 --- a/message/message-tool/tool/pom.xml +++ b/message/message-tool/tool/pom.xml @@ -48,10 +48,6 @@ javax.servlet servlet-api - - commons-logging - commons-logging - diff --git a/message/message-util/util/pom.xml b/message/message-util/util/pom.xml index 7aa5782e1c13..a0b6ae24c5d2 100644 --- a/message/message-util/util/pom.xml +++ b/message/message-util/util/pom.xml @@ -40,10 +40,6 @@ org.sakaiproject.scheduler scheduler-api - - commons-logging - commons-logging - javax.servlet servlet-api diff --git a/message/search-adapters/impl/pom.xml b/message/search-adapters/impl/pom.xml index ab4554845ae3..e97a661ca87f 100644 --- a/message/search-adapters/impl/pom.xml +++ b/message/search-adapters/impl/pom.xml @@ -45,17 +45,6 @@ search-util jar - - log4j - log4j - 1.2.13 - jar - test - - - commons-logging - commons-logging - diff --git a/msgcntr/messageforums-api/pom.xml b/msgcntr/messageforums-api/pom.xml index 7997c5fe3674..793d370b386c 100644 --- a/msgcntr/messageforums-api/pom.xml +++ b/msgcntr/messageforums-api/pom.xml @@ -23,10 +23,6 @@ org.sakaiproject.kernel sakai-kernel-api - - commons-logging - commons-logging - org.sakaiproject.entitybroker entitybroker-api diff --git a/msgcntr/messageforums-app/pom.xml b/msgcntr/messageforums-app/pom.xml index 26072fce75c2..62f3b542e461 100644 --- a/msgcntr/messageforums-app/pom.xml +++ b/msgcntr/messageforums-app/pom.xml @@ -75,11 +75,6 @@ commons-validator commons-validator - 1.4.0 - - - commons-logging - commons-logging org.springframework @@ -105,27 +100,8 @@ net.sf.json-lib json-lib - 2.2.3 + 2.4 jdk15 - jar - - - net.sf.json-lib - json-lib - 2.2.3 - jdk15-sources - jar - - - net.sf.json-lib - json-lib - 2.2.3 - jdk15-javadoc - jar - - - org.projectlombok - lombok diff --git a/msgcntr/messageforums-component-impl/pom.xml b/msgcntr/messageforums-component-impl/pom.xml index c21226eed268..c238302b5147 100644 --- a/msgcntr/messageforums-component-impl/pom.xml +++ b/msgcntr/messageforums-component-impl/pom.xml @@ -70,7 +70,6 @@ commons-beanutils commons-beanutils - 1.7.0 org.sakaiproject.common @@ -80,10 +79,6 @@ org.sakaiproject.common sakai-common-manager-api - - commons-logging - commons-logging - commons-codec commons-codec diff --git a/msgcntr/messageforums-hbm/pom.xml b/msgcntr/messageforums-hbm/pom.xml index 12aa33183942..6d2969911e80 100644 --- a/msgcntr/messageforums-hbm/pom.xml +++ b/msgcntr/messageforums-hbm/pom.xml @@ -31,14 +31,9 @@ org.sakaiproject.msgcntr messageforums-api - - commons-logging - commons-logging - commons-beanutils commons-beanutils - 1.7.0 diff --git a/oauth/api/pom.xml b/oauth/api/pom.xml index dc04bc08d861..92fb5ebad633 100755 --- a/oauth/api/pom.xml +++ b/oauth/api/pom.xml @@ -24,22 +24,14 @@ javax.servlet servlet-api - provided org.sakaiproject.kernel sakai-kernel-api - provided org.sakaiproject.kernel sakai-component-manager - provided - - - commons-logging - commons-logging - provided diff --git a/oauth/impl/pom.xml b/oauth/impl/pom.xml index 54197d6cf6e6..f905fe3abead 100755 --- a/oauth/impl/pom.xml +++ b/oauth/impl/pom.xml @@ -41,11 +41,6 @@ net.oauth.core oauth - - org.slf4j - slf4j-api - - joda-time joda-time diff --git a/oauth/pack/pom.xml b/oauth/pack/pom.xml index 26962387f5c5..127b5c702ed2 100755 --- a/oauth/pack/pom.xml +++ b/oauth/pack/pom.xml @@ -38,12 +38,6 @@ ${project.groupId} oauth-dao-server-config - - - org.slf4j - slf4j-log4j12 - - org.springframework spring-core diff --git a/oauth/pom.xml b/oauth/pom.xml index 42dd83113782..0fd3b152dd54 100755 --- a/oauth/pom.xml +++ b/oauth/pom.xml @@ -71,7 +71,6 @@ 20100527 - 1.1.1 2.5 1.4.23 1.7.5 @@ -134,27 +133,6 @@ oauth-provider ${oauth.version} - - commons-logging - commons-logging - ${commons-logging.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - - - log4j - log4j - - - @@ -172,8 +150,6 @@ - - org.apache.maven.plugins maven-compiler-plugin @@ -186,30 +162,4 @@ - - diff --git a/oauth/tool/pom.xml b/oauth/tool/pom.xml index 8821836e06e9..185e1992741e 100755 --- a/oauth/tool/pom.xml +++ b/oauth/tool/pom.xml @@ -43,15 +43,6 @@ org.apache.wicket wicket-spring - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 - diff --git a/pasystem/pasystem-api/api/pom.xml b/pasystem/pasystem-api/api/pom.xml index 87414d31f98c..34e759628951 100644 --- a/pasystem/pasystem-api/api/pom.xml +++ b/pasystem/pasystem-api/api/pom.xml @@ -17,13 +17,6 @@ ../../pom.xml - - - org.projectlombok - lombok - - - shared diff --git a/pasystem/pasystem-impl/impl/pom.xml b/pasystem/pasystem-impl/impl/pom.xml index faae5f4d8152..ecd32974f31d 100644 --- a/pasystem/pasystem-impl/impl/pom.xml +++ b/pasystem/pasystem-impl/impl/pom.xml @@ -72,22 +72,6 @@ org.sakaiproject.kernel sakai-component-manager - - org.slf4j - slf4j-api - 1.6.1 - - - org.slf4j - slf4j-simple - 1.6.1 - - - org.projectlombok - lombok - - - org.sakaiproject.pasystem pasystem-api diff --git a/pasystem/pasystem-tool/tool/pom.xml b/pasystem/pasystem-tool/tool/pom.xml index 7c1c4c126c39..dd256516ac92 100644 --- a/pasystem/pasystem-tool/tool/pom.xml +++ b/pasystem/pasystem-tool/tool/pom.xml @@ -28,10 +28,6 @@ commons-lang3 compile - - org.projectlombok - lombok - commons-fileupload commons-fileupload @@ -48,16 +44,6 @@ org.sakaiproject.kernel sakai-component-manager - - org.slf4j - slf4j-api - 1.6.1 - - - org.slf4j - slf4j-simple - 1.6.1 - com.googlecode.json-simple json-simple diff --git a/podcasts/podcasts-app/pom.xml b/podcasts/podcasts-app/pom.xml index 454926ce661f..5b3a846e2c41 100644 --- a/podcasts/podcasts-app/pom.xml +++ b/podcasts/podcasts-app/pom.xml @@ -42,10 +42,6 @@ commons-fileupload commons-fileupload - - commons-logging - commons-logging - org.sakaiproject sakai-podcasts-api @@ -74,10 +70,6 @@ org.springframework spring-beans - - org.projectlombok - lombok - commons-lang commons-lang diff --git a/podcasts/podcasts-impl/pom.xml b/podcasts/podcasts-impl/pom.xml index 71e46ea9a926..2ba52c290605 100644 --- a/podcasts/podcasts-impl/pom.xml +++ b/podcasts/podcasts-impl/pom.xml @@ -44,10 +44,6 @@ org.sakaiproject sakai-podcasts-api - - commons-logging - commons-logging - rome diff --git a/podcasts/podcasts/pom.xml b/podcasts/podcasts/pom.xml index 4311fac92608..8d7084ff6b1f 100644 --- a/podcasts/podcasts/pom.xml +++ b/podcasts/podcasts/pom.xml @@ -36,10 +36,6 @@ commons-codec commons-codec - - commons-logging - commons-logging - org.sakaiproject sakai-podcasts-api diff --git a/polls/impl/pom.xml b/polls/impl/pom.xml index 7e3894a12ec0..357c0c40f569 100644 --- a/polls/impl/pom.xml +++ b/polls/impl/pom.xml @@ -55,10 +55,6 @@ commons-collections commons-collections - - commons-logging - commons-logging - commons-lang commons-lang @@ -66,7 +62,6 @@ commons-validator commons-validator - 1.3.1 dom4j @@ -140,10 +135,6 @@ oro 2.0.8 - - org.slf4j - slf4j-log4j12 - @@ -188,6 +179,7 @@ hibernate-test.xml hibernate.properties + log4j.properties diff --git a/polls/impl/src/test/log4j.properties b/polls/impl/src/test/log4j.properties new file mode 100644 index 000000000000..e78168e1f881 --- /dev/null +++ b/polls/impl/src/test/log4j.properties @@ -0,0 +1,6 @@ +log4j.appender.Stdout=org.apache.log4j.ConsoleAppender +log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m%n + +log4j.rootLogger=INFO,Stdout + diff --git a/polls/tool/pom.xml b/polls/tool/pom.xml index c89dfb5d500e..b3e4d169c51e 100644 --- a/polls/tool/pom.xml +++ b/polls/tool/pom.xml @@ -42,10 +42,6 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - commons-lang commons-lang @@ -61,15 +57,10 @@ javax.servlet servlet-api - - - org.projectlombok - lombok commons-beanutils commons-beanutils - 1.8.3 diff --git a/polls/tool/src/java/org/sakaiproject/poll/tool/entityproviders/PollEntityProvider.java b/polls/tool/src/java/org/sakaiproject/poll/tool/entityproviders/PollEntityProvider.java index 714b46c51b91..56fdc7e8a5a4 100644 --- a/polls/tool/src/java/org/sakaiproject/poll/tool/entityproviders/PollEntityProvider.java +++ b/polls/tool/src/java/org/sakaiproject/poll/tool/entityproviders/PollEntityProvider.java @@ -46,12 +46,15 @@ import org.sakaiproject.poll.model.Poll; import org.sakaiproject.poll.model.Vote; +import lombok.extern.slf4j.Slf4j; + /** * Handles the poll entity * * @author Aaron Zeckoski (azeckoski @ gmail.com) */ +@Slf4j public class PollEntityProvider extends AbstractEntityProvider implements CoreEntityProvider, RESTful, RequestStorable, RedirectDefinable { @@ -249,7 +252,7 @@ public void deleteEntity(EntityReference ref, Map params) { @Deprecated public List getEntities(EntityReference ref, Search search) { - System.out.println("get entities"); + log.info("get entities"); // get the setting which indicates if we are getting polls we can admin or polls we can take boolean adminControl = false; Restriction adminRes = search.getRestrictionByProperty("admin"); diff --git a/polls/tool/src/java/org/sakaiproject/poll/tool/entityproviders/PollsEntityProvider.java b/polls/tool/src/java/org/sakaiproject/poll/tool/entityproviders/PollsEntityProvider.java index e3b79d02c488..c0364356c521 100644 --- a/polls/tool/src/java/org/sakaiproject/poll/tool/entityproviders/PollsEntityProvider.java +++ b/polls/tool/src/java/org/sakaiproject/poll/tool/entityproviders/PollsEntityProvider.java @@ -34,9 +34,6 @@ import javax.servlet.http.HttpServletResponse; -import lombok.Setter; -import lombok.extern.apachecommons.CommonsLog; - import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.lang.StringUtils; import org.sakaiproject.entitybroker.EntityReference; @@ -64,13 +61,16 @@ import org.sakaiproject.poll.model.Vote; import org.sakaiproject.user.api.UserDirectoryService; +import lombok.Setter; +import lombok.extern.slf4j.Slf4j; + /** * Handles the polls tool. * * @author Aaron Zeckoski (azeckoski @ gmail.com) * @author Denny (denny.denny @ gmail.com) */ -@CommonsLog +@Slf4j public class PollsEntityProvider extends AbstractEntityProvider implements EntityProvider, AutoRegisterEntityProvider, RequestStorable, ActionsExecutable, Outputable, Describeable { @@ -170,7 +170,7 @@ public List getPollsForSite(EntityView view) { @EntityCustomAction(action = "my", viewKey = EntityView.VIEW_LIST) public List getEntities(EntityReference ref, Search search) { - System.out.println("get entities"); + log.info("get entities"); // get the setting which indicates if we are getting polls we can admin // or polls we can take boolean adminControl = false; @@ -312,7 +312,7 @@ public Poll getPollEntity(EntityView view, EntityReference ref) { } } - log.debug(requestStorage == null); + log.debug("requestStorage" , requestStorage); Boolean includeVotes = requestStorage.getStoredValueAsType( Boolean.class, "includeVotes"); if (includeVotes == null) { @@ -591,20 +591,20 @@ private void copyParamsToObject(Map params, Object object) { try { m.invoke(object, new Object[] { dateValue }); } catch (IllegalAccessException e) { - log.debug(e); + log.debug(e.getMessage(), e); } catch (IllegalArgumentException e) { - log.debug(e); + log.debug(e.getMessage(), e); } catch (InvocationTargetException e) { - log.debug(e); + log.debug(e.getMessage(), e); } } else { // use generic converter from BeanUtils try { BeanUtils.copyProperty(object, key, value); } catch (IllegalAccessException e) { - log.debug(e); + log.debug(e.getMessage(), e); } catch (InvocationTargetException e) { - log.debug(e); + log.debug(e.getMessage(), e); } } } @@ -723,7 +723,7 @@ public String createVoteEntity(EntityReference ref, try { pollId = Long.valueOf((String) params.get("pollId")); } catch (Exception e) { - log.warn(e); + log.warn(e.getMessage(), e); } if (pollId == null) { @@ -737,7 +737,7 @@ public String createVoteEntity(EntityReference ref, try { optionId = Long.valueOf((String) params.get("pollOption")); } catch (Exception e) { - log.warn(e); + log.warn(e.getMessage(), e); } if (optionId == null) { diff --git a/portal/editor-tool/tool/pom.xml b/portal/editor-tool/tool/pom.xml index 5ea1bb0cb0a9..13cf3c4ab0b0 100644 --- a/portal/editor-tool/tool/pom.xml +++ b/portal/editor-tool/tool/pom.xml @@ -40,10 +40,6 @@ ${project.groupId} sakai-portal-util - - commons-logging - commons-logging - javax.servlet servlet-api diff --git a/portal/pom.xml b/portal/pom.xml index 3b42aedf60df..11c96b534744 100644 --- a/portal/pom.xml +++ b/portal/pom.xml @@ -79,14 +79,13 @@ org.apache.velocity velocity ${sakai.velocity.version} - - - org.mockito - mockito-core - 1.8.5 - test - - + + + org.mockito + mockito-core + 1.8.5 + test + diff --git a/portal/portal-api/api/pom.xml b/portal/portal-api/api/pom.xml index 40c7d9fc51da..699bd6e2e8c6 100644 --- a/portal/portal-api/api/pom.xml +++ b/portal/portal-api/api/pom.xml @@ -35,10 +35,6 @@ javax.servlet servlet-api - - org.projectlombok - lombok - diff --git a/portal/portal-chat/tool/pom.xml b/portal/portal-chat/tool/pom.xml index 7a7fe03d7f53..fccfb74d2224 100644 --- a/portal/portal-chat/tool/pom.xml +++ b/portal/portal-chat/tool/pom.xml @@ -83,10 +83,6 @@ jgroups 3.0.10.Final - - log4j - log4j - javax.servlet servlet-api diff --git a/portal/portal-impl/impl/pom.xml b/portal/portal-impl/impl/pom.xml index a8d9ef546619..2830e505932f 100644 --- a/portal/portal-impl/impl/pom.xml +++ b/portal/portal-impl/impl/pom.xml @@ -82,10 +82,6 @@ commons-collections commons-collections - - commons-logging - commons-logging - javax.portlet portlet-api @@ -106,10 +102,6 @@ 4.8.1 test - - log4j - log4j - org.apache.velocity velocity diff --git a/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/SiteHandler.java b/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/SiteHandler.java index c3376fe71ccd..cd03afcfea50 100644 --- a/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/SiteHandler.java +++ b/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/SiteHandler.java @@ -1097,10 +1097,10 @@ public Object bufferContent(HttpServletRequest req, HttpServletResponse res, String bodyString = responseStr.substring(bodyStart + 1, bodyEnd); if (tidAllow.indexOf(":debug:") >= 0) { - System.out.println(" ---- Head --- "); - System.out.println(headString); - System.out.println(" ---- Body --- "); - System.out.println(bodyString); + log.info(" ---- Head --- "); + log.info(headString); + log.info(" ---- Body --- "); + log.info(bodyString); } m.put("responseHead", headString); m.put("responseBody", bodyString); diff --git a/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/site/PortalSiteHelperImpl.java b/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/site/PortalSiteHelperImpl.java index 473c2d09326a..99897c6c333f 100644 --- a/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/site/PortalSiteHelperImpl.java +++ b/portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/site/PortalSiteHelperImpl.java @@ -922,7 +922,7 @@ public boolean setTemporaryPlacement(Site site) ppp = getToolManager().getCurrentPlacement(); if (ppp == null) { - System.out.println("WARNING portal-temporary placement not set - null"); + log.warn("portal-temporary placement not set - null"); } else { @@ -933,7 +933,7 @@ public boolean setTemporaryPlacement(Site site) } else { - System.out.println("WARNING portal-temporary placement mismatch site=" + log.warn("portal-temporary placement mismatch site=" + site.getId() + " context=" + cont); } } diff --git a/portal/portal-render-api/api/pom.xml b/portal/portal-render-api/api/pom.xml index 14294d76c779..e90b26098c3a 100644 --- a/portal/portal-render-api/api/pom.xml +++ b/portal/portal-render-api/api/pom.xml @@ -35,10 +35,6 @@ ${project.groupId} sakai-portal-api - - commons-logging - commons-logging - javax.servlet servlet-api diff --git a/portal/portal-render-engine-impl/impl/pom.xml b/portal/portal-render-engine-impl/impl/pom.xml index 3ed026f0ec86..d5a95f3a9720 100644 --- a/portal/portal-render-engine-impl/impl/pom.xml +++ b/portal/portal-render-engine-impl/impl/pom.xml @@ -45,10 +45,6 @@ sakai-portal-util test - - commons-logging - commons-logging - javax.servlet servlet-api @@ -78,10 +74,6 @@ 3.8.1 test - - log4j - log4j - diff --git a/portal/portal-render-engine-impl/pack/pom.xml b/portal/portal-render-engine-impl/pack/pom.xml index f86121f294e8..b10da4e93705 100644 --- a/portal/portal-render-engine-impl/pack/pom.xml +++ b/portal/portal-render-engine-impl/pack/pom.xml @@ -49,10 +49,6 @@ sakai-portal-util test - - commons-logging - commons-logging - httpunit httpunit diff --git a/portal/portal-render-impl/impl/pom.xml b/portal/portal-render-impl/impl/pom.xml index 26e23b880038..8effa758ab95 100644 --- a/portal/portal-render-impl/impl/pom.xml +++ b/portal/portal-render-impl/impl/pom.xml @@ -48,10 +48,6 @@ commons-codec commons-codec - - commons-logging - commons-logging - jtidy jtidy @@ -84,5 +80,13 @@ src/java + + + ${basedir}/src/test + + log4j.properties + + + diff --git a/portal/portal-render-impl/impl/src/test/log4j.properties b/portal/portal-render-impl/impl/src/test/log4j.properties new file mode 100644 index 000000000000..e78168e1f881 --- /dev/null +++ b/portal/portal-render-impl/impl/src/test/log4j.properties @@ -0,0 +1,6 @@ +log4j.appender.Stdout=org.apache.log4j.ConsoleAppender +log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m%n + +log4j.rootLogger=INFO,Stdout + diff --git a/portal/portal-service-impl/impl/pom.xml b/portal/portal-service-impl/impl/pom.xml index a72eb1bf49e5..8f4d1eead0ca 100644 --- a/portal/portal-service-impl/impl/pom.xml +++ b/portal/portal-service-impl/impl/pom.xml @@ -40,10 +40,6 @@ castor castor - - commons-logging - commons-logging - javax.portlet portlet-api diff --git a/portal/portal-tool/tool/pom.xml b/portal/portal-tool/tool/pom.xml index 3b5270d6e751..0440daced264 100644 --- a/portal/portal-tool/tool/pom.xml +++ b/portal/portal-tool/tool/pom.xml @@ -36,10 +36,6 @@ ${project.groupId} sakai-portal-util - - commons-logging - commons-logging - javax.servlet servlet-api diff --git a/portal/portal-util/util/pom.xml b/portal/portal-util/util/pom.xml index 73fea3aee1af..1404c50f8e36 100644 --- a/portal/portal-util/util/pom.xml +++ b/portal/portal-util/util/pom.xml @@ -36,10 +36,6 @@ ${project.groupId} sakai-portal-api - - commons-logging - commons-logging - javax.servlet servlet-api diff --git a/postem/postem-app/pom.xml b/postem/postem-app/pom.xml index f95e4382d9f4..aa8c732bdc7f 100644 --- a/postem/postem-app/pom.xml +++ b/postem/postem-app/pom.xml @@ -103,10 +103,6 @@ commons-fileupload commons-fileupload - - commons-logging - commons-logging - javax.servlet.jsp jsp-api diff --git a/presence/presence-impl/impl/pom.xml b/presence/presence-impl/impl/pom.xml index e83be08e4693..a08701be47ab 100644 --- a/presence/presence-impl/impl/pom.xml +++ b/presence/presence-impl/impl/pom.xml @@ -40,10 +40,6 @@ org.sakaiproject.common sakai-privacy-api - - commons-logging - commons-logging - diff --git a/presence/presence-tool/tool/pom.xml b/presence/presence-tool/tool/pom.xml index a9155ba196f0..6104b313449f 100644 --- a/presence/presence-tool/tool/pom.xml +++ b/presence/presence-tool/tool/pom.xml @@ -60,10 +60,6 @@ javax.servlet servlet-api - - commons-logging - commons-logging - diff --git a/presence/presence-util/util/pom.xml b/presence/presence-util/util/pom.xml index 43c8d40132b4..d82cef32ed39 100644 --- a/presence/presence-util/util/pom.xml +++ b/presence/presence-util/util/pom.xml @@ -44,9 +44,5 @@ org.sakaiproject.courier sakai-courier-util - - commons-logging - commons-logging - diff --git a/profile2/api/pom.xml b/profile2/api/pom.xml index 9ac84d498585..75c90f298adb 100644 --- a/profile2/api/pom.xml +++ b/profile2/api/pom.xml @@ -27,10 +27,6 @@ commons-codec commons-codec - - org.projectlombok - lombok - org.sakaiproject.common sakai-common-edu-person-api diff --git a/profile2/impl/pom.xml b/profile2/impl/pom.xml index 6183d5040c67..5e6a8589666c 100644 --- a/profile2/impl/pom.xml +++ b/profile2/impl/pom.xml @@ -42,10 +42,6 @@ org.quartz-scheduler quartz - - log4j - log4j - org.twitter4j twitter4j-core @@ -63,10 +59,6 @@ javax.servlet servlet-api - - org.projectlombok - lombok - net.sf.opencsv opencsv diff --git a/profile2/tool/pom.xml b/profile2/tool/pom.xml index be5ef45fe5f2..28cec6820d1e 100644 --- a/profile2/tool/pom.xml +++ b/profile2/tool/pom.xml @@ -32,18 +32,6 @@ org.wicketstuff wicketstuff-objectautocomplete - - org.slf4j - slf4j-log4j12 - - - org.slf4j - slf4j-api - - - log4j - log4j - commons-lang commons-lang @@ -57,10 +45,6 @@ javax.servlet servlet-api - - org.projectlombok - lombok - commons-io commons-io @@ -149,7 +133,7 @@ unpack - process-resources + prepare-package unpack diff --git a/profile2/tool/src/java/org/sakaiproject/profile2/tool/models/DetachableMessageThreadModel.java b/profile2/tool/src/java/org/sakaiproject/profile2/tool/models/DetachableMessageThreadModel.java index 1ce93e00499d..367cc27f031e 100644 --- a/profile2/tool/src/java/org/sakaiproject/profile2/tool/models/DetachableMessageThreadModel.java +++ b/profile2/tool/src/java/org/sakaiproject/profile2/tool/models/DetachableMessageThreadModel.java @@ -82,10 +82,6 @@ else if (obj instanceof DetachableMessageThreadModel) { * @see org.apache.wicket.model.LoadableDetachableModel#load() */ protected MessageThread load(){ - - System.out.println("1: " + messagingLogic); - System.out.println("2: " + id); - return messagingLogic.getMessageThread(id); } } \ No newline at end of file diff --git a/profile2/util/pom.xml b/profile2/util/pom.xml index 88df3932293a..40c733f63de6 100644 --- a/profile2/util/pom.xml +++ b/profile2/util/pom.xml @@ -14,10 +14,6 @@ - - log4j - log4j - commons-lang commons-lang diff --git a/providers/allhands/pom.xml b/providers/allhands/pom.xml index 25aeece0aa77..9f41aedbce1e 100644 --- a/providers/allhands/pom.xml +++ b/providers/allhands/pom.xml @@ -28,24 +28,10 @@ org.sakaiproject.kernel sakai-kernel-api - - - commons-logging - commons-logging - ${sakai.commons-logging.version} - commons-lang commons-lang - - - - - - diff --git a/providers/allhands/src/java/org/sakaiproject/provider/authzGroup/AllHandsGroupProvider.java b/providers/allhands/src/java/org/sakaiproject/provider/authzGroup/AllHandsGroupProvider.java index 5949cd708dc7..c683809e9a97 100644 --- a/providers/allhands/src/java/org/sakaiproject/provider/authzGroup/AllHandsGroupProvider.java +++ b/providers/allhands/src/java/org/sakaiproject/provider/authzGroup/AllHandsGroupProvider.java @@ -88,7 +88,7 @@ public AllHandsGroupProvider() */ public String getRole(String id, String user) { - System.out.println("getRole() id="+id+" user="+user); + M_log.info("getRole() id="+id+" user="+user); // Apparently this is not called ??? return null; } @@ -136,7 +136,7 @@ public Map getUserRolesForGroup(String id) public Map getGroupRolesForUser(String userId) { - System.out.println("getGroupRolesForUser() user="+userId); + M_log.info("getGroupRolesForUser() user="+userId); Map rv = new HashMap(); diff --git a/providers/cm-authz-provider/pom.xml b/providers/cm-authz-provider/pom.xml index d1421c0cec6a..e718db0848f6 100644 --- a/providers/cm-authz-provider/pom.xml +++ b/providers/cm-authz-provider/pom.xml @@ -28,10 +28,6 @@ org.sakaiproject.edu-services.course-management coursemanagement-api - - commons-logging - commons-logging - org.mockito mockito-core diff --git a/providers/federating/pom.xml b/providers/federating/pom.xml index 9c74c167fac4..7a9d6bc66749 100644 --- a/providers/federating/pom.xml +++ b/providers/federating/pom.xml @@ -23,19 +23,6 @@ org.sakaiproject.kernel sakai-kernel-api - - - commons-logging - commons-logging - ${sakai.commons-logging.version} - - - - - - diff --git a/providers/imsent/pom.xml b/providers/imsent/pom.xml index 37cb8358a7c3..bec9b3926ca6 100644 --- a/providers/imsent/pom.xml +++ b/providers/imsent/pom.xml @@ -28,20 +28,6 @@ org.sakaiproject.kernel sakai-kernel-api - - - commons-logging - commons-logging - ${sakai.commons-logging.version} - - - - - - - diff --git a/providers/jldap-mock/pom.xml b/providers/jldap-mock/pom.xml index fde018ff5cda..032b764543e9 100644 --- a/providers/jldap-mock/pom.xml +++ b/providers/jldap-mock/pom.xml @@ -28,26 +28,10 @@ org.sakaiproject.kernel sakai-kernel-api - - - - commons-logging - commons-logging - ${sakai.commons-logging.version} - commons-lang commons-lang - - - - - diff --git a/providers/jldap/pom.xml b/providers/jldap/pom.xml index 7804b63efda1..f186b2f38646 100644 --- a/providers/jldap/pom.xml +++ b/providers/jldap/pom.xml @@ -32,13 +32,6 @@ org.sakaiproject.kernel sakai-component-manager - - - commons-logging - commons-logging - commons-pool commons-pool @@ -72,12 +65,6 @@ - - log4j - log4j - 1.2.8 - test - org.sakaiproject sakai-jldap-provider-mock diff --git a/providers/kerberos/pom.xml b/providers/kerberos/pom.xml index eef1e31efc2f..623642a0d36b 100644 --- a/providers/kerberos/pom.xml +++ b/providers/kerberos/pom.xml @@ -47,10 +47,6 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - diff --git a/providers/openldap/pom.xml b/providers/openldap/pom.xml index ab778624529b..e7a55d39c49a 100644 --- a/providers/openldap/pom.xml +++ b/providers/openldap/pom.xml @@ -28,19 +28,6 @@ org.sakaiproject.kernel sakai-kernel-api - - - commons-logging - commons-logging - ${sakai.commons-logging.version} - - - - - - diff --git a/providers/sample/pom.xml b/providers/sample/pom.xml index a28b65f31036..cc26ae5d2a26 100644 --- a/providers/sample/pom.xml +++ b/providers/sample/pom.xml @@ -28,10 +28,6 @@ org.sakaiproject.kernel sakai-kernel-api - - commons-logging - commons-logging - commons-lang commons-lang diff --git a/reset-pass/account-validator-api/pom.xml b/reset-pass/account-validator-api/pom.xml index e4444fa81af3..9d183a910dc2 100644 --- a/reset-pass/account-validator-api/pom.xml +++ b/reset-pass/account-validator-api/pom.xml @@ -28,10 +28,6 @@ org.sakaiproject.kernel sakai-kernel-api - - commons-logging - commons-logging - org.sakaiproject.entitybroker entitybroker-api diff --git a/reset-pass/account-validator-impl/pom.xml b/reset-pass/account-validator-impl/pom.xml index bd4b9caed2a8..1669e27e3843 100644 --- a/reset-pass/account-validator-impl/pom.xml +++ b/reset-pass/account-validator-impl/pom.xml @@ -156,7 +156,6 @@ commons-validator commons-validator - 1.3.1 oro diff --git a/reset-pass/account-validator-tool/pom.xml b/reset-pass/account-validator-tool/pom.xml index 1ca9d97390ee..9c397be5bd68 100644 --- a/reset-pass/account-validator-tool/pom.xml +++ b/reset-pass/account-validator-tool/pom.xml @@ -80,15 +80,6 @@ ${project.version} war - - - - commons-logging - commons-logging - - - - junit junit diff --git a/reset-pass/reset-pass/pom.xml b/reset-pass/reset-pass/pom.xml index 0e5c64453d63..65c93be1d79d 100644 --- a/reset-pass/reset-pass/pom.xml +++ b/reset-pass/reset-pass/pom.xml @@ -72,9 +72,5 @@ commons-lang commons-lang - - commons-logging - commons-logging - diff --git a/rights/rights-impl/impl/pom.xml b/rights/rights-impl/impl/pom.xml index aff692da0f8c..5680b9fabfb5 100644 --- a/rights/rights-impl/impl/pom.xml +++ b/rights/rights-impl/impl/pom.xml @@ -32,14 +32,6 @@ org.sakaiproject sakai-rights-api - - - - - commons-logging - commons-logging - ${sakai.commons-logging.version} - diff --git a/rights/rights-tool/tool/pom.xml b/rights/rights-tool/tool/pom.xml index a81e971d9c13..655d6bcb9231 100644 --- a/rights/rights-tool/tool/pom.xml +++ b/rights/rights-tool/tool/pom.xml @@ -69,11 +69,6 @@ org.sakaiproject.velocity sakai-velocity-tool - - commons-logging - commons-logging - ${sakai.commons-logging.version} - diff --git a/roster2/pom.xml b/roster2/pom.xml index 1e8ede02366b..9f69b825e17e 100644 --- a/roster2/pom.xml +++ b/roster2/pom.xml @@ -114,10 +114,6 @@ commons-lang provided - - commons-logging - commons-logging - javax.servlet servlet-api @@ -143,10 +139,6 @@ poi-ooxml ${sakai.poi.version} - - org.projectlombok - lombok - org.springframework spring-core diff --git a/rsf/sakai-rsf-core/pom.xml b/rsf/sakai-rsf-core/pom.xml index de204c790da4..eb5313913bf9 100644 --- a/rsf/sakai-rsf-core/pom.xml +++ b/rsf/sakai-rsf-core/pom.xml @@ -22,12 +22,18 @@ uk.org.ponder.rsf rsf-core-ponderutilcore ${rsf.version} - + uk.org.ponder.rsf rsf-core-servletutil ${rsf.version} - + + + commons-logging + commons-logging + + + uk.org.ponder.rsf rsf-core @@ -121,10 +127,6 @@ org.springframework spring-webmvc - - log4j - log4j - diff --git a/rsf/sakai-rsf-web/evolvers/pom.xml b/rsf/sakai-rsf-web/evolvers/pom.xml index 9a4040189101..9b7b8f4ff8b6 100644 --- a/rsf/sakai-rsf-web/evolvers/pom.xml +++ b/rsf/sakai-rsf-web/evolvers/pom.xml @@ -63,10 +63,6 @@ org.springframework spring-webmvc - - commons-logging - commons-logging - cglib cglib-nodep diff --git a/rwiki/rwiki-access-tool/pom.xml b/rwiki/rwiki-access-tool/pom.xml index 17eac66f8118..0f6866afdce8 100644 --- a/rwiki/rwiki-access-tool/pom.xml +++ b/rwiki/rwiki-access-tool/pom.xml @@ -29,27 +29,6 @@ org.sakaiproject.kernel sakai-kernel-api - - - - - - - - - - commons-logging - commons-logging - ${sakai.commons-logging.version} - jar - - diff --git a/rwiki/rwiki-impl/impl/pom.xml b/rwiki/rwiki-impl/impl/pom.xml index c2f4fc05aa76..ae85b6f9ee69 100644 --- a/rwiki/rwiki-impl/impl/pom.xml +++ b/rwiki/rwiki-impl/impl/pom.xml @@ -47,7 +47,12 @@ false - + + ${basedir}/src/test + + log4j.properties + + @@ -68,26 +73,11 @@ org.sakaiproject.kernel sakai-component-manager - - - - - commons-logging - commons-logging - jar - commons-lang commons-lang jar - org.sakaiproject sakai-radeox @@ -108,19 +98,6 @@ sakai-rwiki-util jar - - - - - - - - - - - - - org.sakaiproject.search search-api @@ -131,14 +108,11 @@ search-util jar - - org.sakaiproject.edu-services.sections sections-api jar - org.hibernate hibernate-core diff --git a/rwiki/rwiki-impl/impl/src/test/log4j.properties b/rwiki/rwiki-impl/impl/src/test/log4j.properties new file mode 100644 index 000000000000..e78168e1f881 --- /dev/null +++ b/rwiki/rwiki-impl/impl/src/test/log4j.properties @@ -0,0 +1,6 @@ +log4j.appender.Stdout=org.apache.log4j.ConsoleAppender +log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m%n + +log4j.rootLogger=INFO,Stdout + diff --git a/rwiki/rwiki-tool/tool/pom.xml b/rwiki/rwiki-tool/tool/pom.xml index d70796a67930..3fcbfbd4e9b6 100644 --- a/rwiki/rwiki-tool/tool/pom.xml +++ b/rwiki/rwiki-tool/tool/pom.xml @@ -120,10 +120,6 @@ 1.1.2 jar - - commons-logging - commons-logging - easymock easymock @@ -151,10 +147,6 @@ commons-lang commons-lang - - org.projectlombok - lombok - diff --git a/rwiki/rwiki-util/radeox/pom.xml b/rwiki/rwiki-util/radeox/pom.xml index 11e089a7604d..830a368d8c0f 100644 --- a/rwiki/rwiki-util/radeox/pom.xml +++ b/rwiki/rwiki-util/radeox/pom.xml @@ -52,14 +52,6 @@ org.sakaiproject.kernel sakai-kernel-api - - - commons-logging - commons-logging - ${sakai.commons-logging.version} - junit junit diff --git a/rwiki/rwiki-util/util/pom.xml b/rwiki/rwiki-util/util/pom.xml index b9e315c6b261..0e935ed04f61 100644 --- a/rwiki/rwiki-util/util/pom.xml +++ b/rwiki/rwiki-util/util/pom.xml @@ -59,24 +59,9 @@ org.sakaiproject.kernel sakai-component-manager - - - - - - - - commons-logging - commons-logging - ${sakai.commons-logging.version} - commons-lang commons-lang - - diff --git a/samigo/pom.xml b/samigo/pom.xml index 85e2d8d7784e..2d11b01ca0a6 100644 --- a/samigo/pom.xml +++ b/samigo/pom.xml @@ -135,10 +135,6 @@ org.sakaiproject.kernel sakai-kernel-api - - org.projectlombok - lombok - diff --git a/samigo/samigo-api/pom.xml b/samigo/samigo-api/pom.xml index 8de42cf82139..fec5d61e5509 100644 --- a/samigo/samigo-api/pom.xml +++ b/samigo/samigo-api/pom.xml @@ -35,10 +35,6 @@ org.apache.commons commons-lang3 - - commons-logging - commons-logging - org.sakaiproject.kernel sakai-kernel-api diff --git a/samigo/samigo-app/pom.xml b/samigo/samigo-app/pom.xml index d4e8062c32b1..cf3b535bdc80 100644 --- a/samigo/samigo-app/pom.xml +++ b/samigo/samigo-app/pom.xml @@ -128,7 +128,6 @@ commons-beanutils commons-beanutils - 1.7.0 commons-fileupload @@ -138,10 +137,6 @@ commons-lang commons-lang - - commons-logging - commons-logging - org.apache.commons commons-math @@ -245,10 +240,6 @@ xml-apis 2.0.2 - - org.projectlombok - lombok - org.springframework diff --git a/samigo/samigo-app/src/test/log4j.properties b/samigo/samigo-app/src/test/log4j.properties new file mode 100644 index 000000000000..e78168e1f881 --- /dev/null +++ b/samigo/samigo-app/src/test/log4j.properties @@ -0,0 +1,6 @@ +log4j.appender.Stdout=org.apache.log4j.ConsoleAppender +log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m%n + +log4j.rootLogger=INFO,Stdout + diff --git a/samigo/samigo-cp/pom.xml b/samigo/samigo-cp/pom.xml index bdd05fbf293d..d4f0d05c0d24 100644 --- a/samigo/samigo-cp/pom.xml +++ b/samigo/samigo-cp/pom.xml @@ -43,10 +43,6 @@ ${project.groupId} samigo-qti - - commons-logging - commons-logging - jdom jdom diff --git a/samigo/samigo-hibernate/pom.xml b/samigo/samigo-hibernate/pom.xml index f3d564bbe257..1103fc06bcb2 100644 --- a/samigo/samigo-hibernate/pom.xml +++ b/samigo/samigo-hibernate/pom.xml @@ -26,14 +26,6 @@ ${project.groupId} samigo-api - - - log4j - log4j - - - commons-logging - commons-logging commons-lang diff --git a/samigo/samigo-impl/pom.xml b/samigo/samigo-impl/pom.xml index 8adf6d416614..a9c0f3ca8ca8 100644 --- a/samigo/samigo-impl/pom.xml +++ b/samigo/samigo-impl/pom.xml @@ -50,10 +50,6 @@ emailtemplateservice-api provided - - commons-logging - commons-logging - commons-codec commons-codec @@ -74,11 +70,6 @@ jdom jdom - - log4j - log4j - - diff --git a/samigo/samigo-pack/pom.xml b/samigo/samigo-pack/pom.xml index 5a481bc1beff..c626763474ee 100644 --- a/samigo/samigo-pack/pom.xml +++ b/samigo/samigo-pack/pom.xml @@ -31,10 +31,6 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - ${project.groupId} diff --git a/samigo/samigo-qti/pom.xml b/samigo/samigo-qti/pom.xml index 3a651c9ccce7..1ee8aefc9833 100644 --- a/samigo/samigo-qti/pom.xml +++ b/samigo/samigo-qti/pom.xml @@ -49,15 +49,9 @@ ${project.groupId} samigo-hibernate - - log4j - log4j - 1.2.8 - commons-beanutils commons-beanutils - 1.7.0 commons-collections @@ -67,10 +61,6 @@ commons-lang commons-lang - - commons-logging - commons-logging - jaxen jaxen @@ -104,6 +94,7 @@ src/test **/*.xml + **/log4j.properties **/*.java diff --git a/samigo/samigo-services/pom.xml b/samigo/samigo-services/pom.xml index 656255dad3c0..91a089747b9f 100644 --- a/samigo/samigo-services/pom.xml +++ b/samigo/samigo-services/pom.xml @@ -59,10 +59,6 @@ commons-lang commons-lang - - commons-logging - commons-logging - org.apache.commons commons-math @@ -75,10 +71,6 @@ javax.activation activation - - log4j - log4j - OKI OkiOSID @@ -167,10 +159,6 @@ ehcache-core test - - org.slf4j - slf4j-log4j12 - @@ -195,6 +183,7 @@ hibernate-test.xml hibernate.properties + log4j.properties spring-hibernate.xml diff --git a/samigo/samigo-services/src/java/org/sakaiproject/tool/assessment/entity/impl/CoreAssessmentEntityProviderImpl.java b/samigo/samigo-services/src/java/org/sakaiproject/tool/assessment/entity/impl/CoreAssessmentEntityProviderImpl.java index 8e28fd6f32cb..02268d4e0cba 100644 --- a/samigo/samigo-services/src/java/org/sakaiproject/tool/assessment/entity/impl/CoreAssessmentEntityProviderImpl.java +++ b/samigo/samigo-services/src/java/org/sakaiproject/tool/assessment/entity/impl/CoreAssessmentEntityProviderImpl.java @@ -85,7 +85,6 @@ public boolean entityExists(String id) { public Object getEntity(EntityReference ref) { - System.out.println("core getentity"); return new EntityData(new EntityReference("dummy reference"), "dummy"); } diff --git a/samigo/samlite-impl/pom.xml b/samigo/samlite-impl/pom.xml index d3981b27c571..a76fdb2655a4 100644 --- a/samigo/samlite-impl/pom.xml +++ b/samigo/samlite-impl/pom.xml @@ -45,18 +45,6 @@ org.apache.commons commons-math - - - commons-logging - commons-logging - ${sakai.commons-logging.version} - org.sakaiproject.kernel sakai-component-manager diff --git a/search/elasticsearch/impl/pom.xml b/search/elasticsearch/impl/pom.xml index a8179448831c..8221271f432b 100644 --- a/search/elasticsearch/impl/pom.xml +++ b/search/elasticsearch/impl/pom.xml @@ -83,18 +83,6 @@ 0.2 test - - log4j - log4j - jar - test - - - org.slf4j - slf4j-api - 1.6.1 - test - diff --git a/search/search-impl/impl/pom.xml b/search/search-impl/impl/pom.xml index 06b62e1d9011..b5670f12c2f8 100644 --- a/search/search-impl/impl/pom.xml +++ b/search/search-impl/impl/pom.xml @@ -123,10 +123,6 @@ sanselan 0.97-incubator - - commons-logging - commons-logging - jtidy jtidy @@ -157,7 +153,6 @@ org.apache.pdfbox pdfbox 1.8.6 - jar @@ -186,7 +181,6 @@ commons-httpclient commons-httpclient 3.1 - jar org.apache.myfaces.core diff --git a/shortenedurl/impl/pom.xml b/shortenedurl/impl/pom.xml index 283b7eb1e23c..fb99decdbd54 100755 --- a/shortenedurl/impl/pom.xml +++ b/shortenedurl/impl/pom.xml @@ -46,14 +46,6 @@ commons-lang commons-lang - - commons-logging - commons-logging - - - org.projectlombok - lombok - javax.servlet servlet-api diff --git a/shortenedurl/pom.xml b/shortenedurl/pom.xml index 9c41959a55ff..3b425dc0df37 100755 --- a/shortenedurl/pom.xml +++ b/shortenedurl/pom.xml @@ -75,12 +75,6 @@ - - commons-logging - commons-logging - ${sakai.commons-logging.version} - provided - commons-lang commons-lang diff --git a/shortenedurl/tool/pom.xml b/shortenedurl/tool/pom.xml index e83324824510..0a3c80aa3c8e 100755 --- a/shortenedurl/tool/pom.xml +++ b/shortenedurl/tool/pom.xml @@ -28,10 +28,6 @@ javax.servlet servlet-api - - commons-logging - commons-logging - commons-lang commons-lang diff --git a/signup/api/pom.xml b/signup/api/pom.xml index 04835baa16df..dcd4509f653e 100644 --- a/signup/api/pom.xml +++ b/signup/api/pom.xml @@ -43,10 +43,6 @@ commons-lang commons-lang - - org.projectlombok - lombok - org.mnode.ical4j ical4j diff --git a/signup/impl/pom.xml b/signup/impl/pom.xml index 7e79bf6ede91..45a97f76cfe5 100644 --- a/signup/impl/pom.xml +++ b/signup/impl/pom.xml @@ -66,10 +66,6 @@ org.quartz-scheduler quartz - - commons-logging - commons-logging - commons-lang commons-lang @@ -110,10 +106,6 @@ cglib cglib-nodep - - org.projectlombok - lombok - org.mnode.ical4j ical4j diff --git a/signup/impl/src/java/org/sakaiproject/signup/logic/SignupEmailFacadeImpl.java b/signup/impl/src/java/org/sakaiproject/signup/logic/SignupEmailFacadeImpl.java index 404dfd3bffcf..fb6f7d06728c 100644 --- a/signup/impl/src/java/org/sakaiproject/signup/logic/SignupEmailFacadeImpl.java +++ b/signup/impl/src/java/org/sakaiproject/signup/logic/SignupEmailFacadeImpl.java @@ -29,7 +29,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; -import org.apache.commons.logging.impl.LogFactoryImpl; +import org.apache.commons.logging.LogFactory; import org.apache.commons.validator.EmailValidator; import org.sakaiproject.email.api.AddressValidationException; import org.sakaiproject.email.api.Attachment; @@ -84,7 +84,7 @@ public class SignupEmailFacadeImpl implements SignupEmailFacade { @Setter private SignupCalendarHelper calendarHelper; - private Log logger = LogFactoryImpl.getLog(getClass()); + private Log logger = LogFactory.getLog(SignupEmailFacadeImpl.class); /** diff --git a/signup/impl/src/java/org/sakaiproject/signup/logic/messages/EmailDeliverer.java b/signup/impl/src/java/org/sakaiproject/signup/logic/messages/EmailDeliverer.java index 4a2b43095ef7..714cca26d080 100644 --- a/signup/impl/src/java/org/sakaiproject/signup/logic/messages/EmailDeliverer.java +++ b/signup/impl/src/java/org/sakaiproject/signup/logic/messages/EmailDeliverer.java @@ -22,7 +22,7 @@ import java.util.List; import org.apache.commons.logging.Log; -import org.apache.commons.logging.impl.LogFactoryImpl; +import org.apache.commons.logging.LogFactory; import org.sakaiproject.email.api.EmailService; import org.sakaiproject.user.api.User; @@ -34,7 +34,7 @@ public class EmailDeliverer implements Runnable { private List sakaiUsers; private final EmailService emailService; - private Log logger = LogFactoryImpl.getLog(getClass()); + private Log logger = LogFactory.getLog(EmailDeliverer.class); private final List headers; private final String message; diff --git a/signup/pom.xml b/signup/pom.xml index 9e340ca9c377..1f9323b8e9ec 100644 --- a/signup/pom.xml +++ b/signup/pom.xml @@ -155,12 +155,6 @@ 2.1 provided - - commons-validator - commons-validator - 1.3.0 - compile - oro oro diff --git a/signup/tool/pom.xml b/signup/tool/pom.xml index dd34a2313630..0ef1954b5b2b 100644 --- a/signup/tool/pom.xml +++ b/signup/tool/pom.xml @@ -137,10 +137,6 @@ oro oro - - commons-logging - commons-logging - commons-lang commons-lang @@ -149,10 +145,6 @@ net.sf.opencsv opencsv - - org.projectlombok - lombok - commons-io commons-io diff --git a/signup/tool/src/java/org/sakaiproject/signup/tool/entityproviders/EventProcessHandler.java b/signup/tool/src/java/org/sakaiproject/signup/tool/entityproviders/EventProcessHandler.java index 2cf9f3264d85..8b9c53f1225f 100644 --- a/signup/tool/src/java/org/sakaiproject/signup/tool/entityproviders/EventProcessHandler.java +++ b/signup/tool/src/java/org/sakaiproject/signup/tool/entityproviders/EventProcessHandler.java @@ -25,7 +25,7 @@ import java.util.List; import org.apache.commons.logging.Log; -import org.apache.commons.logging.impl.LogFactoryImpl; +import org.apache.commons.logging.LogFactory; import org.sakaiproject.signup.logic.SakaiFacade; import org.sakaiproject.signup.logic.SignupEventTypes; import org.sakaiproject.signup.logic.SignupMeetingService; @@ -62,7 +62,7 @@ public class EventProcessHandler implements SignupBeanConstants { protected SignupRESTfulSessionManager signupRESTfulSessionManager; - protected Log logger = LogFactoryImpl.getLog(getClass()); + protected Log logger = LogFactory.getLog(EventProcessHandler.class); public SignupEvent getSignupEvent(Long eventId, String siteId, String userId, boolean mustAccessDB) { SignupEvent event = null; diff --git a/signup/tool/src/java/org/sakaiproject/signup/tool/jsf/SignupPermissionsUpdateBean.java b/signup/tool/src/java/org/sakaiproject/signup/tool/jsf/SignupPermissionsUpdateBean.java index 71eb9494d645..e4ba6677e864 100644 --- a/signup/tool/src/java/org/sakaiproject/signup/tool/jsf/SignupPermissionsUpdateBean.java +++ b/signup/tool/src/java/org/sakaiproject/signup/tool/jsf/SignupPermissionsUpdateBean.java @@ -30,7 +30,7 @@ import javax.faces.context.FacesContext; import org.apache.commons.logging.Log; -import org.apache.commons.logging.impl.LogFactoryImpl; +import org.apache.commons.logging.LogFactory; import org.sakaiproject.authz.api.AuthzGroupService; import org.sakaiproject.authz.api.PermissionsHelper; import org.sakaiproject.exception.IdUnusedException; @@ -53,7 +53,7 @@ */ public class SignupPermissionsUpdateBean { - private Log logger = LogFactoryImpl.getLog(getClass()); + private Log logger = LogFactory.getLog(SignupPermissionsUpdateBean.class); private SakaiFacade sakaiFacade; diff --git a/signup/tool/src/java/org/sakaiproject/signup/tool/jsf/SignupUIBaseBean.java b/signup/tool/src/java/org/sakaiproject/signup/tool/jsf/SignupUIBaseBean.java index d2e228ee942a..95e909085499 100644 --- a/signup/tool/src/java/org/sakaiproject/signup/tool/jsf/SignupUIBaseBean.java +++ b/signup/tool/src/java/org/sakaiproject/signup/tool/jsf/SignupUIBaseBean.java @@ -38,14 +38,11 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import lombok.Getter; -import lombok.Setter; - import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; -import org.apache.commons.logging.impl.LogFactoryImpl; +import org.apache.commons.logging.LogFactory; import org.sakaiproject.signup.logic.SakaiFacade; import org.sakaiproject.signup.logic.SignupCalendarHelper; import org.sakaiproject.signup.logic.SignupMeetingService; @@ -59,10 +56,12 @@ import org.sakaiproject.signup.tool.jsf.attachment.AttachmentHandler; import org.sakaiproject.signup.tool.util.SignupBeanConstants; import org.sakaiproject.signup.tool.util.Utilities; -import org.sakaiproject.time.api.Time; import org.sakaiproject.time.api.TimeService; import org.sakaiproject.user.api.User; +import lombok.Getter; +import lombok.Setter; + /** *

* This is a abstract base class for JSF Signup tool UIBean. It provides some @@ -98,7 +97,7 @@ abstract public class SignupUIBaseBean implements SignupBeanConstants, SignupMes protected boolean sendEmail = DEFAULT_SEND_EMAIL; - protected Log logger = LogFactoryImpl.getLog(getClass()); + protected Log logger = LogFactory.getLog(SignupUIBaseBean.class); protected Boolean publishedSite; diff --git a/signup/tool/src/java/org/sakaiproject/signup/tool/jsf/organizer/OrganizerSignupMBean.java b/signup/tool/src/java/org/sakaiproject/signup/tool/jsf/organizer/OrganizerSignupMBean.java index 589fcb13866a..186e8885a23a 100644 --- a/signup/tool/src/java/org/sakaiproject/signup/tool/jsf/organizer/OrganizerSignupMBean.java +++ b/signup/tool/src/java/org/sakaiproject/signup/tool/jsf/organizer/OrganizerSignupMBean.java @@ -25,13 +25,13 @@ import javax.faces.component.UIData; import javax.faces.component.UIInput; +import javax.faces.event.ActionEvent; import javax.faces.model.SelectItem; import javax.faces.model.SelectItemGroup; -import javax.faces.event.ActionEvent; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; -import org.apache.commons.logging.impl.LogFactoryImpl; +import org.apache.commons.logging.LogFactory; import org.sakaiproject.exception.IdUnusedException; import org.sakaiproject.signup.logic.SignupUser; import org.sakaiproject.signup.logic.SignupUserActionException; @@ -96,7 +96,7 @@ public class OrganizerSignupMBean extends SignupUIBaseBean { private UIInput selectedTimeslotId; - private Log logger = LogFactoryImpl.getLog(getClass()); + private Log logger = LogFactory.getLog(OrganizerSignupMBean.class); private boolean addNewAttendee; diff --git a/signup/tool/src/java/org/sakaiproject/signup/tool/util/Utilities.java b/signup/tool/src/java/org/sakaiproject/signup/tool/util/Utilities.java index 647889db48ff..ee01c27afb55 100644 --- a/signup/tool/src/java/org/sakaiproject/signup/tool/util/Utilities.java +++ b/signup/tool/src/java/org/sakaiproject/signup/tool/util/Utilities.java @@ -26,10 +26,11 @@ import java.util.Map; import javax.faces.context.FacesContext; +import javax.faces.event.ActionEvent; import javax.faces.model.SelectItem; import org.apache.commons.logging.Log; -import org.apache.commons.logging.impl.LogFactoryImpl; +import org.apache.commons.logging.LogFactory; import org.sakaiproject.component.cover.ServerConfigurationService; import org.sakaiproject.event.api.UsageSession; import org.sakaiproject.event.cover.EventTrackingService; @@ -44,7 +45,6 @@ import org.sakaiproject.signup.tool.jsf.SignupMeetingsBean; import org.sakaiproject.signup.tool.jsf.organizer.UserDefineTimeslotBean; import org.sakaiproject.util.ResourceLoader; -import javax.faces.event.ActionEvent; /** *

@@ -77,7 +77,7 @@ public final class Utilities implements SignupBeanConstants, MeetingTypes { private static final int TYPE_ERROR=1; private static final int TYPE_INFO=2; - protected static Log logger = LogFactoryImpl.getLog(Utilities.class); + protected static Log logger = LogFactory.getLog(Utilities.class); /** * Add the error message to mssageUIBean for UI purpose. diff --git a/simple-rss-portlet/pom.xml b/simple-rss-portlet/pom.xml index 9f28be2051c2..57ef745eacde 100644 --- a/simple-rss-portlet/pom.xml +++ b/simple-rss-portlet/pom.xml @@ -60,16 +60,6 @@ commons-lang 2.6 - - commons-logging - commons-logging - 1.1.1 - - - log4j - log4j - 1.2.16 - commons-io commons-io @@ -106,12 +96,7 @@ 2.6.8 compile - - org.slf4j - slf4j-log4j12 - 1.5.8 - - + javax.portlet @@ -125,11 +110,6 @@ 2.4 provided - - org.projectlombok - lombok - provided - org.apache.pluto pluto-taglib diff --git a/simple-rss-portlet/src/main/resources/log4j.properties b/simple-rss-portlet/src/main/resources/log4j.properties deleted file mode 100644 index acfff9b1bb35..000000000000 --- a/simple-rss-portlet/src/main/resources/log4j.properties +++ /dev/null @@ -1,52 +0,0 @@ -########################################################################### -# Log file variables, such as "{environment.build.log.rootLevel}" are defined -# by properties in the uPortal/filters directory. See the Building -# and Deploying uPortal section of the uPortal manual - -########################################################################### -# Adjust logging level to appropriate level of logging. Once -# everything is running, using WARN or ERROR will turn off -# tons of debug messages. -# -log4j.rootCategory=WARN, R - -# Set log levels for specific packages -#log4j.logger.au.edu.anu.portal.portlets.cache = DEBUG -#log4j.category.net.sf.ehcache = DEBUG - - -########################################################################### -# Setup a rolling file appender -log4j.appender.R=org.apache.log4j.DailyRollingFileAppender - -########################################################################### -# Uncomment the next line to have messages go to stdout (System.out) -#log4j.appender.R=org.apache.log4j.ConsoleAppender - -# This is the path to the log file. It's usually set to something like -# c:\\portal\\logs\\portal.log or /opt/portal/logs/portal.log -# Relative file names will be relative to the directory specified by the -# user.dir System property. -# WARNING: ALL SLASHES MUST BE FORWARD SLASHES OR ESCAPED BACK SLASHES!!! -# -log4j.appender.R.File=${catalina.base}/logs/simple-rss-portlet.log - -# This tells log4j what type of encoding to use -log4j.appender.R.Encoding=UTF-8 - -# This tells log4j to use PatternLayout for log file formatting -log4j.appender.R.layout=org.apache.log4j.PatternLayout - -# Pattern used during debugging -#log4j.appender.R.layout.ConversionPattern=%5p [%t] %d{MMM/dd HH:mm:ss,SSS} %c{2}.[%x] (%F:%L) - %m%n - -# Pattern that should be used when speed is important (it doesn't provide location info) -log4j.appender.R.layout.ConversionPattern=%5p [%t] %c{2}.[%x] %d{ISO8601} - %m%n - -# Log file rolling frequency -log4j.appender.R.DatePattern='.'yyyy-MM-dd - -# Pattern for performing hourly log rolling, defaults to '.'yyyy-MM-dd -#log4j.appender.R.DatePattern='.'yyyy-MM-dd-HH - - diff --git a/site-manage/pageorder/tool/pom.xml b/site-manage/pageorder/tool/pom.xml index 5f109770695b..31018ac14316 100644 --- a/site-manage/pageorder/tool/pom.xml +++ b/site-manage/pageorder/tool/pom.xml @@ -36,10 +36,6 @@ commons-lang commons-lang - - commons-logging - commons-logging - org.springframework spring-webmvc diff --git a/site-manage/site-association-impl/impl/pom.xml b/site-manage/site-association-impl/impl/pom.xml index c7f4fd3574c3..345fd66a6750 100644 --- a/site-manage/site-association-impl/impl/pom.xml +++ b/site-manage/site-association-impl/impl/pom.xml @@ -40,10 +40,6 @@ ${project.groupId} sakai-siteassociation-hbm - - commons-logging - commons-logging - org.hibernate hibernate-core diff --git a/site-manage/site-association-util/util/pom.xml b/site-manage/site-association-util/util/pom.xml index 106bd5e0fce7..0683bfb59e42 100644 --- a/site-manage/site-association-util/util/pom.xml +++ b/site-manage/site-association-util/util/pom.xml @@ -40,9 +40,5 @@ javax.servlet servlet-api - - commons-logging - commons-logging - diff --git a/site-manage/site-manage-group-helper/tool/pom.xml b/site-manage/site-manage-group-helper/tool/pom.xml index 38c4fbc90216..9b5d10195d0c 100644 --- a/site-manage/site-manage-group-helper/tool/pom.xml +++ b/site-manage/site-manage-group-helper/tool/pom.xml @@ -40,10 +40,6 @@ commons-lang commons-lang - - commons-logging - commons-logging - org.springframework spring-webmvc diff --git a/site-manage/site-manage-group-section-role-helper/pack/pom.xml b/site-manage/site-manage-group-section-role-helper/pack/pom.xml index bfb5a8315908..67bf28dad9e4 100644 --- a/site-manage/site-manage-group-section-role-helper/pack/pom.xml +++ b/site-manage/site-manage-group-section-role-helper/pack/pom.xml @@ -44,9 +44,5 @@ commons-lang commons-lang - - commons-logging - commons-logging - diff --git a/site-manage/site-manage-group-section-role-helper/tool/pom.xml b/site-manage/site-manage-group-section-role-helper/tool/pom.xml index 2a72dd97bc36..d156bdbe49f1 100644 --- a/site-manage/site-manage-group-section-role-helper/tool/pom.xml +++ b/site-manage/site-manage-group-section-role-helper/tool/pom.xml @@ -44,10 +44,6 @@ commons-lang commons-lang - - commons-logging - commons-logging - org.springframework spring-webmvc @@ -82,10 +78,6 @@ net.sf.opencsv opencsv - - org.projectlombok - lombok - org.sakaiproject.edu-services.course-management coursemanagement-api diff --git a/site-manage/site-manage-impl/impl/pom.xml b/site-manage/site-manage-impl/impl/pom.xml index b9db6f71d7d4..4683d01fe31d 100644 --- a/site-manage/site-manage-impl/impl/pom.xml +++ b/site-manage/site-manage-impl/impl/pom.xml @@ -56,10 +56,6 @@ commons-lang commons-lang - - commons-logging - commons-logging - org.hibernate hibernate-core @@ -98,10 +94,6 @@ org.quartz-scheduler quartz - - org.projectlombok - lombok - com.github.javafaker javafaker diff --git a/site-manage/site-manage-link-helper/pom.xml b/site-manage/site-manage-link-helper/pom.xml index d7d0f7dea839..cfc7ce82b45b 100644 --- a/site-manage/site-manage-link-helper/pom.xml +++ b/site-manage/site-manage-link-helper/pom.xml @@ -40,10 +40,6 @@ org.sakaiproject.velocity sakai-velocity-tool - - commons-logging - commons-logging - javax.servlet servlet-api diff --git a/site-manage/site-manage-participant-helper/pom.xml b/site-manage/site-manage-participant-helper/pom.xml index 8353a7d95f8c..98ff23870fac 100644 --- a/site-manage/site-manage-participant-helper/pom.xml +++ b/site-manage/site-manage-participant-helper/pom.xml @@ -64,14 +64,9 @@ commons-lang commons-lang - - commons-logging - commons-logging - commons-validator commons-validator - 1.3.1 oro diff --git a/site-manage/site-manage-tool/tool/pom.xml b/site-manage/site-manage-tool/tool/pom.xml index 695349dd4cd7..18e027d20a1d 100644 --- a/site-manage/site-manage-tool/tool/pom.xml +++ b/site-manage/site-manage-tool/tool/pom.xml @@ -83,16 +83,10 @@ commons-beanutils commons-beanutils - 1.7.0 commons-validator commons-validator - 1.4.0 - - - commons-logging - commons-logging org.apache.xmlgraphics diff --git a/site-manage/site-manage-util/util/pom.xml b/site-manage/site-manage-util/util/pom.xml index e77c77db6c8a..1ab3a1ab3104 100644 --- a/site-manage/site-manage-util/util/pom.xml +++ b/site-manage/site-manage-util/util/pom.xml @@ -43,10 +43,6 @@ commons-lang commons-lang - - - commons-logging - commons-logging junit diff --git a/site/admin-perms-tool/pom.xml b/site/admin-perms-tool/pom.xml index 47f880f70d75..92218706bcb6 100644 --- a/site/admin-perms-tool/pom.xml +++ b/site/admin-perms-tool/pom.xml @@ -95,17 +95,6 @@ 1.1.2 runtime - - - commons-logging - commons-logging - - - - log4j - log4j - test - diff --git a/site/mergedlist-util/util/pom.xml b/site/mergedlist-util/util/pom.xml index fb942ad33a5d..618679a8d751 100644 --- a/site/mergedlist-util/util/pom.xml +++ b/site/mergedlist-util/util/pom.xml @@ -32,9 +32,5 @@ org.sakaiproject.velocity sakai-velocity-tool - - commons-logging - commons-logging - diff --git a/site/sakai-message-bundle-manager-tool/pom.xml b/site/sakai-message-bundle-manager-tool/pom.xml index cd87280555f3..b80d1e78dee3 100644 --- a/site/sakai-message-bundle-manager-tool/pom.xml +++ b/site/sakai-message-bundle-manager-tool/pom.xml @@ -69,15 +69,6 @@ - - - log4j - log4j - - - org.projectlombok - lombok - commons-lang commons-lang diff --git a/site/site-tool/tool/pom.xml b/site/site-tool/tool/pom.xml index 9dfdc3c84771..dd5969aa976d 100644 --- a/site/site-tool/tool/pom.xml +++ b/site/site-tool/tool/pom.xml @@ -48,10 +48,6 @@ javax.servlet servlet-api - - commons-logging - commons-logging - diff --git a/sitestats/pom.xml b/sitestats/pom.xml index 4754c2cfea40..779e93097569 100644 --- a/sitestats/pom.xml +++ b/sitestats/pom.xml @@ -22,9 +22,7 @@ - 1.6 0.8 - 1.7.0 3.2 1.1.111 5.1.25 @@ -110,21 +108,11 @@ provided - - commons-digester - commons-digester - ${commons-digester.version} - commons-betwixt commons-betwixt ${commons-betwixt.version} - - commons-beanutils - commons-beanutils-core - ${commons-beanutils.version} - org.apache.xmlgraphics diff --git a/sitestats/sitestats-api/pom.xml b/sitestats/sitestats-api/pom.xml index 8a63c4e331f1..689d431218c9 100644 --- a/sitestats/sitestats-api/pom.xml +++ b/sitestats/sitestats-api/pom.xml @@ -33,10 +33,6 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - diff --git a/sitestats/sitestats-impl-hib/pom.xml b/sitestats/sitestats-impl-hib/pom.xml index 4c86cfb0fc45..f661fb60f8cb 100644 --- a/sitestats/sitestats-impl-hib/pom.xml +++ b/sitestats/sitestats-impl-hib/pom.xml @@ -29,11 +29,7 @@ org.sakaiproject.sitestats sitestats-api - - - org.projectlombok - lombok - + diff --git a/sitestats/sitestats-impl/pom.xml b/sitestats/sitestats-impl/pom.xml index b226155b5585..cfd48da8ebfe 100644 --- a/sitestats/sitestats-impl/pom.xml +++ b/sitestats/sitestats-impl/pom.xml @@ -105,10 +105,6 @@ commons-dbcp test - - commons-logging - commons-logging - commons-lang commons-lang @@ -116,12 +112,6 @@ commons-digester commons-digester - - - commons-beanutils - commons-beanutils - - commons-betwixt @@ -129,7 +119,7 @@ commons-beanutils - commons-beanutils-core + commons-beanutils @@ -230,27 +220,6 @@ servlet-api test - - log4j - log4j - jar - test - - - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 - - - - org.projectlombok - lombok - - diff --git a/sitestats/sitestats-tool/pom.xml b/sitestats/sitestats-tool/pom.xml index 75a002b61693..5ce75b8e7542 100644 --- a/sitestats/sitestats-tool/pom.xml +++ b/sitestats/sitestats-tool/pom.xml @@ -100,24 +100,8 @@ org.apache.wicket wicket-devutils - - org.slf4j - slf4j-api - - - org.slf4j - slf4j-log4j12 - - - org.projectlombok - lombok - - - commons-logging - commons-logging - commons-lang commons-lang diff --git a/syllabus/syllabus-app/pom.xml b/syllabus/syllabus-app/pom.xml index cb196c64fe47..937f38e7e26a 100644 --- a/syllabus/syllabus-app/pom.xml +++ b/syllabus/syllabus-app/pom.xml @@ -102,11 +102,6 @@ org.sakaiproject sakai-syllabus-api - - commons-logging - commons-logging - ${sakai.commons-logging.version} - org.sakaiproject.calendar sakai-calendar-api @@ -123,10 +118,6 @@ org.springframework spring-beans - - org.projectlombok - lombok - commons-lang commons-lang diff --git a/syllabus/syllabus-impl/pom.xml b/syllabus/syllabus-impl/pom.xml index 74810e05255a..9884a81c2f98 100644 --- a/syllabus/syllabus-impl/pom.xml +++ b/syllabus/syllabus-impl/pom.xml @@ -62,10 +62,6 @@ org.sakaiproject.common archive-api - - commons-logging - commons-logging - commons-codec commons-codec diff --git a/taggable/taggable-impl/impl/pom.xml b/taggable/taggable-impl/impl/pom.xml index 7a17983c8a17..a929da8a6a5a 100644 --- a/taggable/taggable-impl/impl/pom.xml +++ b/taggable/taggable-impl/impl/pom.xml @@ -40,10 +40,6 @@ ${project.groupId} sakai-taggable-hbm - - commons-logging - commons-logging - org.hibernate hibernate-core diff --git a/textarea/FCKeditor/connector/pom.xml b/textarea/FCKeditor/connector/pom.xml index 05072353a2fd..e15948ecb74f 100644 --- a/textarea/FCKeditor/connector/pom.xml +++ b/textarea/FCKeditor/connector/pom.xml @@ -37,10 +37,6 @@ commons-codec commons-codec - - commons-logging - commons-logging - commons-fileupload commons-fileupload diff --git a/textarea/calendar/pom.xml b/textarea/calendar/pom.xml index 77fa11082022..e79a11729f7a 100644 --- a/textarea/calendar/pom.xml +++ b/textarea/calendar/pom.xml @@ -33,10 +33,6 @@ org.sakaiproject.kernel sakai-component-manager - - commons-logging - commons-logging - commons-fileupload commons-fileupload diff --git a/tool/tool-tool/su/pom.xml b/tool/tool-tool/su/pom.xml index c2944c2bd76b..6df0a44b4e01 100644 --- a/tool/tool-tool/su/pom.xml +++ b/tool/tool-tool/su/pom.xml @@ -66,11 +66,6 @@ commons-beanutils commons-beanutils - 1.7.0 - - - commons-logging - commons-logging diff --git a/user/user-tool-admin-prefs/admin-prefs/pom.xml b/user/user-tool-admin-prefs/admin-prefs/pom.xml index bbff64958699..f3ae5efa8a9e 100644 --- a/user/user-tool-admin-prefs/admin-prefs/pom.xml +++ b/user/user-tool-admin-prefs/admin-prefs/pom.xml @@ -25,10 +25,6 @@ org.sakaiproject.kernel sakai-kernel-api - - commons-logging - commons-logging - org.sakaiproject.jsf @@ -59,7 +55,6 @@ commons-beanutils commons-beanutils - 1.7.0 taglibs diff --git a/user/user-tool-prefs/tool/pom.xml b/user/user-tool-prefs/tool/pom.xml index 90f7702f18f6..8e5bb681bdfa 100644 --- a/user/user-tool-prefs/tool/pom.xml +++ b/user/user-tool-prefs/tool/pom.xml @@ -34,10 +34,6 @@ org.sakaiproject.common sakai-privacy-api - - commons-logging - commons-logging - org.apache.myfaces.tomahawk tomahawk @@ -82,7 +78,6 @@ commons-beanutils commons-beanutils - 1.7.0 taglibs diff --git a/user/user-tool/tool/pom.xml b/user/user-tool/tool/pom.xml index 64a2330726b1..e1d672cfcfbd 100644 --- a/user/user-tool/tool/pom.xml +++ b/user/user-tool/tool/pom.xml @@ -36,16 +36,11 @@ commons-validator commons-validator - 1.4.0 commons-lang commons-lang - - commons-logging - commons-logging - org.sakaiproject.velocity sakai-velocity-tool-api @@ -64,10 +59,6 @@ opencsv 2.3 - - org.projectlombok - lombok - org.sakaiproject.portal sakai-portal-util diff --git a/userauditservice/util/pom.xml b/userauditservice/util/pom.xml index 34cbe19c4d47..8d5cf127f814 100644 --- a/userauditservice/util/pom.xml +++ b/userauditservice/util/pom.xml @@ -52,10 +52,6 @@ javax.servlet servlet-api - - commons-logging - commons-logging - diff --git a/usermembership/impl/pom.xml b/usermembership/impl/pom.xml index 4ec5168c7cbb..d376c2192da6 100644 --- a/usermembership/impl/pom.xml +++ b/usermembership/impl/pom.xml @@ -27,33 +27,15 @@ org.sakaiproject.kernel sakai-component-manager - org.sakaiproject sakai-usermembership-api - - - - - - - - - - commons-lang commons-lang - - commons-logging - commons-logging - ${sakai.commons-logging.version} - diff --git a/usermembership/tool/pom.xml b/usermembership/tool/pom.xml index cefd54b64dcd..1d415b63ab77 100644 --- a/usermembership/tool/pom.xml +++ b/usermembership/tool/pom.xml @@ -77,16 +77,10 @@ commons-digester commons-digester - 1.6 commons-beanutils commons-beanutils - 1.7.0 - - - commons-logging - commons-logging diff --git a/velocity/tool/pom.xml b/velocity/tool/pom.xml index 0b7337133e8f..eee63c93abc8 100644 --- a/velocity/tool/pom.xml +++ b/velocity/tool/pom.xml @@ -40,10 +40,6 @@ org.sakaiproject.courier sakai-courier-api - - commons-logging - commons-logging - commons-fileupload commons-fileupload @@ -75,7 +71,6 @@ commons-digester commons-digester - 1.8 diff --git a/web/web-impl/impl/pom.xml b/web/web-impl/impl/pom.xml index 9532eef0adf3..c3552aad4066 100644 --- a/web/web-impl/impl/pom.xml +++ b/web/web-impl/impl/pom.xml @@ -44,10 +44,6 @@ org.sakaiproject.common archive-api - - commons-logging - commons-logging - commons-codec commons-codec diff --git a/web/web-portlet/pom.xml b/web/web-portlet/pom.xml index 51aa77a9cb26..0559bca3bac2 100644 --- a/web/web-portlet/pom.xml +++ b/web/web-portlet/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 web-base @@ -33,10 +33,6 @@ org.sakaiproject.portal sakai-portal-util - - commons-logging - commons-logging - commons-lang commons-lang @@ -50,7 +46,6 @@ commons-validator commons-validator - 1.4.0 javax.servlet diff --git a/web/web-tool/tool/pom.xml b/web/web-tool/tool/pom.xml index 8e6b7abca70c..c0aed8b224ea 100644 --- a/web/web-tool/tool/pom.xml +++ b/web/web-tool/tool/pom.xml @@ -43,15 +43,9 @@ org.sakaiproject.entitybroker entitybroker-utils - - commons-logging - commons-logging - ${sakai.commons-logging.version} - commons-validator commons-validator - 1.3.1 org.sakaiproject.velocity @@ -65,10 +59,6 @@ org.springframework spring-beans - - org.projectlombok - lombok - diff --git a/webservices/cxf/pom.xml b/webservices/cxf/pom.xml index 5634172bdd79..f1117d8b6c06 100644 --- a/webservices/cxf/pom.xml +++ b/webservices/cxf/pom.xml @@ -120,14 +120,6 @@ quartz - - log4j - log4j - - - commons-logging - commons-logging - commons-codec commons-codec diff --git a/webservices/cxf/src/test/resources/log4j.properties b/webservices/cxf/src/test/resources/log4j.properties new file mode 100644 index 000000000000..e78168e1f881 --- /dev/null +++ b/webservices/cxf/src/test/resources/log4j.properties @@ -0,0 +1,6 @@ +log4j.appender.Stdout=org.apache.log4j.ConsoleAppender +log4j.appender.Stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.Stdout.layout.conversionPattern=%-5p - %-26.26c{1} - %m%n + +log4j.rootLogger=INFO,Stdout +