Skip to content

Commit fc21e2b

Browse files
thomaswoehlkethomaswoehlke
committed
work
1 parent ae5e45a commit fc21e2b

File tree

4 files changed

+237
-86
lines changed

4 files changed

+237
-86
lines changed

‎pom.xml‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@
473473
</dependencies>
474474

475475
<build>
476-
<plugins>s
476+
<plugins>
477477
<plugin>
478478
<groupId>org.apache.maven.plugins</groupId>
479479
<artifactId>maven-compiler-plugin</artifactId>
@@ -604,14 +604,10 @@
604604
<version>3.4.1</version>
605605
</plugin>
606606

607-
<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId>
608-
<version>3.1</version> <configuration> <source>1.7</source> <target>1.7</target>
609-
<encoding>${encoding}</encoding> </configuration> </plugin> -->
610-
611607
<plugin>
612608
<groupId>org.apache.maven.plugins</groupId>
613609
<artifactId>maven-javadoc-plugin</artifactId>
614-
<version>3.4.1s</version>
610+
<version>3.4.1</version>
615611
<configuration>
616612
<!-- <links> <link>http://java.sun.com/javase/6/docs/api/</link> <link>http://static.springframework.org/spring/docs/3.0.x/api/</link>
617613
<link>http://static.springframework.org/spring-webflow/docs/2.1.x/javadoc-api/</link>
@@ -621,14 +617,20 @@
621617
</links> -->
622618
<linksource>true</linksource>
623619
<maxmemory>1024m</maxmemory>
624-
<source>1.8</source>
620+
<source>11</source>
625621
<encoding>${encoding}</encoding>
626622
</configuration>
627623
</plugin>
628-
<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId>
629-
<version>2.2</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId>
630-
<artifactId>maven-surefire-report-plugin</artifactId> <version>2.0</version>
631-
</plugin> -->
624+
<plugin>
625+
<groupId>org.apache.maven.plugins</groupId>
626+
<artifactId>maven-surefire-plugin</artifactId>
627+
<version>3.0.0-M7</version>
628+
</plugin>
629+
<plugin>
630+
<groupId>org.apache.maven.plugins</groupId>
631+
<artifactId>maven-surefire-report-plugin</artifactId>
632+
<version>3.0.0-M7</version>
633+
</plugin>
632634
<plugin>
633635
<groupId>org.apache.maven.plugins</groupId>
634636
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -641,10 +643,6 @@
641643
<version>3.3.0</version>
642644
</plugin>
643645

644-
<!-- This Plugin looks up SVN -->
645-
<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-changelog-plugin</artifactId>
646-
<version>2.2</version> </plugin> -->
647-
648646
<plugin>
649647
<groupId>org.apache.maven.plugins</groupId>
650648
<artifactId>maven-jxr-plugin</artifactId>
@@ -657,7 +655,7 @@
657655
<version>3.19.0</version>
658656
<configuration>
659657
<minimumTokens>100</minimumTokens>
660-
<targetJdk>1.8</targetJdk>
658+
<targetJdk>11</targetJdk>
661659
<excludeRoots>
662660
<excludeRoot>target</excludeRoot>
663661
</excludeRoots>
@@ -673,9 +671,6 @@
673671
</configuration>
674672
</plugin>
675673

676-
<!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId>
677-
<version>2.5.2</version> </plugin> -->
678-
679674
<plugin>
680675
<groupId>org.apache.maven.plugins</groupId>
681676
<artifactId>maven-source-plugin</artifactId>
@@ -721,11 +716,10 @@
721716
</plugin>
722717

723718
<plugin>
724-
<groupId>org.apache.maven.plugins</groupId>
725-
<artifactId>maven-release-plugin</artifactId>
726-
<version>3.0.0-M7</version>
719+
<groupId>org.springframework.boot</groupId>
720+
<artifactId>spring-boot-maven-plugin</artifactId>
721+
<version>${project.parent.version}</version>
727722
</plugin>
728-
729723
</plugins>
730724
</build>
731725

‎src/main/java/org/woehlke/greenshop/GreenshopApplication.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package org.woehlke.greenshop;
2+
3+
import org.springframework.boot.SpringApplication;
4+
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
import org.springframework.boot.builder.SpringApplicationBuilder;
6+
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
7+
import org.springframework.web.WebApplicationInitializer;
8+
9+
@SpringBootApplication
10+
public class GreenshopApplication extends SpringBootServletInitializer implements WebApplicationInitializer {
11+
12+
@Override
13+
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
14+
return application.sources(GreenshopApplication.class);
15+
}
16+
17+
public static void main(String[] args) {
18+
SpringApplication.run(GreenshopApplication.class, args);
19+
}
20+
}

‎src/main/resources/META-INF/persistence.xml‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎src/main/resources/application.yml‎

