Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: apache/ode
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: OpenTOSCA/ode
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: opentoscaimprovements
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.

Commits on May 18, 2010

  1. Creating maintanence branch for 1.3.4 release

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.3.4.X@945493 13f79535-47bb-0310-9956-ffa450edef68
    Rafal Konrad Rusin committed May 18, 2010
    Copy the full SHA
    57f3edb View commit details
  2. 1.3.4rc1

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.3.4.X@945498 13f79535-47bb-0310-9956-ffa450edef68
    Rafal Konrad Rusin committed May 18, 2010
    Copy the full SHA
    ed84aaa View commit details
  3. 1.3.4rc1 fix

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.3.4.X@945500 13f79535-47bb-0310-9956-ffa450edef68
    Rafal Konrad Rusin committed May 18, 2010
    Copy the full SHA
    8ac5b6b View commit details
  4. Dependency fix

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.3.4.X@945511 13f79535-47bb-0310-9956-ffa450edef68
    Rafal Konrad Rusin committed May 18, 2010
    Copy the full SHA
    8cf6950 View commit details
  5. Removed jibx deps from utils

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.3.4.X@945559 13f79535-47bb-0310-9956-ffa450edef68
    Rafal Konrad Rusin committed May 18, 2010
    Copy the full SHA
    4b84b4a View commit details

Commits on May 21, 2010

  1. ActivityRecovery test fix

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.3.4.X@946901 13f79535-47bb-0310-9956-ffa450edef68
    Rafal Konrad Rusin committed May 21, 2010
    Copy the full SHA
    8ef70bc View commit details

Commits on May 22, 2010

  1. Load immediate fix

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.3.4.X@947308 13f79535-47bb-0310-9956-ffa450edef68
    Rafal Konrad Rusin committed May 22, 2010
    Copy the full SHA
    7579773 View commit details

Commits on May 23, 2010

  1. Acquire instance lock for INVOKE_INTERNAL

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.3.4.X@947487 13f79535-47bb-0310-9956-ffa450edef68
    Rafal Konrad Rusin committed May 23, 2010
    Copy the full SHA
    e2c7f8a View commit details

Commits on May 27, 2010

  1. ODE-833: ODE 1.3.4rc1 + EclipseLink 2.0 integration in SMX 4.2 (thank…

    …s to Augustin Ganan)
    
    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.3.4.X@948766 13f79535-47bb-0310-9956-ffa450edef68
    Rafal Konrad Rusin committed May 27, 2010
    Copy the full SHA
    561a69e View commit details
  2. code signing key added.

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.3.4.X@948780 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed May 27, 2010
    Copy the full SHA
    bc68e89 View commit details
  3. 1.3.4 version

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.3.4.X@948797 13f79535-47bb-0310-9956-ffa450edef68
    Rafal Konrad Rusin committed May 27, 2010
    Copy the full SHA
    b3555ec View commit details
  4. Fixed missing license headers for java files

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.3.4.X@948808 13f79535-47bb-0310-9956-ffa450edef68
    Rafal Konrad Rusin committed May 27, 2010
    Copy the full SHA
    2e764d8 View commit details
  5. Fixing xml files missing license headers

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.3.4.X@948813 13f79535-47bb-0310-9956-ffa450edef68
    Rafal Konrad Rusin committed May 27, 2010
    Copy the full SHA
    b4626b4 View commit details
  6. License update

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.3.4.X@948814 13f79535-47bb-0310-9956-ffa450edef68
    Rafal Konrad Rusin committed May 27, 2010
    Copy the full SHA
    4330f56 View commit details
  7. licenses

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.3.4.X@948823 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed May 27, 2010
    Copy the full SHA
    f5bd235 View commit details
  8. license fix

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.3.4.X@948828 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed May 27, 2010
    Copy the full SHA
    82596e1 View commit details
  9. tweaking the docs

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.3.4.X@948836 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed May 27, 2010
    Copy the full SHA
    1a9096e View commit details

Commits on May 28, 2010

  1. Removed e4x from distro, fixed axis2 war deps

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.3.4.X@949125 13f79535-47bb-0310-9956-ffa450edef68
    Rafal Konrad Rusin committed May 28, 2010
    Copy the full SHA
    673458a View commit details
  2. Copy the full SHA
    eec2753 View commit details

