Skip to content

Commit ca418b3

Browse files
author
Maksim Kostromin
committed
finis activemq-spring-stomp
1 parent 3affc62 commit ca418b3

File tree

109 files changed

+850
-834
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+850
-834
lines changed

activemq-spring-stomp/build.gradle

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,11 @@ gradle.includedBuilds.each { build ->
3737
finalizedBy composeDown
3838
}
3939
}
40+
41+
["dockerUp", "dockerDown"].each { taskName ->
42+
gradle.includedBuilds.findAll({ it.name == "docker" }).each { build ->
43+
tasks.create(taskName) { task ->
44+
dependsOn gradle.includedBuild(build.name).task(":$taskName")
45+
}
46+
}
47+
}

activemq-spring-stomp/client-frontend-app/src/main/java/daggerok/domain/MessageRestRepository.java

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

activemq-spring-stomp/client-frontend-app/src/main/java/daggerok/messaging/JmsConfig.java

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

activemq-spring-stomp/client-frontend-app/src/main/java/daggerok/messaging/StompConfig.java

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

activemq-spring-stomp/client-frontend-app/src/main/java/daggerok/rest/MessageResource.java

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

activemq-spring-stomp/client-frontend-app/src/main/java/daggerok/rest/StompResource.java

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

activemq-spring-stomp/docker-compose.yml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,17 @@ services:
1212
- "61614:61614" # ws
1313
- "61616:61616" # jms
1414
networks: [backing-services]
15-
volumes: ["activemq-data:/opt/activemq/conf", "activemq-data:/data/activemq", "activemq-data:/var/log/activemq"]
15+
volumes:
16+
- "activemq-data:/opt/activemq/conf"
17+
- "activemq-data:/data/activemq"
18+
- "activemq-data:/var/log/activemq"
1619
environment:
20+
ACTIVEMQ_MIN_MEMORY: 512
21+
ACTIVEMQ_MAX_MEMORY: 2048
22+
ACTIVEMQ_ENABLED_SCHEDULER: "true"
1723
ACTIVEMQ_REMOVE_DEFAULT_ACCOUNT: "true"
1824
ACTIVEMQ_ADMIN_LOGIN: admin
1925
ACTIVEMQ_ADMIN_PASSWORD: password
20-
ACTIVEMQ_WRITE_LOGIN: write
21-
ACTIVEMQ_WRITE_PASSWORD: password
22-
ACTIVEMQ_READ_LOGIN: read
23-
ACTIVEMQ_READ_PASSWORD: password
24-
ACTIVEMQ_JMX_LOGIN: jmx
25-
ACTIVEMQ_JMX_PASSWORD: password
26-
ACTIVEMQ_STATIC_TOPICS: static-topic-1;static-topic-2
27-
ACTIVEMQ_STATIC_QUEUES: static-queue-1;static-queue-2
28-
ACTIVEMQ_ENABLED_SCHEDULER: "true"
29-
ACTIVEMQ_MIN_MEMORY: 512
30-
ACTIVEMQ_MAX_MEMORY: 2048
3126

3227
postgres:
3328
image: healthcheck/postgres:alpine
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
plugins {
2+
id "base"
3+
id "com.avast.gradle.docker-compose" version "0.3.21"
4+
}
5+
6+
dockerCompose {
7+
useComposeFiles = ["$projectDir/docker-compose.yml"]
8+
captureContainersOutput = true
9+
stopContainers = true
10+
removeContainers = true
11+
removeImages = "Local"
12+
removeVolumes = true
13+
projectName = "$rootProject.name"
14+
}
15+
16+
task dockerUp(dependsOn: composeUp)
17+
task dockerDown(dependsOn: composeDown)
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
version: "2.1"
2+
3+
services:
4+
5+
activemq:
6+
image: webcenter/activemq:5.14.3
7+
ports:
8+
- "1883:1883" # mqtt
9+
- "5672:5672" # amqp
10+
- "8161:8161" # ui
11+
- "61613:61613" # stomp
12+
- "61614:61614" # ws
13+
- "61616:61616" # jms
14+
networks: [backing-services]
15+
volumes:
16+
- "activemq-data:/opt/activemq/conf"
17+
- "activemq-data:/data/activemq"
18+
- "activemq-data:/var/log/activemq"
19+
environment:
20+
ACTIVEMQ_MIN_MEMORY: 512
21+
ACTIVEMQ_MAX_MEMORY: 2048
22+
ACTIVEMQ_ENABLED_SCHEDULER: "true"
23+
ACTIVEMQ_REMOVE_DEFAULT_ACCOUNT: "true"
24+
ACTIVEMQ_ADMIN_LOGIN: admin
25+
ACTIVEMQ_ADMIN_PASSWORD: password
26+
27+
postgres:
28+
image: healthcheck/postgres:alpine
29+
ports: ["5432:5432"]
30+
networks: [backing-services]
31+
volumes: ["postgres-data:/var/lib/postgresql/data"]
32+
environment:
33+
POSTGRES_DB: db
34+
POSTGRES_USER: user
35+
POSTGRES_PASSWORD: password
36+
37+
volumes:
38+
activemq-data: {}
39+
postgres-data: {}
40+
41+
networks:
42+
backing-services:
43+
driver: bridge

activemq-spring-stomp/simple-jms-app/build.gradle renamed to activemq-spring-stomp/messaging-backend/build.gradle

