summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuabingZhao <zhao.huabing@zte.com.cn>2017-09-22 06:45:49 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-22 06:45:49 +0000
commitcf73d3ced57c580908426da6734f554fa9478d79 (patch)
tree724f9e4b0b12db03579534a71aa7e83da6968152
parentff8d695d686c7f8f9dba746f8c7ee2233f46fddb (diff)
parent7bd71a2e066ee437fba53357db5553f7437200fe (diff)
Merge "Initialize MSB java sdk docs"
-rw-r--r--.checkstyle23
-rw-r--r--docs/index.rst8
-rw-r--r--example/src/main/java/org/onap/msb/sdk/example/client/ExampleClient.java4
-rw-r--r--example/src/main/java/org/onap/msb/sdk/example/server/ExampleApp.java4
4 files changed, 35 insertions, 4 deletions
diff --git a/.checkstyle b/.checkstyle
new file mode 100644
index 0000000..2cd01ac
--- /dev/null
+++ b/.checkstyle
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
+ <local-check-config name="maven-checkstyle-plugin check-license" location="jar:file:/D:/mvnlocalrepo/org/onap/oparent/checkstyle/1.0.0-SNAPSHOT/checkstyle-1.0.0-SNAPSHOT.jar!/onap-checkstyle/check-license.xml" type="remote" description="maven-checkstyle-plugin configuration check-license">
+ <property name="checkstyle.cache.file" value="${project_loc}/target/checkstyle-cachefile"/>
+ <property name="checkstyle.header.file" value="D:\eclipse\workspace\.metadata\.plugins\org.eclipse.core.resources\.projects\msb-java-sdk\com.basistech.m2e.code.quality.checkstyleConfigurator\checkstyle-header-check-license.txt"/>
+ </local-check-config>
+ <local-check-config name="maven-checkstyle-plugin check-style" location="jar:file:/D:/mvnlocalrepo/org/onap/oparent/checkstyle/1.0.0-SNAPSHOT/checkstyle-1.0.0-SNAPSHOT.jar!/onap-checkstyle/onap-java-style.xml" type="remote" description="maven-checkstyle-plugin configuration check-style">
+ <property name="checkstyle.cache.file" value="${project_loc}/target/checkstyle-cachefile"/>
+ <property name="checkstyle.header.file" value="D:\eclipse\workspace\.metadata\.plugins\org.eclipse.core.resources\.projects\msb-java-sdk\com.basistech.m2e.code.quality.checkstyleConfigurator\checkstyle-header-check-style.txt"/>
+ </local-check-config>
+ <fileset name="java-sources-check-license" enabled="true" check-config-name="maven-checkstyle-plugin check-license" local="true">
+ <file-match-pattern match-pattern="^src/test/java.*\.java" include-pattern="true"/>
+ <file-match-pattern match-pattern="^src/main/java/.*\.java" include-pattern="true"/>
+ </fileset>
+ <fileset name="java-sources-check-style" enabled="true" check-config-name="maven-checkstyle-plugin check-style" local="true">
+ <file-match-pattern match-pattern="^src/main/java/src/main/java.*\.java" include-pattern="true"/>
+ <file-match-pattern match-pattern="^src/test/java.*\.java" include-pattern="true"/>
+ <file-match-pattern match-pattern="^src/main/java/.*\.java" include-pattern="true"/>
+ <file-match-pattern match-pattern="^src/main/resources.*\.properties" include-pattern="true"/>
+ <file-match-pattern match-pattern="^src/test/resources.*\.properties" include-pattern="true"/>
+ </fileset>
+</fileset-config>
diff --git a/docs/index.rst b/docs/index.rst
new file mode 100644
index 0000000..833e1aa
--- /dev/null
+++ b/docs/index.rst
@@ -0,0 +1,8 @@
+.. This work is licensed under a Creative Commons Attribution 4.0 International License.
+
+TODO Add files to toctree and delete this header
+------------------------------------------------
+.. toctree::
+ :maxdepth: 1
+
+
diff --git a/example/src/main/java/org/onap/msb/sdk/example/client/ExampleClient.java b/example/src/main/java/org/onap/msb/sdk/example/client/ExampleClient.java
index 15a9f6f..ac31836 100644
--- a/example/src/main/java/org/onap/msb/sdk/example/client/ExampleClient.java
+++ b/example/src/main/java/org/onap/msb/sdk/example/client/ExampleClient.java
@@ -28,8 +28,8 @@ public class ExampleClient {
*/
public static void main(String[] args) throws IOException {
//For real use case, MSB IP and Port should come from configuration file instead of hard code here
- String MSB_IP="127.0.0.1";
- int MSB_Port=10081;
+ String MSB_IP="10.96.33.44";
+ int MSB_Port=30081;
MSBServiceClient msbClient = new MSBServiceClient(MSB_IP, MSB_Port);
diff --git a/example/src/main/java/org/onap/msb/sdk/example/server/ExampleApp.java b/example/src/main/java/org/onap/msb/sdk/example/server/ExampleApp.java
index 76827c5..f44ba39 100644
--- a/example/src/main/java/org/onap/msb/sdk/example/server/ExampleApp.java
+++ b/example/src/main/java/org/onap/msb/sdk/example/server/ExampleApp.java
@@ -39,8 +39,8 @@ public class ExampleApp extends Application<Config> {
@Override
public void run(Config configuration, Environment environment) throws Exception {
- String MSB_IP="127.0.0.1";
- int MSB_Port=10081;
+ String MSB_IP="10.96.33.44";
+ int MSB_Port=30080;
environment.jersey().register(new AnimalResource());