Commits on Jun 4, 2010

  1. ODE-840 fix for failing to parse XPath functions correctly, caused by…

    … ODE-807.
    
    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/APACHE_ODE_1.3.4.X@951527 13f79535-47bb-0310-9956-ffa450edef68
    David A Carver committed Jun 4, 2010
    Copy the full SHA
    5af0fb3 View commit details

Commits on Jun 9, 2010

  1. tagging the 1.3.4 release

    git-svn-id: https://svn.apache.org/repos/asf/ode/tags/APACHE_ODE_1.3.4@953028 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Jun 9, 2010
    Copy the full SHA
    14b82d0 View commit details

Commits on Nov 24, 2010

  1. creating a branch for ODE 1.3.5

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/ode-1.3.5.x@1038705 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Nov 24, 2010
    Copy the full SHA
    0bb8dc1 View commit details

Commits on Dec 2, 2010

  1. next version is 1.3.5 (maintainance release)

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/ode-1.3.5.x@1041491 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Dec 2, 2010
    Copy the full SHA
    b88147c View commit details
  2. Copy the full SHA
    a995bac View commit details
  3. fix for ODE-885

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/ode-1.3.5.x@1041530 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Dec 2, 2010
    Copy the full SHA
    dce9ac5 View commit details
  4. fixes ODE-891.

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/ode-1.3.5.x@1041531 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Dec 2, 2010
    Copy the full SHA
    e900cb8 View commit details
  5. fixing ODE-856.

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/ode-1.3.5.x@1041534 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Dec 2, 2010
    Copy the full SHA
    8d8ed3d View commit details
  6. Copy the full SHA
    990bbf9 View commit details
  7. Copy the full SHA
    8273977 View commit details
  8. Next version is 1.3.5, also for buildr.

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/ode-1.3.5.x@1041539 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Dec 2, 2010
    Copy the full SHA
    a2d8e7d View commit details

Commits on Dec 6, 2010

  1. fixing ODE-878.

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/ode-1.3.5.x@1042784 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Dec 6, 2010
    Copy the full SHA
    16b86fa View commit details

Commits on Dec 7, 2010

  1. buildr upgrade to 1.4.3

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/ode-1.3.5.x@1042871 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Dec 7, 2010
    Copy the full SHA
    4cc1e3d View commit details
  2. ODE-876: performance improvements, thanks to Mateusz Nowakowski!

    Conflicts:
    
    	bpel-runtime/src/main/java/org/apache/ode/bpel/elang/xpath20/runtime/XPath20ExpressionRuntime.java
    	bpel-runtime/src/test/java/org/apache/ode/bpel/elang/xpath20/runtime/XsdTypesTest.java
    
    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/ode-1.3.5.x@1042877 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Dec 7, 2010
    Copy the full SHA
    6b223e3 View commit details

Commits on Dec 8, 2010

  1. aligning buildr deps with mvn deps.

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/ode-1.3.5.x@1043724 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Dec 8, 2010
    Copy the full SHA
    a39024d View commit details
  2. gpg signing improved.

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/ode-1.3.5.x@1043726 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Dec 8, 2010
    Copy the full SHA
    89d8f18 View commit details
  3. debug stmt removed.

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/ode-1.3.5.x@1043733 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Dec 8, 2010
    Copy the full SHA
    3311722 View commit details

Commits on Dec 9, 2010

  1. git support for source bundling.

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/ode-1.3.5.x@1043787 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Dec 9, 2010
    Copy the full SHA
    4cf690b View commit details
  2. typo fixed.

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/ode-1.3.5.x@1043798 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Dec 9, 2010
    Copy the full SHA
    95ccf37 View commit details
  3. some GC tweaks for itesting.

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/ode-1.3.5.x@1043898 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Dec 9, 2010
    Copy the full SHA
    4a31616 View commit details
  4. releasto-repo fix.

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/ode-1.3.5.x@1043928 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Dec 9, 2010
    Copy the full SHA
    68df037 View commit details
  5. fixing a potential NPE.

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/ode-1.3.5.x@1043930 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Dec 9, 2010
    Copy the full SHA
    8989103 View commit details
  6. fixing a potential NPE.

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/ode-1.3.5.x@1043931 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Dec 9, 2010
    Copy the full SHA
    fda09c9 View commit details
  7. Copy the full SHA
    d21c8bd View commit details

