Skip to content

Commit 1b67421

Browse files
authored
Merge pull request #2 from PredixDev/feature/release2
Updates SDK to build 551
2 parents 5bd1f55 + 1d15dbe commit 1b67421

File tree

9 files changed

+47
-9
lines changed

9 files changed

+47
-9
lines changed

.gitignore

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
*.class
2+
3+
# Mobile Tools for Java (J2ME)
4+
.mtj.tmp/
5+
6+
# Package Files #
7+
*.war
8+
*.ear
9+
10+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
11+
hs_err_pid*
12+
.gradle
13+
.idea
14+
build
15+
data
16+
out

README.md

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
Overview
88
----------
99

10-
The Predix Mobile Java application is an example of how the [Predix Mobile Java SDK](https://github.com/PredixDev/PredixMobileJavaSDK) can be used to create a native exectuting client for Mac, Windows, Linux or any other operating system that Java supports. For an overview of Predix Mobile development please visit the [SDK repo](https://github.com/PredixDev/PredixMobileSDK) and [wiki](https://github.com/PredixDev/PredixMobileSDK/wiki).
10+
The Predix Mobile Java application is an example of how the [Predix Mobile Java SDK](https://github.com/PredixDev/PredixMobileJavaSDK) can be used to create a think client for Mac, Windows, Linux or any other operating system that Java supports. For an overview of Predix Mobile development please visit the [SDK repo](https://github.com/PredixDev/PredixMobileSDK) and [wiki](https://github.com/PredixDev/PredixMobileSDK/wiki).
1111

1212
This reference application provides the following:
1313

1414
- A container for a web application hosted with the Predix Mobile Service
15-
- A way to Authenticate with a UAA instance bound to a Predix Mobile Service
15+
- A way Authenticate with a UAA instance bound to a Predix Mobile Service
1616
- A way to run the container application on platforms that support Java
17-
- An installer example using a gradle task that creates a platfrom installer for the running platform (Windows and Mac only)
17+
- An installer example using a gradle task that creates an installer on the executed platform (Windows and Mac only)
1818

1919
Technology
2020
----------
@@ -51,7 +51,7 @@ This will cause a message to be printed to the console that looks something like
5151
5252
This will allow you to set break points and examine areas of your JavaScript running in the JavaFX WebView.
5353

54-
##### Limitations:
54+
##### limitations:
5555

5656
One limitation is console messages from you JavaScript will not be available in the Chrome console tab. Instead you should enable a redirect that shows JavaScript console logs in the Java console.
5757

@@ -95,11 +95,11 @@ logging_level=error
9595

9696
Using gradle you can simple issue gradle commands from the command line to run the application.
9797

98-
#### Mac/Linux:
98+
####Mac/Linux:
9999
```
100100
./gradlew run
101101
```
102-
#### Windows:
102+
####Windows:
103103
```
104104
gradle.bat run
105105
```
@@ -125,6 +125,16 @@ https.proxyPort=proxyPortHere
125125

126126
In some cases both the configuration file and the Java VM argument may be required.
127127

128+
###****GE ONLY****
129+
130+
This proxy config will work for GE's proxy
131+
```
132+
http.proxyHost=sjc1intproxy01.crd.ge.com
133+
http.proxyPort=8080
134+
https.proxyHost=sjc1intproxy01.crd.ge.com
135+
https.proxyPort=8080
136+
```
137+
128138
Using an IDE
129139
----------
130140

@@ -146,7 +156,7 @@ Example installer
146156
This example includes a very basic way to generate an Installer you could use to distribute your application for Mac, Windows, Linux, etc... The included installer is just an example and is not required to be used if you want to distribute your application using another install builder like install4j (http://www.ej-technologies.com/products/install4j/overview.html) or lzPack (http://izpack.org/). This is simply a quick and dirty example to show what is possible.
147157

148158
to use the example installer simply execute the jfxNative task from your IDE or using the Gradle command line. Here is an example of executing the installer task using Gradle in the command line.
149-
##### Mac:
159+
#####Mac:
150160
```
151161
./gradlew jfxNative
152162
```
@@ -156,7 +166,7 @@ On Mac this will produce a DMG file that can be used to install the application
156166

157167
This example does not deal with signing the MacOS DMG or the application. For more on how to sign your DMG and APP file please visit Apple's documentation on signing (https://developer.apple.com/library/content/technotes/tn2206/_index.html). To integrate signing into the jfxNative Gradle Plugin please visit (https://github.com/FibreFoX/javafx-gradle-plugin)
158168

159-
##### Windows:
169+
#####Windows:
160170
```
161171
gradle.bat jfxNative
162172
```

build.gradle

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ buildscript {
1111
}
1212

1313
group 'com.ge.predix'
14-
version '1.1.1'
14+
version '1.1.2'
1515

1616
apply plugin: 'java'
1717
apply plugin: 'idea'
@@ -27,6 +27,7 @@ if (OperatingSystem.current().isMacOsX()) {
2727
def vendorName = "GE Digital"
2828

2929
sourceCompatibility = 1.8
30+
targetCompatibility = 1.8
3031

3132
repositories {
3233
mavenCentral()
@@ -76,6 +77,7 @@ If enabled I would recommend skipCopyingDependencies = true in the jfx task if o
7677
// }
7778
//}
7879

80+
7981
jfx {
8082
identifier = group + "." + project.name.replace(" ", "-")
8183
mainClass = mainClassName
@@ -96,3 +98,4 @@ jfx {
9698

9799
}
98100

101+

libs/PredixMobileJavaSDK-1.1.0.jar

-483 KB
Binary file not shown.
673 KB
Binary file not shown.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
my.hello=Hello (default)
2+
bootService.Syncing = Syncing (default)
3+
bootService.Finished = Finished (default)
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
my.hello=Hello
2+
bootService.Syncing = Syncing
3+
bootService.Finished = Finished
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
my.hello=Salut
2+
bootService.Syncing = Synchronisation
3+
bootService.Finished = Terminée

src/main/resources/securestorage.properties

Whitespace-only changes.

0 commit comments

Comments
 (0)