Skip to content

Commit 9946143

Browse files
fax4everfax4ever
committed
OCP-DEMO Upgrades Wildfly 13 - OGM 5.4.0.Beta2 - Infinispan 9.3.0.Final
OCP-DEMO remove --follows from start built Console can hang and get stunk, using Origin 3.9
1 parent 0422240 commit 9946143

File tree

15 files changed

+77
-147
lines changed

15 files changed

+77
-147
lines changed

‎openshift/message-board/README.asciidoc

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,14 @@ Made with Hibernate ORM, Hibernate OGM and Infinispan for OpenShift Container Pl
88
* Java 8
99
* Maven 3+
1010
* NPM (https://www.npmjs.com/)
11-
* Angular Cli (npm install -g @angular/cli)
11+
* Angular Cli (npm install -g @angular/cli) [avoid 6.1.x]
1212
* OpenShift (3.7+) client
1313
14+
## Build demo
15+
----
16+
mvn clean install
17+
----
18+
1419
## Install demo
1520
----
1621
cd script
@@ -65,4 +70,19 @@ http://web-message-board.[YOUR-IP].nip.io/account-service/user
6570
#### without proxy
6671
----
6772
http://account-service-message-board.[YOUR-IP].nip.io/account-service/user
68-
----
73+
----
74+
75+
## Known Issues
76+
77+
### NodeJs module Angular cli 6.1.x
78+
It seems there is an issue on angular-cli versions 6.1.0 and 6.1.1.
79+
It might need to downgrade angular-cli version:
80+
----
81+
sudo -s npm uninstall -g @angular/cli
82+
sudo -s npm install -g @angular/[email protected]
83+
----
84+
For more information see https://github.com/angular/angular-cli/issues/11661[Issue Page].
85+
86+
### MiniShift CDK v3.5.0-1
87+
Actually there is an issue with MiniShift v1.20.0+1bd6d5c, CDK v3.5.0-1.
88+
The persistent volume for Infinispan server pod is mounted as root user.

‎openshift/message-board/account-service/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,14 @@
121121
<scope>test</scope>
122122
</dependency>
123123

124+
<dependency>
125+
<!-- TODO Workaround to fix wildfly-arquillian-container-managed \https://issues.jboss.org/browse/WFLY-9747 -->
126+
<groupId>org.wildfly.security</groupId>
127+
<artifactId>wildfly-elytron</artifactId>
128+
<version>1.1.0.Final</version>
129+
<scope>test</scope>
130+
</dependency>
131+
124132
</dependencies>
125133

126134
<build>

‎openshift/message-board/account-service/src/main/resources/META-INF/persistence.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
version="2.0">
55

66
<persistence-unit name="board-account">
7-
<jta-data-source>java:jboss/datasources/account_mysql</jta-data-source>
7+
<jta-data-source>java:jboss/datasources/MySQLDS</jta-data-source>
88
<properties>
99
<property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect"/>
1010
<property name="hibernate.hbm2ddl.auto" value="update"/>

‎openshift/message-board/message-service/pom.xml

Lines changed: 10 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@
1313
<packaging>war</packaging>
1414

1515
<properties>
16-
<version.hibernate.ogm>5.3.0.Final</version.hibernate.ogm>
17-
<version.hibernate.orm>5.2.13.Final</version.hibernate.orm>
18-
<version.infinispan>9.1.6.Final</version.infinispan>
19-
20-
<classifier.wildfly>wildfly-11-dist</classifier.wildfly>
16+
<version.hibernate.ogm>5.4.0.Beta2</version.hibernate.ogm>
17+
<version.infinispan>9.3.0.Final</version.infinispan>
2118

2219
<name.wildfly>wildfly-${version.wildfly}</name.wildfly>
2320
<name.infinispan>infinispan-server-${version.infinispan}</name.infinispan>
@@ -135,6 +132,13 @@
135132
<scope>test</scope>
136133
</dependency>
137134

135+
<dependency>
136+
<!-- TODO Workaround to fix wildfly-arquillian-container-managed https://issues.jboss.org/browse/WFLY-9747 -->
137+
<groupId>org.wildfly.security</groupId>
138+
<artifactId>wildfly-elytron</artifactId>
139+
<version>1.1.0.Final</version>
140+
<scope>test</scope>
141+
</dependency>
138142
</dependencies>
139143

140144
<build>
@@ -144,13 +148,11 @@
144148
<filtering>true</filtering>
145149
</testResource>
146150
</testResources>
147-
148151
<plugins>
149-
150152
<plugin>
151153
<groupId>org.wildfly.build</groupId>
152154
<artifactId>wildfly-server-provisioning-maven-plugin</artifactId>
153-
<version>1.2.9.Final</version>
155+
<version>1.2.10.Final</version>
154156
<executions>
155157
<execution>
156158
<id>wildfly-server</id>
@@ -176,56 +178,6 @@
176178
</execution>
177179
</executions>
178180
</plugin>
179-
180-
<plugin>
181-
<artifactId>maven-dependency-plugin</artifactId>
182-
<version>3.0.1</version>
183-
<executions>
184-
<execution>
185-
<id>unpack</id>
186-
<phase>pre-integration-test</phase>
187-
<goals>
188-
<goal>unpack</goal>
189-
</goals>
190-
<configuration>
191-
<artifactItems>
192-
<!-- Hibernate OGM Wildfly modules -->
193-
<artifactItem>
194-
<groupId>org.hibernate.ogm</groupId>
195-
<artifactId>hibernate-ogm-modules</artifactId>
196-
<classifier>${classifier.wildfly}</classifier>
197-
<version>${version.hibernate.ogm}</version>
198-
<type>zip</type>
199-
<overWrite>false</overWrite>
200-
<outputDirectory>${home.wildfly}/modules</outputDirectory>
201-
</artifactItem>
202-
203-
<!-- Hibernate ORM Wildfly modules -->
204-
<artifactItem>
205-
<groupId>org.hibernate</groupId>
206-
<artifactId>hibernate-orm-modules</artifactId>
207-
<version>${version.hibernate.orm}</version>
208-
<classifier>${classifier.wildfly}</classifier>
209-
<type>zip</type>
210-
<overWrite>false</overWrite>
211-
<outputDirectory>${home.wildfly}/modules</outputDirectory>
212-
</artifactItem>
213-
214-
<!-- Infinispan Wildfly modules -->
215-
<artifactItem>
216-
<groupId>org.infinispan</groupId>
217-
<artifactId>infinispan-wildfly-modules</artifactId>
218-
<version>${version.infinispan}</version>
219-
<type>zip</type>
220-
<overWrite>true</overWrite>
221-
<outputDirectory>${home.wildfly}/modules</outputDirectory>
222-
</artifactItem>
223-
</artifactItems>
224-
</configuration>
225-
</execution>
226-
</executions>
227-
</plugin>
228-
229181
<plugin>
230182
<artifactId>maven-failsafe-plugin</artifactId>
231183
<version>2.20</version>
@@ -246,8 +198,6 @@
246198
</execution>
247199
</executions>
248200
</plugin>
249-
250201
</plugins>
251202
</build>
252-
253203
</project>

‎openshift/message-board/message-service/provisioning-infinispan.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<server-provisioning xmlns="urn:wildfly:server-provisioning:1.1">
22
<feature-packs>
3-
43
<feature-pack groupId="org.infinispan.server" artifactId="infinispan-server-feature-pack" version="${version.infinispan}" />
5-
64
</feature-packs>
75
</server-provisioning>

‎openshift/message-board/message-service/provisioning-wildfly.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<server-provisioning xmlns="urn:wildfly:server-provisioning:1.1">
22
<feature-packs>
3-
43
<feature-pack groupId="org.wildfly" artifactId="wildfly-feature-pack" version="${version.wildfly}" />
5-
4+
<feature-pack groupId="org.hibernate.ogm" artifactId="hibernate-ogm-featurepack-infinispan-remote" version="${version.hibernate.ogm}" />
65
</feature-packs>
76
</server-provisioning>

‎openshift/message-board/message-service/src/main/java/org/hibernate/demo/message/post/core/entity/Message.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public class Message implements Comparable<Message> {
4848
@Temporal(TemporalType.TIMESTAMP)
4949
private Date moment = new Date();
5050

51-
private Message() {
51+
public Message() {
5252
}
5353

5454
public Message(String username, String body) {
@@ -76,6 +76,14 @@ public String getBody() {
7676
return body;
7777
}
7878

79+
public void setUsername(String username) {
80+
this.username = username;
81+
}
82+
83+
public void setBody(String body) {
84+
this.body = body;
85+
}
86+
7987
public void setTags(Set<Tag> tags) {
8088
this.tags = tags;
8189
}

‎openshift/message-board/message-service/src/main/resources/META-INF/persistence.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
<persistence-unit name="primary" transaction-type="JTA">
77
<provider>org.hibernate.ogm.jpa.HibernateOgmPersistence</provider>
88
<properties>
9-
<property name="jboss.as.jpa.providerModule" value="org.hibernate:5.2"/>
10-
119
<property name="hibernate.ogm.datastore.provider" value="infinispan_remote" />
1210
<property name="hibernate.ogm.infinispan_remote.configuration_resource_name" value="hotrodclient.properties" />
1311
<property name="hibernate.ogm.datastore.create_database" value="true" />

‎openshift/message-board/message-service/src/test/java/org/hibernate/demo/message/post/test/PostRepoTest.java

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

‎openshift/message-board/message-service/src/test/java/org/hibernate/demo/message/post/util/DeploymentUtil.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ private static PersistenceDescriptor persistenceXml() {
3434
.transactionType( PersistenceUnitTransactionType._JTA )
3535
.provider( "org.hibernate.ogm.jpa.HibernateOgmPersistence" )
3636
.getOrCreateProperties()
37-
.createProperty().name( "jboss.as.jpa.providerModule" ).value( "org.hibernate:5.2" ).up()
3837
.createProperty().name( "hibernate.ogm.datastore.provider" ).value( "infinispan_remote" ).up()
3938
.createProperty().name( "hibernate.ogm.infinispan_remote.configuration_resource_name" ).value( "hotrodclient.properties" ).up()
4039
.createProperty().name( "hibernate.ogm.datastore.create_database" ).value( "true" ).up()

0 commit comments

Comments
 (0)