Commits on Dec 21, 2010

  1. empty file removed.

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/ode-1.3.5.x@1051538 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Dec 21, 2010
    Copy the full SHA
    24efd1c View commit details
  2. fixing jbi-karaf and jbi-karaf with buildr.

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/ode-1.3.5.x@1051541 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Dec 21, 2010
    Copy the full SHA
    1662e5e View commit details

Commits on Jan 5, 2011

  1. osgi bundling fix.

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/ode-1.3.5.x@1055525 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Jan 5, 2011
    Copy the full SHA
    b24bfc0 View commit details
  2. Copy the full SHA
    01ec622 View commit details

Commits on Jan 6, 2011

  1. jbi osgi bundling fix.

    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/ode-1.3.5.x@1055955 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Jan 6, 2011
    Copy the full SHA
    67c0405 View commit details
  2. Copy the full SHA
    4d750d8 View commit details
  3. ODE-739: Add recoverActivity command. Thanks to Daniel Dominguez!

    Also:
      - suspend and resume commands added.
      - list command improved.
    
    git-svn-id: https://svn.apache.org/repos/asf/ode/branches/ode-1.3.5.x@1055957 13f79535-47bb-0310-9956-ffa450edef68
    vanto committed Jan 6, 2011
    Copy the full SHA
    c6f26b2 View commit details
Showing 1,025 changed files with 63,545 additions and 10,485 deletions.
59 changes: 59 additions & 0 deletions .github/workflows/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# Copyright 2023 University of Stuttgart

# This file is a modified version of the original that can be found here:
# https://github.com/sathwik/docker-buildr

# Licensed 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.

FROM openjdk:8

MAINTAINER Sathwik B P

ENV JRUBY_VERSION 9.1.12.0
ENV BUILDR_VERSION 1.5.3
ENV JRUBY_OPENSSL_VERSION 0.9.17
ENV RSPEC-EXPECTATIONS 2.14.3
ENV RSPEC-MOCKS 2.14.3
ENV RSPEC-CORE 2.14.5
ENV RSPEC 2.14.1
ENV NOKOGIRI 1.6.8

RUN mkdir /opt/jruby \
&& curl http://jruby.org.s3.amazonaws.com/downloads/${JRUBY_VERSION}/jruby-bin-${JRUBY_VERSION}.tar.gz \
| tar -zxC /opt/jruby --strip-components=1 \
&& update-alternatives --install /usr/local/bin/ruby ruby /opt/jruby/bin/jruby 1

ENV PATH /opt/jruby/bin:$PATH

RUN echo 'gem: --no-rdoc --no-ri' >> /.gemrc

RUN gem install bundler -v 2.3.26
# RUN gem install jruby-openssl -v ${JRUBY_OPENSSL_VERSION}
RUN gem install buildr -v ${BUILDR_VERSION}
RUN gem install rspec-expectations -v ${RSPEC-EXPECTATIONS}
RUN gem install rspec-mocks -v ${RSPEC-MOCKS}
RUN gem install rspec-core -v ${RSPEC-CORE}
RUN gem install rspec -v ${RSPEC}
RUN gem install nokogiri -v ${NOKOGIRI}

# make /tmp available to all users.
RUN chmod 777 -R /tmp && chmod o+t -R /tmp

RUN update-alternatives --install /usr/local/bin/buildr buildr /opt/jruby/bin/buildr 1 \
&& update-alternatives --install /usr/local/bin/jruby jruby /opt/jruby/bin/jruby 1

ENV WORKSPACE /workspace
VOLUME /workspace
WORKDIR /workspace

ENTRYPOINT [ "buildr" ]
56 changes: 56 additions & 0 deletions .github/workflows/docker_image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: Push docker images to the GitHub registry

on:
push:
tags:
- "v*.*.*"
workflow_dispatch:

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}

