diff --git a/pdf-toolkit-repo/README.md b/pdf-toolkit-repo/README.md new file mode 100644 index 0000000..78a55f6 --- /dev/null +++ b/pdf-toolkit-repo/README.md @@ -0,0 +1,42 @@ +# Alfresco ACS JAR Module - SDK 4.0 + +This is an ACS project for Alfresco SDK 4.0. + +Run with `./run.sh build_start` or `./run.bat build_start` and verify that it + + * Runs Alfresco Content Service (ACS) + * (Optional) Runs Alfresco Share + * Runs Alfresco Search Service (ASS) + * Runs PostgreSQL database + * Deploys the JAR assembled module + +All the services of the project are now run as docker containers. The run script offers the next tasks: + + * `build_start`. Build the whole project, recreate the ACS docker image, start the dockerised environment composed by ACS, Share (optional), ASS + and PostgreSQL and tail the logs of all the containers. + * `start`. Start the dockerised environment without building the project and tail the logs of all the containers. + * `stop`. Stop the dockerised environment. + * `purge`. Stop the dockerised container and delete all the persistent data (docker volumes). + * `tail`. Tail the logs of all the containers. + * `reload_acs`. Build the ACS module, recreate the ACS docker image and restart the ACS container. + * `build_test`. Build the whole project, recreate the ACS docker image, start the dockerised environment, execute the integration tests and stop + the environment. + * `test`. Execute the integration tests (the environment must be already started). + +# Few things to notice + + * No parent pom + * No WAR projects, the jars are included in the custom docker images + * No runner project - the Alfresco environment is now managed through [Docker](https://www.docker.com/) + * Standard JAR packaging and layout + * Works seamlessly with Eclipse and IntelliJ IDEA + * JRebel for hot reloading, JRebel maven plugin for generating rebel.xml [JRebel integration documentation] + * AMP as an assembly + * Persistent test data through restart thanks to the use of Docker volumes for ACS, ASS and database data + * Resources loaded from META-INF + * Web Fragment (this includes a sample servlet configured via web fragment) + +# TODO + + * Abstract assembly into a dependency so we don't have to ship the assembly in the archetype + * Functional/remote unit tests diff --git a/pdf-toolkit-repo/docker/docker-compose.yml b/pdf-toolkit-repo/docker/docker-compose.yml new file mode 100644 index 0000000..7af0084 --- /dev/null +++ b/pdf-toolkit-repo/docker/docker-compose.yml @@ -0,0 +1,54 @@ +version: '3.4' +services: +# Optional +# pdf-toolkit-repo-share: +# image: ${docker.share.image}:${alfresco.share.version} +# environment: +# REPO_HOST: pdf-toolkit-repo-acs +# REPO_PORT: 8080 +# ports: +# - "${share.port}:8080" + pdf-toolkit-repo-acs: + image: alfresco-content-services-pdf-toolkit-repo:development + build: + dockerfile: ./Dockerfile + context: ../../../target + environment: + CATALINA_OPTS: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888" + ports: + - "${acs.port}:8080" + - "${acs.debug.port}:8888" + volumes: + - pdf-toolkit-repo-acs-volume:/usr/local/tomcat/alf_data + depends_on: + - pdf-toolkit-repo-postgres + pdf-toolkit-repo-postgres: + image: postgres:9.6 + environment: + POSTGRES_DB: alfresco + POSTGRES_USER: alfresco + POSTGRES_PASSWORD: alfresco + ports: + - "${postgres.port}:5432" + volumes: + - pdf-toolkit-repo-db-volume:/var/lib/postgresql/data + pdf-toolkit-repo-ass: + image: alfresco/alfresco-search-services:1.2.0 + environment: + SOLR_ALFRESCO_HOST: pdf-toolkit-repo-acs + SOLR_ALFRESCO_PORT: 8080 + SOLR_SOLR_HOST: pdf-toolkit-repo-ass + SOLR_SOLR_PORT: 8983 + SOLR_CREATE_ALFRESCO_DEFAULTS: alfresco,archive + ports: + - "8983:8983" + volumes: + - pdf-toolkit-repo-ass-volume:/opt/alfresco-search-services/contentstore + - pdf-toolkit-repo-ass-volume:/opt/alfresco-search-services/data +volumes: + pdf-toolkit-repo-acs-volume: + external: true + pdf-toolkit-repo-db-volume: + external: true + pdf-toolkit-repo-ass-volume: + external: true \ No newline at end of file diff --git a/pdf-toolkit-repo/pom.xml b/pdf-toolkit-repo/pom.xml index dc4a742..0b9e467 100644 --- a/pdf-toolkit-repo/pom.xml +++ b/pdf-toolkit-repo/pom.xml @@ -1,89 +1,477 @@ - + 4.0.0 + org.alfresco.extension pdf-toolkit-repo + 1.4.4-SNAPSHOT Alfresco PDF Toolkit - Repo - amp Alfresco PDF Toolkit repository extensions + jar - - org.alfresco.extension - pdf-toolkit - 1.4.2 - - - - alfresco - - - - + + 4.0.0-beta-1 + + UTF-8 + + + org.alfresco + acs-community-packaging + 6.0.7-ga + 6.0.b + + + alfresco/alfresco-content-repository-community + alfresco/alfresco-share + + + 1.1.6 + + + 1.8 + 1.8 + + + 8180 + pdf-toolkit-repo-acs + 8080 + 8888 + 5555 + + + - - + + + - org.alfresco - alfresco-repository + junit + junit + 4.12 + test + + + org.mockito + mockito-all + 1.9.5 + test + + + org.apache.httpcomponents + httpclient + 4.5.2 + test - - - com.itextpdf - itextpdf - 5.0.6 - jar - - - * - * - - - - - com.tradeshift - junit-remote - 3 + + + + ${alfresco.groupId} + alfresco-remote-api + provided + + + + + org.alfresco.maven + alfresco-rad + ${alfresco.sdk.version} test - - - junit - junit - test - + + + + com.itextpdf + itextpdf + 5.5.13 + + + + org.apache.pdfbox + pdfbox + 2.0.8 + provided + + - - - - - - enterprise - - - ${alfresco.groupId} - alfresco-enterprise-repository - ${alfresco.version} - provided - - - - - - - run - - true - - - - - + + + + + + ${alfresco.groupId} + ${alfresco.bomDependencyArtifactId} + ${alfresco.platform.version} + pom + import + + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.0.1 + + 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 + + + + + + + copy-and-filter-docker-resources-non-filtered + validate + + copy-resources + + + ${project.build.directory} + + + src/main/docker + false + + **/*.jar + **/*.so + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.0.2 + + + + copy-repo-extension + pre-integration-test + + copy + + + + + org.alfresco.extension + pdf-toolkit-repo + ${project.version} + false + ${project.build.directory}/extensions + + + + + org.alfresco.maven + alfresco-rad + ${alfresco.sdk.version} + false + ${project.build.directory}/extensions + + + junit + junit + 4.12 + false + ${project.build.directory}/extensions + + + org.mockito + mockito-all + 1.9.5 + false + ${project.build.directory}/extensions + + + org.apache.httpcomponents + httpclient + 4.5.2 + false + ${project.build.directory}/extensions + + + + + + + copy-third-party-dependencies + pre-integration-test + + copy-dependencies + + + ${project.build.directory}/extensions + runtime + + + + + + + + org.apache.maven.plugins + maven-failsafe-plugin + 2.19.1 + + + ${test.acs.endpoint.path} + + + + + integration-test + integration-test + + integration-test + + + + verify-test + verify + + verify + + + + + + org.apache.maven.surefire + surefire-junit47 + 2.19.1 + + + + + + + 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.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 + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.zeroturnaround + + + jrebel-maven-plugin + + + [1.1.6,) + + + generate + + + + + + + + + + + + + + + + + + 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-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 + + + + \ No newline at end of file diff --git a/pdf-toolkit-repo/run.bat b/pdf-toolkit-repo/run.bat new file mode 100644 index 0000000..e9fbff2 --- /dev/null +++ b/pdf-toolkit-repo/run.bat @@ -0,0 +1,86 @@ +@ECHO OFF + +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|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==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 :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 pdf-toolkit-repo-acs-volume + docker volume create pdf-toolkit-repo-db-volume + docker volume create pdf-toolkit-repo-ass-volume + docker-compose -f "%COMPOSE_FILE_PATH%" up --build -d +EXIT /B 0 +:down + docker-compose -f "%COMPOSE_FILE_PATH%" down +EXIT /B 0 +:build + docker rmi alfresco-content-services-pdf-toolkit-repo:development + call %MVN_EXEC% clean install -DskipTests +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 +:test + call %MVN_EXEC% verify +EXIT /B 0 +:purge + docker volume rm pdf-toolkit-repo-acs-volume + docker volume rm pdf-toolkit-repo-db-volume + docker volume rm pdf-toolkit-repo-ass-volume +EXIT /B 0 \ No newline at end of file diff --git a/pdf-toolkit-repo/run.sh b/pdf-toolkit-repo/run.sh new file mode 100755 index 0000000..4ae53b4 --- /dev/null +++ b/pdf-toolkit-repo/run.sh @@ -0,0 +1,79 @@ +#!/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 + +start() { + docker volume create pdf-toolkit-repo-acs-volume + docker volume create pdf-toolkit-repo-db-volume + docker volume create pdf-toolkit-repo-ass-volume + docker-compose -f $COMPOSE_FILE_PATH up --build -d +} + +down() { + docker-compose -f $COMPOSE_FILE_PATH down +} + +purge() { + docker volume rm pdf-toolkit-repo-acs-volume + docker volume rm pdf-toolkit-repo-db-volume + docker volume rm pdf-toolkit-repo-ass-volume +} + +build() { + docker rmi alfresco-content-services-pdf-toolkit-repo:development + $MVN_EXEC clean install -DskipTests=true +} + +tail() { + docker-compose -f $COMPOSE_FILE_PATH logs -f +} + +tail_all() { + docker-compose -f $COMPOSE_FILE_PATH logs --tail="all" +} + +test() { + $MVN_EXEC verify +} + +case "$1" in + build_start) + down + build + start + tail + ;; + start) + start + tail + ;; + stop) + down + ;; + purge) + down + purge + ;; + tail) + tail + ;; + build_test) + down + build + start + test + tail_all + down + ;; + test) + test + ;; + *) + echo "Usage: $0 {build_start|start|stop|purge|tail|build_test|test}" +esac \ No newline at end of file diff --git a/pdf-toolkit-repo/src/main/amp/config/alfresco/module/org.alfresco.extension.pdftoolkit/log4j.properties b/pdf-toolkit-repo/src/main/amp/config/alfresco/module/org.alfresco.extension.pdftoolkit/log4j.properties deleted file mode 100644 index 0729f28..0000000 --- a/pdf-toolkit-repo/src/main/amp/config/alfresco/module/org.alfresco.extension.pdftoolkit/log4j.properties +++ /dev/null @@ -1,5 +0,0 @@ -# turn on debug logging for pdf toolkit classes -#log4j.logger.org.alfresco.extension.pdftoolkit=DEBUG - -# turn on form service debug logging -#log4j.logger.org.alfresco.repo.forms=DEBUG \ No newline at end of file diff --git a/pdf-toolkit-repo/src/main/assembly/amp.xml b/pdf-toolkit-repo/src/main/assembly/amp.xml new file mode 100644 index 0000000..e41c098 --- /dev/null +++ b/pdf-toolkit-repo/src/main/assembly/amp.xml @@ -0,0 +1,61 @@ + + + + + build-amp-file + + + amp + + + false + + + + + src/main/resources/alfresco/module/${project.artifactId}/module.properties + true + + + + src/main/assembly/file-mapping.properties + false + + + + + + + src/main/assembly/web + web + true + + README.md + + + + + + + + lib + + + + \ No newline at end of file diff --git a/pdf-toolkit-repo/src/main/assembly/file-mapping.properties b/pdf-toolkit-repo/src/main/assembly/file-mapping.properties new file mode 100644 index 0000000..501b3d6 --- /dev/null +++ b/pdf-toolkit-repo/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/pdf-toolkit-repo/src/main/assembly/web/README.md b/pdf-toolkit-repo/src/main/assembly/web/README.md new file mode 100644 index 0000000..d1c0157 --- /dev/null +++ b/pdf-toolkit-repo/src/main/assembly/web/README.md @@ -0,0 +1,22 @@ +# Web resources that should override out-of-the-box files + +Put here any web resources that should override out-of-the-box +web resources, such as favicon.ico. They will then end up in the +*/web* directory in the AMP, and applied to the WAR, and override +any existing web resources in the Alfresco.WAR. + +**Note**. Module dependency needs to be set to amp for the web resources to be applied by MMT: + +` + + ${project.groupId} + some-platform-jar + ${project.version} + amp + +` + +**Important**. New web resources should not be located here, but instead + in the usual place in the *src/main/resources/META-INF/resources* directory. + + diff --git a/pdf-toolkit-repo/src/main/docker/Dockerfile b/pdf-toolkit-repo/src/main/docker/Dockerfile new file mode 100644 index 0000000..0acd7c6 --- /dev/null +++ b/pdf-toolkit-repo/src/main/docker/Dockerfile @@ -0,0 +1,18 @@ +FROM ${docker.acs.image}:${alfresco.platform.version} + +ARG TOMCAT_DIR=/usr/local/tomcat + +# 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-log4j.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/ \ No newline at end of file diff --git a/repo/src/main/properties/local/alfresco-global.properties b/pdf-toolkit-repo/src/main/docker/alfresco-global.properties similarity index 60% rename from repo/src/main/properties/local/alfresco-global.properties rename to pdf-toolkit-repo/src/main/docker/alfresco-global.properties index 63fd28d..77495e5 100644 --- a/repo/src/main/properties/local/alfresco-global.properties +++ b/pdf-toolkit-repo/src/main/docker/alfresco-global.properties @@ -15,15 +15,12 @@ # RUN TIME PROPERTIES # ------------------- -######################################################################################################################## -# Alfresco configuration for running locally +# +# Alfresco configuration for running locally with PostgreSQL Database # # 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 @@ -34,24 +31,11 @@ alfresco.protocol=http # Alfresco Share Webapp (share.war) context, ports etc share.context=share share.host=localhost -share.port=8080 +share.port=8180 share.protocol=http -# Use Solr4 as that is used by default with Alfresco 5 -index.subsystem.name=solr4 -solr.host=localhost -solr.port=8080 -solr.secureComms=none - -# Setting Solr backup for the future. Tweak this if needed (ideally in other env properties files) -solr.backup.alfresco.cronExpression=0 30 2 * * ? 2050 -solr.backup.archive.cronExpression=0 30 3 * * ? 2050 -solr.backup.alfresco.remoteBackupLocation=${dir.root}/solr4Backup/alfresco -solr.backup.archive.remoteBackupLocation=${dir.root}/solr4Backup/archive - -# We are in the local DEV properties file, no need for Solr backup -solr.backup.alfresco.numberToKeep=0 -solr.backup.archive.numberToKeep=0 +# 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 @@ -63,16 +47,30 @@ 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} +# 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=pdf-toolkit-repo-ass +solr.port=8983 +solr.secureComms=none + +db.username=alfresco +db.password=alfresco db.pool.initial=10 db.pool.max=100 -hibernate.dialect=org.hibernate.dialect.H2Dialect + +db.url=jdbc:postgresql://pdf-toolkit-repo-postgres:5432/alfresco # File servers related properties # For local runs we disable CIFS and FTP cifs.enabled=false -ftp.enabled=false \ No newline at end of file +ftp.enabled=false + +csrf.filter.enabled=false \ No newline at end of file diff --git a/share/src/main/resources/log4j.properties b/pdf-toolkit-repo/src/main/docker/dev-log4j.properties similarity index 82% rename from share/src/main/resources/log4j.properties rename to pdf-toolkit-repo/src/main/docker/dev-log4j.properties index 12d10f0..a954274 100644 --- a/share/src/main/resources/log4j.properties +++ b/pdf-toolkit-repo/src/main/docker/dev-log4j.properties @@ -1,262 +1,267 @@ -# 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}share.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 \ No newline at end of file +# Set root logger level to error +log4j.rootLogger=error, Console, File + + +# 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 + +log4j.appender.File=org.apache.log4j.DailyRollingFileAppender +log4j.appender.File.File=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{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n + +#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 + + +# 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.transaction=warn +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.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.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.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.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.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.cluster=info +log4j.logger.org.alfresco.repo.version.Version2ServiceImpl=warn + +#log4j.logger.org.alfresco.web.app.DebugPhaseListener=debug +log4j.logger.org.alfresco.repo.node.db.NodeStringLengthWorker=info + +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=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 +log4j.logger.org.alfresco.fileserver=warn + +# Repo filesystem debug logging +#log4j.logger.org.alfresco.filesys.repo.ContentDiskDriver=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 + +# Property sheet and modelling debugging +# change to error to hide the warnings about missing properties and associations +log4j.logger.alfresco.missingProperties=warn + +# 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.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 +log4j.logger.org.apache.chemistry.opencmis.server.impl.browser.CmisBrowserBindingServlet=OFF +log4j.logger.org.apache.chemistry.opencmis.server.impl.atompub.CmisAtomPubServlet=OFF + +# 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 + + +# 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.domain.schema.script.ScriptBundleExecutorImpl=off +log4j.logger.org.alfresco.repo.domain.schema.script.ScriptExecutorImpl=info + +log4j.logger.org.alfresco.repo.search.impl.solr.facet.SolrFacetServiceImpl=info + +# Bulk Filesystem Import Tool +log4j.logger.org.alfresco.repo.bulkimport=warn + +# 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 + +# lucene index warnings +log4j.logger.org.alfresco.repo.search.impl.lucene.index.IndexInfo=warn + +# Warn about RMI socket bind retries. +log4j.logger.org.alfresco.util.remote.server.socket.HostConfigurableSocketFactory=warn + +log4j.logger.org.alfresco.repo.usage.RepoUsageMonitor=info + +# Authorization +log4j.logger.org.alfresco.enterprise.repo.authorization.AuthorizationService=info +log4j.logger.org.alfresco.enterprise.repo.authorization.AuthorizationsConsistencyMonitor=warn + +#----------------------------------------------------------------------- +# Platform module logging +#----------------------------------------------------------------------- +log4j.logger.org.alfresco.extension.platformsample.DemoComponent=debug +log4j.logger.org.alfresco.extension.platformsample.HelloWorldWebScript=debug + + + diff --git a/pdf-toolkit-repo/src/main/docker/disable-webscript-caching-context.xml b/pdf-toolkit-repo/src/main/docker/disable-webscript-caching-context.xml new file mode 100644 index 0000000..07829ea --- /dev/null +++ b/pdf-toolkit-repo/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/pdf-toolkit-repo/src/main/docker/hotswap-agent.properties b/pdf-toolkit-repo/src/main/docker/hotswap-agent.properties new file mode 100644 index 0000000..bf98657 --- /dev/null +++ b/pdf-toolkit-repo/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/pdf-toolkit-repo/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/pdf-toolkit-repo/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/pdf-toolkit-repo/src/main/docker/license/README.md b/pdf-toolkit-repo/src/main/docker/license/README.md new file mode 100644 index 0000000..996f1bd --- /dev/null +++ b/pdf-toolkit-repo/src/main/docker/license/README.md @@ -0,0 +1,6 @@ +# Enterprise License location + +Put the Alfresco Enterprise license file in this directory. +It will then be copied into the ACS container in the +$TOMCAT_DIR/WEB-INF/classes/alfresco/extension/license directory. + diff --git a/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/form/PDFActionFormFilter.java b/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/form/PDFActionFormFilter.java index aca4bac..94c845c 100644 --- a/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/form/PDFActionFormFilter.java +++ b/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/form/PDFActionFormFilter.java @@ -51,8 +51,6 @@ public void beforeGenerate(Object obj, List fields, public void beforePersist(Object obj, FormData formData) { logger.debug("beforePersist"); - NodeService ns = serviceRegistry.getNodeService(); - //check the action, is it one we need to handle? if(obj != null) { diff --git a/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFAppendActionExecuter.java b/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFAppendActionExecuter.java index 810f99f..44dcdf6 100644 --- a/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFAppendActionExecuter.java +++ b/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFAppendActionExecuter.java @@ -19,17 +19,13 @@ package org.alfresco.extension.pdftoolkit.repo.action.executer; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.extension.pdftoolkit.constants.PDFToolkitConstants; import org.alfresco.repo.action.ParameterDefinitionImpl; import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.action.ParameterDefinition; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; -import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.NodeRef; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFSplitActionExecuter.java b/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFSplitActionExecuter.java index 349ca5f..b7bda92 100644 --- a/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFSplitActionExecuter.java +++ b/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFSplitActionExecuter.java @@ -19,32 +19,15 @@ package org.alfresco.extension.pdftoolkit.repo.action.executer; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.HashMap; -import java.util.Iterator; import java.util.List; -import java.util.Map; - -import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.extension.pdftoolkit.constants.PDFToolkitConstants; -import org.alfresco.model.ContentModel; import org.alfresco.repo.action.ParameterDefinitionImpl; import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.action.ParameterDefinition; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; -import org.alfresco.service.cmr.model.FileExistsException; -import org.alfresco.service.cmr.model.FileInfo; -import org.alfresco.service.cmr.repository.ContentReader; -import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.TempFileProvider; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.pdfbox.exceptions.COSVisitorException; -import org.apache.pdfbox.pdmodel.PDDocument; -import org.apache.pdfbox.util.Splitter; /** diff --git a/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFSplitAtPageActionExecuter.java b/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFSplitAtPageActionExecuter.java index 0cd628a..83d3502 100644 --- a/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFSplitAtPageActionExecuter.java +++ b/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/repo/action/executer/PDFSplitAtPageActionExecuter.java @@ -19,33 +19,15 @@ package org.alfresco.extension.pdftoolkit.repo.action.executer; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.util.HashMap; -import java.util.Iterator; import java.util.List; -import java.util.Map; - -import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.extension.pdftoolkit.constants.PDFToolkitConstants; -import org.alfresco.model.ContentModel; import org.alfresco.repo.action.ParameterDefinitionImpl; import org.alfresco.service.cmr.action.Action; import org.alfresco.service.cmr.action.ParameterDefinition; import org.alfresco.service.cmr.dictionary.DataTypeDefinition; -import org.alfresco.service.cmr.model.FileExistsException; -import org.alfresco.service.cmr.model.FileInfo; -import org.alfresco.service.cmr.repository.ContentReader; -import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.NodeRef; -import org.alfresco.util.TempFileProvider; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.pdfbox.exceptions.COSVisitorException; -import org.apache.pdfbox.pdmodel.PDDocument; -import org.apache.pdfbox.util.PDFMergerUtility; -import org.apache.pdfbox.util.Splitter; /** diff --git a/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/service/PDFToolkitServiceImpl.java b/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/service/PDFToolkitServiceImpl.java index c71be71..154813e 100644 --- a/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/service/PDFToolkitServiceImpl.java +++ b/pdf-toolkit-repo/src/main/java/org/alfresco/extension/pdftoolkit/service/PDFToolkitServiceImpl.java @@ -50,10 +50,9 @@ import org.alfresco.util.TempFileProvider; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.pdfbox.exceptions.COSVisitorException; +import org.apache.pdfbox.multipdf.PDFMergerUtility; +import org.apache.pdfbox.multipdf.Splitter; import org.apache.pdfbox.pdmodel.PDDocument; -import org.apache.pdfbox.util.PDFMergerUtility; -import org.apache.pdfbox.util.Splitter; import org.springframework.extensions.surf.util.I18NUtil; import com.itextpdf.text.Document; @@ -63,10 +62,12 @@ import com.itextpdf.text.pdf.BaseFont; import com.itextpdf.text.pdf.PdfContentByte; import com.itextpdf.text.pdf.PdfCopy; +import com.itextpdf.text.pdf.PdfDate; import com.itextpdf.text.pdf.PdfDictionary; import com.itextpdf.text.pdf.PdfName; import com.itextpdf.text.pdf.PdfNumber; import com.itextpdf.text.pdf.PdfReader; +import com.itextpdf.text.pdf.PdfSignature; import com.itextpdf.text.pdf.PdfSignatureAppearance; import com.itextpdf.text.pdf.PdfStamper; import com.itextpdf.text.pdf.PdfWriter; @@ -166,10 +167,6 @@ public NodeRef appendPDF(NodeRef targetNodeRef, Map params } } } - catch (COSVisitorException e) - { - throw new AlfrescoRuntimeException(e.getMessage(), e); - } catch (IOException e) { throw new AlfrescoRuntimeException(e.getMessage(), e); @@ -502,13 +499,21 @@ else if (keyType.equalsIgnoreCase(KEY_TYPE_PKCS12)) } else { stamp = PdfStamper.createSignature(reader, fout, '\0'); } + PdfSignatureAppearance sap = stamp.getSignatureAppearance(); - sap.setCrypto(key, chain, null, PdfSignatureAppearance.WINCER_SIGNED); - // set reason for signature and location of signer sap.setReason(reason); sap.setLocation(location); - + + PdfSignature dic = new PdfSignature( + PdfName.ADOBE_PPKLITE, PdfName.ADBE_PKCS7_DETACHED); + dic.setReason(sap.getReason()); + dic.setLocation(sap.getLocation()); + dic.setContact(sap.getContact()); + dic.setDate(new PdfDate(sap.getSignDate())); + + //sap.setCrypto(key, chain, null, PdfSignatureAppearance.WINCER_SIGNED); + if (visibility.equalsIgnoreCase(VISIBILITY_VISIBLE)) { //create the signature rectangle using either the provided position or @@ -524,6 +529,8 @@ else if (keyType.equalsIgnoreCase(KEY_TYPE_PKCS12)) sap.setVisibleSignature(new Rectangle(locationX, locationY, locationX + width, locationY - height), pageNumber, null); } } + + sap.setCryptoDictionary(dic); stamp.close(); @@ -749,10 +756,6 @@ public NodeRef splitPDF(NodeRef targetNodeRef, Map params) } } } - catch (COSVisitorException e) - { - throw new AlfrescoRuntimeException(e.getMessage(), e); - } catch (IOException e) { throw new AlfrescoRuntimeException(e.getMessage(), e); @@ -947,10 +950,6 @@ public NodeRef splitPDFAtPage(NodeRef targetNodeRef, Map p } } } - catch (COSVisitorException e) - { - throw new AlfrescoRuntimeException(e.getMessage(), e); - } catch (IOException e) { throw new AlfrescoRuntimeException(e.getMessage(), e); @@ -1093,10 +1092,6 @@ public NodeRef insertPDF(NodeRef targetNodeRef, Map params } } // TODO add better handling - catch (COSVisitorException e) - { - throw new AlfrescoRuntimeException(e.getMessage(), e); - } catch (IOException e) { throw new AlfrescoRuntimeException(e.getMessage(), e); diff --git a/pdf-toolkit-repo/src/main/resources/META-INF/resources/test.html b/pdf-toolkit-repo/src/main/resources/META-INF/resources/test.html new file mode 100644 index 0000000..29bc9b4 --- /dev/null +++ b/pdf-toolkit-repo/src/main/resources/META-INF/resources/test.html @@ -0,0 +1 @@ +Test 123 \ No newline at end of file diff --git a/pdf-toolkit-repo/src/main/amp/config/org/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfappend-messages.properties b/pdf-toolkit-repo/src/main/resources/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfappend-messages.properties similarity index 100% rename from pdf-toolkit-repo/src/main/amp/config/org/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfappend-messages.properties rename to pdf-toolkit-repo/src/main/resources/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfappend-messages.properties diff --git a/pdf-toolkit-repo/src/main/amp/config/org/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfdelete-messages.properties b/pdf-toolkit-repo/src/main/resources/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfdelete-messages.properties similarity index 100% rename from pdf-toolkit-repo/src/main/amp/config/org/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfdelete-messages.properties rename to pdf-toolkit-repo/src/main/resources/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfdelete-messages.properties diff --git a/pdf-toolkit-repo/src/main/amp/config/org/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfencryption-messages.properties b/pdf-toolkit-repo/src/main/resources/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfencryption-messages.properties similarity index 100% rename from pdf-toolkit-repo/src/main/amp/config/org/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfencryption-messages.properties rename to pdf-toolkit-repo/src/main/resources/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfencryption-messages.properties diff --git a/pdf-toolkit-repo/src/main/amp/config/org/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfinsert-messages.properties b/pdf-toolkit-repo/src/main/resources/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfinsert-messages.properties similarity index 100% rename from pdf-toolkit-repo/src/main/amp/config/org/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfinsert-messages.properties rename to pdf-toolkit-repo/src/main/resources/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfinsert-messages.properties diff --git a/pdf-toolkit-repo/src/main/amp/config/org/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfsignature-messages.properties b/pdf-toolkit-repo/src/main/resources/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfsignature-messages.properties similarity index 100% rename from pdf-toolkit-repo/src/main/amp/config/org/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfsignature-messages.properties rename to pdf-toolkit-repo/src/main/resources/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfsignature-messages.properties diff --git a/pdf-toolkit-repo/src/main/amp/config/org/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfsplit-messages.properties b/pdf-toolkit-repo/src/main/resources/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfsplit-messages.properties similarity index 100% rename from pdf-toolkit-repo/src/main/amp/config/org/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfsplit-messages.properties rename to pdf-toolkit-repo/src/main/resources/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfsplit-messages.properties diff --git a/pdf-toolkit-repo/src/main/amp/config/org/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfsplitatpage-messages.properties b/pdf-toolkit-repo/src/main/resources/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfsplitatpage-messages.properties similarity index 100% rename from pdf-toolkit-repo/src/main/amp/config/org/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfsplitatpage-messages.properties rename to pdf-toolkit-repo/src/main/resources/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfsplitatpage-messages.properties diff --git a/pdf-toolkit-repo/src/main/amp/config/org/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfwatermark-messages.properties b/pdf-toolkit-repo/src/main/resources/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfwatermark-messages.properties similarity index 100% rename from pdf-toolkit-repo/src/main/amp/config/org/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfwatermark-messages.properties rename to pdf-toolkit-repo/src/main/resources/alfresco/extension/pdftoolkit/web/bean/actions/handlers/pdfwatermark-messages.properties diff --git a/pdf-toolkit-repo/src/main/amp/config/alfresco/extension/templates/webscripts/org/alfresco/extension/pdftoolkit/pagecount.get.desc.xml b/pdf-toolkit-repo/src/main/resources/alfresco/extension/templates/webscripts/org/alfresco/extension/pdftoolkit/pagecount.get.desc.xml similarity index 100% rename from pdf-toolkit-repo/src/main/amp/config/alfresco/extension/templates/webscripts/org/alfresco/extension/pdftoolkit/pagecount.get.desc.xml rename to pdf-toolkit-repo/src/main/resources/alfresco/extension/templates/webscripts/org/alfresco/extension/pdftoolkit/pagecount.get.desc.xml diff --git a/pdf-toolkit-repo/src/main/amp/config/alfresco/extension/templates/webscripts/org/alfresco/extension/pdftoolkit/pagecount.get.json.ftl b/pdf-toolkit-repo/src/main/resources/alfresco/extension/templates/webscripts/org/alfresco/extension/pdftoolkit/pagecount.get.json.ftl similarity index 100% rename from pdf-toolkit-repo/src/main/amp/config/alfresco/extension/templates/webscripts/org/alfresco/extension/pdftoolkit/pagecount.get.json.ftl rename to pdf-toolkit-repo/src/main/resources/alfresco/extension/templates/webscripts/org/alfresco/extension/pdftoolkit/pagecount.get.json.ftl diff --git a/pdf-toolkit-repo/src/main/amp/config/alfresco/extension/templates/webscripts/org/alfresco/extension/pdftoolkit/pageschemes.get.desc.xml b/pdf-toolkit-repo/src/main/resources/alfresco/extension/templates/webscripts/org/alfresco/extension/pdftoolkit/pageschemes.get.desc.xml similarity index 100% rename from pdf-toolkit-repo/src/main/amp/config/alfresco/extension/templates/webscripts/org/alfresco/extension/pdftoolkit/pageschemes.get.desc.xml rename to pdf-toolkit-repo/src/main/resources/alfresco/extension/templates/webscripts/org/alfresco/extension/pdftoolkit/pageschemes.get.desc.xml diff --git a/pdf-toolkit-repo/src/main/amp/config/alfresco/extension/templates/webscripts/org/alfresco/extension/pdftoolkit/pageschemes.get.json.ftl b/pdf-toolkit-repo/src/main/resources/alfresco/extension/templates/webscripts/org/alfresco/extension/pdftoolkit/pageschemes.get.json.ftl similarity index 100% rename from pdf-toolkit-repo/src/main/amp/config/alfresco/extension/templates/webscripts/org/alfresco/extension/pdftoolkit/pageschemes.get.json.ftl rename to pdf-toolkit-repo/src/main/resources/alfresco/extension/templates/webscripts/org/alfresco/extension/pdftoolkit/pageschemes.get.json.ftl diff --git a/pdf-toolkit-repo/src/main/amp/config/alfresco/extension/templates/webscripts/org/alfresco/extension/pdftoolkit/pageschemes.get_pt_BR.properties b/pdf-toolkit-repo/src/main/resources/alfresco/extension/templates/webscripts/org/alfresco/extension/pdftoolkit/pageschemes.get_pt_BR.properties similarity index 100% rename from pdf-toolkit-repo/src/main/amp/config/alfresco/extension/templates/webscripts/org/alfresco/extension/pdftoolkit/pageschemes.get_pt_BR.properties rename to pdf-toolkit-repo/src/main/resources/alfresco/extension/templates/webscripts/org/alfresco/extension/pdftoolkit/pageschemes.get_pt_BR.properties diff --git a/pdf-toolkit-repo/src/main/amp/config/alfresco/messages/pdf-toolkit.properties b/pdf-toolkit-repo/src/main/resources/alfresco/messages/pdf-toolkit.properties similarity index 100% rename from pdf-toolkit-repo/src/main/amp/config/alfresco/messages/pdf-toolkit.properties rename to pdf-toolkit-repo/src/main/resources/alfresco/messages/pdf-toolkit.properties diff --git a/pdf-toolkit-repo/src/main/amp/config/alfresco/messages/pdf-toolkit_de.properties b/pdf-toolkit-repo/src/main/resources/alfresco/messages/pdf-toolkit_de.properties similarity index 100% rename from pdf-toolkit-repo/src/main/amp/config/alfresco/messages/pdf-toolkit_de.properties rename to pdf-toolkit-repo/src/main/resources/alfresco/messages/pdf-toolkit_de.properties diff --git a/pdf-toolkit-repo/src/main/amp/config/alfresco/messages/pdf-toolkit_en.properties b/pdf-toolkit-repo/src/main/resources/alfresco/messages/pdf-toolkit_en.properties similarity index 100% rename from pdf-toolkit-repo/src/main/amp/config/alfresco/messages/pdf-toolkit_en.properties rename to pdf-toolkit-repo/src/main/resources/alfresco/messages/pdf-toolkit_en.properties diff --git a/pdf-toolkit-repo/src/main/amp/config/alfresco/messages/pdf-toolkit_pt_BR.properties b/pdf-toolkit-repo/src/main/resources/alfresco/messages/pdf-toolkit_pt_BR.properties similarity index 100% rename from pdf-toolkit-repo/src/main/amp/config/alfresco/messages/pdf-toolkit_pt_BR.properties rename to pdf-toolkit-repo/src/main/resources/alfresco/messages/pdf-toolkit_pt_BR.properties diff --git a/pdf-toolkit-repo/src/main/resources/alfresco/module/pdf-toolkit-repo/alfresco-global.properties b/pdf-toolkit-repo/src/main/resources/alfresco/module/pdf-toolkit-repo/alfresco-global.properties new file mode 100644 index 0000000..f566f22 --- /dev/null +++ b/pdf-toolkit-repo/src/main/resources/alfresco/module/pdf-toolkit-repo/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/pdf-toolkit-repo/src/main/amp/config/alfresco/module/org.alfresco.extension.pdftoolkit/context/alfresco-pdf-toolkit-context.xml b/pdf-toolkit-repo/src/main/resources/alfresco/module/pdf-toolkit-repo/context/alfresco-pdf-toolkit-context.xml similarity index 94% rename from pdf-toolkit-repo/src/main/amp/config/alfresco/module/org.alfresco.extension.pdftoolkit/context/alfresco-pdf-toolkit-context.xml rename to pdf-toolkit-repo/src/main/resources/alfresco/module/pdf-toolkit-repo/context/alfresco-pdf-toolkit-context.xml index ed71e2c..eaf0db9 100644 --- a/pdf-toolkit-repo/src/main/amp/config/alfresco/module/org.alfresco.extension.pdftoolkit/context/alfresco-pdf-toolkit-context.xml +++ b/pdf-toolkit-repo/src/main/resources/alfresco/module/pdf-toolkit-repo/context/alfresco-pdf-toolkit-context.xml @@ -1,10 +1,10 @@ - + + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"> - - + diff --git a/pdf-toolkit-repo/src/main/amp/config/alfresco/module/org.alfresco.extension.pdftoolkit/context/custom-form-services-context.xml b/pdf-toolkit-repo/src/main/resources/alfresco/module/pdf-toolkit-repo/context/custom-form-services-context.xml similarity index 55% rename from pdf-toolkit-repo/src/main/amp/config/alfresco/module/org.alfresco.extension.pdftoolkit/context/custom-form-services-context.xml rename to pdf-toolkit-repo/src/main/resources/alfresco/module/pdf-toolkit-repo/context/custom-form-services-context.xml index 85fcc20..ec14c8d 100644 --- a/pdf-toolkit-repo/src/main/amp/config/alfresco/module/org.alfresco.extension.pdftoolkit/context/custom-form-services-context.xml +++ b/pdf-toolkit-repo/src/main/resources/alfresco/module/pdf-toolkit-repo/context/custom-form-services-context.xml @@ -1,8 +1,26 @@ - - - - + + + + - - - - + + + + + + + + + text/plain + application/pdf + + + text/csv + application/pdf + + + text/xml + application/pdf + + + + + + + + + + image/tiff + application/pdf + + + + + + + + + + + diff --git a/pdf-toolkit-repo/src/main/amp/config/alfresco/module/org.alfresco.extension.pdftoolkit/model/pdftoolkitModel.xml b/pdf-toolkit-repo/src/main/resources/alfresco/module/pdf-toolkit-repo/model/pdftoolkitModel.xml similarity index 100% rename from pdf-toolkit-repo/src/main/amp/config/alfresco/module/org.alfresco.extension.pdftoolkit/model/pdftoolkitModel.xml rename to pdf-toolkit-repo/src/main/resources/alfresco/module/pdf-toolkit-repo/model/pdftoolkitModel.xml diff --git a/pdf-toolkit-repo/src/main/amp/config/alfresco/module/org.alfresco.extension.pdftoolkit/module-context.xml b/pdf-toolkit-repo/src/main/resources/alfresco/module/pdf-toolkit-repo/module-context.xml similarity index 77% rename from pdf-toolkit-repo/src/main/amp/config/alfresco/module/org.alfresco.extension.pdftoolkit/module-context.xml rename to pdf-toolkit-repo/src/main/resources/alfresco/module/pdf-toolkit-repo/module-context.xml index 99fd1be..313d956 100644 --- a/pdf-toolkit-repo/src/main/amp/config/alfresco/module/org.alfresco.extension.pdftoolkit/module-context.xml +++ b/pdf-toolkit-repo/src/main/resources/alfresco/module/pdf-toolkit-repo/module-context.xml @@ -1,22 +1,40 @@ - - + + + + + - + - + - + - alfresco/module/org.alfresco.extension.pdftoolkit/model/pdftoolkitModel.xml + alfresco/module/${project.artifactId}/model/pdftoolkitModel.xml @@ -30,14 +48,6 @@ - - - - alfresco.messages.pdf-toolkit - - - - @@ -161,8 +171,9 @@ - classpath:alfresco/module/org.alfresco.extension.pdftoolkit/context/pdftoolkit-config.properties + classpath:alfresco/module/${project.artifactId}/context/pdftoolkit-config.properties - \ No newline at end of file + + diff --git a/pdf-toolkit-share/src/main/amp/module.properties b/pdf-toolkit-repo/src/main/resources/alfresco/module/pdf-toolkit-repo/module.properties similarity index 91% rename from pdf-toolkit-share/src/main/amp/module.properties rename to pdf-toolkit-repo/src/main/resources/alfresco/module/pdf-toolkit-repo/module.properties index ff42da6..158500f 100644 --- a/pdf-toolkit-share/src/main/amp/module.properties +++ b/pdf-toolkit-repo/src/main/resources/alfresco/module/pdf-toolkit-repo/module.properties @@ -18,12 +18,13 @@ # 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=${noSnapshotVersion} +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. diff --git a/pdf-toolkit-repo/src/test/java/org/alfresco/extension/pdftoolkit/form/TestPDFActionFormFilter.java b/pdf-toolkit-repo/src/test/java/org/alfresco/extension/pdftoolkit/form/TestPDFActionFormFilter.java deleted file mode 100644 index cf82e0c..0000000 --- a/pdf-toolkit-repo/src/test/java/org/alfresco/extension/pdftoolkit/form/TestPDFActionFormFilter.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.alfresco.extension.pdftoolkit.form; - -import org.alfresco.repo.action.ActionDefinitionImpl; -import org.alfresco.repo.forms.FormData; -import org.alfresco.service.ServiceRegistry; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import com.tradeshift.test.remote.Remote; -import com.tradeshift.test.remote.RemoteTestRunner; - -@RunWith(RemoteTestRunner.class) -@Remote(runnerClass=SpringJUnit4ClassRunner.class) -@ContextConfiguration("classpath:alfresco/application-context.xml") -public class TestPDFActionFormFilter { - // parameter constants from PDFActionFormFilter - private String WATERMARK_IMAGE_FIELD = "assoc_watermark-image_added"; - - @Autowired @Qualifier("ServiceRegistry") - private ServiceRegistry serviceRegistry; - ActionDefinitionImpl act = new ActionDefinitionImpl("test"); - - @Test - public void testNullParamsInBeforePersist() { - PDFActionFormFilter filter = new PDFActionFormFilter(); - filter.setServiceRegistry(serviceRegistry); - FormData formDataNullInplace = new FormData(); - formDataNullInplace.addFieldData(WATERMARK_IMAGE_FIELD, ""); - - filter.beforePersist((Object) act, formDataNullInplace); - } -} diff --git a/pdf-toolkit-repo/src/test/properties/local/alfresco-global.properties b/pdf-toolkit-repo/src/test/properties/local/alfresco-global.properties deleted file mode 100644 index 343401a..0000000 --- a/pdf-toolkit-repo/src/test/properties/local/alfresco-global.properties +++ /dev/null @@ -1,57 +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 -# ------------------- - -# Sample custom content and index data location -# This will create alf_data Relative to appserver run folder -# In this default file we take the property from the POM (for compatbility with local jetty and jboss deployments) but it can also be edited here. -dir.root=${alfresco.data.location} -# Allowed values are: NONE, AUTO, FULL -index.recovery.mode=NONE -# This is default. Allowed values are: solr, lucene, noindex -index.subsystem.name=solr - -#dir.keystore=. -#keystore.password=storepassword -#metadata.password=metapassword - -# 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 - -# File servers related properties -# For local builds we disable CIFS and FTP. Edit the following property to reenable them -smb.server.enabled=false -smb.server.name=CFS_SHARE_LOCAL -smb.server.domain=mycompany.com -smb.server.bindto=127.0.0.1 -smb.tcpip.port=1445 -netbios.session.port=1139 -netbios.name.port=1137 -netbios.datagram.port=1138 -ftp.server.enables=false -ftp.port=1121 -ftp.authenticator=alfresco \ No newline at end of file diff --git a/pdf-toolkit-repo/src/test/resources/test-log4j.properties b/pdf-toolkit-repo/src/test/resources/test-log4j.properties deleted file mode 100644 index b40d997..0000000 --- a/pdf-toolkit-repo/src/test/resources/test-log4j.properties +++ /dev/null @@ -1,23 +0,0 @@ -# Overrides only log4j locations and add the test logging properties -# This gets merged with the main file - -# 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 \ No newline at end of file diff --git a/pdf-toolkit-repo/tomcat/context.xml b/pdf-toolkit-repo/tomcat/context.xml deleted file mode 100644 index bc392e0..0000000 --- a/pdf-toolkit-repo/tomcat/context.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - diff --git a/pdf-toolkit-share/README.md b/pdf-toolkit-share/README.md new file mode 100644 index 0000000..1e3f235 --- /dev/null +++ b/pdf-toolkit-share/README.md @@ -0,0 +1,33 @@ +# Alfresco Share JAR Module - SDK 3 + +To run this module use `mvn clean install -DskipTests=true alfresco:run` or `./run.sh` and verify that it + + * Runs the embedded Tomcat + H2 DB + * Runs Alfresco Share + * Packages both as JAR and AMP assembly + +Note. You access Share as follows: http://localhost:8081/share + +Note. You need an Alfresco Platform instance running at http://localhost:8080/alfresco that Share can talk to. + Typically you will just kick off a platform-jar module for that. + +# Few things to notice + + * No parent pom + * WAR assembly is handled by the Alfresco Maven Plugin configuration, if needed + * Standard JAR packaging and layout + * Works seamlessly with Eclipse and IntelliJ IDEA + * JRebel for hot reloading, JRebel maven plugin for generating rebel.xml, agent usage: `MAVEN_OPTS=-Xms256m -Xmx1G -agentpath:/home/martin/apps/jrebel/lib/libjrebel64.so` + * AMP as an assembly + * [Configurable Run mojo](https://github.com/Alfresco/alfresco-sdk/blob/sdk-3.0/plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/RunMojo.java) in the `alfresco-maven-plugin` + * No unit testing/functional tests just yet + * Resources loaded from META-INF + * Web Fragment (this includes a sample servlet configured via web fragment) + +# TODO + + * Abstract assembly into a dependency so we don't have to ship the assembly in the archetype + + + + diff --git a/pdf-toolkit-share/debug.bat b/pdf-toolkit-share/debug.bat new file mode 100644 index 0000000..40ba50e --- /dev/null +++ b/pdf-toolkit-share/debug.bat @@ -0,0 +1,10 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:: Dev environment startup script for Alfresco Community. :: +:: :: +:: Note. requires Alfresco.war to be running in another :: +:: Tomcat on port 8080. :: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +@echo off + +mvnDebug clean install alfresco:run + diff --git a/pdf-toolkit-share/debug.sh b/pdf-toolkit-share/debug.sh new file mode 100644 index 0000000..773d0ac --- /dev/null +++ b/pdf-toolkit-share/debug.sh @@ -0,0 +1,4 @@ +#!/bin/bash +# Note. requires Alfresco.war to be running in another Tomcat on port 8080 + +mvnDebug clean install alfresco:run diff --git a/pdf-toolkit-share/pom.xml b/pdf-toolkit-share/pom.xml index 445ab77..db7f636 100644 --- a/pdf-toolkit-share/pom.xml +++ b/pdf-toolkit-share/pom.xml @@ -1,90 +1,251 @@ - + 4.0.0 + org.alfresco.extension pdf-toolkit-share + 1.4.3-SNAPSHOT Alfresco PDF Toolkit - Share - amp Alfresco PDF Toolkit Share customizations - - - org.alfresco.extension - pdf-toolkit - 1.4.2 - + jar - - share + + 3.0.1 + + UTF-8 + + + org.alfresco + + + 5.2.f + + + community + + + 6.11 + + + 8081 - - WARN + + 1.1.6 + + + 1.7 + 1.7 - + + ${alfresco.groupId} share - ${alfresco.version} + ${alfresco.share.version} classes provided - org.springframework.extensions.surf + org.alfresco.surf spring-surf-api + ${alfresco.surf.version} provided + - + + + + + org.alfresco.maven.plugin + alfresco-maven-plugin + ${alfresco.sdk.version} + - - - ${alfresco.groupId} - share-po - ${alfresco.version} - test - - - - ${alfresco.groupId} - share-po - ${alfresco.version} - tests - test - - - - - org.seleniumhq.selenium - selenium-java - - - org.seleniumhq.selenium - selenium-server - - - - - - - org.alfresco.test - alfresco-testng - 1.1 - test - - - org.hamcrest - hamcrest-core - - - - - - + + false + false + false + + + true + + + + + + ${project.groupId} + ${project.artifactId} + ${project.version} + + + + + + + + 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.zeroturnaround + jrebel-maven-plugin + ${jrebel.version} + + + generate-rebel-xml + process-resources + + generate + + + + + + + all + + + + + + + + + true + + + + + org.apache.maven.plugins + maven-resources-plugin + 3.0.1 + + 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 + + + + + + + + + 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-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 + + + + + \ No newline at end of file diff --git a/pdf-toolkit-share/run.bat b/pdf-toolkit-share/run.bat new file mode 100644 index 0000000..8c88313 --- /dev/null +++ b/pdf-toolkit-share/run.bat @@ -0,0 +1,9 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:: Dev environment startup script for Alfresco Community. :: +:: :: +:: Note. requires Alfresco.war to be running in another :: +:: Tomcat on port 8080. :: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +@echo off + +mvn clean install alfresco:run diff --git a/pdf-toolkit-share/run.sh b/pdf-toolkit-share/run.sh new file mode 100755 index 0000000..45abd23 --- /dev/null +++ b/pdf-toolkit-share/run.sh @@ -0,0 +1,4 @@ +#!/bin/bash +# Note. requires Alfresco.war to be running in another Tomcat on port 8080 + +mvn clean install alfresco:run diff --git a/pdf-toolkit-share/src/main/assembly/amp.xml b/pdf-toolkit-share/src/main/assembly/amp.xml new file mode 100644 index 0000000..9f17de8 --- /dev/null +++ b/pdf-toolkit-share/src/main/assembly/amp.xml @@ -0,0 +1,61 @@ + + + + + build-amp-file + + + amp + + + false + + + + + src/main/resources/alfresco/module/${project.artifactId}/module.properties + true + + + + src/main/assembly/file-mapping.properties + false + + + + + + + src/main/assembly/web + web + true + + README.md + + + + + + + + lib + + + + \ No newline at end of file diff --git a/pdf-toolkit-share/src/main/assembly/file-mapping.properties b/pdf-toolkit-share/src/main/assembly/file-mapping.properties new file mode 100644 index 0000000..501b3d6 --- /dev/null +++ b/pdf-toolkit-share/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/pdf-toolkit-share/src/main/assembly/web/README.md b/pdf-toolkit-share/src/main/assembly/web/README.md new file mode 100644 index 0000000..44f7597 --- /dev/null +++ b/pdf-toolkit-share/src/main/assembly/web/README.md @@ -0,0 +1,22 @@ +# Web resources that should override out-of-the-box files + +Put here any web resources that should override out-of-the-box +web resources, such as favicon.ico. They will then end up in the +*/web* directory in the AMP, and applied to the WAR, and override +any existing web resources in the Share.WAR. + +**Note**. Module dependency needs to be set to amp for the web resources to be applied by MMT: + +` + + ${project.groupId} + some-share-jar + ${project.version} + amp + +` + +**Important**. New web resources should not be located here, but instead + in the usual place in the *src/main/resources/META-INF/resources//* directory. + + diff --git a/pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/page_white_acrobat.png b/pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/page_white_acrobat.png similarity index 100% rename from pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/page_white_acrobat.png rename to pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/page_white_acrobat.png diff --git a/pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-append-16.png b/pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-append-16.png similarity index 100% rename from pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-append-16.png rename to pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-append-16.png diff --git a/pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-base-icon-16.png b/pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-base-icon-16.png similarity index 100% rename from pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-base-icon-16.png rename to pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-base-icon-16.png diff --git a/pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-decryption-16.png b/pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-decryption-16.png similarity index 100% rename from pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-decryption-16.png rename to pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-decryption-16.png diff --git a/pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-delete-page-16.png b/pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-delete-page-16.png similarity index 100% rename from pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-delete-page-16.png rename to pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-delete-page-16.png diff --git a/pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-encryption-16.png b/pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-encryption-16.png similarity index 100% rename from pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-encryption-16.png rename to pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-encryption-16.png diff --git a/pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-extract-page-16.png b/pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-extract-page-16.png similarity index 100% rename from pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-extract-page-16.png rename to pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-extract-page-16.png diff --git a/pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-insert-at-page-16.png b/pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-insert-at-page-16.png similarity index 100% rename from pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-insert-at-page-16.png rename to pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-insert-at-page-16.png diff --git a/pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-rotate-16.png b/pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-rotate-16.png similarity index 100% rename from pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-rotate-16.png rename to pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-rotate-16.png diff --git a/pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-signature-16.png b/pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-signature-16.png similarity index 100% rename from pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-signature-16.png rename to pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-signature-16.png diff --git a/pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-split-16.png b/pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-split-16.png similarity index 100% rename from pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-split-16.png rename to pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-split-16.png diff --git a/pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-split-at-page-16.png b/pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-split-at-page-16.png similarity index 100% rename from pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-split-at-page-16.png rename to pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-split-at-page-16.png diff --git a/pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-watermark-16.png b/pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-watermark-16.png similarity index 100% rename from pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/actions/pdf-watermark-16.png rename to pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/actions/pdf-watermark-16.png diff --git a/pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/indicators/pdf-encryption-16.png b/pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/indicators/pdf-encryption-16.png similarity index 100% rename from pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/indicators/pdf-encryption-16.png rename to pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/indicators/pdf-encryption-16.png diff --git a/pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/indicators/pdf-signature-16.png b/pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/indicators/pdf-signature-16.png similarity index 100% rename from pdf-toolkit-share/src/main/resources/META-INF/components/documentlibrary/indicators/pdf-signature-16.png rename to pdf-toolkit-share/src/main/resources/META-INF/resources/components/documentlibrary/indicators/pdf-signature-16.png diff --git a/pdf-toolkit-repo/src/main/amp/module.properties b/pdf-toolkit-share/src/main/resources/alfresco/module/pdf-toolkit-share/module.properties similarity index 91% rename from pdf-toolkit-repo/src/main/amp/module.properties rename to pdf-toolkit-share/src/main/resources/alfresco/module/pdf-toolkit-share/module.properties index ff42da6..158500f 100644 --- a/pdf-toolkit-repo/src/main/amp/module.properties +++ b/pdf-toolkit-share/src/main/resources/alfresco/module/pdf-toolkit-share/module.properties @@ -18,12 +18,13 @@ # 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=${noSnapshotVersion} +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. diff --git a/pdf-toolkit-share/src/main/amp/config/alfresco/messages/pdftoolkit.properties b/pdf-toolkit-share/src/main/resources/alfresco/web-extension/messages/pdftoolkit.properties similarity index 100% rename from pdf-toolkit-share/src/main/amp/config/alfresco/messages/pdftoolkit.properties rename to pdf-toolkit-share/src/main/resources/alfresco/web-extension/messages/pdftoolkit.properties diff --git a/pdf-toolkit-share/src/main/amp/config/alfresco/messages/pdftoolkit_de.properties b/pdf-toolkit-share/src/main/resources/alfresco/web-extension/messages/pdftoolkit_de.properties similarity index 100% rename from pdf-toolkit-share/src/main/amp/config/alfresco/messages/pdftoolkit_de.properties rename to pdf-toolkit-share/src/main/resources/alfresco/web-extension/messages/pdftoolkit_de.properties diff --git a/pdf-toolkit-share/src/main/amp/config/alfresco/messages/pdftoolkit_en.properties b/pdf-toolkit-share/src/main/resources/alfresco/web-extension/messages/pdftoolkit_en.properties similarity index 100% rename from pdf-toolkit-share/src/main/amp/config/alfresco/messages/pdftoolkit_en.properties rename to pdf-toolkit-share/src/main/resources/alfresco/web-extension/messages/pdftoolkit_en.properties diff --git a/pdf-toolkit-share/src/main/amp/config/alfresco/messages/pdftoolkit_pt_BR.properties b/pdf-toolkit-share/src/main/resources/alfresco/web-extension/messages/pdftoolkit_pt_BR.properties similarity index 100% rename from pdf-toolkit-share/src/main/amp/config/alfresco/messages/pdftoolkit_pt_BR.properties rename to pdf-toolkit-share/src/main/resources/alfresco/web-extension/messages/pdftoolkit_pt_BR.properties diff --git a/pdf-toolkit-share/src/main/amp/config/alfresco/web-extension/pdftoolkit-context.xml b/pdf-toolkit-share/src/main/resources/alfresco/web-extension/pdftoolkit-context.xml similarity index 95% rename from pdf-toolkit-share/src/main/amp/config/alfresco/web-extension/pdftoolkit-context.xml rename to pdf-toolkit-share/src/main/resources/alfresco/web-extension/pdftoolkit-context.xml index b340cfd..ba8d05e 100644 --- a/pdf-toolkit-share/src/main/amp/config/alfresco/web-extension/pdftoolkit-context.xml +++ b/pdf-toolkit-share/src/main/resources/alfresco/web-extension/pdftoolkit-context.xml @@ -8,7 +8,7 @@ class="org.springframework.extensions.surf.util.ResourceBundleBootstrapComponent"> - alfresco.messages.pdftoolkit + alfresco.web-extension.messages.pdftoolkit diff --git a/pdf-toolkit-share/src/main/amp/config/alfresco/web-extension/site-data/extensions/alfresco-pdf-toolkit-extension.xml b/pdf-toolkit-share/src/main/resources/alfresco/web-extension/site-data/extensions/alfresco-pdf-toolkit-extension.xml similarity index 100% rename from pdf-toolkit-share/src/main/amp/config/alfresco/web-extension/site-data/extensions/alfresco-pdf-toolkit-extension.xml rename to pdf-toolkit-share/src/main/resources/alfresco/web-extension/site-data/extensions/alfresco-pdf-toolkit-extension.xml diff --git a/pdf-toolkit-share/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/pdftoolkit/components/form/controls/dependentSelect.ftl b/pdf-toolkit-share/src/main/resources/alfresco/web-extension/site-webscripts/org/alfresco/pdftoolkit/components/form/controls/dependentSelect.ftl similarity index 100% rename from pdf-toolkit-share/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/pdftoolkit/components/form/controls/dependentSelect.ftl rename to pdf-toolkit-share/src/main/resources/alfresco/web-extension/site-webscripts/org/alfresco/pdftoolkit/components/form/controls/dependentSelect.ftl diff --git a/pdf-toolkit-share/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/pdftoolkit/components/form/controls/hidingCheckbox.ftl b/pdf-toolkit-share/src/main/resources/alfresco/web-extension/site-webscripts/org/alfresco/pdftoolkit/components/form/controls/hidingCheckbox.ftl similarity index 100% rename from pdf-toolkit-share/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/pdftoolkit/components/form/controls/hidingCheckbox.ftl rename to pdf-toolkit-share/src/main/resources/alfresco/web-extension/site-webscripts/org/alfresco/pdftoolkit/components/form/controls/hidingCheckbox.ftl diff --git a/pdf-toolkit-share/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/pdftoolkit/components/form/controls/selectPage.ftl b/pdf-toolkit-share/src/main/resources/alfresco/web-extension/site-webscripts/org/alfresco/pdftoolkit/components/form/controls/selectPage.ftl similarity index 100% rename from pdf-toolkit-share/src/main/amp/config/alfresco/web-extension/site-webscripts/org/alfresco/pdftoolkit/components/form/controls/selectPage.ftl rename to pdf-toolkit-share/src/main/resources/alfresco/web-extension/site-webscripts/org/alfresco/pdftoolkit/components/form/controls/selectPage.ftl diff --git a/pdf-toolkit-share/src/test/properties/local/alfresco-global.properties b/pdf-toolkit-share/src/test/properties/local/alfresco-global.properties deleted file mode 100644 index 343401a..0000000 --- a/pdf-toolkit-share/src/test/properties/local/alfresco-global.properties +++ /dev/null @@ -1,57 +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 -# ------------------- - -# Sample custom content and index data location -# This will create alf_data Relative to appserver run folder -# In this default file we take the property from the POM (for compatbility with local jetty and jboss deployments) but it can also be edited here. -dir.root=${alfresco.data.location} -# Allowed values are: NONE, AUTO, FULL -index.recovery.mode=NONE -# This is default. Allowed values are: solr, lucene, noindex -index.subsystem.name=solr - -#dir.keystore=. -#keystore.password=storepassword -#metadata.password=metapassword - -# 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 - -# File servers related properties -# For local builds we disable CIFS and FTP. Edit the following property to reenable them -smb.server.enabled=false -smb.server.name=CFS_SHARE_LOCAL -smb.server.domain=mycompany.com -smb.server.bindto=127.0.0.1 -smb.tcpip.port=1445 -netbios.session.port=1139 -netbios.name.port=1137 -netbios.datagram.port=1138 -ftp.server.enables=false -ftp.port=1121 -ftp.authenticator=alfresco \ No newline at end of file diff --git a/pdf-toolkit-share/src/test/resources/share-hotswap-agent.properties b/pdf-toolkit-share/src/test/resources/share-hotswap-agent.properties new file mode 100644 index 0000000..53bb263 --- /dev/null +++ b/pdf-toolkit-share/src/test/resources/share-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=${project.build.outputDirectory};${project.build.testOutputDirectory} + +# 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=${project.build.outputDirectory}/META-INF/resources + +# Load static web resources from different directory. +# +# This setting is dependent on application server plugin(Jetty, Tomcat, JBoss, ...) +webappDir=${project.build.outputDirectory}/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/pdf-toolkit-share/src/test/resources/share/log4j.properties b/pdf-toolkit-share/src/test/resources/share/log4j.properties new file mode 100644 index 0000000..873677f --- /dev/null +++ b/pdf-toolkit-share/src/test/resources/share/log4j.properties @@ -0,0 +1,52 @@ +# Set root logger level to error +log4j.rootLogger=error, Console, File + + +# 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 + +log4j.appender.File=org.apache.log4j.DailyRollingFileAppender +log4j.appender.File.File=share.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{yyyy-MM-dd} %d{ABSOLUTE} %-5p [%c] [%t] %m%n + +# 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 + +# 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 + +# Alfresco +log4j.logger.org.alfresco=error +log4j.logger.org.alfresco.config=warn +log4j.logger.org.alfresco.config.JndiObjectFactoryBean=warn +log4j.logger.org.alfresco.web=info + +# 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 + +# 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= + +#----------------------------------------------------------------------- +# Custom Share module logging goes here... +#----------------------------------------------------------------------- + + + diff --git a/pdf-toolkit-share/src/test/resources/test-log4j.properties b/pdf-toolkit-share/src/test/resources/test-log4j.properties deleted file mode 100644 index b40d997..0000000 --- a/pdf-toolkit-share/src/test/resources/test-log4j.properties +++ /dev/null @@ -1,23 +0,0 @@ -# Overrides only log4j locations and add the test logging properties -# This gets merged with the main file - -# 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 \ No newline at end of file diff --git a/pdf-toolkit-share/tomcat/context.xml b/pdf-toolkit-share/tomcat/context.xml deleted file mode 100644 index bc392e0..0000000 --- a/pdf-toolkit-share/tomcat/context.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 0098476..0000000 --- a/pom.xml +++ /dev/null @@ -1,151 +0,0 @@ - - - 4.0.0 - org.alfresco.extension - pdf-toolkit - 1.4.2 - Quickstart of Alfresco and Share with DB and runner embedded - This All-in-One project allows to manage all the components involved in Alfresco development (Repo, Share, Solr, AMPs) in one project - pom - - - org.alfresco.maven - alfresco-sdk-parent - 2.2.0 - - - - - - org.alfresco - - 5.1.e - - WARN - - - - - local - http://localhost:8080/share - - - - - - ${alfresco.groupId} - alfresco-repository - ${alfresco.version} - h2scripts - test - - - * - * - - - - - - - - - - - ${alfresco.groupId} - alfresco-platform-distribution - ${alfresco.version} - pom - import - - - - - - - - - net.alchim31.maven - yuicompressor-maven-plugin - - - org.alfresco.maven.plugin - alfresco-maven-plugin - - - - - - - - run - - - false - - - - - - chmod - - - unix - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.2.1 - false - - - chmod - validate - - exec - - - - - chmod - - +x - ${basedir}/run.sh - - - - - - - - - - pdf-toolkit-repo - pdf-toolkit-share - repo - solr-config - share - runner - - \ No newline at end of file diff --git a/repo/pom.xml b/repo/pom.xml deleted file mode 100644 index 5bc5074..0000000 --- a/repo/pom.xml +++ /dev/null @@ -1,185 +0,0 @@ - - - - - 4.0.0 - repo - Alfresco Repository WAR Aggregator - war - Alfresco Repository aggregator, installs your repository AMPs in the Alfresco WAR for aggregation and easy deployment purposes - - - org.alfresco.extension - pdf-toolkit - 1.4.2 - - - - - DEBUG - - - - - ${alfresco.groupId} - ${alfresco.repo.artifactId} - ${alfresco.version} - war - - - - ${project.groupId} - pdf-toolkit-repo - ${project.version} - amp - - - - - - - - - - - maven-war-plugin - - - - - - - - ${alfresco.groupId} - ${alfresco.repo.artifactId} - war - - - - - - ${project.groupId} - pdf-toolkit-repo - amp - - - - - - - - - - - - - - - run - - - - maven-war-plugin - - - prepare-exploded-war - - exploded - - prepare-package - - - default-war - - ${project.build.directory}/${project.build.finalName}-nossl/WEB-INF/web.xml - - - - - - - com.google.code.maven-replacer-plugin - replacer - - - disable-securecomms - prepare-package - - replace - - - - - true - ${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml - ${project.build.directory}/${project.build.finalName}-nossl/WEB-INF/ - false - - - ]]> - - - - ]]> - ]]> - - - - - - - - - - org.alfresco.maven - alfresco-rad - ${maven.alfresco.version} - - - - - diff --git a/repo/src/main/resources/alfresco/extension/dev-log4j.properties b/repo/src/main/resources/alfresco/extension/dev-log4j.properties deleted file mode 100644 index 4bc0c51..0000000 --- a/repo/src/main/resources/alfresco/extension/dev-log4j.properties +++ /dev/null @@ -1,2 +0,0 @@ -# You can add here custom log4j classes. This will be merged with the main log4j.properties -# See http://wiki.alfresco.com/wiki/Developing_an_Alfresco_Module#Best_Log4j_Configuration_Practices \ No newline at end of file diff --git a/run.bat b/run.bat deleted file mode 100644 index 7d0730c..0000000 --- a/run.bat +++ /dev/null @@ -1,8 +0,0 @@ -@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 -) -ECHO MAVEN_OPTS is set to '%MAVEN_OPTS%' -mvn clean install -Prun \ No newline at end of file diff --git a/run.sh b/run.sh deleted file mode 100755 index 0b28657..0000000 --- a/run.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/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" -fi -echo "MAVEN_OPTS is set to '$MAVEN_OPTS'"; -mvn clean install -Prun \ No newline at end of file diff --git a/runner/pom.xml b/runner/pom.xml deleted file mode 100644 index 1416f6d..0000000 --- a/runner/pom.xml +++ /dev/null @@ -1,469 +0,0 @@ - - - 4.0.0 - runner - Alfresco, Share and Solr4 Tomcat Runner - pom - Alfresco, Share and Solr4 Tomcat Runner - - - org.alfresco.extension - pdf-toolkit - 1.4.2 - - - - - 4.1.6.RELEASE - - - - - run - - - - ${alfresco.data.location}/solr4 - ${alfresco.solr.dir}/config - ${alfresco.solr.dir}/data - - - - - - - org.apache.maven.plugins - maven-resources-plugin - - - copy-tomcat-resources - prepare-package - - copy-resources - - - ${project.build.directory}/contexts - - - tomcat - true - - - - - - - - - - org.apache.tomcat.maven - tomcat7-maven-plugin - - - - org.alfresco - alfresco-repository - ${alfresco.version} - h2scripts - - - * - * - - - - - - org.codehaus.plexus - plexus-archiver - 2.3 - - - - - run-wars - - run - - pre-integration-test - - - - true - - true - / - - ${alfresco.solr.home.dir} - - - - false - - UTF-8 - - - ${project.groupId} - repo - ${project.version} - war - - true - /alfresco - ${project.build.directory}/contexts/context-repo.xml - - - ${project.groupId} - share - ${project.version} - war - true - /share - ${project.build.directory}/contexts/context-share.xml - - - ${alfresco.groupId} - alfresco-solr4 - ${alfresco.version} - war - true - /solr4 - ${project.build.directory}/contexts/context-solr.xml - - - org.alfresco - api-explorer - ${maven.alfresco.api.explorer.version} - /api-explorer - war - true - - - - - - - - - - - regression-testing - - - - true - - - false - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - prepare-regression-test-resources - pre-integration-test - - unpack - - - ${alfresco.groupId}:share-po:${alfresco.version}:jar:tests - ${project.build.directory}/testng-resources - - - - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.18.1 - - - - - ${project.basedir}/test-ng/testng-alfresco-share.xml - - ${project.build.directory}/testng-resources - - - ${share.client.url} - - - - - **/*Test.java - - - - - regression-tests - integration-test - - integration-test - - - - verify-tests - verify - - verify - - - - - - - - - - - - ${alfresco.groupId} - share-po - ${alfresco.version} - test - - - - ${alfresco.groupId} - share-po - ${alfresco.version} - tests - test - - - - - org.seleniumhq.selenium - selenium-java - - - org.seleniumhq.selenium - selenium-server - - - - - - - org.alfresco.test - alfresco-testng - 1.1 - test - - - org.hamcrest - hamcrest-core - - - - - - - org.springframework - spring-core - ${spring.version} - provided - - - org.springframework - spring-beans - ${spring.version} - provided - - - org.springframework - spring-context - ${spring.version} - provided - - - org.springframework - spring-aspects - ${spring.version} - - - org.springframework - spring-test - ${spring.version} - - - - - - - functional-testing - - - - true - - - - - org.apache.maven.plugins - maven-failsafe-plugin - 2.18.1 - - - ${project.parent.basedir}/pdf-toolkit-share/target/test-classes/testng.xml - - ${project.parent.basedir}/pdf-toolkit-share/target/test-classes - - - ${share.client.url} - - - - - functional-tests - integration-test - - integration-test - - - - verify-tests - verify - - verify - - - - - - - - - - - ${alfresco.groupId} - share-po - ${alfresco.version} - test - - - - ${alfresco.groupId} - share-po - ${alfresco.version} - tests - test - - - - - org.seleniumhq.selenium - selenium-java - - - org.seleniumhq.selenium - selenium-server - - - - - - - org.alfresco.test - alfresco-testng - 1.1 - test - - - org.hamcrest - hamcrest-core - - - - - - - org.springframework - spring-core - ${spring.version} - provided - - - org.springframework - spring-beans - ${spring.version} - provided - - - org.springframework - spring-context - ${spring.version} - provided - - - org.springframework - spring-aspects - ${spring.version} - - - org.springframework - spring-test - ${spring.version} - - - - - - - diff --git a/runner/src/main/webapp/index.html b/runner/src/main/webapp/index.html deleted file mode 100644 index 9a1a5d7..0000000 --- a/runner/src/main/webapp/index.html +++ /dev/null @@ -1,24 +0,0 @@ - - - Alfresco SDK 2.1.0 - Running Alfresco ${alfresco.version} - - - Maven Alfresco SDK -

