Merge remote-tracking branch 'origin/dev-tubes2-integration' into dev-irene

TugasBesar2_2017/IdentityService/.gitignore

+src/main/resources/config/db.properties
+

TugasBesar2_2017/IdentityService/src/main/resources/config/db.properties

-DB_HOST = localhost
-DB_USER = test
-DB_PASS = test
-DB_NAME = test_wbd3_id

TugasBesar2_2017/IdentityService/src/main/resources/config/db.properties.example

 DB_HOST = localhost
-DB_USER = wbd
-DB_PASS = wbd123
-DB_NAME = wbd_idservice
\ No newline at end of file
+DB_USER = test
+DB_PASS = test
+DB_NAME = test_wbd3_id

TugasBesar2_2017/IdentityService/src/main/webapp/WEB-INF/web.xml

@@ -44,6 +44,6 @@
   </servlet>
   <servlet-mapping>
     <servlet-name>web-jaxws</servlet-name>
-    <url-pattern>/soap</url-pattern>
+    <url-pattern>/</url-pattern>
   </servlet-mapping>
 </web-app>

TugasBesar2_2017/WebApp/.gitignore

+src/main/resources/config/domain.properties
+

TugasBesar2_2017/WebApp/src/main/java/com/adaapa/ojekservice/OjekOnlineService.java

@@ -17,7 +17,7 @@ import javax.xml.ws.WebServiceFeature;
  * Generated source version: 2.2
  *
  */
