[GitHub] kameshsampath closed pull request #19: [WIP] Java Improvements

[GitBox <gi...@apache.org>]

kameshsampath closed pull request #19: [WIP] Java Improvements
URL: https://github.com/apache/incubator-openwhisk-runtime-java/pull/19
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/.gitignore b/.gitignore
index f65f024..a0df7f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,3 +70,7 @@ ansible/roles/nginx/files/*cert.pem
 !tests/dat/actions/python_virtualenv_dir.zip
 !tests/dat/actions/python_virtualenv_name.zip
 !tests/dat/actions/zippedaction.zip
+
+# VSCode project files
+**/.vscode
+**/.sts4-cache/
diff --git a/core/.editorconfig b/core/.editorconfig
new file mode 100644
index 0000000..cb3b9e6
--- /dev/null
+++ b/core/.editorconfig
@@ -0,0 +1,11 @@
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = false
+insert_final_newline = false
+indent_style = space
+
+[*.java]
+indent_size = 4
diff --git a/core/javaAction/.dockerignore b/core/javaAction/.dockerignore
new file mode 100644
index 0000000..f34a890
--- /dev/null
+++ b/core/javaAction/.dockerignore
@@ -0,0 +1,11 @@
+**/gradlew
+**/gradle
+**/build.gradle
+**/settings.gradle
+**/.gradle
+./proxy/build/delete-build-run.sh
+./proxy/bin
+./proxy/src
+./proxy/.sts4-cache
+./proxy/build/classes
+./proxy/build/tmp
\ No newline at end of file
diff --git a/core/javaAction/Dockerfile b/core/javaAction/Dockerfile
index 93add0f..9fe9443 100644
--- a/core/javaAction/Dockerfile
+++ b/core/javaAction/Dockerfile
@@ -1,38 +1,7 @@
-FROM buildpack-deps:trusty-curl
+FROM docker.io/fabric8/java-jboss-openjdk8-jdk
 
-ENV DEBIAN_FRONTEND noninteractive
+ENV AB_OFF=true \
+    AB_ENABLED="" \
+    JAVA_APP_NAME=javaAction-all.jar
 
-RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-
-ENV VERSION 8
-ENV UPDATE 131
-ENV BUILD 11
-
-ENV JAVA_HOME /usr/lib/jvm/java-${VERSION}-oracle
-ENV JRE_HOME ${JAVA_HOME}/jre
-
-RUN curl --silent --location --retry 3 --cacert /etc/ssl/certs/GeoTrust_Global_CA.pem \
-  --header "Cookie: oraclelicense=accept-securebackup-cookie;" \
-  http://download.oracle.com/otn-pub/java/jdk/"${VERSION}"u"${UPDATE}"-b"${BUILD}"/d54c1d3a095b4ff2b6607d096fa80163/server-jre-"${VERSION}"u"${UPDATE}"-linux-x64.tar.gz \
-  | tar xz -C /tmp && \
-  mkdir -p /usr/lib/jvm && mv /tmp/jdk1.${VERSION}.0_${UPDATE} "${JAVA_HOME}" && \
-  apt-get autoclean && apt-get --purge -y autoremove && \
-  rm -rf /tmp/* /var/tmp/*
-
-RUN update-alternatives --install "/usr/bin/java" "java" "${JRE_HOME}/bin/java" 1 && \
-  update-alternatives --install "/usr/bin/javac" "javac" "${JAVA_HOME}/bin/javac" 1 && \
-  update-alternatives --set java "${JRE_HOME}/bin/java" && \
-  update-alternatives --set javac "${JAVA_HOME}/bin/javac"
-
-ADD proxy /javaAction
-
-RUN rm -rf /javaAction/.classpath /javaAction/.gitignore /javaAction/.gradle /javaAction/.project /javaAction/.settings /javaAction/Dockerfile /javaAction/build
-
-RUN cd /javaAction; ./gradlew oneJar
-
-RUN rm -rf /javaAction/src
-
-CMD ["java", "-jar", "/javaAction/build/libs/javaAction-all.jar"]
+ADD ./proxy/build/libs/proxy-all.jar /deployments/javaAction-all.jar
diff --git a/core/javaAction/settings.gradle b/core/javaAction/settings.gradle
new file mode 100644
index 0000000..a96ec62
--- /dev/null
+++ b/core/javaAction/settings.gradle
@@ -0,0 +1 @@
+include 'proxy'
\ No newline at end of file


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services