From 5de9d86fab2b8bec58bd09e95640da468d4e1f61 Mon Sep 17 00:00:00 2001 From: Manjunath Ranganathaiah Date: Tue, 10 Apr 2018 13:22:00 -0700 Subject: [PATCH] Add maven build structure Restructure the directories and files to accommodate maven build. This will build, test and generate jar file for clients to use. Adds a target in the top level makefile. Issue-ID: AAF-183 Change-Id: I8c27396248d83070befe51f2c6e01aed7dea9202 Signed-off-by: Manjunath Ranganathaiah --- sms-client/pom.xml | 52 ++++++++++++++++++++++ .../{java => main}/example/SmsClientExample.java | 0 .../java/org/onap/aaf/sms}/SmsClient.java | 0 .../java/org/onap/aaf/sms}/SmsInterface.java | 0 .../java/org/onap/aaf/sms}/SmsResponse.java | 0 .../java/org/onap/aaf/sms}/ClientTestRunner.java | 2 + .../org/onap/aaf/sms}/SmsCreateDomainTest.java | 8 ++-- .../org/onap/aaf/sms}/SmsDeleteDomainTest.java | 8 ++-- .../java/org/onap/aaf/sms}/SmsSecureSocket.java | 2 +- .../java/org/onap/aaf/sms}/SmsTest.java | 3 +- sms-service/src/Makefile | 8 +++- 11 files changed, 71 insertions(+), 12 deletions(-) create mode 100644 sms-client/pom.xml rename sms-client/src/{java => main}/example/SmsClientExample.java (100%) rename sms-client/src/{java/main => main/java/org/onap/aaf/sms}/SmsClient.java (100%) rename sms-client/src/{java/main => main/java/org/onap/aaf/sms}/SmsInterface.java (100%) rename sms-client/src/{java/main => main/java/org/onap/aaf/sms}/SmsResponse.java (100%) rename sms-client/src/{java/test => test/java/org/onap/aaf/sms}/ClientTestRunner.java (97%) rename sms-client/src/{java/test => test/java/org/onap/aaf/sms}/SmsCreateDomainTest.java (92%) rename sms-client/src/{java/test => test/java/org/onap/aaf/sms}/SmsDeleteDomainTest.java (91%) rename sms-client/src/{java/test => test/java/org/onap/aaf/sms}/SmsSecureSocket.java (98%) rename sms-client/src/{java/test => test/java/org/onap/aaf/sms}/SmsTest.java (98%) diff --git a/sms-client/pom.xml b/sms-client/pom.xml new file mode 100644 index 0000000..e060feb --- /dev/null +++ b/sms-client/pom.xml @@ -0,0 +1,52 @@ + + 4.0.0 + org.onap.aaf.sms + sms-client + jar + 1.0.0-SNAPSHOT + sms-client + + + UTF-8 + 1.8 + 1.8 + + + + org.json + json + 20180130 + + + junit + junit + 4.12 + + + + + + org.apache.maven.plugins + maven-shade-plugin + 2.1 + + + package + + shade + + + + + org.onap.aaf.sms.ClientTestRunner + + + + + + + + + diff --git a/sms-client/src/java/example/SmsClientExample.java b/sms-client/src/main/example/SmsClientExample.java similarity index 100% rename from sms-client/src/java/example/SmsClientExample.java rename to sms-client/src/main/example/SmsClientExample.java diff --git a/sms-client/src/java/main/SmsClient.java b/sms-client/src/main/java/org/onap/aaf/sms/SmsClient.java similarity index 100% rename from sms-client/src/java/main/SmsClient.java rename to sms-client/src/main/java/org/onap/aaf/sms/SmsClient.java diff --git a/sms-client/src/java/main/SmsInterface.java b/sms-client/src/main/java/org/onap/aaf/sms/SmsInterface.java similarity index 100% rename from sms-client/src/java/main/SmsInterface.java rename to sms-client/src/main/java/org/onap/aaf/sms/SmsInterface.java diff --git a/sms-client/src/java/main/SmsResponse.java b/sms-client/src/main/java/org/onap/aaf/sms/SmsResponse.java similarity index 100% rename from sms-client/src/java/main/SmsResponse.java rename to sms-client/src/main/java/org/onap/aaf/sms/SmsResponse.java diff --git a/sms-client/src/java/test/ClientTestRunner.java b/sms-client/src/test/java/org/onap/aaf/sms/ClientTestRunner.java similarity index 97% rename from sms-client/src/java/test/ClientTestRunner.java rename to sms-client/src/test/java/org/onap/aaf/sms/ClientTestRunner.java index dc5fbf9..d209b2c 100644 --- a/sms-client/src/java/test/ClientTestRunner.java +++ b/sms-client/src/test/java/org/onap/aaf/sms/ClientTestRunner.java @@ -14,6 +14,8 @@ * limitations under the License. */ +package org.onap.aaf.sms; + import org.junit.runner.JUnitCore; import org.junit.runner.Result; import org.junit.runner.notification.Failure; diff --git a/sms-client/src/java/test/SmsCreateDomainTest.java b/sms-client/src/test/java/org/onap/aaf/sms/SmsCreateDomainTest.java similarity index 92% rename from sms-client/src/java/test/SmsCreateDomainTest.java rename to sms-client/src/test/java/org/onap/aaf/sms/SmsCreateDomainTest.java index 2bbe348..b1f5828 100644 --- a/sms-client/src/java/test/SmsCreateDomainTest.java +++ b/sms-client/src/test/java/org/onap/aaf/sms/SmsCreateDomainTest.java @@ -14,10 +14,12 @@ * limitations under the License. */ +package org.onap.aaf.sms; + import junit.framework.*; import org.onap.aaf.sms.SmsClient; import org.onap.aaf.sms.SmsResponse; -import org.onap.aaf.sms.test.SmsSecureSocket; +import org.onap.aaf.sms.SmsSecureSocket; import javax.net.ssl.SSLSocketFactory; import java.util.HashMap; import java.util.Map; @@ -26,9 +28,7 @@ public class SmsCreateDomainTest extends TestCase { public void testSmsCreateDomain() { try { - SmsSecureSocket sss = new SmsSecureSocket(); - - SmsTest sms = new SmsTest("otconap4.sc.intel.com", 10443, sss.getSSF()); + SmsTest sms = new SmsTest("otconap4.sc.intel.com", 10443, null); SmsResponse resp = sms.createDomain("onap.new.test.sms0"); assertTrue(resp.getSuccess()); if ( resp.getSuccess() ) { diff --git a/sms-client/src/java/test/SmsDeleteDomainTest.java b/sms-client/src/test/java/org/onap/aaf/sms/SmsDeleteDomainTest.java similarity index 91% rename from sms-client/src/java/test/SmsDeleteDomainTest.java rename to sms-client/src/test/java/org/onap/aaf/sms/SmsDeleteDomainTest.java index aa047b2..712014e 100644 --- a/sms-client/src/java/test/SmsDeleteDomainTest.java +++ b/sms-client/src/test/java/org/onap/aaf/sms/SmsDeleteDomainTest.java @@ -14,10 +14,12 @@ * limitations under the License. */ +package org.onap.aaf.sms; + import junit.framework.*; import org.onap.aaf.sms.SmsClient; import org.onap.aaf.sms.SmsResponse; -import org.onap.aaf.sms.test.SmsSecureSocket; +import org.onap.aaf.sms.SmsSecureSocket; import javax.net.ssl.SSLSocketFactory; import java.util.HashMap; import java.util.Map; @@ -26,9 +28,7 @@ public class SmsDeleteDomainTest extends TestCase { public void testSmsDeleteDomain() { try { - SmsSecureSocket sss = new SmsSecureSocket(); - - SmsTest sms = new SmsTest("otconap4.sc.intel.com", 10443, sss.getSSF()); + SmsTest sms = new SmsTest("otconap4.sc.intel.com", 10443, null); SmsResponse resp = sms.deleteDomain("onap.new.test.sms0"); assertTrue(resp.getSuccess()); if ( resp.getSuccess() ) { diff --git a/sms-client/src/java/test/SmsSecureSocket.java b/sms-client/src/test/java/org/onap/aaf/sms/SmsSecureSocket.java similarity index 98% rename from sms-client/src/java/test/SmsSecureSocket.java rename to sms-client/src/test/java/org/onap/aaf/sms/SmsSecureSocket.java index 34acb79..3e28aa7 100644 --- a/sms-client/src/java/test/SmsSecureSocket.java +++ b/sms-client/src/test/java/org/onap/aaf/sms/SmsSecureSocket.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.onap.aaf.sms.test; +package org.onap.aaf.sms; import java.io.FileInputStream; import javax.net.ssl.KeyManagerFactory; diff --git a/sms-client/src/java/test/SmsTest.java b/sms-client/src/test/java/org/onap/aaf/sms/SmsTest.java similarity index 98% rename from sms-client/src/java/test/SmsTest.java rename to sms-client/src/test/java/org/onap/aaf/sms/SmsTest.java index 79c1625..4bdf54c 100644 --- a/sms-client/src/java/test/SmsTest.java +++ b/sms-client/src/test/java/org/onap/aaf/sms/SmsTest.java @@ -13,7 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -//package org.onap.aaf.sms; + +package org.onap.aaf.sms; import javax.net.ssl.SSLSocketFactory; import java.net.URL; diff --git a/sms-service/src/Makefile b/sms-service/src/Makefile index 6569ec1..f085059 100644 --- a/sms-service/src/Makefile +++ b/sms-service/src/Makefile @@ -1,7 +1,11 @@ -build: +buildclient: + cd ../../sms-client && echo "Building JAVA client package" && \ + mvn package + +build: buildclient $(MAKE) -C sms build $(MAKE) -C quorumclient build deploy: $(MAKE) -C sms deploy - $(MAKE) -C quorumclient deploy \ No newline at end of file + $(MAKE) -C quorumclient deploy -- 2.16.6