Skip to content

Commit

Permalink
Multipane (#92)
Browse files Browse the repository at this point in the history 
* modified files for multipane

* updated README

* updated README

* updated README

* updated README

* updated README

* updated README

* updated README

* updated README

* updated files for multipane

* updated README

* Separating file paths into two lines

* Updating README

* Removed finish.adoc include from README.adoc

* Adjusting order of dependencies

* JDK 11 pom update

* Updating dependency comments

* Updated README with [hotspot] changes

* Combined separated hotspots

* Updated README.adoc

* Updated README with link in new tab changes

* Updated README

* Updating README

* Updating file number

* Change the guide attribution to point to master

* Updated copyright
  • Loading branch information
@andrewdes @evelinec
andrewdes authored and evelinec committed Feb 27, 2019
1 parent 62e1c34 commit 5859a94
Show file tree
Hide file tree
Showing 9 changed files with 172 additions and 210 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ before_script:
- unset _JAVA_OPTIONS
- cd finish
script:
- mvn clean install
- mvn -q clean install
- serverName=$(backendServices/target/liberty/wlp/bin/server list | cut -d '.' -f2| tr -d '\n');
- build=$(grep "Open Liberty" backendServices/target/liberty/wlp/usr/servers/"$serverName"/logs/console.log
| cut -d' ' -f5 | cut -d')' -f1 ); release=$( echo "$build" | cut -d'/' -f1); number=$(
Expand Down
158 changes: 103 additions & 55 deletions README.adoc
View file

Large diffs are not rendered by default.

70 changes: 19 additions & 51 deletions finish/backendServices/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,6 @@
<packaging>war</packaging>

<dependencies>
<!-- For tests -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
</dependency>
<!--Open Liberty features -->
<dependency>
<groupId>io.openliberty.features</groupId>
Expand All @@ -57,7 +40,24 @@
<artifactId>jpa-2.2</artifactId>
<type>esa</type>
</dependency>
<!--For JDK 9 & 10 support -->
<!-- For tests -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
</dependency>
<!-- Support for JDk 9 and above -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
Expand Down Expand Up @@ -146,45 +146,13 @@
</configuration>
<executions>
<execution>
<id>install-liberty</id>
<phase>prepare-package</phase>
<goals>
<goal>install-server</goal>
</goals>
</execution>
<execution>
<id>install-app</id>
<phase>pre-integration-test</phase>
<goals>
<goal>install-apps</goal>
</goals>
<id>install-apps</id>
<configuration>
<looseApplication>true</looseApplication>
<stripVersion>true</stripVersion>
<installAppPackages>project</installAppPackages>
</configuration>
</execution>
<execution>
<id>start-server</id>
<phase>pre-integration-test</phase>
<goals>
<goal>start-server</goal>
</goals>
</execution>
<execution>
<id>stop-server</id>
<phase>post-integration-test</phase>
<goals>
<goal>stop-server</goal>
</goals>
</execution>
<execution>
<id>package-app</id>
<phase>package</phase>
<goals>
<goal>package-server</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Plugin to run functional tests -->
Expand Down
8 changes: 5 additions & 3 deletions finish/backendServices/src/main/resources/META-INF/persistence.xml
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<persistence version="2.2"
xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd">
xmlns="http://xmlns.jcp.org/xml/ns/persistence"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd">
<persistence-unit name="jpa-unit" transaction-type="JTA">
<jta-data-source>jdbc/eventjpadatasource</jta-data-source>
<properties>
<property name="eclipselink.ddl-generation" value="create-tables"/>
<property name="eclipselink.ddl-generation.output-mode" value="both" />
</properties>
</persistence-unit>
</persistence>
</persistence>
36 changes: 2 additions & 34 deletions finish/frontendUI/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<type>esa</type>
<scope>provided</scope>
</dependency>
<!--For JDK 9 & 10 support -->
<!-- Support for JDK 9 and above -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
Expand Down Expand Up @@ -93,45 +93,13 @@
</configuration>
<executions>
<execution>
<id>install-liberty</id>
<phase>prepare-package</phase>
<goals>
<goal>install-server</goal>
</goals>
</execution>
<execution>
<id>install-app</id>
<phase>pre-integration-test</phase>
<goals>
<goal>install-apps</goal>
</goals>
<id>install-apps</id>
<configuration>
<looseApplication>true</looseApplication>
<stripVersion>true</stripVersion>
<installAppPackages>project</installAppPackages>
</configuration>
</execution>
<execution>
<id>start-server</id>
<phase>pre-integration-test</phase>
<goals>
<goal>start-server</goal>
</goals>
</execution>
<execution>
<id>stop-server</id>
<phase>post-integration-test</phase>
<goals>
<goal>stop-server</goal>
</goals>
</execution>
<execution>
<id>package-app</id>
<phase>package</phase>
<goals>
<goal>package-server</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
Expand Down
18 changes: 11 additions & 7 deletions finish/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@
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>
<parent>
<groupId>net.wasdev.wlp.maven.parent</groupId>
<artifactId>liberty-maven-app-parent</artifactId>
<version>RELEASE</version>
</parent>

<groupId>io.openliberty.guides</groupId>
<artifactId>jpa-intro</artifactId>
Expand Down Expand Up @@ -41,13 +46,13 @@
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<version>3.1.11</version>
<version>3.2.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
<version>3.1.11</version>
<version>3.2.6</version>
<scope>test</scope>
</dependency>
<dependency>
Expand All @@ -56,21 +61,21 @@
<version>1.0.4</version>
<scope>test</scope>
</dependency>
<!--For JDK 9 & 10 support -->
<!-- Support for JDK 9 and above -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.2.11</version>
<version>2.3.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.2.11</version>
<version>2.3.0.1</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.2.11</version>
<version>2.3.2</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
Expand All @@ -88,7 +93,6 @@
<plugin>
<groupId>net.wasdev.wlp.maven.plugins</groupId>
<artifactId>liberty-maven-plugin</artifactId>
<version>2.6.1</version>
<configuration>
<assemblyArtifact>
<groupId>io.openliberty</groupId>
Expand Down
70 changes: 19 additions & 51 deletions start/backendServices/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,6 @@
<packaging>war</packaging>

<dependencies>
<!-- For tests -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
</dependency>
<!--Open Liberty features -->
<dependency>
<groupId>io.openliberty.features</groupId>
Expand All @@ -57,7 +40,24 @@
<artifactId>jpa-2.2</artifactId>
<type>esa</type>
</dependency>
<!--For JDK 9 & 10 support -->
<!-- For tests -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
</dependency>
<!-- Support for JDK 9 and above -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
Expand Down Expand Up @@ -146,45 +146,13 @@
</configuration>
<executions>
<execution>
<id>install-liberty</id>
<phase>prepare-package</phase>
<goals>
<goal>install-server</goal>
</goals>
</execution>
<execution>
<id>install-app</id>
<phase>pre-integration-test</phase>
<goals>
<goal>install-apps</goal>
</goals>
<id>install-apps</id>
<configuration>
<looseApplication>true</looseApplication>
<stripVersion>true</stripVersion>
<installAppPackages>project</installAppPackages>
</configuration>
</execution>
<execution>
<id>start-server</id>
<phase>pre-integration-test</phase>
<goals>
<goal>start-server</goal>
</goals>
</execution>
<execution>
<id>stop-server</id>
<phase>post-integration-test</phase>
<goals>
<goal>stop-server</goal>
</goals>
</execution>
<execution>
<id>package-app</id>
<phase>package</phase>
<goals>
<goal>package-server</goal>
</goals>
</execution>
</executions>
</plugin>
<!-- Plugin to run functional tests -->
Expand Down
2 changes: 1 addition & 1 deletion start/frontendUI/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<type>esa</type>
<scope>provided</scope>
</dependency>
<!--For JDK 9 & 10 support -->
<!-- Support for JDK 9 and above -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
Expand Down
Loading

0 comments on commit 5859a94

Please sign in to comment.