Lines changed: 5 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
import java.nio.file.Files
2-
import java.nio.file.Paths
3-
41
buildscript {
52
ext {
63
springBootVersion = "1.5.7.RELEASE"
@@ -10,7 +7,7 @@ buildscript {
107

118
plugins {
129
id "java"
13-
id "com.moowork.node" version "1.2.0"
10+
id "idea"
1411
id "cn.bestwu.propdeps" version "0.0.10"
1512
id "cn.bestwu.propdeps-idea" version "0.0.10"
1613
id "cn.bestwu.propdeps-maven" version "0.0.10"
@@ -49,13 +46,6 @@ dependencies {
4946
compile("com.querydsl:querydsl-jpa")
5047

5148
compile("org.projectlombok:lombok")
52-
// compile("org.webjars:EventSource:0.0.9")
53-
// compile("org.webjars.npm:eventsource:0.1.6")
54-
55-
compile "org.webjars:webjars-locator",
56-
"org.webjars:sockjs-client:1.0.2",
57-
"org.webjars:stomp-websocket:2.3.3",
58-
"org.webjars.npm:types__whatwg-fetch:0.0.33"
5949

6050
optional("org.springframework.boot:spring-boot-configuration-processor")
6151

@@ -65,28 +55,6 @@ dependencies {
6555
testCompile("org.springframework.boot:spring-boot-starter-test")
6656
}
6757

68-
clean {
69-
delete "$projectDir/src/main/js/node_modules"
70-
delete "$projectDir/src/main/js/build"
71-
delete "$projectDir/node_modules"
72-
delete "$buildDir"
73-
}
74-
75-
// node plugin: https://github.com/srs/gradle-node-plugin/blob/master/docs/node.md
76-
node {
77-
version = "6.9.2"
78-
npmVersion = "3.10.9"
79-
distBaseUrl = "https://nodejs.org/dist"
80-
download = true
81-
workDir = file("$buildDir/nodejs")
82-
npmWorkDir = file("$buildDir/npm")
83-
yarnWorkDir = file("$buildDir/yarn")
84-
nodeModulesDir = file("$projectDir/src/main/js")
85-
}
86-
87-
processResources { dependsOn npm_run_build }
88-
[build, test, assemble].each { it.dependsOn npm_i }
89-
9058
// spring dependency management plugin
9159
dependencyManagement {
9260
imports {
@@ -107,3 +75,7 @@ sourceSets {
10775
main
10876
test
10977
}
78+
79+
clean {
80+
delete "$projectDir/out"
81+
}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Oct 17 13:28:41 EEST 2017
1+
#Tue Oct 17 18:23:01 EEST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-all.zip

activemq-spring-stomp/simple-jms-app/src/main/java/daggerok/Application.java renamed to activemq-spring-stomp/messaging-backend/src/main/java/daggerok/MessagingBackend.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
55

66
@SpringBootApplication
7-
public class Application {
7+
public class MessagingBackend {
88

99
public static void main(String[] args) {
10-
SpringApplication.run(Application.class, args);
10+
SpringApplication.run(MessagingBackend.class, args);
1111
}
1212
}

activemq-spring-stomp/simple-jms-app/src/main/java/daggerok/domain/MessageRestRepository.java renamed to activemq-spring-stomp/messaging-backend/src/main/java/daggerok/domain/MessageRestRepository.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import org.springframework.data.jpa.repository.JpaRepository;
44
import org.springframework.data.querydsl.QueryDslPredicateExecutor;
55
import org.springframework.stereotype.Repository;
6+
import org.springframework.web.bind.annotation.CrossOrigin;
67

8+
@CrossOrigin
79
@Repository
810
public interface MessageRestRepository extends JpaRepository<Message, Long>, QueryDslPredicateExecutor<Message> {}

activemq-spring-stomp/simple-jms-app/src/main/java/daggerok/messaging/JmsConfig.java renamed to activemq-spring-stomp/messaging-backend/src/main/java/daggerok/messaging/JmsConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package daggerok.messaging;
22

3-
import daggerok.Application;
3+
import daggerok.MessagingBackend;
44
import daggerok.domain.Message;
55
import daggerok.props.MessageQueueProperties;
66
import lombok.RequiredArgsConstructor;
@@ -39,7 +39,7 @@ public ConnectionFactory connectionFactory() {
3939
public DefaultJmsListenerContainerFactory jmsListenerContainerFactory() {
4040
val factory = new DefaultJmsListenerContainerFactory();
4141
factory.setConnectionFactory(connectionFactory());
42-
factory.setClientId(Application.class.getName());
42+
factory.setClientId(MessagingBackend.class.getName());
4343
factory.setConcurrency("2-10");
4444
return factory;
4545
}

activemq-spring-stomp/client-frontend-app/src/main/java/daggerok/messaging/MessageConsumer.java renamed to activemq-spring-stomp/messaging-backend/src/main/java/daggerok/messaging/MessageConsumer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class MessageConsumer {
2727
@JmsListener(destination = "jms.topic.messages")
2828
public void dot(final Message message) {
2929
val result = messageRepository.save(message);
30-
log.info("saving: {}", result);
30+
log.debug("saving: {}", result);
3131
brokerMessagingTemplate.convertAndSend("/topic/messages", objectMapper.writeValueAsString(result));
3232
}
3333
}

activemq-spring-stomp/client-frontend-app/src/main/java/daggerok/messaging/MessageProducer.java renamed to activemq-spring-stomp/messaging-backend/src/main/java/daggerok/messaging/MessageProducer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class MessageProducer {
1414
final JmsTemplate jmsTemplate;
1515

1616
public void send(final Message message) {
17-
log.info("before save {}", message);
17+
log.debug("before save {}", message);
1818
jmsTemplate.convertAndSend("jms.topic.messages", message);
1919
}
2020
}

0 commit comments

Comments
 (0)