finishing

IdentityService/nbproject/build-impl.xml

@@ -998,13 +998,11 @@ exists or setup the property manually. For example like this:
     <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
     <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
         <copyfiles files="${file.reference.mysql-connector-java-5.1.40-bin.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.org.json.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
     <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
         <copyfiles files="${file.reference.mysql-connector-java-5.1.40-bin.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.org.json.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
     </target>
     <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
         <delete dir="${build.web.dir}/WEB-INF/lib"/>

IdentityService/nbproject/genfiles.properties

-build.xml.data.CRC32=e13aca47
+build.xml.data.CRC32=7efe60a3
 build.xml.script.CRC32=e342e6c3
 build.xml.stylesheet.CRC32=651128d4@1.75.1.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=e13aca47
-nbproject/build-impl.xml.script.CRC32=815852c7
+nbproject/build-impl.xml.data.CRC32=7efe60a3
+nbproject/build-impl.xml.script.CRC32=74e54d3d
 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1

IdentityService/nbproject/project.properties

@@ -29,7 +29,6 @@ endorsed.classpath=\
     ${libs.javaee-endorsed-api-7.0.classpath}
 excludes=
 file.reference.mysql-connector-java-5.1.40-bin.jar=../mysql-connector-java-5.1.40-bin.jar
-file.reference.org.json.jar=../org.json.jar
 includes=**
 j2ee.compile.on.save=true
 j2ee.copy.static.files.on.save=true
@@ -44,8 +43,7 @@ j2ee.platform.wsit.classpath=
 j2ee.server.type=gfv3ee6
 jar.compress=false
 javac.classpath=\