jobs:
build_push:
runs-on: ubuntu-latest
services:
registry:
image: registry:2
ports:
- 5000:5000
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
with:
driver-opts: network=host
- name: Build Apache Buildr
uses: docker/build-push-action@v4
with:
context: .github/workflows
platforms: linux/amd64,linux/arm64
push: true
tags: localhost:5000/sathwik/apache-buildr:latest-jruby-jdk8
- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v4
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
- name: Login to GitHub registry
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push
uses: docker/build-push-action@v4
with:
context: .
file: Dockerfile-workflow
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
12 changes: 8 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# for those of us using git internally
# before committing in the central svn repository.

*.class
*.pyc
*.iml
@@ -11,10 +8,17 @@
*.orig
*.rej
*~
*.versionsBackup
.classpath
.project
.metadata
bin
target
reports
test-output
_buildr.rb
*.log
.settings
.m2
.buildr
build
Gemfile.lock
23 changes: 23 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
language: java
branches:
only:
- master
- ode-1.3.x
jdk:
- oraclejdk7
rvm:
- 1.9.3
install:
- rvm use 1.9.3
- gem install bundler
- bundle install
cache:
directories:
- $HOME/.m2
notifications:
irc: "chat.freenode.net#apache-ode"
email:
- dev@ode.apache.org
env:
- TEST_PORTS=8888,7171
script: buildr clean package JAVADOC=off
19 changes: 9 additions & 10 deletions BUILDING
Original file line number Diff line number Diff line change
@@ -7,30 +7,29 @@ If you downloaded the source distribution of ODE you can safely ignore the first
Getting the source code
-----------------------

