From e20cf233f02c7cdba21b8d19448f1bbfe5bb4536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Jak=C3=B3?= Date: Tue, 5 Nov 2024 10:43:14 +0100 Subject: [PATCH 1/2] Use Alfresco SDK 4.9 --- docker/docker-compose.yml | 72 +++ src/main/assembly/amp.xml | 70 +++ src/main/assembly/file-mapping.properties | 27 ++ src/main/docker/Dockerfile | 23 + src/main/docker/alfresco-global.properties | 85 ++++ src/main/docker/dev-log4j2.properties | 423 ++++++++++++++++++ .../disable-webscript-caching-context.xml | 63 +++ src/main/docker/hotswap-agent.properties | 48 ++ .../alfresco-global.properties | 5 + .../log4j2.properties | 1 + .../module-context.xml | 18 + .../module.properties | 48 ++ 12 files changed, 883 insertions(+) create mode 100644 docker/docker-compose.yml create mode 100644 src/main/assembly/amp.xml create mode 100644 src/main/assembly/file-mapping.properties create mode 100644 src/main/docker/Dockerfile create mode 100644 src/main/docker/alfresco-global.properties create mode 100644 src/main/docker/dev-log4j2.properties create mode 100644 src/main/docker/disable-webscript-caching-context.xml create mode 100644 src/main/docker/hotswap-agent.properties create mode 100644 src/main/resources/alfresco/module/alfresco-javamelody-addon/alfresco-global.properties create mode 100644 src/main/resources/alfresco/module/alfresco-javamelody-addon/log4j2.properties create mode 100644 src/main/resources/alfresco/module/alfresco-javamelody-addon/module-context.xml create mode 100644 src/main/resources/alfresco/module/alfresco-javamelody-addon/module.properties diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml new file mode 100644 index 0000000..b6ef2dd --- /dev/null +++ b/docker/docker-compose.yml @@ -0,0 +1,72 @@ +version: '3.4' +services: +# Optional +# alfresco-javamelody-addon-share: +# image: ${docker.share.image}:${alfresco.share.version} +# environment: +# REPO_HOST: alfresco-javamelody-addon-acs +# REPO_PORT: 8080 +# ports: +# - "${share.port}:8080" + alfresco-javamelody-addon-acs: + image: alfresco-content-services-alfresco-javamelody-addon:development + build: + dockerfile: ./Dockerfile + context: ../../../target + environment: + JAVA_TOOL_OPTIONS: "${keystore.settings}" + JAVA_OPTS: " + -Dsolr.secureComms=secret + -Dsolr.sharedSecret=secret + -Dmessaging.broker.url=\"failover:(nio://alfresco-javamelody-addon-activemq:61616)?timeout=3000&jms.useCompression=true\" + " + CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:8888" + ports: + - "${acs.port}:8080" + - "${acs.debug.port}:8888" + volumes: + - alfresco-javamelody-addon-acs-volume:/usr/local/tomcat/alf_data + depends_on: + - alfresco-javamelody-addon-postgres + alfresco-javamelody-addon-postgres: + image: postgres:9.6 + environment: + POSTGRES_DB: alfresco + POSTGRES_USER: alfresco + POSTGRES_PASSWORD: alfresco + command: postgres -c max_connections=300 -c log_min_messages=LOG + ports: + - "${postgres.port}:5432" + volumes: + - alfresco-javamelody-addon-db-volume:/var/lib/postgresql/data + alfresco-javamelody-addon-ass: + image: alfresco/alfresco-search-services:2.0.3 + environment: + SOLR_ALFRESCO_HOST: alfresco-javamelody-addon-acs + SOLR_ALFRESCO_PORT: 8080 + SOLR_SOLR_HOST: alfresco-javamelody-addon-ass + SOLR_SOLR_PORT: 8983 + SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive + ALFRESCO_SECURE_COMMS: "secret" + JAVA_TOOL_OPTIONS: "-Dalfresco.secureComms.secret=secret" + ports: + - "8983:8983" + volumes: + - alfresco-javamelody-addon-ass-volume:/opt/alfresco-search-services/contentstore + - alfresco-javamelody-addon-ass-volume:/opt/alfresco-search-services/data + alfresco-javamelody-addon-activemq: + image: alfresco/alfresco-activemq:5.16.1 + mem_limit: 1g + ports: + - 8161:8161 # Web Console + - 5672:5672 # AMQP + - 61616:61616 # OpenWire + - 61613:61613 # STOMP + +volumes: + alfresco-javamelody-addon-acs-volume: + external: true + alfresco-javamelody-addon-db-volume: + external: true + alfresco-javamelody-addon-ass-volume: + external: true diff --git a/src/main/assembly/amp.xml b/src/main/assembly/amp.xml new file mode 100644 index 0000000..84b0e1a --- /dev/null +++ b/src/main/assembly/amp.xml @@ -0,0 +1,70 @@ + + + + + build-amp-file + + + amp + + + false + + + + + src/main/resources/alfresco/module/${project.artifactId}/module.properties + true + + + + src/main/assembly/file-mapping.properties + false + + + + + + + + + + + + + + lib + + + + \ No newline at end of file diff --git a/src/main/assembly/file-mapping.properties b/src/main/assembly/file-mapping.properties new file mode 100644 index 0000000..501b3d6 --- /dev/null +++ b/src/main/assembly/file-mapping.properties @@ -0,0 +1,27 @@ +# Custom AMP to WAR location mappings + +# +# The following property can be used to include the standard set of mappings. +# The contents of this file will override any defaults. The default is +# 'true', i.e. the default mappings will be augmented or modified by values in +# this file. +# +# Default mappings are: +# +# /config=/WEB-INF/classes +# /lib=/WEB-INF/lib +# /licenses=/WEB-INF/licenses +# /web/jsp=/jsp +# /web/css=/css +# /web/images=/images +# /web/scripts=/scripts +# /web/php=/php +# +include.default=true + +# +# Custom mappings. If 'include.default' is false, then this is the complete set. +# Map /web to / in AMP so we can override things like favicon.ico +# +/web=/ + diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile new file mode 100644 index 0000000..b5a2597 --- /dev/null +++ b/src/main/docker/Dockerfile @@ -0,0 +1,23 @@ +FROM ${docker.acs.image}:${alfresco.platform.version} + +ARG TOMCAT_DIR=/usr/local/tomcat +ARG USERNAME=${alfresco.platform.docker.user} + +USER root + +# Copy Dockerfile to avoid an error if no JARs exist +COPY Dockerfile extensions/*.jar $TOMCAT_DIR/webapps/alfresco/WEB-INF/lib/ + +# Copy Dockerfile to avoid an error if no AMPs exist +COPY Dockerfile extensions/*.amp $TOMCAT_DIR/amps/ +RUN java -jar $TOMCAT_DIR/alfresco-mmt/alfresco-mmt*.jar install \ + $TOMCAT_DIR/amps $TOMCAT_DIR/webapps/alfresco -directory -nobackup -force + +COPY alfresco-global.properties $TOMCAT_DIR/shared/classes/alfresco-global.properties +COPY dev-log4j2.properties $TOMCAT_DIR/shared/classes/alfresco/extension +COPY disable-webscript-caching-context.xml $TOMCAT_DIR/shared/classes/alfresco/extension + +# Copy Dockerfile to avoid an error if no license file exists +COPY Dockerfile license/*.* $TOMCAT_DIR/webapps/alfresco/WEB-INF/classes/alfresco/extension/license/ + +USER ${USERNAME} \ No newline at end of file diff --git a/src/main/docker/alfresco-global.properties b/src/main/docker/alfresco-global.properties new file mode 100644 index 0000000..d367d75 --- /dev/null +++ b/src/main/docker/alfresco-global.properties @@ -0,0 +1,85 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# RUN TIME PROPERTIES +# ------------------- + +# +# Alfresco configuration for running locally with PostgreSQL Database +# +# Configuration when running Tomcat embedded from Maven. +# Property values from the POM but it can also be edited here. +# + +# Alfresco Repo Webapp (alfresco.war) context, ports etc +alfresco.context=alfresco +alfresco.host=localhost +alfresco.port=8080 +alfresco.protocol=http + +# Alfresco Share Webapp (share.war) context, ports etc +share.context=share +share.host=localhost +share.port=8180 +share.protocol=http + +# Don't try and recover any index +index.recovery.mode=NONE + +# These jobs seem to require Lucene (Unsupported Operation with Solr) so we disable them / set to future date +# See https://forums.alfresco.com/en/viewtopic.php?f=52&t=41597 +# If you want to enable them (and so full WQS functionality), please also set index.subsystem.name=lucene +wcmqs.dynamicCollectionProcessor.schedule=0 30 2 * * ? 2060 +wcmqs.feedbackProcessor.schedule=0 40 2 * * ? 2060 +wcmqs.publishQueueProcessor.schedule=0 50 2 * * ? 2060 + +# Fail or not when there are node integrity checker errors +integrity.failOnError=true + +# Alfresco Repository PostgreSQL Database configuration. +# The PostgreSQL Driver is brought in via the tomcat7-maven-plugin as a dependency. +db.driver=org.postgresql.Driver + +# This Alfresco Platform Configuration file should be used for custom properties that are introduced by this module. +# Define default values for all properties here. +# System Administrators can override these values in environment specific configurations in +# alfresco/tomcat/shared/classes/alfresco-global.properties. +# +index.subsystem.name=solr6 +solr.host=alfresco-javamelody-addon-ass +solr.port=8983 +solr.secureComms=secret +solr.sharedSecret=secret + +db.username=alfresco +db.password=alfresco +db.pool.initial=10 +db.pool.max=100 + +db.url=jdbc:postgresql://alfresco-javamelody-addon-postgres:5432/alfresco + +# File servers related properties +# For local runs we disable CIFS and FTP +cifs.enabled=false +ftp.enabled=false + +csrf.filter.enabled=false + +# Embedded broker without persistence +messaging.broker.url=vm://localhost?broker.persistent=false + +# Disable ATS +transform.service.enabled=false +local.transform.service.enabled=false +legacy.transform.service.enabled=false diff --git a/src/main/docker/dev-log4j2.properties b/src/main/docker/dev-log4j2.properties new file mode 100644 index 0000000..fd7b615 --- /dev/null +++ b/src/main/docker/dev-log4j2.properties @@ -0,0 +1,423 @@ +# Set root logger level to error +#log4j.rootLogger=error, Console, File +rootLogger.level=error +rootLogger.appenderRef.stdout.ref=ConsoleAppender +rootLogger.appenderRef.rolling.ref=RollingAppender + +# All outputs currently set to be a ConsoleAppender. +appender.console.type=Console +appender.console.name=ConsoleAppender +appender.console.layout.type=PatternLayout +appender.console.layout.pattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %replace{%m}{[\r\n]+}{}%n + +# use log4j NDC to replace %x with tenant domain / username +appender.console.layout.pattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %replace{%m}{[\r\n]+}{}%n + +# File appender definition # +appender.rolling.type=RollingFile +appender.rolling.name=RollingAppender +appender.rolling.fileName=alfresco.log +appender.rolling.filePattern=alfresco.log.%d{yyyy-MM-dd} +appender.rolling.layout.type=PatternLayout +appender.rolling.layout.pattern=%d{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %replace{%m}{[\r\n]+}{}%n +appender.rolling.policies.type = Policies +appender.rolling.policies.time.type = TimeBasedTriggeringPolicy +appender.rolling.policies.time.interval = 1 + +# Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4JHierarchyInit) +# Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime +# control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via +# Log4j addLoggerMBean as long as the logger exists and has been loaded. + +# Hibernate +logger.hibernate.name=org.hibernate +logger.hibernate.level=error + +logger.hibernate-util-JDBCExceptionReporter.name=org.hibernate.util.JDBCExceptionReporter +logger.hibernate-util-JDBCExceptionReporter.level=fatal + +logger.hibernate-event-def-AbstractFlushingEventListener.name=org.hibernate.event.def.AbstractFlushingEventListener +logger.hibernate-event-def-AbstractFlushingEventListener.level=fatal + +logger.hibernate-type.name=org.hibernate.type +logger.hibernate-type.level=warn + +logger.hibernate-cfg-SettingsFactory.name=org.hibernate.cfg.SettingsFactory +logger.hibernate-cfg-SettingsFactory.level=warn + +# Spring +logger.springframework.name=org.springframework +logger.springframework.level=warn + +# Turn off Spring remoting warnings that should really be info or debug. +logger.springframework-remoting-support.name=org.springframework.remoting.support +logger.springframework-remoting-support.level=error + +logger.springframework-util.name=org.springframework.util +logger.springframework-util.level=error + +# Axis/WSS4J +logger.apache-axis.name=org.apache.axis +logger.apache-axis.level=info + +logger.apache-ws.name=org.apache.ws +logger.apache-ws.level=info + +# CXF +logger.apache-cxf.name=org.apache.cxf +logger.apache-cxf.level=error + +# MyFaces +logger.apache-myfaces-util-DebugUtils.name=org.apache.myfaces.util.DebugUtils +logger.apache-myfaces-util-DebugUtils.level=info + +logger.apache-myfaces-el-VariableResolverImpl.name=org.apache.myfaces.el.VariableResolverImpl +logger.apache-myfaces-el-VariableResolverImpl.level=error + +logger.apache-myfaces-application-jsp-JspViewHandlerImpl.name=org.apache.myfaces.application.jsp.JspViewHandlerImpl +logger.apache-myfaces-application-jsp-JspViewHandlerImpl.level=error + +logger.apache-myfaces-taglib.name=org.apache.myfaces.taglib +logger.apache-myfaces-taglib.level=error + +# OpenOfficeConnection +logger.sf-jooreports-openoffice-connection.name=net.sf.jooreports.openoffice.connection +logger.sf-jooreports-openoffice-connection.level=fatal + +# log prepared statement cache activity log4j.logger.org.hibernate.ps.PreparedStatementCache=info + +# Alfresco +logger.alfresco.name=org.alfresco +logger.alfresco.level=error + +logger.alfresco-repo-admin.name=org.alfresco.repo.admin +logger.alfresco-repo-admin.level=info + +logger.alfresco-repo-transaction.name=org.alfresco.repo.transaction +logger.alfresco-repo-transaction.level=warn + +logger.alfresco-repo-cache-TransactionalCache.name=org.alfresco.repo.cache.TransactionalCache +logger.alfresco-repo-cache-TransactionalCache.level=warn + +logger.alfresco-repo-model-filefolder.name=org.alfresco.repo.model.filefolder +logger.alfresco-repo-model-filefolder.level=warn + +logger.alfresco-repo-tenant.name=org.alfresco.repo.tenant +logger.alfresco-repo-tenant.level=info + +logger.alfresco-config.name=org.alfresco.config +logger.alfresco-config.level=warn + +logger.alfresco-config-JndiObjectFactoryBean.name=org.alfresco.config.JndiObjectFactoryBean +logger.alfresco-config-JndiObjectFactoryBean.level=warn + +logger.alfresco-config-JBossEnabledWebApplicationContext.name=org.alfresco.config.JBossEnabledWebApplicationContext +logger.alfresco-config-JBossEnabledWebApplicationContext.level=warn + +logger.alfresco-repo-management-subsystems.name=org.alfresco.repo.management.subsystems +logger.alfresco-repo-management-subsystems.level=warn + +logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory.name=org.alfresco.repo.management.subsystems.ChildApplicationContextFactory +logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory.level=info + +logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory$ChildApplicationContext.name=org.alfresco.repo.management.subsystems.ChildApplicationContextFactory$ChildApplicationContext +logger.alfresco-repo-management-subsystems-ChildApplicationContextFactory$ChildApplicationContext.level=warn + +logger.alfresco-repo-security-sync.name=org.alfresco.repo.security.sync +logger.alfresco-repo-security-sync.level=info + +logger.alfresco-repo-security-person.name=org.alfresco.repo.security.person +logger.alfresco-repo-security-person.level=info + +logger.alfresco-sample.name=org.alfresco.sample +logger.alfresco-sample.level=info + +logger.alfresco-web.name=org.alfresco.web +logger.alfresco-web.level=info + +logger.alfresco-service-descriptor-DescriptorService.name=org.alfresco.service.descriptor.DescriptorService +logger.alfresco-service-descriptor-DescriptorService.level=info + +logger.alfresco-repo-importer-ImporterBootstrap.name=org.alfresco.repo.importer.ImporterBootstrap +logger.alfresco-repo-importer-ImporterBootstrap.level=error + +logger.alfresco-repo-admin-patch-PatchExecuter.name=org.alfresco.repo.admin.patch.PatchExecuter +logger.alfresco-repo-admin-patch-PatchExecuter.level=info + +logger.alfresco-repo-domain-patch-ibatis-PatchDAOImpl.name=org.alfresco.repo.domain.patch.ibatis.PatchDAOImpl +logger.alfresco-repo-domain-patch-ibatis-PatchDAOImpl.level=info + +# Specific patches +logger.alfresco-repo-admin-patch-impl-DeploymentMigrationPatch.name=org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch +logger.alfresco-repo-admin-patch-impl-DeploymentMigrationPatch.level=info + +logger.alfresco-repo-version-VersionMigrator.name=org.alfresco.repo.version.VersionMigrator +logger.alfresco-repo-version-VersionMigrator.level=info + +logger.alfresco-repo-module-ModuleServiceImpl.name=org.alfresco.repo.module.ModuleServiceImpl +logger.alfresco-repo-module-ModuleServiceImpl.level=info + +logger.alfresco-repo-domain-schema-SchemaBootstrap.name=org.alfresco.repo.domain.schema.SchemaBootstrap +logger.alfresco-repo-domain-schema-SchemaBootstrap.level=info + +logger.alfresco-repo-admin-ConfigurationChecker.name=org.alfresco.repo.admin.ConfigurationChecker +logger.alfresco-repo-admin-ConfigurationChecker.level=info + +logger.alfresco-repo-node-index-AbstractReindexComponent.name=org.alfresco.repo.node.index.AbstractReindexComponent +logger.alfresco-repo-node-index-AbstractReindexComponent.level=warn + +logger.alfresco-repo-node-index-IndexTransactionTracker.name=org.alfresco.repo.node.index.IndexTransactionTracker +logger.alfresco-repo-node-index-IndexTransactionTracker.level=warn + +logger.alfresco-repo-node-index-FullIndexRecoveryComponent.name=org.alfresco.repo.node.index.FullIndexRecoveryComponent +logger.alfresco-repo-node-index-FullIndexRecoveryComponent.level=info + +#logger.alfresco-repo-node-db-hibernate-HibernateNodeDaoServiceImpl.name=org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl +#logger.alfresco-repo-node-db-hibernate-HibernateNodeDaoServiceImpl.level=warn + +logger.alfresco-repo-domain-hibernate-DirtySessionMethodInterceptor.name=org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor +logger.alfresco-repo-domain-hibernate-DirtySessionMethodInterceptor.level=warn + +logger.alfresco-repo-transaction-RetryingTransactionHelper.name=org.alfresco.repo.transaction.RetryingTransactionHelper +logger.alfresco-repo-transaction-RetryingTransactionHelper.level=warn + +logger.alfresco-util-transaction-SpringAwareUserTransaction-trace.name=org.alfresco.util.transaction.SpringAwareUserTransaction.trace +logger.alfresco-util-transaction-SpringAwareUserTransaction-trace.level=warn + +logger.alfresco-util-AbstractTriggerBean.name=org.alfresco.util.AbstractTriggerBean +logger.alfresco-util-AbstractTriggerBean.level=warn + +logger.alfresco-enterprise-repo-cluster.name=org.alfresco.enterprise.repo.cluster +logger.alfresco-enterprise-repo-cluster.level=info + +logger.alfresco-repo-version-Version2ServiceImpl.name=org.alfresco.repo.version.Version2ServiceImpl +logger.alfresco-repo-version-Version2ServiceImpl.level=warn + +#logger.alfresco-web-app-DebugPhaseListener.name=org.alfresco.web.app.DebugPhaseListener +#logger.alfresco-web-app-DebugPhaseListener.level=debug + +logger.alfresco-repo-node-db-NodeStringLengthWorker.name=org.alfresco.repo.node.db.NodeStringLengthWorker +logger.alfresco-repo-node-db-NodeStringLengthWorker.level=info + +logger.alfresco-repo-workflow.name=org.alfresco.repo.workflow +logger.alfresco-repo-workflow.level=info + +# CIFS server debugging +logger.alfresco-smb.protocol.name=org.alfresco.smb.protocol +logger.alfresco-smb.protocol.level=error + +# FTP server debugging +logger.alfresco-ftp-protocol.name=org.alfresco.ftp.protocol +logger.alfresco-ftp-protocol.level=error + +# WebDAV debugging +logger.alfresco-webdav-protocol.name=org.alfresco.webdav.protocol +logger.alfresco-webdav-protocol.level=info + +# NTLM servlet filters +#log4j.logger.org.alfresco.web.app.servlet.NTLMAuthenticationFilter=debug +#log4j.logger.org.alfresco.repo.webdav.auth.NTLMAuthenticationFilter=debug + +# Kerberos servlet filters +#log4j.logger.org.alfresco.web.app.servlet.KerberosAuthenticationFilter=debug +#log4j.logger.org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter=debug + +# File servers +logger.alfresco-fileserver.name=org.alfresco.fileserver +logger.alfresco-fileserver.level=warn + +# Repo filesystem debug logging +#log4j.logger.org.alfresco.filesys.repo.ContentDiskDriver=debug + +# Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated +logger.alfresco-repo-node-integrity.name=org.alfresco.repo.node.integrity +logger.alfresco-repo-node-integrity.level=error + +# Indexer debugging +logger.alfresco-repo-search-Indexer.name=org.alfresco.repo.search.Indexer +logger.alfresco-repo-search-Indexer.level=error + +logger.alfresco-repo-search-impl-lucene-index.name=org.alfresco.repo.search.impl.lucene.index +logger.alfresco-repo-search-impl-lucene-index.level=error + +logger.alfresco-repo-search-impl-lucene-fts-FullTextSearchIndexerImpl.name=org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexerImpl +logger.alfresco-repo-search-impl-lucene-fts-FullTextSearchIndexerImpl.level=warn + +# Audit debugging +logger.missingProperties.name=alfresco.missingProperties +logger.missingProperties.level=warn + +# Property sheet and modelling debugging +logger.missingProperties.name=alfresco.missingProperties +logger.missingProperties.level=warn + +# Dictionary/Model debugging +logger.alfresco-repo-dictionary.name=org.alfresco.repo.dictionary +logger.alfresco-repo-dictionary.level=warn + +logger.alfresco-repo-dictionary-types-period.name=org.alfresco.repo.dictionary.types.period +logger.alfresco-repo-dictionary-types-period.level=warn + +# Virtualization Server Registry +logger.alfresco-mbeans-VirtServerRegistry.name=org.alfresco.mbeans.VirtServerRegistry +logger.alfresco-mbeans-VirtServerRegistry.level=error + +# Spring context runtime property setter +logger.alfresco-util-RuntimeSystemPropertiesSetter.name=org.alfresco.util.RuntimeSystemPropertiesSetter +logger.alfresco-util-RuntimeSystemPropertiesSetter.level=info + +# Debugging options for clustering +logger.alfresco-repo-content-ReplicatingContentStore.name=org.alfresco.repo.content.ReplicatingContentStore +logger.alfresco-repo-content-ReplicatingContentStore.level=error + +logger.alfresco-repo-content-replication.name=org.alfresco.repo.content.replication +logger.alfresco-repo-content-replication.level=error + +# Activity service +logger.alfresco-repo-activities.name=org.alfresco.repo.activities +logger.alfresco-repo-activities.level=warn + +# User usage tracking +logger.alfresco-repo-usage.name=org.alfresco.repo.usage +logger.alfresco-repo-usage.level=info + +# Sharepoint +logger.alfresco-module-vti.name=org.alfresco.module.vti +logger.alfresco-module-vti.level=info + +# Forms Engine +logger.alfresco-web-config-forms.name=org.alfresco.web.config.forms +logger.alfresco-web-config-forms.level=info + +logger.alfresco-web-scripts-forms.name=org.alfresco.web.scripts.forms +logger.alfresco-web-scripts-forms.level=info + +# CMIS +logger.alfresco-opencmis.name=org.alfresco.opencmis +logger.alfresco-opencmis.level=error + +logger.alfresco-opencmis-AlfrescoCmisServiceInterceptor.name=org.alfresco.opencmis.AlfrescoCmisServiceInterceptor +logger.alfresco-opencmis-AlfrescoCmisServiceInterceptor.level=error + +logger.alfresco-cmis.name=org.alfresco.cmis +logger.alfresco-cmis.level=error + +logger.alfresco-cmis-dictionary.name=org.alfresco.cmis.dictionary +logger.alfresco-cmis-dictionary.level=warn + +logger.apache-chemistry-opencmis.name=org.apache.chemistry.opencmis +logger.apache-chemistry-opencmis.level=info + +logger.apache-chemistry-opencmis-server-impl-browser-CmisBrowserBindingServlet.name=org.apache.chemistry.opencmis.server.impl.browser.CmisBrowserBindingServlet +logger.apache-chemistry-opencmis-server-impl-browser-CmisBrowserBindingServlet.level=off + +logger.apache-chemistry-opencmis-server-impl-atompub-CmisAtomPubServlet.name=org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet +logger.apache-chemistry-opencmis-server-impl-atompub-CmisAtomPubServlet.level=off + +# IMAP +logger.alfresco-repo-imap.name=org.alfresco.repo.imap +logger.alfresco-repo-imap.level=info + +# JBPM +# Note: non-fatal errors (eg. logged during job execution) should be handled by Alfresco's retrying transaction handler +logger.jbpm-graph-def-GraphElement.name=org.jbpm.graph.def.GraphElement +logger.jbpm-graph-def-GraphElement.level=fatal + + +# Web Framework +logger.springframework-extensions-webscripts.name=org.springframework.extensions.webscripts +logger.springframework-extensions-webscripts.level=info + +logger.springframework-extensions-webscripts-ScriptLogger.name=org.springframework.extensions.webscripts.ScriptLogger +logger.springframework-extensions-webscripts-ScriptLogger.level=warn + +logger.springframework-extensions-webscripts-ScriptDebugger.name=org.springframework.extensions.webscripts.ScriptDebugger +logger.springframework-extensions-webscripts-ScriptDebugger.level=off + +# Repository +logger.alfresco-repo-web-scripts.name=org.alfresco.repo.web.scripts +logger.alfresco-repo-web-scripts.level=warn + +logger.alfresco-repo-web-scripts-BaseWebScriptTest.name=org.alfresco.repo.web.scripts.BaseWebScriptTest +logger.alfresco-repo-web-scripts-BaseWebScriptTest.level=info + +logger.alfresco-repo-web-scripts-AlfrescoRhinoScriptDebugger.name=org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger +logger.alfresco-repo-web-scripts-AlfrescoRhinoScriptDebugger.level=off + +logger.alfresco-repo-jscript.name=org.alfresco.repo.jscript +logger.alfresco-repo-jscript.level=error + +logger.alfresco-repo-jscript-ScriptLogger.name=org.alfresco.repo.jscript.ScriptLogger +logger.alfresco-repo-jscript-ScriptLogger.level=warn + +logger.alfresco-repo-cmis-rest-CMISTest.name=org.alfresco.repo.cmis.rest.CMISTest +logger.alfresco-repo-cmis-rest-CMISTest.level=info + +logger.alfresco-repo-domain-schema-script-ScriptBundleExecutorImpl.name=org.alfresco.repo.domain.schema.script.ScriptBundleExecutorImpl +logger.alfresco-repo-domain-schema-script-ScriptBundleExecutorImpl.level=off + +logger.alfresco-repo-domain-schema-script-ScriptExecutorImpl.name=org.alfresco.repo.domain.schema.script.ScriptExecutorImpl +logger.alfresco-repo-domain-schema-script-ScriptExecutorImpl.level=info + +logger.alfresco-repo-domain-schema-script-DeleteNotExistsExecutor.name=org.alfresco.repo.domain.schema.script.DeleteNotExistsExecutor +logger.alfresco-repo-domain-schema-script-DeleteNotExistsExecutor.level=off + +logger.alfresco-repo-search-impl-solr-facet-SolrFacetServiceImpl.name=org.alfresco.repo.search.impl.solr.facet.SolrFacetServiceImpl +logger.alfresco-repo-search-impl-solr-facet-SolrFacetServiceImpl.level=info + +# Bulk Filesystem Import Tool +logger.alfresco-repo-bulkimport.name=org.alfresco.repo.bulkimport +logger.alfresco-repo-bulkimport.level=warn + +# Freemarker +# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler +logger.runtime.name=freemarker.runtime +logger.runtime.level= + +# Metadata extraction +logger.alfresco-repo-content-metadata-AbstractMappingMetadataExtracter.name=org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter +logger.alfresco-repo-content-metadata-AbstractMappingMetadataExtracter.level=warn + +# Reduces PDFont error level due to ALF-7105 +logger.apache-pdfbox-pdmodel-font-PDSimpleFont.name=org.apache.pdfbox.pdmodel.font.PDSimpleFont +logger.apache-pdfbox-pdmodel-font-PDSimpleFont.level=fatal +logger.apache-pdfbox-pdmodel-font-PDFont.name=org.apache.pdfbox.pdmodel.font.PDFont +logger.apache-pdfbox-pdmodel-font-PDFont=fatal +logger.apache-pdfbox-pdmodel-font-PDCIDFont.name=org.apache.pdfbox.pdmodel.font.PDCIDFont +logger.apache-pdfbox-pdmodel-font-PDCIDFont.level=fatal + +# no index support +logger.alfresco-repo-search-impl-noindex-NoIndexIndexer.name=org.alfresco.repo.search.impl.noindex.NoIndexIndexer +logger.alfresco-repo-search-impl-noindex-NoIndexIndexer.level=fatal + +logger.alfresco-repo-search-impl-noindex-NoIndexSearchService.name=org.alfresco.repo.search.impl.noindex.NoIndexSearchService +logger.alfresco-repo-search-impl-noindex-NoIndexSearchService.level=fatal + +# lucene index warnings +logger.alfresco-repo-search-impl-lucene-index-IndexInfo.name=org.alfresco.repo.search.impl.lucene.index.IndexInfo +logger.alfresco-repo-search-impl-lucene-index-IndexInfo.level=warn + +# Warn about RMI socket bind retries. +logger.alfresco-util-remote-server-socket-HostConfigurableSocketFactory.name=org.alfresco.util.remote.server.socket.HostConfigurableSocketFactory +logger.alfresco-util-remote-server-socket-HostConfigurableSocketFactory.level=warn + +logger.alfresco-repo-usage-RepoUsageMonitor.name=org.alfresco.repo.usage.RepoUsageMonitor +logger.alfresco-repo-usage-RepoUsageMonitor.level=info + +# Authorization +logger.alfresco-enterprise-repo-authorization-AuthorizationService.name=org.alfresco.enterprise.repo.authorization.AuthorizationService +logger.alfresco-enterprise-repo-authorization-AuthorizationService.level=info + +logger.alfresco-enterprise-repo-authorization-AuthorizationsConsistencyMonitor.name=org.alfresco.enterprise.repo.authorization.AuthorizationsConsistencyMonitor +logger.alfresco-enterprise-repo-authorization-AuthorizationsConsistencyMonitor.level=warn + +#----------------------------------------------------------------------- +# Platform module logging +#----------------------------------------------------------------------- +logger.net.bull.javamelody-platformsample-DemoComponent.name=net.bull.javamelody.platformsample.DemoComponent +logger.net.bull.javamelody-platformsample-DemoComponent.level=debug +logger.net.bull.javamelody-platformsample-HelloWorldWebScript.name=net.bull.javamelody.platformsample.HelloWorldWebScript +logger.net.bull.javamelody-platformsample-HelloWorldWebScript.level=debug + + + diff --git a/src/main/docker/disable-webscript-caching-context.xml b/src/main/docker/disable-webscript-caching-context.xml new file mode 100644 index 0000000..07829ea --- /dev/null +++ b/src/main/docker/disable-webscript-caching-context.xml @@ -0,0 +1,63 @@ + + + + + + + + javascript + + + js + + + + false + + + + + true + + + + + + + + + + ${spaces.store} + + + ${spaces.company_home.childname} + + + + + diff --git a/src/main/docker/hotswap-agent.properties b/src/main/docker/hotswap-agent.properties new file mode 100644 index 0000000..fbe8a22 --- /dev/null +++ b/src/main/docker/hotswap-agent.properties @@ -0,0 +1,48 @@ +# Enable hotswap so that changes in this module will be automatically reloaded +# Watch for changed class files on watchResources path and reload class definition in the running application. +autoHotswap=true +#autoHotswap.port=8000 + +# Add a directory prior to application classpath (load classes and resources). +# +# This may be useful for example in multi module maven project to load class changes from upstream project +# classes. Set extraClasspath to upstream project compiler output and .class file will have precedence to +# classes from built JAR file. +# i.e. monitor /target/classes +# should work with extraClasspath=${project.build.outputDirectory} +# If not try +extraClasspath=/usr/local/tomcat/hotswap-agent + +# Comma separated list of disabled plugins +# Use plugin name - e.g. +# Hotswapper, AnonymousClassPatch, WatchResources, Hibernate, Spring, Jersey2, Jetty, Tomcat, +# ZK, Logback, JSF, Seam, ELResolver, OsgiEquinox, Proxy, WebObjects, Weld, JBossModules, Resteasy, Gae +disabledPlugins=Hibernate,Spring + +# Add a directory prior to webapp path (load webapp resources). +# +# Load web application resources (such as HTML, JSP, CSS, ...) from this directory prior to default processing. +# Use this setting to set to serve resources from source directory directly (e.g. src/main/webapp). +extraWebappContext=/usr/local/tomcat/hotswap-agent/alfresco-javamelody-addon/target/classes/META-INF/resources; + +# Load static web resources from different directory. +# +# This setting is dependent on application server plugin(Jetty, Tomcat, JBoss, ...) +webappDir=/usr/local/tomcat/hotswap-agent/alfresco-javamelody-addon/target/classes/META-INF/resources; + +# Watch for changes in a directory (resources only). +# +# Similar to extraClasspath this property adds classpath when searching for resources (not classes). +# While extra classpath just modifies the classloader, this setting does nothing until the resource +# is really changed. +# +# Sometimes it is not possible to point extraClasspath to your i.e. src/main/resources, because there are multiple +# replacements of resources in a building step (maven filtering resource option). +# This setting will leave i.e. src/target/classes as default source for resources, but after the resource is modified +# in src/main/resources, the new changed resource is served instead. +# watchResources= + +LOGGER.org.hotswap.agent=DEBUG +#LOGGER.org.hotswap.agent.plugin=TRACE +#LOGGER.org.hotswap.agent.watch=TRACE +#LOGGER.org.hotswap.agent.command=TRACE \ No newline at end of file diff --git a/src/main/resources/alfresco/module/alfresco-javamelody-addon/alfresco-global.properties b/src/main/resources/alfresco/module/alfresco-javamelody-addon/alfresco-global.properties new file mode 100644 index 0000000..f566f22 --- /dev/null +++ b/src/main/resources/alfresco/module/alfresco-javamelody-addon/alfresco-global.properties @@ -0,0 +1,5 @@ +## This Alfresco Platform Configuration file should be used for custom properties that are introduced by this module. +## Define default values for all properties here. +## System Administrators can override these values in environment specific configurations in +## alfresco/tomcat/shared/classes/alfresco-global.properties. +## diff --git a/src/main/resources/alfresco/module/alfresco-javamelody-addon/log4j2.properties b/src/main/resources/alfresco/module/alfresco-javamelody-addon/log4j2.properties new file mode 100644 index 0000000..5bb2a36 --- /dev/null +++ b/src/main/resources/alfresco/module/alfresco-javamelody-addon/log4j2.properties @@ -0,0 +1 @@ +# Add here module-specific custom log4j2.properties configuration \ No newline at end of file diff --git a/src/main/resources/alfresco/module/alfresco-javamelody-addon/module-context.xml b/src/main/resources/alfresco/module/alfresco-javamelody-addon/module-context.xml new file mode 100644 index 0000000..7557672 --- /dev/null +++ b/src/main/resources/alfresco/module/alfresco-javamelody-addon/module-context.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + diff --git a/src/main/resources/alfresco/module/alfresco-javamelody-addon/module.properties b/src/main/resources/alfresco/module/alfresco-javamelody-addon/module.properties new file mode 100644 index 0000000..158500f --- /dev/null +++ b/src/main/resources/alfresco/module/alfresco-javamelody-addon/module.properties @@ -0,0 +1,48 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + + +# SDK Sample module + +# ==== Beginning of Alfresco required/optional properties ====== # +# NB: These properties are filtered at build time by Maven, single +# sourcing from POM properties +module.id=${project.artifactId} +#module.aliases=myModule-123, my-module +module.title=${project.name} +module.description=${project.description} +module.version=${project.version} + +# The following optional properties can be used to prevent the module from being added +# to inappropriate versions of the WAR file. +# module.repo.version.min=2.0 +# module.repo.version.max=2.1 + +# FIXME: This dependencies should come out of mvn dependencies on amp + +# The following describe dependencies on other modules +# Depends on net.sf.myproject.module.SupportModuleA version ${version} or later +# module.depends.net.sf.myproject.module.SupportModuleA=${version}-* +# Depends on net.sf.myproject.module.SupportModuleA version ${version} to 2.0 +# module.depends.net.sf.myproject.module.SupportModuleB=${version}-2.0 +# Depends on net.sf.myproject.module.SupportModuleC - any version +# module.depends.net.sf.myproject.module.SupportModuleB=* + + +# ==== End of Alfresco required/optional properties ======= # + + +# ==== Beginning of module required properties/optional ====== # \ No newline at end of file From 18f84f48868ecedc7506de23ca97303326c75523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Jak=C3=B3?= Date: Tue, 5 Nov 2024 11:12:18 +0100 Subject: [PATCH 2/2] remove tomcat folder, modify pom.xml --- pom.xml | 608 +++++++++++++++--- run.bat | 101 ++- run.sh | 97 ++- .../alfresco-global.properties | 5 - .../log4j.properties | 40 -- .../module-context.xml | 23 - src/main/amp/module.properties | 43 -- .../local/alfresco-global.properties | 68 -- src/test/resources/log4j.properties | 265 -------- tomcat/context.xml | 34 - 10 files changed, 699 insertions(+), 585 deletions(-) mode change 100644 => 100755 run.sh delete mode 100644 src/main/amp/config/alfresco/module/alfresco-javamelody-addon/alfresco-global.properties delete mode 100644 src/main/amp/config/alfresco/module/alfresco-javamelody-addon/log4j.properties delete mode 100644 src/main/amp/config/alfresco/module/alfresco-javamelody-addon/module-context.xml delete mode 100644 src/main/amp/module.properties delete mode 100644 src/test/properties/local/alfresco-global.properties delete mode 100644 src/test/resources/log4j.properties delete mode 100644 tomcat/context.xml diff --git a/pom.xml b/pom.xml index 96fc4be..2e1b340 100644 --- a/pom.xml +++ b/pom.xml @@ -1,16 +1,15 @@ - - 4.0.0 - net.bull.javamelody - alfresco-javamelody-addon - 2.3.0 + + 4.0.0 + net.bull.javamelody + alfresco-javamelody-addon + 2.3.0 Alfresco JavaMelody add-on - amp JavaMelody Monitoring in Alfresco - - https://github.com/javamelody/javamelody/wiki + jar + + https://github.com/javamelody/javamelody/wiki 2013 @@ -47,56 +46,83 @@ http://javamelody.ci.cloudbees.com/job/alfresco-javamelody - - org.alfresco.maven - alfresco-sdk-parent - 2.2.0 - - - - - UTF-8 - UTF-8 + + + 4.9.0 + UTF-8 + UTF-8 + 17 ${java.version} ${java.version} - 5.2.g - - - - - - - - - - - - - - ${alfresco.groupId} - alfresco-platform-distribution - ${alfresco.version} - pom - import - - - - - - + + org.alfresco + acs-community-packaging + 23.3.0 + alfresco + 23.3.0.85 + 23.3.0 + + + alfresco/alfresco-content-repository-community + alfresco/alfresco-share + + -Dencryption.keystore.type=JCEKS -Dencryption.cipherAlgorithm=AES/CBC/PKCS5Padding -Dencryption.keyAlgorithm=AES -Dencryption.keystore.location=/usr/local/tomcat/shared/classes/alfresco/extension/keystore/keystore -Dmetadata-keystore.password=mp6yc0UD9e -Dmetadata-keystore.aliases=metadata -Dmetadata-keystore.metadata.password=oKIWzVdEdA -Dmetadata-keystore.metadata.algorithm=AES + + + 1.1.8 + + + 8180 + alfresco-javamelody-addon-acs + 8080 + 8888 + 5555 + + + + + + + + + + junit + junit + 4.13.1 + test + + + org.mockito + mockito-core + 4.2.0 + test + + + org.apache.httpcomponents + httpclient + test + + + + + ${alfresco.groupId} + alfresco-remote-api + provided + + + + + org.alfresco.maven + alfresco-rad + ${alfresco.sdk.version} + test + + + net.bull.javamelody javamelody-core @@ -121,52 +147,442 @@ - + + jakarta.servlet jakarta.servlet-api - 5.0.0 provided - - - ${alfresco.groupId} - alfresco-repository - + - - - ${alfresco.groupId} - alfresco-repository - ${alfresco.version} - h2scripts - test - - - * - * - - - - - - - - - enterprise - - - ${alfresco.groupId} - alfresco-enterprise-repository - ${alfresco.version} - provided - - - - + + + + + ${alfresco.groupId} + ${alfresco.bomDependencyArtifactId} + ${alfresco.platform.version} + pom + import + + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.6 + + + build-amp-file + package + + single + + + false + src/main/assembly/amp.xml + + + + + + org.alfresco.maven.plugin + alfresco-maven-plugin + ${alfresco.sdk.version} + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.1.0 + + UTF-8 + + ftl + acp + svg + pdf + doc + docx + xls + xlsx + ppt + pptx + bin + lic + swf + zip + msg + jar + ttf + eot + woff + woff2 + css + ico + psd + js + + + + + copy-and-filter-docker-compose-resources + validate + + copy-resources + + + ${project.build.outputDirectory}/docker + + + docker + true + + + + + + copy-and-filter-docker-resources + validate + + copy-resources + + + ${project.build.directory} + + + src/main/docker + true + + **/*.jar + **/*.so + **/*.gz + + + + + + + copy-and-filter-docker-resources-non-filtered + validate + + copy-resources + + + ${project.build.directory} + + + src/main/docker + false + + **/*.jar + **/*.so + **/*.gz + + + + + + + copy-repository-extension + package + + copy-resources + + + ${project.build.directory}/extensions + + + target + + ${project.build.finalName}.jar + + false + + + + + + copy-repository-tests + pre-integration-test + + copy-resources + + + ${project.build.directory}/extensions + + + target + + ${project.build.finalName}-tests.jar + + false + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.1.1 + + + + collect-test-artifacts + pre-integration-test + + copy-dependencies + + + ${project.build.directory}/extensions + compile + + + + + collect-extensions + package + + copy-dependencies + + + ${project.build.directory}/extensions + runtime + + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 3.1.0 + + + + test-jar + + + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + 3.0.0-M1 + + + ${test.acs.endpoint.path} + + + + + integration-test + integration-test + + integration-test + + + + verify-test + verify + + verify + + + + + + org.apache.maven.surefire + surefire-junit47 + 3.0.0-M1 + + + + + + + com.github.blutorange + closure-compiler-maven-plugin + 2.28.0 + + + + compress-assembly + generate-resources + + minify + + + ${project.basedir}/src/main/assembly + ${project.basedir}/src/main/assembly + web + web + true + + **/*.js + + + **/webscripts/** + **/site-webscripts/** + **/META-INF/** + **/*.lib.js + **/*.css + **/*.min.js + **/*.min.css + + true + + + + + compress-resources + generate-resources + + minify + + + ${project.basedir}/src/main + ${project.basedir}/src/main + resources + resources + true + + **/*.js + + + **/webscripts/** + **/site-webscripts/** + **/*.lib.js + **/*.css + **/*.min.js + **/*.min.css + + true + + + + + + + org.zeroturnaround + jrebel-maven-plugin + ${jrebel.version} + + + generate-rebel-xml + process-resources + + generate + + + + + + + all + + + ${project.build.outputDirectory} + ${project.build.testOutputDirectory} + + + + + + true + + + + + + + + src/main/resources + true + + + + + + src/test/resources + true + + + + + + + + alfresco-public + https://artifacts.alfresco.com/nexus/content/groups/public + + + alfresco-public-snapshots + https://artifacts.alfresco.com/nexus/content/groups/public-snapshots + + true + daily + + + + + alfresco-private-repository + https://artifacts.alfresco.com/nexus/content/groups/private + + + alfresco-internal + https://artifacts.alfresco.com/nexus/content/groups/internal + + + + + + alfresco-plugin-public + https://artifacts.alfresco.com/nexus/content/groups/public + + + alfresco-plugin-public-snapshots + https://artifacts.alfresco.com/nexus/content/groups/public-snapshots + + true + daily + + + diff --git a/run.bat b/run.bat index bb89e74..f4bc99e 100644 --- a/run.bat +++ b/run.bat @@ -1,8 +1,99 @@ @ECHO OFF -IF "%MAVEN_OPTS%" == "" ( - ECHO The environment variable 'MAVEN_OPTS' is not set, setting it for you - SET MAVEN_OPTS=-Xms256m -Xmx2G -XX:PermSize=300m +SET COMPOSE_FILE_PATH=%CD%\target\classes\docker\docker-compose.yml + +IF [%M2_HOME%]==[] ( + SET MVN_EXEC=mvn +) + +IF NOT [%M2_HOME%]==[] ( + SET MVN_EXEC=%M2_HOME%\bin\mvn +) + +IF [%1]==[] ( + echo "Usage: %0 {build_start|build_start_it_supported|start|stop|purge|tail|build_test|test}" + GOTO END +) + +IF %1==build_start ( + CALL :down + CALL :build + CALL :start + CALL :tail + GOTO END +) +IF %1==build_start_it_supported ( + CALL :down + CALL :build + CALL :prepare_test + CALL :start + CALL :tail + GOTO END ) -ECHO MAVEN_OPTS is set to '%MAVEN_OPTS%' -mvn clean install -Pamp-to-war +IF %1==start ( + CALL :start + CALL :tail + GOTO END +) +IF %1==stop ( + CALL :down + GOTO END +) +IF %1==purge ( + CALL:down + CALL:purge + GOTO END +) +IF %1==tail ( + CALL :tail + GOTO END +) +IF %1==build_test ( + CALL :down + CALL :build + CALL :prepare_test + CALL :start + CALL :test + CALL :tail_all + CALL :down + GOTO END +) +IF %1==test ( + CALL :test + GOTO END +) +echo "Usage: %0 {build_start|start|stop|purge|tail|build_test|test}" +:END +EXIT /B %ERRORLEVEL% + +:start + docker volume create alfresco-javamelody-addon-acs-volume + docker volume create alfresco-javamelody-addon-db-volume + docker volume create alfresco-javamelody-addon-ass-volume + docker compose -f "%COMPOSE_FILE_PATH%" up --build -d +EXIT /B 0 +:down + if exist "%COMPOSE_FILE_PATH%" ( + docker compose -f "%COMPOSE_FILE_PATH%" down + ) +EXIT /B 0 +:build + call %MVN_EXEC% clean package +EXIT /B 0 +:tail + docker compose -f "%COMPOSE_FILE_PATH%" logs -f +EXIT /B 0 +:tail_all + docker compose -f "%COMPOSE_FILE_PATH%" logs --tail="all" +EXIT /B 0 +:prepare_test + call %MVN_EXEC% verify -DskipTests=true +EXIT /B 0 +:test + call %MVN_EXEC% verify +EXIT /B 0 +:purge + docker volume rm -f alfresco-javamelody-addon-acs-volume + docker volume rm -f alfresco-javamelody-addon-db-volume + docker volume rm -f alfresco-javamelody-addon-ass-volume +EXIT /B 0 \ No newline at end of file diff --git a/run.sh b/run.sh old mode 100644 new mode 100755 index 1df845e..663e078 --- a/run.sh +++ b/run.sh @@ -1,7 +1,92 @@ -#!/bin/bash -if [[ -z ${MAVEN_OPTS} ]]; then - echo "The environment variable 'MAVEN_OPTS' is not set, setting it for you"; - MAVEN_OPTS="-Xms256m -Xmx1524m -XX:PermSize=300m" +#!/bin/sh + +export COMPOSE_FILE_PATH="${PWD}/target/classes/docker/docker-compose.yml" + +if [ -z "${M2_HOME}" ]; then + export MVN_EXEC="mvn" +else + export MVN_EXEC="${M2_HOME}/bin/mvn" fi -echo "MAVEN_OPTS is set to '$MAVEN_OPTS'"; -mvn clean install -Pamp-to-war \ No newline at end of file + +start() { + docker volume create alfresco-javamelody-addon-acs-volume + docker volume create alfresco-javamelody-addon-db-volume + docker volume create alfresco-javamelody-addon-ass-volume + docker compose -f "$COMPOSE_FILE_PATH" up --build -d +} + +down() { + if [ -f "$COMPOSE_FILE_PATH" ]; then + docker compose -f "$COMPOSE_FILE_PATH" down + fi +} + +purge() { + docker volume rm -f alfresco-javamelody-addon-acs-volume + docker volume rm -f alfresco-javamelody-addon-db-volume + docker volume rm -f alfresco-javamelody-addon-ass-volume +} + +build() { + $MVN_EXEC clean package +} + +tail() { + docker compose -f "$COMPOSE_FILE_PATH" logs -f +} + +tail_all() { + docker compose -f "$COMPOSE_FILE_PATH" logs --tail="all" +} + +prepare_test() { + $MVN_EXEC verify -DskipTests=true +} + +test() { + $MVN_EXEC verify +} + +case "$1" in + build_start) + down + build + start + tail + ;; + build_start_it_supported) + down + build + prepare_test + start + tail + ;; + start) + start + tail + ;; + stop) + down + ;; + purge) + down + purge + ;; + tail) + tail + ;; + build_test) + down + build + prepare_test + start + test + tail_all + down + ;; + test) + test + ;; + *) + echo "Usage: $0 {build_start|build_start_it_supported|start|stop|purge|tail|build_test|test}" +esac \ No newline at end of file diff --git a/src/main/amp/config/alfresco/module/alfresco-javamelody-addon/alfresco-global.properties b/src/main/amp/config/alfresco/module/alfresco-javamelody-addon/alfresco-global.properties deleted file mode 100644 index 25e70d1..0000000 --- a/src/main/amp/config/alfresco/module/alfresco-javamelody-addon/alfresco-global.properties +++ /dev/null @@ -1,5 +0,0 @@ -## This Alfresco Repo Configuration file should be used for custom properties that are introduced by this module. -## Define default values for all properties here. -## System Administrators can override these values in environment specific configurations in -## alfresco/tomcat/shared/classes/alfresco-global.properties. -## diff --git a/src/main/amp/config/alfresco/module/alfresco-javamelody-addon/log4j.properties b/src/main/amp/config/alfresco/module/alfresco-javamelody-addon/log4j.properties deleted file mode 100644 index f7de9d3..0000000 --- a/src/main/amp/config/alfresco/module/alfresco-javamelody-addon/log4j.properties +++ /dev/null @@ -1,40 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -#----------------------------------------------------------------------- -# alfresco-javamelody-addon module log4j.properties -# -# NOTE -# ---- -# Log4j uses the following logging levels: -# debug,info,warn,error,fatal -# -# To set the logging level of {fullClassName} to {loglevel}, -# add a line to this file of the following form: -# -# log4j.logger.{fullClassName}={loglevel} -# -# For example, to make 'com.example.MyExample' produce 'debug' -# logs, add a line like this: -# -# log4j.logger.com.example.MyExample=debug -# -# -# WARNING -# ------- -# Log properties in this log4j.properties file override/augment -# those in the webapp's main log4j.properties. -# -#----------------------------------------------------------------------- -log4j.logger.javamelody=info diff --git a/src/main/amp/config/alfresco/module/alfresco-javamelody-addon/module-context.xml b/src/main/amp/config/alfresco/module/alfresco-javamelody-addon/module-context.xml deleted file mode 100644 index 1a00328..0000000 --- a/src/main/amp/config/alfresco/module/alfresco-javamelody-addon/module-context.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - diff --git a/src/main/amp/module.properties b/src/main/amp/module.properties deleted file mode 100644 index 9a2aecb..0000000 --- a/src/main/amp/module.properties +++ /dev/null @@ -1,43 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -# ==== Beginning of Alfresco required/optional properties ====== # -# NB: These properties are filtered at build time by Maven, single -# sourcing from POM properties -module.id=${project.artifactId} -#module.aliases=myModule-123, my-module -module.title=${project.name} -module.description=${project.description} -module.version=${project.version} - -# The following optional properties can be used to prevent the module from being added -# to inappropriate versions of the WAR file. -# module.repo.version.min=2.0 -# module.repo.version.max=2.1 - -# The following describe dependencies on other modules -# Depends on net.sf.myproject.module.SupportModuleA version ${version} or later -# module.depends.net.sf.myproject.module.SupportModuleA=${version}-* -# Depends on net.sf.myproject.module.SupportModuleA version ${version} to 2.0 -# module.depends.net.sf.myproject.module.SupportModuleB=${version}-2.0 -# Depends on net.sf.myproject.module.SupportModuleC - any version -# module.depends.net.sf.myproject.module.SupportModuleB=* - - -# ==== End of Alfresco required/optional properties ======= # - - -# ==== Beginning of module required properties/optional ====== # diff --git a/src/test/properties/local/alfresco-global.properties b/src/test/properties/local/alfresco-global.properties deleted file mode 100644 index d0dc47a..0000000 --- a/src/test/properties/local/alfresco-global.properties +++ /dev/null @@ -1,68 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# RUN TIME PROPERTIES -# ------------------- - -######################################################################################################################## -# Alfresco configuration for running locally -# -# Configuration when running Tomcat embedded from Maven. -# This will create the alf_data_dev directory relative to Tomcat run folder. -# Property values from the POM but it can also be edited here. -######################################################################################################################## - -dir.root=${alfresco.data.location} - -# Alfresco Repo Webapp (alfresco.war) context, ports etc -alfresco.context=alfresco -alfresco.host=localhost -alfresco.port=8080 -alfresco.protocol=http - -# Alfresco Share Webapp (share.war) context, ports etc -share.context=share -share.host=localhost -share.port=8080 -share.protocol=http - -# Don't try and recover any index -index.recovery.mode=NONE -# As we run embedded, we set Lucene -# TODO: Find a better solution for indexing, as buildonly (embedded Lucene) is deprecated and going to be removed soon -index.subsystem.name=buildonly - -# These jobs seem to require Lucene (Unsupported Operation with Solr) so we disable them / set to future date -# See https://forums.alfresco.com/en/viewtopic.php?f=52&t=41597 -# If you want to enable them (and so full WQS functionality), please also set index.subsystem.name=lucene -wcmqs.dynamicCollectionProcessor.schedule=0 30 2 * * ? 2060 -wcmqs.feedbackProcessor.schedule=0 40 2 * * ? 2060 -wcmqs.publishQueueProcessor.schedule=0 50 2 * * ? 2060 - -# Fail or not when there are node integrity checker errors -integrity.failOnError=true - -# Database connection properties -db.driver=${alfresco.db.datasource.class} -db.url=${alfresco.db.url} -db.username=${alfresco.db.username} -db.password=${alfresco.db.password} -db.pool.initial=10 -db.pool.max=100 -hibernate.dialect=org.hibernate.dialect.H2Dialect - -# File servers related properties -# For local runs we disable CIFS and FTP -cifs.enabled=false -ftp.enabled=false diff --git a/src/test/resources/log4j.properties b/src/test/resources/log4j.properties deleted file mode 100644 index 09c6598..0000000 --- a/src/test/resources/log4j.properties +++ /dev/null @@ -1,265 +0,0 @@ -# This is a full override of Alfresco 4.2.b log4j.properties -# This file overwrites the alfresco.war log4j.properties - -# Set root logger level to error -log4j.rootLogger=${app.log.root.level}, Console, File - -###### Console appender definition ####### - -# All outputs currently set to be a ConsoleAppender. -log4j.appender.Console=org.apache.log4j.ConsoleAppender -log4j.appender.Console.layout=org.apache.log4j.PatternLayout - -# use log4j NDC to replace %x with tenant domain / username -log4j.appender.Console.layout.ConversionPattern=%d{ISO8601} %x %-5p [%c{3}] [%t] %m%n -#log4j.appender.Console.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n - -###### File appender definition ####### -log4j.appender.File=org.apache.log4j.DailyRollingFileAppender -log4j.appender.File.File=${app.log.dir}alfresco.log -log4j.appender.File.Append=true -log4j.appender.File.DatePattern='.'yyyy-MM-dd -log4j.appender.File.layout=org.apache.log4j.PatternLayout -log4j.appender.File.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c] %m%n - -###### Hibernate specific appender definition ####### -#log4j.appender.file=org.apache.log4j.FileAppender -#log4j.appender.file.File=hibernate.log -#log4j.appender.file.layout=org.apache.log4j.PatternLayout -#log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n - -###### Log level overrides ####### - -# Commented-in loggers will be exposed as JMX MBeans (refer to org.alfresco.repo.admin.Log4JHierarchyInit) -# Hence, generally useful loggers should be listed with at least ERROR level to allow simple runtime -# control of the level via a suitable JMX Console. Also, any other loggers can be added transiently via -# Log4j addLoggerMBean as long as the logger exists and has been loaded. - -# Hibernate -log4j.logger.org.hibernate=error -log4j.logger.org.hibernate.util.JDBCExceptionReporter=fatal -log4j.logger.org.hibernate.event.def.AbstractFlushingEventListener=fatal -log4j.logger.org.hibernate.type=warn -log4j.logger.org.hibernate.cfg.SettingsFactory=warn - -# Spring -log4j.logger.org.springframework=warn -# Turn off Spring remoting warnings that should really be info or debug. -log4j.logger.org.springframework.remoting.support=error -log4j.logger.org.springframework.util=error - -# Axis/WSS4J -log4j.logger.org.apache.axis=info -log4j.logger.org.apache.ws=info - -# CXF -log4j.logger.org.apache.cxf=error - -# MyFaces -log4j.logger.org.apache.myfaces.util.DebugUtils=info -log4j.logger.org.apache.myfaces.el.VariableResolverImpl=error -log4j.logger.org.apache.myfaces.application.jsp.JspViewHandlerImpl=error -log4j.logger.org.apache.myfaces.taglib=error - -# OpenOfficeConnection -log4j.logger.net.sf.jooreports.openoffice.connection=fatal - -# log prepared statement cache activity ### -log4j.logger.org.hibernate.ps.PreparedStatementCache=info - -# Alfresco -log4j.logger.org.alfresco=error -log4j.logger.org.alfresco.repo.admin=info -log4j.logger.org.alfresco.repo.cache.TransactionalCache=warn -log4j.logger.org.alfresco.repo.model.filefolder=warn -log4j.logger.org.alfresco.repo.tenant=info -log4j.logger.org.alfresco.repo.avm=info -log4j.logger.org.alfresco.config=warn -log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn -log4j.logger.org.alfresco.config.JBossEnabledWebApplicationContext=warn -log4j.logger.org.alfresco.repo.management.subsystems=warn -log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory=info -log4j.logger.org.alfresco.repo.management.subsystems.ChildApplicationContextFactory$ChildApplicationContext=warn -log4j.logger.org.alfresco.repo.security.sync=info -log4j.logger.org.alfresco.repo.security.person=info - -log4j.logger.org.alfresco.sample=info -log4j.logger.org.alfresco.web=info -#log4j.logger.org.alfresco.web.app.AlfrescoNavigationHandler=debug -#log4j.logger.org.alfresco.web.ui.repo.component.UIActions=debug -#log4j.logger.org.alfresco.web.ui.repo.tag.PageTag=debug -#log4j.logger.org.alfresco.web.bean.clipboard=debug -log4j.logger.org.alfresco.repo.webservice=info -log4j.logger.org.alfresco.service.descriptor.DescriptorService=info -#log4j.logger.org.alfresco.web.page=debug - -log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=error -#log4j.logger.org.alfresco.repo.importer.ImporterBootstrap=info - -log4j.logger.org.alfresco.web.ui.common.Utils=error -#log4j.logger.org.alfresco.web.ui.common.Utils=info - -log4j.logger.org.alfresco.repo.admin.patch.PatchExecuter=info -log4j.logger.org.alfresco.repo.domain.patch.ibatis.PatchDAOImpl=info - -# Specific patches -log4j.logger.org.alfresco.repo.admin.patch.impl.DeploymentMigrationPatch=info -log4j.logger.org.alfresco.repo.version.VersionMigrator=info -log4j.logger.org.alfresco.repo.admin.patch.impl.ResetWCMToGroupBasedPermissionsPatch=info - -log4j.logger.org.alfresco.repo.module.ModuleServiceImpl=info -log4j.logger.org.alfresco.repo.domain.schema.SchemaBootstrap=info -log4j.logger.org.alfresco.repo.admin.ConfigurationChecker=info -log4j.logger.org.alfresco.repo.node.index.AbstractReindexComponent=warn -log4j.logger.org.alfresco.repo.node.index.IndexTransactionTracker=warn -log4j.logger.org.alfresco.repo.node.index.FullIndexRecoveryComponent=info -log4j.logger.org.alfresco.repo.node.index.AVMFullIndexRecoveryComponent=info -log4j.logger.org.alfresco.util.OpenOfficeConnectionTester=info -log4j.logger.org.alfresco.repo.node.db.hibernate.HibernateNodeDaoServiceImpl=warn -log4j.logger.org.alfresco.repo.domain.hibernate.DirtySessionMethodInterceptor=warn -log4j.logger.org.alfresco.repo.transaction.RetryingTransactionHelper=warn -log4j.logger.org.alfresco.util.transaction.SpringAwareUserTransaction.trace=warn -log4j.logger.org.alfresco.util.AbstractTriggerBean=warn -log4j.logger.org.alfresco.enterprise.repo.cache.cluster.KeepAliveHeartbeatReceiver=info -log4j.logger.org.alfresco.repo.version.Version2ServiceImpl=warn - -#log4j.logger.org.alfresco.web.app.DebugPhaseListener=debug - -log4j.logger.org.alfresco.repo.workflow=info - -# CIFS server debugging -log4j.logger.org.alfresco.smb.protocol=error -#log4j.logger.org.alfresco.smb.protocol.auth=debug -#log4j.logger.org.alfresco.acegi=debug - -# FTP server debugging -log4j.logger.org.alfresco.ftp.protocol=error -#log4j.logger.org.alfresco.ftp.server=debug - -# WebDAV debugging -#log4j.logger.org.alfresco.webdav.protocol=debug -log4j.logger.org.alfresco.webdav.protocol=error - -# NTLM servlet filters -#log4j.logger.org.alfresco.web.app.servlet.NTLMAuthenticationFilter=debug -#log4j.logger.org.alfresco.repo.webdav.auth.NTLMAuthenticationFilter=debug - -# Kerberos servlet filters -#log4j.logger.org.alfresco.web.app.servlet.KerberosAuthenticationFilter=debug -#log4j.logger.org.alfresco.repo.webdav.auth.KerberosAuthenticationFilter=debug - -# File servers -log4j.logger.org.alfresco.fileserver=warn - -# Repo filesystem debug logging -#log4j.logger.org.alfresco.filesys.repo.ContentDiskDriver=debug - -# AVM filesystem debug logging -#log4j.logger.org.alfresco.filesys.avm.AVMDiskDriver=debug - -# Integrity message threshold - if 'failOnViolation' is off, then WARNINGS are generated -log4j.logger.org.alfresco.repo.node.integrity=ERROR - -# Indexer debugging -log4j.logger.org.alfresco.repo.search.Indexer=error -#log4j.logger.org.alfresco.repo.search.Indexer=debug - -log4j.logger.org.alfresco.repo.search.impl.lucene.index=error -log4j.logger.org.alfresco.repo.search.impl.lucene.fts.FullTextSearchIndexerImpl=warn -#log4j.logger.org.alfresco.repo.search.impl.lucene.index=DEBUG - -# Audit debugging -# log4j.logger.org.alfresco.repo.audit=DEBUG -# log4j.logger.org.alfresco.repo.audit.model=DEBUG - -# Forms debugging -# log4j.logger.org.alfresco.web.forms=debug -# log4j.logger.org.chiba.xml.xforms=debug -log4j.logger.org.alfresco.web.forms.xforms.XFormsBean=error -log4j.logger.org.alfresco.web.forms.XSLTRenderingEngine=error - -# Property sheet and modelling debugging -# change to error to hide the warnings about missing properties and associations -log4j.logger.alfresco.missingProperties=warn -log4j.logger.org.alfresco.web.ui.repo.component.property.UIChildAssociation=warn -log4j.logger.org.alfresco.web.ui.repo.component.property.UIAssociation=warn -#log4j.logger.org.alfresco.web.ui.repo.component.property=debug - -# Dictionary/Model debugging -log4j.logger.org.alfresco.repo.dictionary=warn -log4j.logger.org.alfresco.repo.dictionary.types.period=warn - -# Virtualization Server Registry -log4j.logger.org.alfresco.mbeans.VirtServerRegistry=error - -# Spring context runtime property setter -log4j.logger.org.alfresco.util.RuntimeSystemPropertiesSetter=info - -# Debugging options for clustering -log4j.logger.org.alfresco.repo.content.ReplicatingContentStore=error -log4j.logger.org.alfresco.repo.content.replication=error - -#log4j.logger.org.alfresco.repo.deploy.DeploymentServiceImpl=debug - -# Activity service -log4j.logger.org.alfresco.repo.activities=warn - -# User usage tracking -log4j.logger.org.alfresco.repo.usage=info - -# Sharepoint -log4j.logger.org.alfresco.module.vti=info - -# Forms Engine -log4j.logger.org.alfresco.repo.forms=info -log4j.logger.org.alfresco.web.config.forms=info -log4j.logger.org.alfresco.web.scripts.forms=info - -# CMIS -log4j.logger.org.alfresco.opencmis=error -log4j.logger.org.alfresco.opencmis.AlfrescoCmisServiceInterceptor=error -log4j.logger.org.alfresco.cmis=error -log4j.logger.org.alfresco.cmis.dictionary=warn -log4j.logger.org.apache.chemistry.opencmis=info - -# IMAP -log4j.logger.org.alfresco.repo.imap=info - -# JBPM -# Note: non-fatal errors (eg. logged during job execution) should be handled by Alfresco's retrying transaction handler -log4j.logger.org.jbpm.graph.def.GraphElement=fatal - -#log4j.logger.org.alfresco.repo.googledocs=debug - -###### Scripting ####### - -# Web Framework -log4j.logger.org.springframework.extensions.webscripts=info -log4j.logger.org.springframework.extensions.webscripts.ScriptLogger=warn -log4j.logger.org.springframework.extensions.webscripts.ScriptDebugger=off - -# Repository -log4j.logger.org.alfresco.repo.web.scripts=warn -log4j.logger.org.alfresco.repo.web.scripts.BaseWebScriptTest=info -log4j.logger.org.alfresco.repo.web.scripts.AlfrescoRhinoScriptDebugger=off -log4j.logger.org.alfresco.repo.jscript=error -log4j.logger.org.alfresco.repo.jscript.ScriptLogger=warn -log4j.logger.org.alfresco.repo.cmis.rest.CMISTest=info - -log4j.logger.org.alfresco.repo.avm.actions=info - -# Freemarker -# Note the freemarker.runtime logger is used to log non-fatal errors that are handled by Alfresco's retrying transaction handler -log4j.logger.freemarker.runtime= - -# Metadata extraction -log4j.logger.org.alfresco.repo.content.metadata.AbstractMappingMetadataExtracter=warn - -# Reduces PDFont error level due to ALF-7105 -log4j.logger.org.apache.pdfbox.pdmodel.font.PDSimpleFont=fatal -log4j.logger.org.apache.pdfbox.pdmodel.font.PDFont=fatal -log4j.logger.org.apache.pdfbox.pdmodel.font.PDCIDFont=fatal - -# no index support -log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexIndexer=fatal -log4j.logger.org.alfresco.repo.search.impl.noindex.NoIndexSearchService=fatal diff --git a/tomcat/context.xml b/tomcat/context.xml deleted file mode 100644 index 5ae9c05..0000000 --- a/tomcat/context.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - -