diff --git a/README.md b/README.md
index 86f89d31..49275e3c 100644
--- a/README.md
+++ b/README.md
@@ -5,23 +5,25 @@
-[![CircleCI](https://circleci.com/gh/Open-MBEE/mms.svg?style=svg)](https://circleci.com/gh/Open-MBEE/mms)
-**AMP for Alfresco (5.1.g)**
+ [ ![Download](https://api.bintray.com/packages/openmbee/maven/mms-amp/images/download.svg) ](https://bintray.com/openmbee/maven/mms-amp/_latestVersion) [![Language Grade: Java](https://img.shields.io/lgtm/grade/java/g/Open-MBEE/mms.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Open-MBEE/mms/context:java) [![CircleCI](https://circleci.com/gh/Open-MBEE/mms.svg?style=svg)](https://circleci.com/gh/Open-MBEE/mms)
-Use this table to check what version of the mms - mdk - ve triple you should be using: https://github.com/Open-MBEE/mdk/blob/support/2.5/manual/MDK%20-%20MMS%20-%20VE%20Compatibility%20Matrix.pdf
+**AMP for Alfresco (5.1.g AKA 201605-GA)**
+
+Use this table to check what version of the mms - mdk - ve triple you should be using: [Compatibility Matrix](https://github.com/Open-MBEE/open-mbee.github.io/blob/master/compat%20matrix.pdf)
## Developer Setup
### Dependencies
-* ElasticSearch 5.x
-* PostgreSQL 9.x
+* ElasticSearch 5.x (Up to 5.5)
+* PostgreSQL 9.x (Up to 9.4 is using PostgreSQL for Alfresco)
### Optional Dependencies
* ActiveMQ 5.X
### 1a. Using Intellij
-* Open Project with root of 'mms-ent'
+* Open Project with root of 'mms'
* Import Maven Project
+* Open Project Structure and Import Module "mms-ent" and set to find projects recursively
### 1b. Import Project from git repo to Eclipse
* **Eclipse** > **File** > **Import** > **General** > **Existing Projects into Workspace**
diff --git a/mms-ent/docker/Dockerfile b/mms-ent/docker/Dockerfile
index 5bcac265..95038c74 100644
--- a/mms-ent/docker/Dockerfile
+++ b/mms-ent/docker/Dockerfile
@@ -1,18 +1,70 @@
FROM openjdk:8-jdk-alpine
-ENV CATALINA_HOME /usr/local/tomcat
-ENV PATH $CATALINA_HOME/bin:$PATH
+ENV BUILD_DEPS \
+ alpine-sdk \
+ cabextract \
+ coreutils \
+ curl \
+ ghc \
+ gmp \
+ libffi \
+ linux-headers \
+ musl-dev \
+ wget \
+ zlib-dev
+
+ENV PERSIST_DEPS \
+ fontconfig \
+ graphviz \
+ imagemagick \
+ msttcorefonts-installer \
+ python \
+ py2-pip \
+ sed \
+ ttf-droid \
+ ttf-droid-nonlatin \
+ unzip
+
+ENV EDGE_DEPS \
+ cabal
ENV TOMCAT_MAJOR 7
ENV TOMCAT_VERSION 7.0.88
ENV TOMCAT_TGZ_URL "http://mirrors.sonic.net/apache/tomcat/tomcat-7/v${TOMCAT_VERSION}/bin/apache-tomcat-${TOMCAT_VERSION}.tar.gz"
-ENV POSTGRES_HOST localhost
+ENV TOMCAT_HOME /usr/local/tomcat
+
+ENV PLANTUML_VERSION 1.2017.18
+ENV PLANTUML_DOWNLOAD_URL https://sourceforge.net/projects/plantuml/files/plantuml.$PLANTUML_VERSION.jar/download
+
+ENV PANDOC_VERSION 1.19.2.4
+ENV PANDOC_DOWNLOAD_URL https://hackage.haskell.org/package/pandoc-$PANDOC_VERSION/pandoc-$PANDOC_VERSION.tar.gz
+ENV PANDOC_HOME /usr/local/pandoc
+
ENV ALF_DATA_DIR /mnt/alf_data
ENV CONFIG_DIR /usr/local/config
ENV FILES_DIR /usr/local/files
-ENV TOMCAT_DIR /usr/local/tomcat
-RUN apk add --update curl wget unzip
+ENV PATH $TOMCAT_HOME/bin:$PANDOC_HOME/bin:$PATH
+
+# ---- Install Dependencies ----
+RUN apk upgrade --update \
+ && apk add --no-cache --virtual .build-deps $BUILD_DEPS \
+ && apk add --no-cache --virtual .persistent-deps $PERSIST_DEPS \
+ && update-ms-fonts \
+ && fc-cache -f \
+ && curl -fsSL "$PLANTUML_DOWNLOAD_URL" -o /usr/local/plantuml.jar \
+ && apk add --no-cache --virtual .edge-deps $EDGE_DEPS -X http://dl-cdn.alpinelinux.org/alpine/edge/community \
+ && curl -fsSL "$PANDOC_DOWNLOAD_URL" | tar -xzf - \
+ && ( cd pandoc-$PANDOC_VERSION && cabal update && cabal install --only-dependencies \
+ && cabal configure --prefix=$PANDOC_HOME \
+ && cabal build \
+ && cabal copy \
+ && cd .. ) \
+ && rm -Rf pandoc-$PANDOC_VERSION/ \
+ && rm -Rf /root/.cabal/ /root/.ghc/ \
+ && rm -Rf /pandoc-build \
+ && mkdir -p /var/docs
+
# ---- Tomcat ----
RUN curl -fSL "$TOMCAT_TGZ_URL" -o tomcat.tar.gz \
@@ -21,47 +73,48 @@ RUN curl -fSL "$TOMCAT_TGZ_URL" -o tomcat.tar.gz \
&& tar -xzf tomcat.tar.gz \
&& rm tomcat.tar.gz* \
&& echo "mv apache-tomcat-${TOMCAT_VERSION} tomcat" \
- && mv apache-tomcat-${TOMCAT_VERSION} ${TOMCAT_DIR}
+ && mv apache-tomcat-${TOMCAT_VERSION} ${TOMCAT_HOME}
# ---- Alfresco ----
WORKDIR /usr/local
-COPY config /usr/local/config
+COPY config ${CONFIG_DIR}
COPY config/config_alfresco.sh .
-COPY config/run.sh tomcat/bin/run.sh
-COPY config/set_properties.sh tomcat/bin/set_properties.sh
+COPY config/run.sh ${TOMCAT_HOME}/bin/run.sh
+COPY config/set_properties.sh ${TOMCAT_HOME}/bin/set_properties.sh
# Download the community zip files
-RUN wget --no-check-certificate "https://download.alfresco.com/release/community/201605-build-00010/alfresco-community-distribution-201605.zip" \
+RUN wget --no-check-certificate -S "https://download.alfresco.com/release/community/201605-build-00010/alfresco-community-distribution-201605.zip" \
&& chmod +x config_alfresco.sh \
- && chmod +x tomcat/bin/run.sh \
- && chmod +x tomcat/bin/set_properties.sh \
+ && chmod +x ${TOMCAT_HOME}/bin/run.sh \
+ && chmod +x ${TOMCAT_HOME}/bin/set_properties.sh \
&& ./config_alfresco.sh
-RUN cp ${CONFIG_DIR}/alfresco-global.properties tomcat/shared/classes/alfresco-global.properties \
- && cp ${CONFIG_DIR}/catalina.properties tomcat/conf/catalina.properties \
- && cp ${CONFIG_DIR}/solr4-context.xml tomcat/conf/Catalina/localhost/solr4.xml \
- && cp ${CONFIG_DIR}/solr4-context.xml tomcat/solr4/context.xml \
- && cp ${CONFIG_DIR}/tomcat-server.xml tomcat/conf/server.xml \
- && cp ${CONFIG_DIR}/archive-solrcore.properties tomcat/solr4/archive-SpacesStore/conf/solrcore.properties \
- && cp ${CONFIG_DIR}/workspace-solrcore.properties tomcat/solr4/workspace-SpacesStore/conf/solrcore.properties
+RUN cp ${CONFIG_DIR}/alfresco-global.properties ${TOMCAT_HOME}/shared/classes/alfresco-global.properties \
+ && cp ${CONFIG_DIR}/catalina.properties ${TOMCAT_HOME}/conf/catalina.properties \
+ && cp ${CONFIG_DIR}/solr4-context.xml ${TOMCAT_HOME}/conf/Catalina/localhost/solr4.xml \
+ && cp ${CONFIG_DIR}/tomcat-server.xml ${TOMCAT_HOME}/conf/server.xml \
+ && cp ${CONFIG_DIR}/tomcat-users.xml ${TOMCAT_HOME}/conf/tomcat-users.xml \
+ && cp ${CONFIG_DIR}/archive-solrcore.properties ${TOMCAT_HOME}/solr4/archive-SpacesStore/conf/solrcore.properties \
+ && cp ${CONFIG_DIR}/workspace-solrcore.properties ${TOMCAT_HOME}/solr4/workspace-SpacesStore/conf/solrcore.properties
+
# ---- MMS -----
COPY files ${FILES_DIR}
-RUN java -jar ${TOMCAT_DIR}/bin/alfresco-mmt.jar install ${FILES_DIR}/mms-amp*.amp ${TOMCAT_DIR}/webapps/alfresco.war -force \
- && java -jar ${TOMCAT_DIR}/bin/alfresco-mmt.jar install ${FILES_DIR}/mms-share-amp*.amp ${TOMCAT_DIR}/webapps/share.war -force \
- && cd ${TOMCAT_DIR}/webapps \
+RUN java -jar ${TOMCAT_HOME}/bin/alfresco-mmt.jar install ${FILES_DIR}/mms-amp*.amp ${TOMCAT_HOME}/webapps/alfresco.war -force \
+ && java -jar ${TOMCAT_HOME}/bin/alfresco-mmt.jar install ${FILES_DIR}/mms-share-amp*.amp ${TOMCAT_HOME}/webapps/share.war -force \
+ && cd ${TOMCAT_HOME}/webapps \
&& rm -rf alfresco share \
&& mkdir alfresco share \
&& cd alfresco \
&& jar xf ../alfresco.war \
&& cd ../share \
&& jar xf ../share.war \
- && mv ${FILES_DIR}/mms.properties.example ${TOMCAT_DIR}/shared/classes/mms.properties \
- && cp ${FILES_DIR}/web.xml ${TOMCAT_DIR}/webapps/alfresco/WEB-INF/web.xml \
+ && mv ${FILES_DIR}/mms.properties.example ${TOMCAT_HOME}/shared/classes/mms.properties \
+ && cp ${FILES_DIR}/web.xml ${TOMCAT_HOME}/webapps/alfresco/WEB-INF/web.xml \
&& rm -rf ${FILES_DIR} \
- && cd ${TOMCAT_DIR}/webapps \
+ && cd ${TOMCAT_HOME}/webapps \
&& rm *.bak
@@ -69,11 +122,14 @@ RUN java -jar ${TOMCAT_DIR}/bin/alfresco-mmt.jar install ${FILES_DIR}/mms-amp*.a
RUN addgroup -S tomcat \
&& adduser -G tomcat -g "Tomcat User" -s /bin/ash -D tomcat \
&& mkdir -p ${ALF_DATA_DIR}/solr4 \
- && chown -R tomcat:tomcat ${TOMCAT_DIR} \
+ && chown -R tomcat:tomcat ${TOMCAT_HOME} \
&& chown -R tomcat:tomcat ${ALF_DATA_DIR}
+RUN apk del .build-deps
+
+
# Alfresco
-#EXPOSE 8080:8080
+EXPOSE 8080:8080
# Postgres
#EXPOSE 5432:5432
# ElasticSearch
diff --git a/mms-ent/docker/README.md b/mms-ent/docker/README.md
index da37aa20..3cc74682 100644
--- a/mms-ent/docker/README.md
+++ b/mms-ent/docker/README.md
@@ -1,12 +1,12 @@
# Docker MMS README
-Build container
+Build docker image
```
-docker build . -t mms-container
+docker build . -t mms-image
```
To run the container:
-- we need to specify the mount directory
+- For persistence, we need to specify the mount directory
```
--mount source=mmsvol,target=/mnt/alf_data
```
@@ -40,5 +40,21 @@ Set the PostgreSQL info:
Example running the container
```
-docker run --mount source=mmsvol,target=/mnt/alf_data -p 8080:8080 -e PG_HOST={PG_ID_ADDR} -e PG_DB_NAME=mms -e PG_DB_USER=${PG_USER} -e PG_DB_PASS={PG_PASS} -e ES_HOST={PG_ID_ADDR} -d mms-container
+docker run --mount source=mmsvol,target=/mnt/alf_data -p 8080:8080 -e PG_HOST={PG_ID_ADDR} -e PG_DB_NAME=mms -e PG_DB_USER=${PG_USER} -e PG_DB_PASS={PG_PASS} -e ES_HOST={PG_ID_ADDR} -d mms-image
+```
+
+Example for initializing Postgres in docker
+
+```
+docker run -d --name postgres-docker --publish=5432:5432 -e POSTGRES_USER=${PG_USER} -e POSTGRES_PASSWORD=${PG_PASS} postgres:9.4-alpine
+docker exec -it postgres-docker psql -h localhost -U postgres -c "ALTER ROLE ${PG_USER} CREATEDB"
+docker exec -it postgres-docker createdb -h localhost -U ${PG_USER} alfresco
+docker exec -it postgres-docker createdb -h localhost -U ${PG_USER} mms
+docker exec -it postgres-docker psql -h localhost -U ${PG_USER} -d mms -c "create table if not exists organizations ( id bigserial primary key, orgId text not null, orgName text not null, constraint unique_organizations unique(orgId, orgName) ); create index orgId on organizations(orgId); create table projects ( id bigserial primary key, projectId text not null, orgId integer references organizations(id), name text not null, location text not null, constraint unique_projects unique(orgId, projectId) ); create index projectIdIndex on projects(projectid);"
+```
+
+Example for initializing Elasticsearch in docker
+```
+docker run -d --name elasticsearch-docker --publish=9200:9200 elasticsearch:5.5-alpine
+curl -XPUT http://localhost:9200/_template/template -d @repo-amp/src/main/resources/mapping_template.json
```
diff --git a/mms-ent/docker/build_image.sh b/mms-ent/docker/build_image.sh
new file mode 100755
index 00000000..64a8d2a8
--- /dev/null
+++ b/mms-ent/docker/build_image.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+count=`ls -1 ./files/*.amp 2>/dev/null | wc -l`
+if [[ ${count} < 2 ]];then
+ (cd ../; ./mvnw clean -Ppurge && ./mvnw install -Pbuild)
+ cp ../repo-amp/target/*.amp ./files/
+ cp ../share-amp/target/*.amp ./files/
+fi
+
+if [ ! -f ./files/mms.properties.example ];then
+ cp ../mms.properties.example ./files/
+fi
+
+docker build . -t mms-image
diff --git a/mms-ent/docker/config/alfresco-global.properties b/mms-ent/docker/config/alfresco-global.properties
index 17c80ad4..88d996fa 100644
--- a/mms-ent/docker/config/alfresco-global.properties
+++ b/mms-ent/docker/config/alfresco-global.properties
@@ -15,20 +15,20 @@ system.content.caching.maxFileSizeMB=0
alfresco.context=alfresco
alfresco.host=localhost
-alfresco.port=8080
-alfresco.protocol=http
+alfresco.port=8443
+alfresco.protocol=https
share.context=share
share.host=localhost
-share.port=8080
-share.protocol=http
+share.port=8443
+share.protocol=https
### database connection properties ###
db.driver=org.postgresql.Driver
db.name=alfresco
-db.username=
-db.password=
-db.host=
+db.username=alfresco
+db.password=alfresco
+db.host=localhost
db.port=5432
# probably can up this to same as max connections in db configuration (currently 225)
db.pool.max=225
@@ -64,7 +64,6 @@ img.root=/usr
img.dyn=${img.root}/lib
img.exe=/usr/bin/convert
swf.exe=/usr/local/bin/pdf2swf
-#swf.languagedir=/opt/local/alfresco-4.2.e/common/japanese
jodconverter.enabled=false
jodconverter.officeHome=/usr/lib64/libreoffice/
@@ -74,14 +73,15 @@ jodconverter.portNumbers=8100
alfresco_user_store.adminusername=admin
alfresco_user_store.adminpassword=209c6174da490caeb422f3fa5a7ae634
-
### E-mail site invitation setting ###
notification.email.siteinvite=false
+encryption.ssl.keystore.location=/usr/local/tomcat/keystore/ssl.keystore
+encryption.ssl.truststore.location=/usr/local/tomcat/keystore/ssl.truststore
### Solr indexing ###
index.subsystem.name=solr4
-dir.keystore=${dir.root}/keystore
+dir.keystore=/usr/local/tomcat/keystore
solr.host=localhost
solr.port=8080
solr.port.ssl=8443
@@ -90,7 +90,6 @@ solr.port.ssl=8443
### BPM Engine ###
system.workflow.engine.jbpm.enabled=false
-# disable services - only enable if necessary
# disable google
googledocs.enabled=false
googledocs.googleeditable.enabled=false
@@ -108,17 +107,14 @@ alfresco.jmx.connector.enabled=false
mail.host =
mail.testmessage.send = true
mail.testmessage.to =
-#mail.testmessage.to = swong@jpl.nasa.gov
mail.username =
mail.from.default =
mail.smtp.timeout=10000
activities.feed.notifier.enabled = false
-
-
#replication.enabled=true
#replication.transfer.readonly=true
-transferservice.receiver.enabled=true
+#transferservice.receiver.enabled=true
###############################################################################
# The default authentication chain
@@ -131,8 +127,6 @@ transferservice.receiver.enabled=true
#authentication.chain=ldap1:ldap,partners1:ldap,alfrescoNtlm1:alfrescoNtlm
authentication.chain=alfrescoNtlm1:alfrescoNtlm
-
-
# turn off timestamp propagation to parent folders (slows down loading)
system.enableTimestampPropagation=false
###### SYNCHRONISATION SETTINGS ####
@@ -158,5 +152,3 @@ synchronization.allowDeletions=false
### synchronisation starts every 60 minutes!
#synchronization.import.cron=0 0/60 * * * ?
synchronization.import.cron=0 0 0/2 * * ?
-
-solr.secureComms=none
diff --git a/mms-ent/docker/config/archive-solrcore.properties b/mms-ent/docker/config/archive-solrcore.properties
index 511827d6..1727a64d 100644
--- a/mms-ent/docker/config/archive-solrcore.properties
+++ b/mms-ent/docker/config/archive-solrcore.properties
@@ -3,7 +3,7 @@
#
# data is in ${data.dir.root}/${data.dir.store}
-data.dir.root=/mnt/alf_data/solr4
+data.dir.root=/mnt/alf_data/solr4/index
data.dir.store=archive/SpacesStore
enable.alfresco.tracking=true
diff --git a/mms-ent/docker/config/config_alfresco.sh b/mms-ent/docker/config/config_alfresco.sh
index 70bde8f5..f1c5ea55 100755
--- a/mms-ent/docker/config/config_alfresco.sh
+++ b/mms-ent/docker/config/config_alfresco.sh
@@ -6,12 +6,13 @@ ROOT_DIR=/usr/local/alfresco-community-distribution-201605
TOMCAT_DIR=/usr/local/tomcat
unzip -q alfresco-community-distribution-201605.zip
-#ls -la
-#ls -la ${CUR_DIR}
-#ls -la ${TOMCAT_DIR}
+#echo "cp -r ${ROOT_DIR}/alf_data /mnt/"
+#cp -r ${ROOT_DIR}/alf_data /mnt/
-echo "cp -r ${ROOT_DIR}/alf_data /mnt/"
-cp -r ${ROOT_DIR}/alf_data /mnt/
+mkdir /mnt/alf_data
+
+echo "cp -r ${ROOT_DIR}/alf_data/keystore ${TOMCAT_DIR}/keystore"
+cp -r ${ROOT_DIR}/alf_data/keystore ${TOMCAT_DIR}/keystore
echo "cp ${ROOT_DIR}/web-server/webapps/alfresco.war ${TOMCAT_DIR}/webapps"
mv ${ROOT_DIR}/web-server/webapps/alfresco.war ${TOMCAT_DIR}/webapps/alfresco.war
@@ -32,7 +33,6 @@ cp ${ROOT_DIR}/web-server/lib/postgresql-9.4-1201-jdbc41.jar ${TOMCAT_DIR}/lib/p
echo "cp -r ${ROOT_DIR}/web-server/shared tomcat/shared"
cp -r ${ROOT_DIR}/web-server/shared ${TOMCAT_DIR}/
mkdir ${TOMCAT_DIR}/shared/lib
-mv ${ROOT_DIR}/web-server/lib/postgresql-9.4-1201-jdbc41.jar ${TOMCAT_DIR}/shared/lib/
echo "cp -r ${ROOT_DIR}/amps tomcat/"
cp -r ${ROOT_DIR}/amps ${TOMCAT_DIR}/
@@ -56,17 +56,6 @@ cp -r ${ROOT_DIR}/bin ${TOMCAT_DIR}/
echo "java -jar ${TOMCAT_DIR}/bin/alfresco-mmt.jar install ${TOMCAT_DIR}/amps/alfresco-share-services.amp ${TOMCAT_DIR}/webapps/repo.war -force"
java -jar ${TOMCAT_DIR}/bin/alfresco-mmt.jar install ${TOMCAT_DIR}/amps/alfresco-share-services.amp ${TOMCAT_DIR}/webapps/alfresco.war -force
-# Explode wars into directories
-cd ${TOMCAT_DIR}/webapps
-rm -rf alfresco share solr4
-mkdir alfresco share solr4
-cd alfresco
-jar xf ../alfresco.war
-cd ../share
-jar xf ../share.war
-cd ../solr4
-jar xf ../solr4.war
-
# Remove extra backup files
cd ${TOMCAT_DIR}/webapps
rm -rf *.bak
diff --git a/mms-ent/docker/config/run.sh b/mms-ent/docker/config/run.sh
index 1090b928..f700b9d4 100644
--- a/mms-ent/docker/config/run.sh
+++ b/mms-ent/docker/config/run.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-${TOMCAT_DIR}/bin/set_properties.sh
+${TOMCAT_HOME}/bin/set_properties.sh
# Start Alfresco
-su - tomcat -c "${TOMCAT_DIR}/bin/catalina.sh run"
+su - tomcat -c "${TOMCAT_HOME}/bin/catalina.sh run"
diff --git a/mms-ent/docker/config/set_properties.sh b/mms-ent/docker/config/set_properties.sh
index 41283515..4d1c1539 100644
--- a/mms-ent/docker/config/set_properties.sh
+++ b/mms-ent/docker/config/set_properties.sh
@@ -2,10 +2,9 @@
# Configure alfresco-global.properties and mms.properties
if [[ -z "$PG_HOST" ]];then
- echo "Postgres host not set"
- exit 1
+ echo "Postgres host not set, using default localhost on port 5432"
else
- sed -i'' -e "s/db.host=/db.host=${PG_HOST}/" /usr/local/tomcat/shared/classes/alfresco-global.properties
+ sed -i'' -e "s/db.host=localhost/db.host=${PG_HOST}/" /usr/local/tomcat/shared/classes/alfresco-global.properties
if [[ -z "$PG_PORT" ]];then
echo "Postgres port not set, using default 5432"
sed -i'' -e "s/pg.host=jdbc:postgresql:\/\/127.0.0.1\//pg.host=jdbc:postgresql:\/\/${PG_HOST}\//" /usr/local/tomcat/shared/classes/mms.properties
@@ -16,27 +15,23 @@ else
fi
if [[ -z "$PG_DB_NAME" ]];then
echo "Postgres Database name not set"
- exit 1
else
- sed -i'' -e "s/pg.name=/pg.name=${PG_DB_NAME}/" /usr/local/tomcat/shared/classes/mms.properties
+ sed -i'' -e "s/pg.name=POSTGRESDBNAME/pg.name=${PG_DB_NAME}/" /usr/local/tomcat/shared/classes/mms.properties
fi
if [[ -z "$PG_DB_USER" ]];then
echo "Postgres Database User not set"
- exit 1
else
- sed -i'' -e "s/db.username=/db.username=${PG_DB_USER}/" /usr/local/tomcat/shared/classes/alfresco-global.properties
- sed -i'' -e "s/pg.user=/pg.user=${PG_DB_USER}/" /usr/local/tomcat/shared/classes/mms.properties
+ sed -i'' -e "s/db.username=alfresco/db.username=${PG_DB_USER}/" /usr/local/tomcat/shared/classes/alfresco-global.properties
+ sed -i'' -e "s/pg.user=POSTGRESUSERNAME/pg.user=${PG_DB_USER}/" /usr/local/tomcat/shared/classes/mms.properties
fi
if [[ -z "$PG_DB_PASS" ]];then
echo "Postgres Database User password not set"
- exit 1
else
- sed -i'' -e "s/db.password=/db.password=${PG_DB_PASS}/" /usr/local/tomcat/shared/classes/alfresco-global.properties
- sed -i'' -e "s/pg.pass=/pg.pass=${PG_DB_PASS}/" /usr/local/tomcat/shared/classes/mms.properties
+ sed -i'' -e "s/db.password=alfresco/db.password=${PG_DB_PASS}/" /usr/local/tomcat/shared/classes/alfresco-global.properties
+ sed -i'' -e "s/pg.pass=POSTGRESPASSWORD/pg.pass=${PG_DB_PASS}/" /usr/local/tomcat/shared/classes/mms.properties
fi
if [[ -z "$ES_HOST" ]];then
echo "Elasticsearch host not set"
- exit 1
else
if [[ -z "$ES_PORT" ]];then
echo "Elasticsearch port not set, using default 9200"
@@ -45,3 +40,17 @@ else
sed -i'' -e "s/elastic.host=http:\/\/localhost:9200/elastic.host=http:\/\/${ES_HOST}:${ES_PORT}/" /usr/local/tomcat/shared/classes/mms.properties
fi
fi
+if [[ -z "$APP_USER" ]];then
+ echo "Application User not set, using default username 'admin'"
+else
+ sed -i'' -e "s/app.user=admin/app.user=${APP_USER}/" /usr/local/tomcat/shared/classes/mms.properties
+fi
+if [[ -z "$APP_PASS" ]];then
+ echo "Application Password not set, using default password 'admin'"
+else
+ sed -i'' -e "s/app.pass=admin/app.pass=${APP_USER}/" /usr/local/tomcat/shared/classes/mms.properties
+fi
+
+# Run these unconditionally
+sed -i'' -e "s/pandoc.exec=\/usr\/local\/bin\/pandoc/pandoc.exec=\/usr\/local\/pandoc\/bin\/pandoc" /usr/local/tomcat/shared/classes/mms.properties
+export CATALINA_TMPDIR=/mnt/alf_data/temp
diff --git a/mms-ent/docker/config/tomcat-server.xml b/mms-ent/docker/config/tomcat-server.xml
index 4e9e6bb4..21c3296e 100644
--- a/mms-ent/docker/config/tomcat-server.xml
+++ b/mms-ent/docker/config/tomcat-server.xml
@@ -68,17 +68,17 @@
APR (HTTP/AJP) Connector: /docs/apr.html
Define a non-SSL HTTP/1.1 Connector on port 8080
-->
-
+
diff --git a/mms-ent/docker/config/workspace-solrcore.properties b/mms-ent/docker/config/workspace-solrcore.properties
index 5470983b..732742db 100644
--- a/mms-ent/docker/config/workspace-solrcore.properties
+++ b/mms-ent/docker/config/workspace-solrcore.properties
@@ -3,7 +3,7 @@
#
# data is in ${data.dir.root}/${data.dir.store}
-data.dir.root=/mnt/alf_data/solr4
+data.dir.root=/mnt/alf_data/solr4/index
data.dir.store=workspace/SpacesStore
enable.alfresco.tracking=true
diff --git a/mms-ent/docker/files/.gitignore b/mms-ent/docker/files/.gitignore
index 4c53162d..c4f607b2 100644
--- a/mms-ent/docker/files/.gitignore
+++ b/mms-ent/docker/files/.gitignore
@@ -1 +1,2 @@
*.amp
+*.example
diff --git a/mms-ent/docker/files/mms.properties.example b/mms-ent/docker/files/mms.properties.example
deleted file mode 100644
index 4aa4c799..00000000
--- a/mms-ent/docker/files/mms.properties.example
+++ /dev/null
@@ -1,44 +0,0 @@
-# setting JMS
-# curl -u admin:admin -H Content-Type:application/json http://localhost:8080/alfresco/service/connection/jms -d '{"ctxFactory":"weblogic.jndi.WLInitialContextFactory", "username":"username", "password":"password", "connFactory":"jms/JMSModuleCF", "topicName":"jms/DistributedTopic", "uri":"t3s://localhost:8111"}'
-# curl -u admin:admin -H Content-Type:application/json http://localhost:8080/alfresco/service/connection/jms -d '{"ctxFactory":"weblogic.jndi.WLInitialContextFactory", "username":"username", "password":"password", "connFactory":"jms/JMSModuleCF", "topicName":"jms/DistributedTopic", "uri":"t3://localhost:8011"}'
-# curl -u admin:admin -H Content-Type:application/json http://localhost:8080/alfresco/service/connection/jms -d '{"ctxFactory":"org.apache.activemq.jndi.ActiveMQInitialContextFactory", "username":null, "password":null, "connFactory":"ConnectionFactory", "topicName":"master", "uri":"tcp://localhost:61616"}'
-
-# CUSTOM PROPERTIES
-#Application Settings
-app.name=APPNAME
-app.title=APPTITLE
-app.url=http://localhost:8080
-app.port=8080
-app.email.from=EMAIL@EXAMPLE.COM
-app.domain.name=EXAMPLE.COM
-app.email.admin=ADMIN@EXAMPLE.COM
-app.logo.url=SOMELOGOURL
-app.logo.alt=SOMELOGOALT
-app.org.name=SOMEORGANIZATIONNAME
-app.inst.name=SOMEINSTITUTIONNAME
-app.user=admin
-app.pass=admin
-
-#Postgres Settings
-pg.host=jdbc:postgresql://127.0.0.1/
-pg.name=
-pg.user=
-pg.pass=
-pg.conn.max=96
-pg.limit.insert=5000
-pg.limit.select=1000
-
-#Elasticsearch Settings
-elastic.host=http://localhost:9200
-elastic.index.element=mms
-elastic.limit.insert=80
-elastic.limit.result=10000
-elastic.limit.term=10000
-
-#JMS Setting
-jms.ctxfactory=org.apache.activemq.jndi.ActiveMQInitialContextFactory
-jms.connfactory=ConnectionFactory
-#jms.username=
-#jms.password=
-jms.destination=master
-jms.uri=tcp://localhost:61616
diff --git a/mms-ent/pom.xml b/mms-ent/pom.xml
index 18f8d555..df63e245 100755
--- a/mms-ent/pom.xml
+++ b/mms-ent/pom.xml
@@ -4,7 +4,7 @@
4.0.0
gov.nasa.jpl.mbee
mms-ent
- 3.3.0-RC2
+ 3.3.0
Alfresco Repository and Share Quickstart with database and an embedded Tomcat runner.
This All-in-One project allows to manage all the components involved in Alfresco development (Repo, Share, Solr4, AMPs) in one project
diff --git a/mms-ent/repo-amp/pom.xml b/mms-ent/repo-amp/pom.xml
index 1b5ef761..b48af0ff 100755
--- a/mms-ent/repo-amp/pom.xml
+++ b/mms-ent/repo-amp/pom.xml
@@ -10,7 +10,7 @@
gov.nasa.jpl.mbee
mms-ent
- 3.3.0-RC2
+ 3.3.0
diff --git a/mms-ent/repo/pom.xml b/mms-ent/repo/pom.xml
index 1edf1653..1f02d639 100755
--- a/mms-ent/repo/pom.xml
+++ b/mms-ent/repo/pom.xml
@@ -18,7 +18,7 @@
gov.nasa.jpl.mbee
mms-ent
- 3.3.0-RC2
+ 3.3.0
diff --git a/mms-ent/runner/pom.xml b/mms-ent/runner/pom.xml
index 015a20a1..3aa46e18 100755
--- a/mms-ent/runner/pom.xml
+++ b/mms-ent/runner/pom.xml
@@ -9,7 +9,7 @@
gov.nasa.jpl.mbee
mms-ent
- 3.3.0-RC2
+ 3.3.0
diff --git a/mms-ent/share-amp/pom.xml b/mms-ent/share-amp/pom.xml
index e6bbf11a..85da4573 100644
--- a/mms-ent/share-amp/pom.xml
+++ b/mms-ent/share-amp/pom.xml
@@ -9,7 +9,7 @@
gov.nasa.jpl.mbee
mms-ent
- 3.3.0-RC2
+ 3.3.0