First you will have to make sure that you have [Subversion|http://svn.tigris.org]. If you don't know what Subversion is or don't have it installed, check [here|http://svnbook.red-bean.com]. Once installed run:
First you will have to make sure that you have [git|http://git-scm.com/]. If you don't know what git is or don't have it installed, check [here|http://git-scm.com/]. Once installed run:

svn checkout http://svn.apache.org/repos/asf/ode/trunk ode
$> git clone http://git.apache.org/ode.git
$> cd ode
$> git checkout -b ode-1.3.6.x --track origin/ode-1.3.6.x

For more information or if you have any problem with Subversion (like being behind a proxy or a firewall) check our Source Code documentation (http://ode.apache.org/source-code.html).

Building With Buildr
--------------------

Buildr requires a Ruby interpreter. If you're running Linux or Mac OS you most probably already have Ruby installed on your machine. For Winows user Ruby installation is very simple. You will need the following:

* Ruby 1.8.x with RubyGems 0.9 or later. For Windows users using the Ruby One-Click Installer is the easiest (http://rubyforge.org/projects/rubyinstaller/). For Linux or Mac OS users, a Ruby interpreter is usually preinstalled. Just make sure to have the ruby-dev package (mkmf is needed for RJB).

* Buildr. Install it by running 'gem install buildr -v 1.2.10'. A proper JAVA_HOME environment variable must be set. Make sure to choose either win32 or ruby platforms (don't choose java for Antwrap, that's JRuby).
Our build is based on Buildr 1.4.12 or higher, a Ruby-based build tool for Java applications. Although Buildr runs nicely with Ruby, we recommend using JRuby 1.7.x
Detailed instructions on installing Buildr can be found here: http://buildr.apache.org/installing.html

Building is then pretty simple. Open a command in the source root directory and run:

rake package
buildr package

To try the test cases bundled with ODE:

rake test
buildr test

It just works! For more information about buildr see http://buildr.rubyforge.org/.
It just works! For more information about buildr see http://buildr.apache.org/.

Running in Tomcat (WAR deployment)
----------------------------------
66 changes: 66 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
FROM sathwik/apache-buildr:latest-jruby-jdk8 as builder

ENV JAVA_OPTS="-Xmx1024M -XX:MaxPermSize=512M"
ENV BUILDR_ARGS="-f Rakefile clean package test=no JAVADOC=off"

RUN apt-get update -qq && apt-get install -qqy \
unzip \
&& rm -rf /var/lib/apt/lists/*

COPY . /workspace

RUN jruby -S bundler install --gemfile=/workspace/Gemfile \
&& buildr $BUILDR_ARGS \
&& mkdir /build \
&& cp /workspace/axis2-war/target/ode-axis2-war-1.3.8-SNAPSHOT.war /build/ode.war \
&& unzip /build/ode.war -d /build/ode


FROM tomcat:8.5-jre8
LABEL maintainer "Johannes Wettinger <jowettinger@gmail.com>, Michael Wurster <miwurster@gmail.com>, Michael Hahn <mhahn.dev@gmail.com>"

ARG DOCKERIZE_VERSION=v0.6.1

ENV TOMCAT_USERNAME admin
ENV TOMCAT_PASSWORD admin
ENV ENGINE_PLAN_PORT 9763
ENV LOG_LEVEL info

RUN rm /dev/random && ln -s /dev/urandom /dev/random \
&& wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz

COPY --from=builder /build/ode ${CATALINA_HOME}/webapps/ode

ADD tomcat-users.xml.tpl ${CATALINA_HOME}/conf/tomcat-users.xml.tpl
ADD manager.xml ${CATALINA_HOME}/conf/Catalina/localhost/manager.xml
ADD server.xml.tpl ${CATALINA_HOME}/conf/server.xml.tpl
ADD axis2.xml.tpl ${CATALINA_HOME}/webapps/ode/WEB-INF/conf/axis2.xml.tpl
ADD log4j2.xml.tpl ${CATALINA_HOME}/webapps/ode/WEB-INF/classes/log4j2.xml.tpl

RUN mkdir ${CATALINA_HOME}/webapps/manager

EXPOSE 9763

CMD dockerize -template ${CATALINA_HOME}/conf/tomcat-users.xml.tpl:${CATALINA_HOME}/conf/tomcat-users.xml \
-template ${CATALINA_HOME}/conf/server.xml.tpl:${CATALINA_HOME}/conf/server.xml \
-template ${CATALINA_HOME}/webapps/ode/WEB-INF/conf/axis2.xml.tpl:${CATALINA_HOME}/webapps/ode/WEB-INF/conf/axis2.xml \
-template ${CATALINA_HOME}/webapps/ode/WEB-INF/classes/log4j2.xml.tpl:${CATALINA_HOME}/webapps/ode/WEB-INF/classes/log4j2.xml \
${CATALINA_HOME}/bin/catalina.sh run

#
# Manually build by running:
#
# docker build -t opentosca/ode:local .
#
# Run ODE container:
#
# docker run -d -p 9763:9763 --name ode opentosca/ode:local
#
# Set a logging level different than "warn", e.g., for debugging process executions.
# Possible values are: all, trace, debug, info, warn, error, fatal, off.
# Visit Apache Log4j2 website for more details: https://logging.apache.org/log4j/2.x/.
#
# docker run -d -p 9763:9763 -e "LOG_LEVEL=debug" --name ode opentosca/ode:local
#
48 changes: 48 additions & 0 deletions Dockerfile-mvn
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
FROM trade4chor/maven:2.2.1-jdk6 as builder

RUN rm /dev/random && ln -s /dev/urandom /dev/random

WORKDIR /opt/opentosca/ode
COPY . /opt/opentosca/ode
RUN mvn clean install -DskipTests=true

FROM tomcat:8.5-jre8
LABEL maintainer "Johannes Wettinger <jowettinger@gmail.com>, Michael Wurster <miwurster@gmail.com>, Michael Hahn <mhahn.dev@gmail.com>"

ARG DOCKERIZE_VERSION=v0.3.0

ENV TOMCAT_USERNAME admin
ENV TOMCAT_PASSWORD admin
ENV ENGINE_PLAN_PORT 9763

RUN rm /dev/random && ln -s /dev/urandom /dev/random \
&& wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz

RUN apt-get update -qq && apt-get install -qqy \
unzip \
&& rm -rf /var/lib/apt/lists/*

ADD tomcat-users.xml.tpl ${CATALINA_HOME}/conf/tomcat-users.xml.tpl
ADD manager.xml ${CATALINA_HOME}/conf/Catalina/localhost/manager.xml
ADD server.xml.tpl ${CATALINA_HOME}/conf/server.xml.tpl

COPY --from=builder /opt/opentosca/ode/axis2-war/target/ode-axis2-war-1.3.8.war ${CATALINA_HOME}/webapps/ode.war
RUN unzip ${CATALINA_HOME}/webapps/ode.war -d ${CATALINA_HOME}/webapps/ode

ADD axis2.xml.tpl ${CATALINA_HOME}/webapps/ode/WEB-INF/conf/axis2.xml.tpl

EXPOSE 9763

CMD dockerize -template ${CATALINA_HOME}/conf/tomcat-users.xml.tpl:${CATALINA_HOME}/conf/tomcat-users.xml \
-template ${CATALINA_HOME}/conf/server.xml.tpl:${CATALINA_HOME}/conf/server.xml \
-template ${CATALINA_HOME}/webapps/ode/WEB-INF/conf/axis2.xml.tpl:${CATALINA_HOME}/webapps/ode/WEB-INF/conf/axis2.xml \
${CATALINA_HOME}/bin/catalina.sh run

#
# Manually build by running:
#
# docker build -f Dockerfile-mvn -t opentosca/engine-plan-ode .
#
#
66 changes: 66 additions & 0 deletions Dockerfile-workflow
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
FROM localhost:5000/sathwik/apache-buildr:latest-jruby-jdk8 as builder

ENV JAVA_OPTS="-Xmx1024M -XX:MaxPermSize=512M"
ENV BUILDR_ARGS="-f Rakefile clean package test=no JAVADOC=off"

RUN apt-get update -qq && apt-get install -qqy \
unzip \
&& rm -rf /var/lib/apt/lists/*

COPY . /workspace

RUN jruby -S bundler install --gemfile=/workspace/Gemfile \
&& buildr $BUILDR_ARGS \
&& mkdir /build \
&& cp /workspace/axis2-war/target/ode-axis2-war-1.3.8-SNAPSHOT.war /build/ode.war \
&& unzip /build/ode.war -d /build/ode


FROM tomcat:8.5-jre8
LABEL maintainer "Johannes Wettinger <jowettinger@gmail.com>, Michael Wurster <miwurster@gmail.com>, Michael Hahn <mhahn.dev@gmail.com>"

ARG DOCKERIZE_VERSION=v0.6.1

ENV TOMCAT_USERNAME admin
ENV TOMCAT_PASSWORD admin
ENV ENGINE_PLAN_PORT 9763
ENV LOG_LEVEL info

RUN rm /dev/random && ln -s /dev/urandom /dev/random \
&& wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
&& rm dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz

COPY --from=builder /build/ode ${CATALINA_HOME}/webapps/ode

ADD tomcat-users.xml.tpl ${CATALINA_HOME}/conf/tomcat-users.xml.tpl
ADD manager.xml ${CATALINA_HOME}/conf/Catalina/localhost/manager.xml
ADD server.xml.tpl ${CATALINA_HOME}/conf/server.xml.tpl
ADD axis2.xml.tpl ${CATALINA_HOME}/webapps/ode/WEB-INF/conf/axis2.xml.tpl
ADD log4j2.xml.tpl ${CATALINA_HOME}/webapps/ode/WEB-INF/classes/log4j2.xml.tpl

RUN mkdir ${CATALINA_HOME}/webapps/manager

EXPOSE 9763

CMD dockerize -template ${CATALINA_HOME}/conf/tomcat-users.xml.tpl:${CATALINA_HOME}/conf/tomcat-users.xml \
-template ${CATALINA_HOME}/conf/server.xml.tpl:${CATALINA_HOME}/conf/server.xml \
-template ${CATALINA_HOME}/webapps/ode/WEB-INF/conf/axis2.xml.tpl:${CATALINA_HOME}/webapps/ode/WEB-INF/conf/axis2.xml \
-template ${CATALINA_HOME}/webapps/ode/WEB-INF/classes/log4j2.xml.tpl:${CATALINA_HOME}/webapps/ode/WEB-INF/classes/log4j2.xml \
${CATALINA_HOME}/bin/catalina.sh run

#
# Manually build by running:
#
# docker build -t opentosca/ode:local .
#
# Run ODE container:
#
# docker run -d -p 9763:9763 --name ode opentosca/ode:local
#
# Set a logging level different than "warn", e.g., for debugging process executions.
# Possible values are: all, trace, debug, info, warn, error, fatal, off.
# Visit Apache Log4j2 website for more details: https://logging.apache.org/log4j/2.x/.
#
# docker run -d -p 9763:9763 -e "LOG_LEVEL=debug" --name ode opentosca/ode:local
#
Loading