-@WebServiceClient(name = "OjekOnlineService", targetNamespace = "http://ojekservice.adaapa.com/", wsdlLocation = "localhost:8080/WebService/soap/ojekonline?wsdl")
+@WebServiceClient(name = "OjekOnlineService", targetNamespace = "http://ojekservice.adaapa.com/", wsdlLocation = "localhost:8080/WebService/ojekonline?wsdl")
 public class OjekOnlineService
     extends Service
 {
@@ -30,7 +30,7 @@ public class OjekOnlineService
         URL url = null;
         WebServiceException e = null;
         try {
-            url = new URL("http://localhost:8080/WebService/soap/ojekonline?wsdl");
+            url = new URL("http://localhost:8080/WebService/ojekonline?wsdl");
         } catch (MalformedURLException ex) {
             e = new WebServiceException(ex);
         }

TugasBesar2_2017/WebApp/src/main/resources/config/domain.properties.example

-IDSERVICE_DOMAIN = "localhost:8001";
-WEBSERVICE_DOMAIN = "localhost:8002";
+IDSERVICE_DOMAIN = http://localhost:8080/IdentityService
+WEBSERVICE_DOMAIN = http://localhost:8080/WebService

TugasBesar2_2017/WebService/.gitignore

+src/main/resources/config/db.properties
+src/main/resources/config/domain.properties
+

TugasBesar2_2017/WebService/src/main/resources/config/db.properties.example

 DB_HOST = localhost
-DB_USER = wbd
-DB_PASS = wbd123
-DB_NAME = wbd_ojekservice
\ No newline at end of file
+DB_USER = test
+DB_PASS = test
+DB_NAME = test_wbd3_web

TugasBesar2_2017/WebService/src/main/resources/config/domain.properties.example

-IDSERVICE_DOMAIN = localhost:8001
+IDSERVICE_DOMAIN = http://localhost:8080/IdentityService

TugasBesar2_2017/WebService/src/main/webapp/WEB-INF/web.xml

@@ -17,6 +17,6 @@
   </servlet>
   <servlet-mapping>
     <servlet-name>web-jaxws</servlet-name>
-    <url-pattern>/soap</url-pattern>
+    <url-pattern>/</url-pattern>
   </servlet-mapping>
 </web-app>

TugasBesar2_2017/misc/wbd_idservice.sql

+-- phpMyAdmin SQL Dump
+-- version 4.7.0
+-- https://www.phpmyadmin.net/
+--
+-- Host: localhost
+-- Generation Time: Nov 16, 2017 at 03:40 AM
+-- Server version: 10.1.25-MariaDB
+-- PHP Version: 7.1.7
+
+SET SQL_MODE = "NO_AUTO_VALUE_ON_ZERO";
+SET AUTOCOMMIT = 0;
+START TRANSACTION;
+SET time_zone = "+00:00";
+
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8mb4 */;
+
+--
+-- Database: `wbd_idservice`
+--
+
+-- --------------------------------------------------------
+
+--
+-- Table structure for table `users`
+--
+
+CREATE TABLE `users` (
+  `id` int(11) UNSIGNED NOT NULL,
+  `name` varchar(50) NOT NULL DEFAULT '',
+  `email` varchar(50) NOT NULL DEFAULT '',
+  `username` varchar(20) NOT NULL DEFAULT '',
+  `password` varchar(255) NOT NULL DEFAULT '',
+  `phone_number` varchar(12) NOT NULL DEFAULT '',
+  `last_token` varchar(255) DEFAULT NULL,
+  `token_expire` timestamp NULL DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+--
+-- Dumping data for table `users`
+--
+
+INSERT INTO `users` (`id`, `name`, `email`, `username`, `password`, `phone_number`, `last_token`, `token_expire`) VALUES
+(1, 'Kenneth', 'kanisiuskenneth@gmail.com', 'kenneth', 'kenneth', '081320067157', 'mNlDVF4Y0Vv5OtnciEipm18+FjWyUnrC9D8QrQ03y+0DNyHZI5mFX8pfK1HYMNFGmlu4yRD7ilmSWxqnT8r6l7xELoPRxL0TUEBB8+0sjQtp6Reow1EmznfRRA56CT/W', '2017-11-22 17:15:07'),
+(2, 'JohnDoe', 'johndoe@gmail.com', 'john', 'john', '081320067156', 'QNBCPrrHYR2FQFh3O9d0vGVoPNOAow7G4FUes5lYtqQGfI9xL5lY6RPdVuRCMbMfOGm+bIOkmK1Xuu6iEm+xxkOCsEljkyKDOxC9v44OpUS7E4jFZpRLSduFCMYBl/EI', NULL),
+(19, 'Irene Edria', 'ireneedriadr@gmail.com', 'ireneedria', '12345', '087878522470', NULL, NULL),
+(20, 'Edria', 'edria@gmail.com', 'edriairene', '12345', '087878522471', NULL, NULL),
+(21, 'Kenneth', 'kanisius@gmail.com', 'kanisius', '12345', '087878522472', NULL, NULL),
+(22, 'Wenny', 'wennyyustalim@hotmail.com', 'wenny', '12345', '087878522477', NULL, NULL),
+(23, 'Shiro', 'shiro@gmail.com', 'shiro', '12345', '087878522473', NULL, NULL),
+(24, 'Irene Edria', 'micin@gmail.com', 'micin', '12345', '081320067157', NULL, NULL),
+(25, 'Ojek Pribadi', 'ojek@gmail.com', 'ojek', '12345', '098678556789', NULL, NULL),
+(26, 'Ojek', 'ojekojek@gmail.com', 'ojekojek', '12345', '087347805034', NULL, NULL),
+(27, 'pengemudi', 'pribadi@gmail.com', 'ojekpribadi', '12345', '098638494045', NULL, NULL),
+(28, 'asdf', 'asdf', 'asdf', 'asdf', 'asdf', NULL, NULL),
+(29, '123', 'asd', 'asd', 'asd', 'asd', NULL, NULL);
+
+--
+-- Indexes for dumped tables
+--
+
+--
+-- Indexes for table `users`
+--
+ALTER TABLE `users`
+  ADD PRIMARY KEY (`id`),
+  ADD UNIQUE KEY `username` (`username`),
+  ADD UNIQUE KEY `token` (`last_token`);
+
+--
+-- AUTO_INCREMENT for dumped tables
+--
+
+--
+-- AUTO_INCREMENT for table `users`
+--
+ALTER TABLE `users`
+  MODIFY `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=30;COMMIT;
+
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;