added Docker Compose, a new run-compose script for quick redeploy functionality, removed site scripts
diff --git a/README.md b/README.md
index e3c2f3e..7e95b76 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Apache ManifoldCF SDK 0.0.5
+# Apache ManifoldCF SDK 1.0.0
This is the SDK project of Apache ManifoldCF dedicated to developers that need to extend the platform with new components, connectors or integrations using Maven and Docker. On the other hand this SDK can be extremely useful also for all the developers who want to contribute to the ManifoldCF project.
This project has started with an initial contribution by @OpenPj and @binduwavell.
@@ -8,12 +8,17 @@
* Preparing the Docker Image for executing the build installing Ant and Maven
* Running the container for executing the building process with Ant and then with Maven
* Copying the entire Maven Repo in the Maven target folder in the host machine (locally)
-* Generating the MCF official site
ManifoldCF SDK is using the ManifoldCF Docker repository:
[https://hub.docker.com/r/apache/manifoldcf](https://hub.docker.com/r/apache/manifoldcf)
-What's new in v0.0.5
+*What's new in v1.0.0*
+* The Maven profile `docker-hub` now is including a default Console appender for logging to show standard output in Docker Desktop
+* Now the default ManifoldCF dependencies version is `2.26 GA` (publicly available)
+* Added run-compose.sh script in order to manage the deployment with a Docker Compose template
+* Added a quick build-and-redeploy functionality in order to recreate only the ManifoldCF container: `./run-compose.sh reload_mcf`
+
+*What's new in v0.0.5*
* The Maven profile `docker-hub` now is enabled by default
* MCF SDK now by default is building the image from the official Docker images
* Added a debug port (5005) for accelerate connectors development with remote debugging
@@ -21,7 +26,17 @@
If you need to build your custom Docker image using dependencies built from the MCF source code and stored in the target folder (using the `init` script mentioned below), please use the `local` Maven profile.
-Examples of commands using the main bash script for a typical usage:
+*Using the run-compose.sh script for using official available artifacts*
+A dedicated script is now provided in order to manage the Docker Compose template included with this SDK: `mcf-docker-overlay/src/main/docker/docker-compose/docker-compose.yml`
+Below some examples of commands using the run-compose.sh script:
+* `./run-compose.sh build_start` -> build the ManifoldCF 2.26 container deploying a separated container for PostgreSQL with dedicated volume
+* `./run-compose.sh start` -> start ManifoldCF platform including the crawler and the PostgreSQL database
+* `./run-compose.sh reload_mcf` -> rebuild ManifoldCF container keeping PostgreSQL up and running
+* `./run-compose.sh purge` -> removes the MCF database Docker Volumes
+
+
+*Using the SDK with local Maven dependencies built from source code*
+Examples of commands using the run bash script for a typical usage:
* `./run.sh init 2.26 ga` -> start the init process for ManifoldCF 2.26 GA
* `./run.sh init custom-version local /<USER_HOME>/Documents/workspaces/manifoldcf/custom-project` -> start the init process for a custom ManifoldCF project
* `./run.sh build_start` -> build extensions and run everything with Docker locally using an official ManifoldCF distribution
@@ -37,13 +52,6 @@
* `./run.sh clean` -> execute ant clean; mvn clean in the MCF source bundle
* `./run.sh purge` -> removes all the Docker Volumes and the MCF init container
-Examples of commands for generating the MCF website contents:
-* `./run-site.sh build` -> Start Apache ManifoldCF SDK initialization for generating website contents
-* `./run-site.sh start` -> Run ManifoldCF Site Docker container
-* `./run-site.sh purge` -> Remove the ManifoldCF Site Docker artifacts and volumes
-* `./run-site.sh clean` -> Start the mcf-sdk-site in order to clean the project
-* `./run-site.sh stop` -> Stop the mcf-sdk-site
-
# Initializing the local Maven repository using Docker (optional)
In order to compile extensions with Maven, the SDK provides an initialization script that will download the source code of ManifoldCF and then build it in the container. At the end of the build process the Maven repository included in the container will be copied in the local folder `target/mcf-maven-repo`. The local Maven repo will be used as the main reference for compiling the extension code.
@@ -89,15 +97,3 @@
### Volumes
* `mcf-maven-repo` -> this volume contains the Maven repo created by the initialization process
* `mcf-app-volume` -> this volume contains the installation storage of ManifoldCF
-
-## run-site.sh (.bat)
-
-### Containers & Images
-
-* `mcf-sdk-site` -> image created with specific version of Apache Ant 1.9.x, Python 2.7.x and OpenJDK 8
-* `mcf-sdk-site` -> container running the generation process of the website contents
-
-### Volumes
-* `mcf-site-source` -> this volume contains the site trunk code
-* `mcf-site-generated-volume` -> this volume contains the generated site
-
diff --git a/mcf-docker-overlay/pom.xml b/mcf-docker-overlay/pom.xml
index b544486..ceb86b4 100644
--- a/mcf-docker-overlay/pom.xml
+++ b/mcf-docker-overlay/pom.xml
@@ -9,7 +9,7 @@
<parent>
<groupId>org.apache.manifoldcf</groupId>
<artifactId>mcf-sdk</artifactId>
- <version>0.0.5</version>
+ <version>1.0.0</version>
</parent>
<properties>
@@ -69,48 +69,7 @@
<plugin>
<artifactId>maven-resources-plugin</artifactId>
<executions>
- <execution>
- <id>copy-and-filter-docker-resources</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.parent.basedir}/target</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/docker</directory>
- <filtering>true</filtering>
- <excludes>
- <exclude>**/*.jar</exclude>
- <exclude>**/*.so</exclude>
- <exclude>**/*.gz</exclude>
- </excludes>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-and-filter-docker-resources-non-filtered</id>
- <phase>package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.parent.basedir}/target</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/docker</directory>
- <filtering>false</filtering>
- <includes>
- <include>**/*.jar</include>
- <include>**/*.so</include>
- <include>**/*.gz</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
+
</executions>
</plugin>
<plugin>
@@ -257,7 +216,7 @@
<outputDirectory>${project.parent.basedir}/target</outputDirectory>
<resources>
<resource>
- <directory>src/main/docker/local</directory>
+ <directory>src/main/docker</directory>
<filtering>true</filtering>
<excludes>
<exclude>**/*.jar</exclude>
@@ -278,6 +237,48 @@
<outputDirectory>${project.parent.basedir}/target</outputDirectory>
<resources>
<resource>
+ <directory>src/main/docker</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>**/*.jar</include>
+ <include>**/*.so</include>
+ <include>**/*.gz</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-and-filter-docker-resources-local</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.parent.basedir}/target</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/docker/local</directory>
+ <filtering>true</filtering>
+ <excludes>
+ <exclude>**/*.jar</exclude>
+ <exclude>**/*.so</exclude>
+ <exclude>**/*.gz</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-and-filter-docker-resources-non-filtered-local</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.parent.basedir}/target</outputDirectory>
+ <resources>
+ <resource>
<directory>src/main/docker/local</directory>
<filtering>false</filtering>
<includes>
@@ -289,6 +290,23 @@
</resources>
</configuration>
</execution>
+ <execution>
+ <id>copy-and-filter-docker-compose-resources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.parent.basedir}/target/docker-compose</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/docker/docker-compose</directory>
+ <filtering>true</filtering>
+ <include>docker-compose.yml</include>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
@@ -314,7 +332,7 @@
<outputDirectory>${project.parent.basedir}/target</outputDirectory>
<resources>
<resource>
- <directory>src/main/docker/hub</directory>
+ <directory>src/main/docker</directory>
<filtering>true</filtering>
<excludes>
<exclude>**/*.jar</exclude>
@@ -335,6 +353,48 @@
<outputDirectory>${project.parent.basedir}/target</outputDirectory>
<resources>
<resource>
+ <directory>src/main/docker</directory>
+ <filtering>false</filtering>
+ <includes>
+ <include>**/*.jar</include>
+ <include>**/*.so</include>
+ <include>**/*.gz</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-and-filter-docker-resources-hub</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.parent.basedir}/target</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/docker/hub</directory>
+ <filtering>true</filtering>
+ <excludes>
+ <exclude>**/*.jar</exclude>
+ <exclude>**/*.so</exclude>
+ <exclude>**/*.gz</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>copy-and-filter-docker-resources-non-filtered-hub</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.parent.basedir}/target</outputDirectory>
+ <resources>
+ <resource>
<directory>src/main/docker/hub</directory>
<filtering>false</filtering>
<includes>
@@ -346,6 +406,23 @@
</resources>
</configuration>
</execution>
+ <execution>
+ <id>copy-and-filter-docker-compose-resources</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.parent.basedir}/target/docker-compose</outputDirectory>
+ <resources>
+ <resource>
+ <directory>src/main/docker/docker-compose</directory>
+ <filtering>true</filtering>
+ <include>docker-compose.yml</include>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
</executions>
</plugin>
</plugins>
diff --git a/mcf-docker-overlay/src/main/docker/docker-compose/docker-compose.yml b/mcf-docker-overlay/src/main/docker/docker-compose/docker-compose.yml
new file mode 100644
index 0000000..30bb090
--- /dev/null
+++ b/mcf-docker-overlay/src/main/docker/docker-compose/docker-compose.yml
@@ -0,0 +1,52 @@
+services:
+
+ mcf-current-project:
+ image: mcf-sdk/current-project:development
+ hostname: mcf-current-project
+ networks:
+ - mcf-network
+ build:
+ dockerfile: Dockerfile
+ context: ../../target
+ tags:
+ - "latest"
+ - "${project.version}"
+ ports:
+ - ${docker.tomcat.port.external}:${docker.tomcat.port.internal}
+ - ${docker.debug.port.external}:${docker.debug.port.internal}
+ healthcheck:
+ test: ["CMD", "curl", "-f", "http://localhost:${docker.tomcat.port.external}/mcf-crawler-ui"]
+ interval: 30s
+ timeout: 10s
+ retries: 5
+ depends_on:
+ mcf-postgres:
+ condition: service_healthy
+
+ mcf-postgres:
+ image: ${docker.mcf.database.image}
+ hostname: mcf-postgres
+ networks:
+ - mcf-network
+ environment:
+ POSTGRES_HOST_AUTH_METHOD: trust
+ POSTGRES_DB: ${docker.mcf.database.server.db.name}
+ POSTGRES_USER: ${docker.mcf.database.username}
+ ports:
+ - ${docker.mcf.database.port.external}:${docker.mcf.database.port.internal}
+ volumes:
+ - mcf-postgres-volume:/var/lib/postgresql/data
+ healthcheck:
+ test: ["CMD-SHELL", "pg_isready -d ${docker.mcf.database.server.db.name} -U ${docker.mcf.database.username}"]
+ interval: 10s
+ timeout: 5s
+ retries: 5
+
+volumes:
+ mcf-postgres-volume:
+ name: mcf-postgres-volume
+ external: true
+networks:
+ mcf-network:
+ name: mcf-network
+ external: true
\ No newline at end of file
diff --git a/mcf-docker-overlay/src/main/docker/hub/Dockerfile b/mcf-docker-overlay/src/main/docker/hub/Dockerfile
index 75e1d82..559be41 100644
--- a/mcf-docker-overlay/src/main/docker/hub/Dockerfile
+++ b/mcf-docker-overlay/src/main/docker/hub/Dockerfile
@@ -1,4 +1,4 @@
-FROM apache/manifoldcf:2.27-RC1
+FROM apache/manifoldcf:2.26
LABEL maintainer="The Apache ManifoldCF Project"
ARG MCF_VERSION=2.27-RC1
@@ -10,6 +10,7 @@
COPY connectors.xml ${APP_DIR}
COPY properties.xml ${APP_DIR}/example
+COPY logging.xml ${APP_DIR}/example
COPY start-options.env.unix ${APP_DIR}/example
COPY extensions/*.jar ${APP_DIR}/connector-lib/
diff --git a/mcf-docker-overlay/src/main/docker/hub/logging.xml b/mcf-docker-overlay/src/main/docker/hub/logging.xml
new file mode 100644
index 0000000..9577743
--- /dev/null
+++ b/mcf-docker-overlay/src/main/docker/hub/logging.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
+<Configuration status="warn" name="ManifoldCF" packages="">
+ <Appenders>
+ <Console name="STDOUT" target="SYSTEM_OUT">
+ <PatternLayout>
+ <Pattern>%5p %d{ISO8601} (%t) - %m%n</Pattern>
+ </PatternLayout>
+ </Console>
+ <File name="MyFile" fileName="logs/manifoldcf.log">
+ <PatternLayout>
+ <Pattern>%5p %d{ISO8601} (%t) - %m%n</Pattern>
+ </PatternLayout>
+ </File>
+ </Appenders>
+ <Loggers>
+ <Root level="error">
+ <AppenderRef ref="STDOUT"/>
+ <AppenderRef ref="MyFile"/>
+ </Root>
+ </Loggers>
+</Configuration>
diff --git a/mcf-docker-overlay/src/main/docker/hub/start-options.env.unix b/mcf-docker-overlay/src/main/docker/hub/start-options.env.unix
index 5fde963..e34531a 100644
--- a/mcf-docker-overlay/src/main/docker/hub/start-options.env.unix
+++ b/mcf-docker-overlay/src/main/docker/hub/start-options.env.unix
@@ -1,6 +1,6 @@
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=0.0.0.0:5005
-Xms512m
--Xmx512m
+-Xmx1g
-Dorg.apache.manifoldcf.configfile=./properties.xml
-Dorg.apache.manifoldcf.jettyshutdowntoken=secret_token
-Djava.security.auth.login.config=
diff --git a/mcf-docker-overlay/src/main/docker/local/Dockerfile b/mcf-docker-overlay/src/main/docker/local/Dockerfile
index b0873a9..232c3c8 100644
--- a/mcf-docker-overlay/src/main/docker/local/Dockerfile
+++ b/mcf-docker-overlay/src/main/docker/local/Dockerfile
@@ -20,6 +20,7 @@
COPY connectors.xml ${APP_DIR}
COPY properties.xml ${APP_DIR}/example
+COPY logging.xml ${APP_DIR}/example
COPY extensions/mcf-extensions-jar-${project.version}.jar ${APP_DIR}/connector-lib
RUN set -ex; \
diff --git a/mcf-docker-overlay/src/main/docker/local/logging.xml b/mcf-docker-overlay/src/main/docker/local/logging.xml
new file mode 100644
index 0000000..9577743
--- /dev/null
+++ b/mcf-docker-overlay/src/main/docker/local/logging.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
+<Configuration status="warn" name="ManifoldCF" packages="">
+ <Appenders>
+ <Console name="STDOUT" target="SYSTEM_OUT">
+ <PatternLayout>
+ <Pattern>%5p %d{ISO8601} (%t) - %m%n</Pattern>
+ </PatternLayout>
+ </Console>
+ <File name="MyFile" fileName="logs/manifoldcf.log">
+ <PatternLayout>
+ <Pattern>%5p %d{ISO8601} (%t) - %m%n</Pattern>
+ </PatternLayout>
+ </File>
+ </Appenders>
+ <Loggers>
+ <Root level="error">
+ <AppenderRef ref="STDOUT"/>
+ <AppenderRef ref="MyFile"/>
+ </Root>
+ </Loggers>
+</Configuration>
diff --git a/mcf-extensions-jar/pom.xml b/mcf-extensions-jar/pom.xml
index 4ff9fb8..042cfef 100644
--- a/mcf-extensions-jar/pom.xml
+++ b/mcf-extensions-jar/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.apache.manifoldcf</groupId>
<artifactId>mcf-sdk</artifactId>
- <version>0.0.5</version>
+ <version>1.0.0</version>
</parent>
<dependencyManagement>
diff --git a/pom.xml b/pom.xml
index 3dad005..5227001 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,24 +3,24 @@
<groupId>org.apache.manifoldcf</groupId>
<artifactId>mcf-sdk</artifactId>
<name>Apache ManifoldCF SDK</name>
- <version>0.0.5</version>
+ <version>1.0.0</version>
<packaging>pom</packaging>
<properties>
<webVersion>4.0</webVersion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <manifoldcf.version>2.27-SNAPSHOT</manifoldcf.version>
+ <manifoldcf.version>2.26</manifoldcf.version>
<maven.enforcer.plugin.version>3.5.0</maven.enforcer.plugin.version>
- <docker-maven-plugin.version>0.44.0</docker-maven-plugin.version>
+ <docker-maven-plugin.version>0.45.0</docker-maven-plugin.version>
<maven.compiler.plugin.version>3.13.0</maven.compiler.plugin.version>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<maven.resources.plugin.version>3.3.1</maven.resources.plugin.version>
- <maven.dependency.plugin.version>3.7.1</maven.dependency.plugin.version>
+ <maven.dependency.plugin.version>3.8.0</maven.dependency.plugin.version>
<maven.clean.plugin.version>3.4.0</maven.clean.plugin.version>
<maven.lifecycle.mapping.plugin.version>1.0.0</maven.lifecycle.mapping.plugin.version>
- <maven.versions.plugin.version>2.16.2</maven.versions.plugin.version>
+ <maven.versions.plugin.version>2.17.1</maven.versions.plugin.version>
<postgresql.version>13.1</postgresql.version>
</properties>
diff --git a/run-compose.sh b/run-compose.sh
new file mode 100755
index 0000000..78abb29
--- /dev/null
+++ b/run-compose.sh
@@ -0,0 +1,115 @@
+#!/bin/sh
+mcfversion=$2
+mcfdist=$3
+
+export COMPOSE_FILE_PATH="${PWD}/target/docker-compose/docker-compose.yml"
+
+if [ -z "${M2_HOME}" ]; then
+ export MVN_EXEC="mvn"
+else
+ export MVN_EXEC="${M2_HOME}/bin/mvn"
+fi
+
+build_start() {
+ echo "Building with Maven skipping tests and run Docker containers"
+ mvn clean install docker:build docker:start -DskipTests -DskipITs
+}
+
+build() {
+ echo "Building with Maven skipping tests"
+ mvn clean install -DskipTests -DskipITs
+}
+
+build_mcf() {
+ docker compose -f "$COMPOSE_FILE_PATH" kill mcf-current-project
+ yes | docker compose -f "$COMPOSE_FILE_PATH" rm -f mcf-current-project
+ $MVN_EXEC clean install -pl mcf-extensions-jar,mcf-docker-overlay
+}
+
+tail() {
+ docker compose -f "$COMPOSE_FILE_PATH" logs -f
+}
+
+tail_all() {
+ docker compose -f "$COMPOSE_FILE_PATH" logs --tail="all"
+}
+
+build_test() {
+ echo "Building with Maven executing tests"
+ mvn clean install
+}
+
+unittests() {
+ echo "Executing unit tests"
+ mvn clean test
+}
+
+integrationtests() {
+ echo "Executing integration tests"
+ mvn clean integration-test
+}
+
+start() {
+ docker volume create mcf-postgres-volume
+ docker compose -f "$COMPOSE_FILE_PATH" up --build -d --remove-orphans
+}
+
+start_mcf() {
+ docker volume create mcf-postgres-volume
+ docker compose -f "$COMPOSE_FILE_PATH" up --build -d mcf-current-project --remove-orphans
+}
+
+down() {
+ if [ -f "$COMPOSE_FILE_PATH" ]; then
+ docker compose -f "$COMPOSE_FILE_PATH" down
+ fi
+}
+
+test() {
+ echo "Starting the mcf-sdk-test-container to execute unit and integration tests"
+ docker run -it --rm -v mcf-maven-repo:/root/.m2 -v mcf-app-volume:/usr/src/manifoldcf -t mcf-sdk-init ant test
+}
+
+purge() {
+ echo "Removing the ManifoldCF Maven repo and installation volumes"
+ docker volume rm mcf-postgres-volume
+}
+
+case "$1" in
+ build_start)
+ down
+ build
+ start
+ tail
+ ;;
+ start)
+ start
+ tail
+ ;;
+ stop)
+ down
+ ;;
+ unittests)
+ unittests
+ ;;
+ integrationtests)
+ integrationtests
+ ;;
+ test)
+ test
+ ;;
+ purge)
+ down
+ purge
+ ;;
+ tail)
+ tail
+ ;;
+ reload_mcf)
+ build_mcf
+ start
+ tail
+ ;;
+ *)
+ echo "Usage: $0 {build_start|start|reload_mcf|stop|unittests|integrationtests|tail|test|purge}"
+esac
\ No newline at end of file
diff --git a/run-site.bat b/run-site.bat
deleted file mode 100644
index dce21a8..0000000
--- a/run-site.bat
+++ /dev/null
@@ -1,89 +0,0 @@
-#set( $symbol_dollar = '$' )
-@ECHO OFF
-
-IF [%M2_HOME%]==[] (
- SET MVN_EXEC=mvn
-)
-
-IF NOT [%M2_HOME%]==[] (
- SET MVN_EXEC=%M2_HOME%\bin\mvn
-)
-
-IF [%1]==[] (
- echo "Usage: %0 {build|clean|start|stop|purge}"
- GOTO END
-)
-
-IF %1==build (
- CALL :build
-)
-
-IF %1==start (
- CALL :start
-)
-
-IF %1==stop (
- CALL :stop
-)
-
-IF %1==clean (
- CALL :clean
-)
-
-IF %1==purge (
- CALL :purge
-)
-
-echo "Usage: %0 {build|clean|start|stop|purge}"
-:END
-EXIT /B %ERRORLEVEL%
-
-:build
- echo "Starting Apache ManifoldCF SDK initialization for generating website contents"
-
- echo "Creating Docker Volume for the ManifoldCF Site Source"
- docker volume create --name mcf-site-source
-
- echo "Creating Docker Volume for the ManifoldCF Website"
- docker volume create --name mcf-site-generated-volume
-
- echo "Building the Docker Container for generating website contents"
- docker build src/main/docker-site -t mcf-sdk-site
-
- echo "Starting the mcf-sdk-site to export generated contents in target/mcf-site-generated ..."
- docker run --name mcf-sdk-site -it -v mcf-site-source:/usr/src/manifoldcf-site -v mcf-site-generated-volume:/usr/src/manifoldcf-site/build/site -t mcf-sdk-site sh -c "
- svn co https\:\/\/svn.apache.org/repos/asf/manifoldcf/site/trunk .; \
- ant make-core-deps; \
- ant build"
-
- echo "Copying the ManifoldCF generated site in target/mcf-site-generated..."
- mkdir -p target/build/site
- docker cp mcf-sdk-site:/usr/src/manifoldcf-site/build/site target/build
-
- echo "Stopping and removing the existent building container..."
- docker stop mcf-sdk-site
-EXIT /B 0
-
-:start
- echo "Run ManifoldCF Site Docker container"
- docker run -it -v mcf-site-source:/usr/src/manifoldcf-site -v mcf-site-generated-volume:/usr/src/manifoldcf-site/build/site -t mcf-sdk-site sh
-EXIT /B 0
-
-:stop
- echo "Stop ManifoldCF Site Docker container"
- docker stop mcf-sdk-site
-EXIT /B 0
-
-:clean
- echo "Starting the mcf-sdk-site to clean the project"
- docker run -it --rm -v mcf-site-source:/usr/src/manifoldcf-site -v mcf-site-generated-volume:/usr/src/manifoldcf-site/build/site -t mcf-sdk-site ant clean
- call %MVN_EXEC% clean
-EXIT /B 0
-
-:purge
- echo "Removing the ManifoldCF Site Docker artifacts and volumes"
- docker volume rm mcf-site-source
- docker volume rm mcf-site-generated-volume
- docker rm mcf-sdk-site
- docker image rm mcf-sdk-site
-EXIT /B 0
\ No newline at end of file
diff --git a/run-site.sh b/run-site.sh
deleted file mode 100755
index 2f3a72a..0000000
--- a/run-site.sh
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-
-build() {
- echo "Starting Apache ManifoldCF SDK initialization for generating website contents"
-
- echo "Creating Docker Volume for the ManifoldCF Site Source"
- docker volume create --name mcf-site-source
-
- echo "Creating Docker Volume for the ManifoldCF Website"
- docker volume create --name mcf-site-generated-volume
-
- echo "Building the Docker Container for generating website contents"
- docker build src/main/docker-site -t mcf-sdk-site
-
- echo "Starting the mcf-sdk-site to export generated contents in target/mcf-site-generated ..."
- docker run --name mcf-sdk-site -it -v mcf-site-source:/usr/src/manifoldcf-site -v mcf-site-generated-volume:/usr/src/manifoldcf-site/build/site -t mcf-sdk-site sh -c "
- svn co https\:\/\/svn.apache.org/repos/asf/manifoldcf/site/trunk .; \
- ant make-core-deps; \
- ant build"
-
- echo "Copying the ManifoldCF generated site in target/mcf-site-generated..."
- mkdir -p target/build/site
- docker cp mcf-sdk-site:/usr/src/manifoldcf-site/build/site target/build
-
- echo "Stopping and removing the existent building container..."
- docker stop mcf-sdk-site
-
-}
-
-start() {
- echo "Run ManifoldCF Site Docker container"
- docker run -it -v mcf-site-source:/usr/src/manifoldcf-site -v mcf-site-generated-volume:/usr/src/manifoldcf-site/build/site -t mcf-sdk-site sh
-}
-
-stop() {
- echo "Stop ManifoldCF Site Docker container"
- docker stop mcf-sdk-site
-}
-
-clean() {
- echo "Starting the mcf-sdk-site to clean the project"
- docker run -it --rm -v mcf-site-source:/usr/src/manifoldcf-site -v mcf-site-generated-volume:/usr/src/manifoldcf-site/build/site -t mcf-sdk-site ant clean
- mvn clean
-}
-
-purge() {
- echo "Removing the ManifoldCF Site Docker artifacts and volumes"
- docker volume rm mcf-site-source
- docker volume rm mcf-site-generated-volume
- docker rm mcf-sdk-site
- docker image rm mcf-sdk-site
-}
-
-case "$1" in
- build)
- build
- ;;
- start)
- start
- ;;
- stop)
- stop
- ;;
- clean)
- clean
- ;;
- purge)
- purge
- ;;
- *)
- echo "Usage: $0 {build|clean|start|stop|purge}"
-esac
\ No newline at end of file