Congratulations, you are successfully running the All in One project from the Alfresco SDK 2.1.0, powered by Apache Maven! -
- You can access the Alfresco components running embedded below:

- -

Resources:

- - - \ No newline at end of file diff --git a/runner/test-ng/testng-alfresco-share.xml b/runner/test-ng/testng-alfresco-share.xml deleted file mode 100644 index bf3a1b0..0000000 --- a/runner/test-ng/testng-alfresco-share.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/runner/tomcat/context-repo.xml b/runner/tomcat/context-repo.xml deleted file mode 100644 index 88c314f..0000000 --- a/runner/tomcat/context-repo.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/runner/tomcat/context-share.xml b/runner/tomcat/context-share.xml deleted file mode 100644 index 59f1d71..0000000 --- a/runner/tomcat/context-share.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/runner/tomcat/context-solr.xml b/runner/tomcat/context-solr.xml deleted file mode 100644 index 77af260..0000000 --- a/runner/tomcat/context-solr.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/share/pom.xml b/share/pom.xml deleted file mode 100644 index 4f2811f..0000000 --- a/share/pom.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - 4.0.0 - share - Alfresco Share Client - war - Alfresco Share Client - - - org.alfresco.extension - pdf-toolkit - 1.4.2 - - - - - http://localhost:8080/alfresco - - - - - ${alfresco.groupId} - share - war - - - - ${project.groupId} - pdf-toolkit-share - ${project.version} - amp - - - - - - - - - maven-dependency-plugin - - - unpack - generate-sources - - unpack-dependencies - - - war - org.alfresco - share - META-INF/MANIFEST.MF - - - - - - maven-war-plugin - - - - false - ${project.build.directory}/dependency/META-INF/MANIFEST.MF - - - - - - - - ${alfresco.groupId} - ${alfresco.share.artifactId} - war - - - - - - ${project.groupId} - pdf-toolkit-share - amp - - - - - - - - - diff --git a/share/src/main/properties/local/application.properties b/share/src/main/properties/local/application.properties deleted file mode 100644 index 7eace43..0000000 --- a/share/src/main/properties/local/application.properties +++ /dev/null @@ -1,8 +0,0 @@ -# SHARE client environment dependent properties (local build) -share.server.scheme=http -share.server.name=localhost -share.server.port=${jetty.port} -alfresco.server.scheme=http -alfresco.server.name=localhost -alfresco.server.port=${jetty.port} -alfresco.webapp.name=alfresco \ No newline at end of file diff --git a/share/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml.sample b/share/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml.sample deleted file mode 100644 index 323b4dc..0000000 --- a/share/src/main/resources/alfresco/web-extension/custom-slingshot-application-context.xml.sample +++ /dev/null @@ -1,112 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/share/src/main/resources/alfresco/web-extension/share-config-custom.xml.sample b/share/src/main/resources/alfresco/web-extension/share-config-custom.xml.sample deleted file mode 100644 index a6c906a..0000000 --- a/share/src/main/resources/alfresco/web-extension/share-config-custom.xml.sample +++ /dev/null @@ -1,346 +0,0 @@ - - - - - - - - false - - - false - - - - - - - - - - production - - - - - manual - true - - - - - - - - - - - - - - - - false - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - http://localhost:8080/alfresco - - - - - false - - - - application/msword - application/vnd.ms-excel - application/vnd.ms-powerpoint - - - - - - - true - - - - - - - - - - - - - - - - - - - - - - - - - location.path.documents - - slingshot/doclib/treenode/site/{site}/{container}{path}?children={evaluateChildFoldersSite}&max={maximumFolderCountSite} - - - - - - - - alfresco://company/home - - - - false - - - 500 - - - - - - - - - secret - - ALFRESCO.ORG - - HTTP/repository.server.com@ALFRESCO.ORG - - ShareHTTP - - - - - - - - - - \ No newline at end of file diff --git a/share/src/main/webapp/WEB-INF/web.xml.sample b/share/src/main/webapp/WEB-INF/web.xml.sample deleted file mode 100644 index 72710fe..0000000 --- a/share/src/main/webapp/WEB-INF/web.xml.sample +++ /dev/null @@ -1,167 +0,0 @@ - - - - - Alfresco Project Slingshot - Alfresco Project Slingshot application - - - org.jboss.jbossfaces.WAR_BUNDLES_JSF_IMPL - true - - - - - Spring config file location - contextConfigLocation - /WEB-INF/classes/web-application-config.xml - - - - Set HTTP cache Expires header 30 days forward for a mapping. - CacheExpiresFilter - org.alfresco.web.scripts.servlet.StaticAssetCacheFilter - - Add an Expires Header 30 days forward - expires - 30 - - - - - MT authentication support - NOTE: does not support portlets - MTAuthentationFilter - org.alfresco.web.site.servlet.MTAuthenticationFilter - - - - Redirects view and service URLs to the dispatcher servlet. - UrlRewriteFilter - org.tuckey.web.filters.urlrewrite.UrlRewriteFilter - - - - Share SSO authentication support filter. - Authentication Filter - org.alfresco.web.site.servlet.SSOAuthenticationFilter - - endpoint - alfresco - - - - - CacheExpiresFilter - *.jpg - - - CacheExpiresFilter - *.png - - - CacheExpiresFilter - *.gif - - - CacheExpiresFilter - *.css - - - CacheExpiresFilter - *.js - - - - Authentication Filter - /page/* - - - - Authentication Filter - /p/* - - - - Authentication Filter - /proxy/* - - - - UrlRewriteFilter - /proxy/* - - - - UrlRewriteFilter - /service/* - - - - UrlRewriteFilter - /feedservice/* - - - - UrlRewriteFilter - /res/* - - - - UrlRewriteFilter - /system/* - - - - MTAuthentationFilter - /page/* - - - MTAuthentationFilter - /p/* - - - - - org.springframework.web.context.ContextLoaderListener - - - - Spring Surf Dispatcher Servlet - org.springframework.web.servlet.DispatcherServlet - - contextAttribute - org.springframework.web.context.WebApplicationContext.ROOT - - 1 - - - - Spring Surf Dispatcher Servlet - /page/* - - - Spring Surf Dispatcher Servlet - /p/* - - - - 60 - - - - - page - index.jsp - - - - 500 - /error500.jsp - - - \ No newline at end of file diff --git a/solr-config/pom.xml b/solr-config/pom.xml deleted file mode 100644 index 8e9cf3d..0000000 --- a/solr-config/pom.xml +++ /dev/null @@ -1,129 +0,0 @@ - - - 4.0.0 - - solr-config - pom - Alfresco Solr 4 Configuration - Apache Solr 4 Configuration Customization - - - - org.alfresco.extension - pdf-toolkit - 1.4.2 - - - - - - run - - - ${alfresco.data.location}/solr4 - ${alfresco.solr.dir}/config - ${alfresco.solr.dir}/data - - - - - - ${alfresco.groupId} - alfresco-solr4 - ${alfresco.version} - config - zip - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack-alfresco-config - - unpack - - generate-resources - - ${alfresco.solr.home.dir} - - - ${alfresco.groupId} - alfresco-solr4 - ${alfresco.version} - config - zip - - - - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - regexp-property - generate-resources - - regex-property - - - - - solrDataDir - ${alfresco.solr.data.dir} - \\ - / - false - - - - - - - com.google.code.maven-replacer-plugin - replacer - - - setup-solr-config - generate-resources - - replace - - - - - false - - ${alfresco.solr.home.dir}/archive-SpacesStore/conf/solrcore.properties - ${alfresco.solr.home.dir}/workspace-SpacesStore/conf/solrcore.properties - - - - @@ALFRESCO_SOLR4_DATA_DIR@@ - ${solrDataDir}/index - - - - - - - - - -