Skip to content

Modified to work with Gradle Commands #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SiaaG-dev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Modified to work with Gradle Commands #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ group = 'net.wasdev.sample'
version = '1.0-SNAPSHOT'
description = "PlantsByWebSphere"

sourceCompatibility = 1.7
targetCompatibility = 1.7
sourceCompatibility = 1.8
targetCompatibility = 1.8
tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
}
Expand All @@ -30,8 +30,10 @@ configurations {

dependencies {
providedCompile 'javax:javaee-api:7.0'
compile 'xalan:xalan:2.7.2'
compile 'xalan:serializer:2.7.2'
serverLibs 'org.apache.derby:derby:10.11.1.1'
libertyRuntime 'com.ibm.websphere.appserver.runtime:wlp-javaee7:19.0.0.8'
libertyRuntime 'io.openliberty:openliberty-runtime:18.0.0.2'
}

task copyServerLibs(type: Copy) {
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/com/ibm/websphere/samples/pbw/bean/ResetDBBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,15 @@ public void populateDB() {
Util.debug("Populating BACKORDER table with default values...");
try {
String[] values = Util.getProperties("backorder");
if (values != null && values.length != 0) {
if (values[0] == null || values[0].isEmpty()) {
Util.debug("No BACKORDER properties found.");
return;
}
} else if (values == null || values.length == 0) {
Util.debug("No BACKORDER properties found.");
return;
}
Util.debug("Found BACKORDER properties: " + values[0]);
// Inserting backorders
for (int index = 0; index < values.length; index++) {
Expand Down
3 changes: 1 addition & 2 deletions src/main/liberty/config/server.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<!-- Automatically expand WAR files and EAR files -->
<applicationManager autoExpand="true"/>

<logging hideMessage="SRVE9967W" />
<variable name="WAS_INSTALL_ROOT" value="${server.config.dir}"/>
<variable name="DERBY_JDBC_DRIVER_PATH" value="${server.config.dir}/lib"/>
<library id="DerbyLib">
Expand All @@ -36,4 +36,3 @@
</dataSource>

</server>