Lines changed: 200 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,200 @@
1+
server:
2+
port: 8080
3+
error:
4+
path: /fehler
5+
compression:
6+
enabled: true
7+
min-response-size: 2048
8+
servlet:
9+
context-path: "/"
10+
endpoints:
11+
shutdown:
12+
enabled: true
13+
spring:
14+
config:
15+
name: bloodmoney
16+
liquibase:
17+
enabled: false
18+
devtools:
19+
livereload:
20+
enabled: true
21+
application:
22+
admin:
23+
enabled: true
24+
datasource:
25+
url: jdbc:mysql://localhost:3306/oscommerce2
26+
username: oscommerce2
27+
password: oscommerce2pwd
28+
driver-class-name: com.mysql.jdbc.Driver
29+
jta:
30+
atomikos:
31+
connectionfactory:
32+
xa-connection-factory-class-name: com.mysql.jdbc.JDBC4Connection
33+
jpa:
34+
open-in-view: true
35+
show-sql: true
36+
database-platform: MYSQL
37+
hibernate:
38+
#ddl-auto: create-drop update
39+
ddl-auto: update
40+
naming:
41+
implicit-strategy: org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl
42+
physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
43+
properties:
44+
hibernate:
45+
dialect: org.hibernate.dialect.PostgreSQL95Dialect
46+
temp:
47+
use_jdbc_metadata_defaults: false
48+
generate_statistics: true
49+
thymeleaf:
50+
cache: false
51+
session:
52+
store-type: jdbc
53+
jdbc:
54+
initialize-schema: ALWAYS
55+
cleanup-cron: 0 * * * * *
56+
#schema: classpath:/org/springframework/session/jdbc/schema-h2.sql
57+
#table-name: SPRING_SESSION
58+
main:
59+
allow-bean-definition-overriding: true
60+
sql:
61+
init:
62+
platform: POSTGRESQL
63+
mode: ALWAYS
64+
org:
65+
woehlke:
66+
greenshop:
67+
testDataHowManyTestData: 10
68+
devTesting: true
69+
#userConfig:
70+
#userEmail: ${GREENSHOP_USER_EMAIL}
71+
#userPassword: ${GREENSHOP_USER_PASSWORD}
72+
#userFullname: ${GREENSHOP_USER_FULLNAME}
73+
webConfig:
74+
exportFilename: "measurements.csv"
75+
exportFilenameSeparator: ";"
76+
webAddResourceHandlers:
77+
- "webjars/"
78+
webAddResourceHandlersStatic:
79+
- "bloodmoney/"
80+
- "icon/"
81+
- "languages/"
82+
- "test/"
83+
- "favicon.ico"
84+
webSecurity:
85+
loginProcessingUrl: "/j_spring_security_check"
86+
failureForwardUrl: "/login?login_error=1"
87+
defaultSuccessUrl: "/"
88+
login-page: "/login"
89+
logout-url: "/logout"
90+
delete-cookies: "JSESSIONID"
91+
invalidate-http-session: true
92+
antMatchersFullyAuthenticated: "/**"
93+
antMatchersPermitAll:
94+
- "/bloodmoney"
95+
- "/bloodmoney/**"
96+
- "/icon/**"
97+
- "/icon"
98+
- "/languages"
99+
- "/languages/**"
100+
- "/favicon.ico"
101+
- "/webjars/**"
102+
- "/webjars"
103+
- "/test*/**"
104+
- "/rest"
105+
- "/rest/**"
106+
- "/bpm"
107+
- "/login*"
108+
- "/register*"
109+
- "/confirm*/**"
110+
- "/resetPassword*"
111+
- "/passwordResetConfirm*/**"
112+
- "/error*"
113+
- "/fehler*"
114+
usernameParameter: "userEmail"
115+
passwordParameter: "userPassword"
116+
#secret: ${GREENSHOP_USER_SECRET}
117+
#iterations: ${GREENSHO_USER_ITERATIONS}
118+
#hashWidth: ${GREENSHO_USER_HASH_WIDTH}
119+
logging:
120+
level:
121+
root: INFO
122+
org:
123+
springframework: INFO
124+
hibernate:
125+
SQL: INFO
126+
engine:
127+
internal: WARN
128+
ch:
129+
qos: WARN
130+
mysql: WARN
131+
greenshop:
132+
java:
133+
bloodmoney: INFO
134+
debug: false
135+
---
136+
spring:
137+
profiles:
138+
active: dev
139+
thymeleaf:
140+
cache: false
141+
devtools:
142+
livereload:
143+
enabled: true
144+
application:
145+
admin:
146+
enabled: false
147+
server:
148+
compression:
149+
enabled: false
150+
logging:
151+
level:
152+
root: INFO
153+
org:
154+
springframework: INFO
155+
hibernate:
156+
SQL: INFO
157+
engine:
158+
internal: WARN
159+
ch:
160+
qos: WARN
161+
postgresql: WARN
162+
woehlke:
163+
java:
164+
bloodmoney: INFO
165+
debug: false
166+
---
167+
spring:
168+
profiles:
169+
active: default
170+
datasource:
171+
url: jdbc:postgresql://localhost:5432/bloodmoney
172+
jta:
173+
atomikos:
174+
properties:
175+
transaction-manager-unique-name: tx-manager-bloodmoney
176+
transaction-manager-id: tx-manager-bloodmoney
177+
log-dir: transaction-logs/tx-logs-bloodmoney
178+
jpa:
179+
hibernate:
180+
ddl-auto: update
181+
server:
182+
port: ${PORT}
183+
compression:
184+
enabled: true
185+
logging:
186+
level:
187+
root: INFO
188+
org:
189+
springframework: INFO
190+
hibernate:
191+
SQL: INFO
192+
engine:
193+
internal: WARN
194+
ch:
195+
qos: WARN
196+
postgresql: WARN
197+
woehlke:
198+
java:
199+
bloodmoney: INFO
200+
debug: false

0 commit comments

Comments
 (0)