Skip to content

Codecrew / Moya

Go to a project
Commit 034fd063 by Tuukka Kivilahti Committed by Tuukka Kivilahti
Options

docker stuffendalen

1 parent 3b053f40
Inline Side-by-side
Showing with 45 additions and 9 deletions
code/moya-beans/src/test/java/fi/codecrew/moya/beans/CheckoutFiBeanTest.java
...@@ -123,10 +123,8 @@ public class CheckoutFiBeanTest { ...@@ -123,10 +123,8 @@ public class CheckoutFiBeanTest {
queryBuilder.addParam(CheckoutFiPaymentParam.DELAYED, returnUrl + "delayed.jsf"); queryBuilder.addParam(CheckoutFiPaymentParam.DELAYED, returnUrl + "delayed.jsf");
requiredParams.put("DELAYED", "https://localhost/MoyaWeb/checkout/delayed.jsf"); requiredParams.put("DELAYED", "https://localhost/MoyaWeb/checkout/delayed.jsf");
queryBuilder.addParam(CheckoutFiPaymentParam.DELIVERY_DATE, new SimpleDateFormat(DATEFORMAT).format(d));
requiredParams.put("DELIVERY_DATE", "20150328");
requiredParams.put("MAC", "7FBDC5A633794B7292E6B02020330E64"); requiredParams.put("MAC", "B3C473308FEE29313C581456C64D3596");
List<NameValuePair> nvpairs = queryBuilder.getNameValuePairs(); List<NameValuePair> nvpairs = queryBuilder.getNameValuePairs();
for (NameValuePair p : nvpairs) { for (NameValuePair p : nvpairs) {
......
code/moya-parent/pom.xml
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<artifactId>moya-parent</artifactId> <artifactId>moya-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<modules> <modules>
<module>../moya-utils</module> <module>../moya-utils</module>
<module>../moya-authmodule-client</module> <module>../moya-authmodule-client</module>
...@@ -17,6 +18,8 @@ ...@@ -17,6 +18,8 @@
<module>../moya-mgmt</module> <module>../moya-mgmt</module>
<module>../moya-terminal-web</module> <module>../moya-terminal-web</module>
<module>../moya-ear</module> <module>../moya-ear</module>
<module>../../docker</module>
<!-- <module>../moya-angular</module> --> <!-- <module>../moya-angular</module> -->
</modules> </modules>
......
code/moya-web/pom.xml
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
<packaging>war</packaging> <packaging>war</packaging>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>${war-plugin-version}</version> <version>${war-plugin-version}</version>
......
code/moya-web/src/main/java/fi/codecrew/moya/handler/SessionStore.java
...@@ -55,9 +55,8 @@ public class SessionStore implements Serializable { ...@@ -55,9 +55,8 @@ public class SessionStore implements Serializable {
Locale ret = locale; Locale ret = locale;
if (ret == null || ret.toString().equals("")) if (ret == null || ret.toString().equals(""))
{ {
LanEvent e = eventbean.getCurrentEvent();
EventOrganiser o = e.getOrganiser(); String retStr = eventbean.getCurrentEvent().getOrganiser().getBundleCountry();
String retStr = o.getBundleCountry();
if (retStr != null && !retStr.isEmpty()) { if (retStr != null && !retStr.isEmpty()) {
try { try {
......
docker/docker-compose.yml
...@@ -22,9 +22,20 @@ services: ...@@ -22,9 +22,20 @@ services:
- "127.0.0.1:4848:4848" - "127.0.0.1:4848:4848"
maven: maven:
build: maven build: maven
entrypoint: "/bin/bash" restart: "no"
tty: true command: mvn clean install -P exploded
working_dir: /usr/src/moya/code/moya-parent working_dir: /usr/src/moya/code/moya-parent
volumes: volumes:
- ../:/usr/src/moya - ../:/usr/src/moya
- ~/.m2:/root/.m2 - ~/.m2:/root/.m2
#
# maven:
# build: maven
# restart: no
# command: postgres -c max_prepared_transactions=10
# tty: true
# working_dir: /usr/src/moya/code/moya-parent
# volumes:
# - ../:/usr/src/moya
# - ~/.m2:/root/.m2
docker/pom.xml 0 → 100644
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>fi.codecrew.moya</groupId>
<name>Docker development environment</name>
<artifactId>development-environment</artifactId>
<version>1.0</version>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!