Fixed cosmetic review remarks (EOLs and Docker EXPOSE redundancy) Project: http://git-wip-us.apache.org/repos/asf/metamodel/repo Commit: http://git-wip-us.apache.org/repos/asf/metamodel/commit/6f6f776b Tree: http://git-wip-us.apache.org/repos/asf/metamodel/tree/6f6f776b Diff: http://git-wip-us.apache.org/repos/asf/metamodel/diff/6f6f776b
Branch: refs/heads/feature/5.x/swagger-docs Commit: 6f6f776b1372f7dc6a24e427ced1c6046d696004 Parents: 972ea4b Author: Kasper Sørensen <i.am.kasper.soren...@gmail.com> Authored: Mon Jun 6 20:14:03 2016 -0700 Committer: Kasper Sørensen <i.am.kasper.soren...@gmail.com> Committed: Mon Jun 6 20:14:03 2016 -0700 ---------------------------------------------------------------------- service-webapp/Dockerfile | 1 - service-webapp/src/main/resources/context/application-context.xml | 2 +- service-webapp/src/main/resources/logback.xml | 2 +- service-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metamodel/blob/6f6f776b/service-webapp/Dockerfile ---------------------------------------------------------------------- diff --git a/service-webapp/Dockerfile b/service-webapp/Dockerfile index 033d6e3..d154aca 100644 --- a/service-webapp/Dockerfile +++ b/service-webapp/Dockerfile @@ -21,5 +21,4 @@ RUN rm -rf $CATALINA_HOME/webapps \ mkdir $CATALINA_HOME/webapps COPY target/MetaModel.war $CATALINA_HOME/webapps/ROOT.war -EXPOSE 8080 CMD ["catalina.sh", "run"] http://git-wip-us.apache.org/repos/asf/metamodel/blob/6f6f776b/service-webapp/src/main/resources/context/application-context.xml ---------------------------------------------------------------------- diff --git a/service-webapp/src/main/resources/context/application-context.xml b/service-webapp/src/main/resources/context/application-context.xml index 89a1b28..e31feb1 100644 --- a/service-webapp/src/main/resources/context/application-context.xml +++ b/service-webapp/src/main/resources/context/application-context.xml @@ -31,4 +31,4 @@ under the License. <bean id="tenantRegistry" class="org.apache.metamodel.service.app.InMemoryTenantRegistry" /> -</beans> \ No newline at end of file +</beans> http://git-wip-us.apache.org/repos/asf/metamodel/blob/6f6f776b/service-webapp/src/main/resources/logback.xml ---------------------------------------------------------------------- diff --git a/service-webapp/src/main/resources/logback.xml b/service-webapp/src/main/resources/logback.xml index de862de..8ba8596 100644 --- a/service-webapp/src/main/resources/logback.xml +++ b/service-webapp/src/main/resources/logback.xml @@ -30,4 +30,4 @@ under the License. <root level="warn"> <appender-ref ref="consoleAppender" /> </root> -</configuration> \ No newline at end of file +</configuration> http://git-wip-us.apache.org/repos/asf/metamodel/blob/6f6f776b/service-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml ---------------------------------------------------------------------- diff --git a/service-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml b/service-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml index 12af16f..41cf38c 100644 --- a/service-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml +++ b/service-webapp/src/main/webapp/WEB-INF/dispatcher-servlet.xml @@ -54,4 +54,4 @@ under the License. </list> </property> </bean> -</beans> \ No newline at end of file +</beans>