-    ${file.reference.mysql-connector-java-5.1.40-bin.jar}:\
-    ${file.reference.org.json.jar}
+    ${file.reference.mysql-connector-java-5.1.40-bin.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.debug=true

IdentityService/nbproject/project.xml

@@ -10,10 +10,6 @@
                     <file>${file.reference.mysql-connector-java-5.1.40-bin.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
-                <library dirs="200">
-                    <file>${file.reference.org.json.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
             </web-module-libraries>
             <web-module-additional-libraries/>
             <source-roots>

MarketplaceWebService/nbproject/build-impl.xml

@@ -998,14 +998,14 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
     <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
-        <copyfiles files="${file.reference.org.json.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.mysql-connector-java-5.1.40-bin.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.org.json.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
     <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
-        <copyfiles files="${file.reference.org.json.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.mysql-connector-java-5.1.40-bin.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.org.json.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
     </target>
     <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
         <delete dir="${build.web.dir}/WEB-INF/lib"/>

MarketplaceWebService/nbproject/genfiles.properties

-build.xml.data.CRC32=905029d5
+build.xml.data.CRC32=cd898da3
 build.xml.script.CRC32=595caedf
 build.xml.stylesheet.CRC32=651128d4@1.75.1.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=905029d5
-nbproject/build-impl.xml.script.CRC32=4ca62907
+nbproject/build-impl.xml.data.CRC32=cd898da3
+nbproject/build-impl.xml.script.CRC32=d3789396
 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.75.1.1
 nbproject/jaxws-build.xml.stylesheet.CRC32=6608c2cf
 nbproject/wsit-deploy.xml.data.CRC32=77810b7d

MarketplaceWebService/nbproject/jax-ws.xml

@@ -4,12 +4,12 @@
     <service name="Buys">
       <implementation-class>buys.Buys</implementation-class>
     </service>
-    <service name="Items">
-      <implementation-class>item.Items</implementation-class>
-    </service>
     <service name="Accounts">
       <implementation-class>account.Accounts</implementation-class>
     </service>
+    <service name="Items">
+      <implementation-class>item.Items</implementation-class>
+    </service>
   </services>
   <clients/>
 </jax-ws>

MarketplaceWebService/nbproject/jaxws-build.xml

@@ -27,19 +27,19 @@
             <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
         </wsgen>
     </target>
-    <target name="wsgen-Items" depends="wsgen-init">
+    <target name="wsgen-Accounts" depends="wsgen-init">
         <copy todir="${build.classes.dir}/META-INF">
-            <fileset dir="${webinf.dir}" includes="wsit-item.Items.xml"/>
+            <fileset dir="${webinf.dir}" includes="wsit-account.Accounts.xml"/>
         </copy>
-        <wsgen sourcedestdir="${build.generated.sources.dir}/jax-ws" resourcedestdir="${build.generated.sources.dir}/jax-ws/resources/" destdir="${build.generated.sources.dir}/jax-ws" verbose="true" keep="true" genwsdl="true" sei="item.Items" xendorsed="true">
+        <wsgen sourcedestdir="${build.generated.sources.dir}/jax-ws" resourcedestdir="${build.generated.sources.dir}/jax-ws/resources/" destdir="${build.generated.sources.dir}/jax-ws" verbose="true" keep="true" genwsdl="true" sei="account.Accounts" xendorsed="true">
             <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
         </wsgen>
     </target>
-    <target name="wsgen-Accounts" depends="wsgen-init">
+    <target name="wsgen-Items" depends="wsgen-init">
         <copy todir="${build.classes.dir}/META-INF">
-            <fileset dir="${webinf.dir}" includes="wsit-account.Accounts.xml"/>
+            <fileset dir="${webinf.dir}" includes="wsit-item.Items.xml"/>
         </copy>
-        <wsgen sourcedestdir="${build.generated.sources.dir}/jax-ws" resourcedestdir="${build.generated.sources.dir}/jax-ws/resources/" destdir="${build.generated.sources.dir}/jax-ws" verbose="true" keep="true" genwsdl="true" sei="account.Accounts" xendorsed="true">
+        <wsgen sourcedestdir="${build.generated.sources.dir}/jax-ws" resourcedestdir="${build.generated.sources.dir}/jax-ws/resources/" destdir="${build.generated.sources.dir}/jax-ws" verbose="true" keep="true" genwsdl="true" sei="item.Items" xendorsed="true">
             <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
         </wsgen>
     </target>

MarketplaceWebService/nbproject/project.properties

@@ -44,8 +44,8 @@ j2ee.platform.wsit.classpath=
 j2ee.server.type=gfv3ee6
 jar.compress=false
 javac.classpath=\
-    ${file.reference.org.json.jar}:\
-    ${file.reference.mysql-connector-java-5.1.40-bin.jar}
+    ${file.reference.mysql-connector-java-5.1.40-bin.jar}:\
+    ${file.reference.org.json.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.debug=true

MarketplaceWebService/nbproject/project.xml

@@ -10,11 +10,11 @@
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <web-module-libraries>
                 <library dirs="200">
-                    <file>${file.reference.org.json.jar}</file>
+                    <file>${file.reference.mysql-connector-java-5.1.40-bin.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.mysql-connector-java-5.1.40-bin.jar}</file>
+                    <file>${file.reference.org.json.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
             </web-module-libraries>

WebApp/build/generated/src/org/apache/jsp/add_005fproduct_jsp.class.smap

+SMAP
+add_005fproduct_jsp.java
+JSP
+*S JSP
+*F
++ 0 add_product.jsp
+add_product.jsp
+*L
+5,7:46
+12:53,2
+13:55
+14,10:57
+23,12:67
+35:79,3
+36,16:82
+52,4:99
+55,18:103
+73,2:121,3
+75,8:127
+*E

WebApp/build/generated/src/org/apache/jsp/add_005fproduct_jsp.java

+package org.apache.jsp;
+
+import javax.servlet.*;
+import javax.servlet.http.*;
+import javax.servlet.jsp.*;
+import java.util.Date;
+import java.text.SimpleDateFormat;
+
+public final class add_005fproduct_jsp extends org.apache.jasper.runtime.HttpJspBase
+    implements org.apache.jasper.runtime.JspSourceDependent {
+
+  private static final JspFactory _jspxFactory = JspFactory.getDefaultFactory();
+
+  private static java.util.List<String> _jspx_dependants;
+
+  private org.glassfish.jsp.api.ResourceInjector _jspx_resourceInjector;
+
+  public java.util.List<String> getDependants() {
+    return _jspx_dependants;
+  }
+
+  public void _jspService(HttpServletRequest request, HttpServletResponse response)
+        throws java.io.IOException, ServletException {
+
+    PageContext pageContext = null;
+    HttpSession session = null;
+    ServletContext application = null;
+    ServletConfig config = null;
+    JspWriter out = null;
+    Object page = this;
+    JspWriter _jspx_out = null;
+    PageContext _jspx_page_context = null;
+
+    try {
+      response.setContentType("text/html;charset=UTF-8");
+      pageContext = _jspxFactory.getPageContext(this, request, response,
+      			null, true, 8192, true);
+      _jspx_page_context = pageContext;
+      application = pageContext.getServletContext();
+      config = pageContext.getServletConfig();
+      session = pageContext.getSession();
+      out = pageContext.getOut();
+      _jspx_out = out;
+      _jspx_resourceInjector = (org.glassfish.jsp.api.ResourceInjector) application.getAttribute("com.sun.appserv.jsp.resource.injector");
+
+      out.write("\n");
+      out.write("\n");
+      out.write("\n");
+      out.write("\n");
+      out.write("\n");
+      out.write("<!DOCTYPE html> \n");
+      out.write("<html> \n");
+      out.write("    ");
+      out.write("\n");
+      out.write("    ");
+
+	account.Accounts_Service serviceValid = new account.Accounts_Service();
+	account.Accounts portValid = serviceValid.getAccountsPort();
+	 // TODO initialize WS operation arguments here
+	java.lang.String token = "qwertyuiop";
+	// TODO process result here
+	account.AccountObject resultValid = portValid.validate(token);
+	if ((resultValid.getValidate() == 2) || (resultValid.getValidate() == 3)) {
+            response.sendRedirect("http://localhost:8000/WebApp/index.jsp");
+        }
+    
+      out.write("\n");
+      out.write("    <head> \n");
+      out.write("\t<title>Add Product</title> \n");
+      out.write("\t<link rel=\"stylesheet\" type=\"text/css\" href=\"css/main.css\">  \n");
+      out.write("\t<script type=\"text/javascript\" src=\"js/validate.js\"></script>\n");
+      out.write("    </head> \n");
+      out.write("\t\n");
+      out.write("    <body id=\"body-color\"> \n");
+      out.write("        <div>\n");
+      out.write("            <h1> <font color=\"#8a1b14\">Sale</font><font color=\"#6e95e4\">Project</font> </h1>\n");
+      out.write("\t</div>\n");
+      out.write("\t<div class=\"atas\">\n");
+      out.write("            Hi, ");
+out.println(resultValid.getUsername());
+      out.write("!<br>\n");
+      out.write("            <a href=\"sign-in.jsp\" class=\"logout\"><font size=\"1\">logout</font></a>\n");
+      out.write("\t</div>\n");
+      out.write("\t<div class=\"navbar\">\n");
+      out.write("            <ul>\n");
+      out.write("\t\t<li><a href=\"catalog.jsp\">Catalog</a></li>\n");
+      out.write("\t\t<li><a href=\"your_product.jsp\">Your Products</a></li>\n");
+      out.write("\t\t<li><a class=\"active\" href=\"add_product.jsp\">Add Products</a></li>\n");
+      out.write("\t\t<li><a href=\"sales.jsp\">Sales</a></li>\n");
+      out.write("\t\t<li><a href=\"purchases.jsp\">Purchases</a></li>\n");
+      out.write("            </ul>\n");
+      out.write("            <br><br>\n");
+      out.write("\t</div>\n");
+      out.write("\t<div>\n");
+      out.write("            <h2> Please add your product here </h2>\n");
+      out.write("        </div>\n");
+      out.write("        ");
+
+            Date dNow = new Date();
+            SimpleDateFormat dateFormat = new SimpleDateFormat ("EEEE',' dd MMMM y");
+            SimpleDateFormat timeFormat = new SimpleDateFormat ("HH.mm");
+         
+      out.write("\n");
+      out.write("\t<form method=\"post\" id=\"add_product\" action=\"AddProductServlet\" enctype=\"multipart/form-data\">\n");
+      out.write("            <label for=\"product_name\">Name</label><br>\n");
+      out.write("            <input type=\"text\" name=\"name\" id=\"name\"><br>\n");
+      out.write("            <div id=\"notif-name\" class=\"notif\">\n");
+      out.write("            </div>\n");
+      out.write("            <label for=\"product_desc\">Description (max 200 chars)</label><br>\n");
+      out.write("            <textarea rows=\"5\" cols=\"107\" name=\"description\" id=\"description\"></textarea><br>\n");
+      out.write("            <div id=\"notif-description\" class=\"notif\">\n");
+      out.write("            </div>\n");
+      out.write("            <label for=\"product_price\">Price (IDR)</label><br>\n");
+      out.write("            <input type=\"text\" name=\"price\" id=\"price\" size=\"200\"><br>\n");
+      out.write("            <div id=\"notif-price\" class=\"notif\">\n");
+      out.write("            </div>\n");
+      out.write("            <label for=\"product_photo\">Photo</label><br>\n");
+      out.write("            <input type=\"file\" accept=\"image/*\" align=\"middle\" id=\"photo\" name=\"photo\"><br>\n");
+      out.write("            <div id=\"notif-photo\" class=\"notif\">\n");
+      out.write("            </div>\n");
+      out.write("            <input type=\"hidden\" id=\"date\" name=\"date\" value=\"");
+      out.print(dateFormat.format(dNow) );
+      out.write("\">\n");
+      out.write("            <input type=\"hidden\" id=\"time\" name=\"time\" value=\"");
+      out.print(timeFormat.format(dNow) );
+      out.write("\">\n");
+      out.write("            <div class=\"submit-style\">\n");
+      out.write("                <input id=\"button\" type=\"submit\" name=\"add_product\" value=\"ADD\"> \n");
+      out.write("                <input id=\"cancel\" class=\"cancel\" type=\"button\" size=\"20\" value=\"CANCEL\" onclick=\"window.location.href='add_product.jsp'\">  \n");
+      out.write("            </div>\n");
+      out.write("\t</form>\t\n");
+      out.write("    </body> \n");
+      out.write("</html>\n");
+    } catch (Throwable t) {
+      if (!(t instanceof SkipPageException)){
+        out = _jspx_out;
+        if (out != null && out.getBufferSize() != 0)
+          out.clearBuffer();
+        if (_jspx_page_context != null) _jspx_page_context.handlePageException(t);
+        else throw new ServletException(t);
+      }
+    } finally {
+      _jspxFactory.releasePageContext(_jspx_page_context);
+    }
+  }
+}

WebApp/build/generated/src/org/apache/jsp/catalog_jsp.class.smap

+SMAP
+catalog_jsp.java
+JSP
+*S JSP
+*F
++ 0 catalog.jsp
+catalog.jsp
+*L
+5,8:46
+13:54,2
+14:56
+15,30:58
+44,13:88
+57:101,3
+58,29:104
+87:133,2
+88:135
+89,28:137
+116:165
+117:166,2
+118,4:168
+122:172,2
+123:174
+124,8:176
+131:184
+132:185,2
+133:187
+134:188,5
+135,3:193
+138:196,3
+139,2:199
+141,3:201,3
+144:210
+145:211,3
+146,3:214
+149,9:218
+157,4:227
+161,8:232
+168,3:240
+172,9:245
+180:254
+181:255,2
+182,3:257
+185,4:260,3
+189,4:272
+193:276,3
+194,3:279
+197,4:282,3
+201,4:294
+205:298,3
+206,4:301
+210,2:305,3
+212,7:311
+219:318,3
+220,3:321
+*E