Simplify repository structure.

Author: Reza Rahman

.gitignore

@@ -7,4 +7,4 @@
 .classpath
 .project
 .settings
-**/target
+target

README.md

@@ -40,15 +40,17 @@
  * holder.
  */
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0modelVersion>
 
     <groupId>org.glassfishgroupId>
-    <artifactId>javaee-javascript-mainartifactId>
+    <artifactId>javaee-javascriptartifactId>
     <version>1.0-SNAPSHOTversion>
     <packaging>warpackaging>
 
-    <name>javaee-javascript-mainname>
+    <name>javaee-javascriptname>
 
     <properties>
         <endorsed.dir>${project.build.directory}/endorsedendorsed.dir>
@@ -69,17 +71,18 @@
             <version>2.0version>
             <type>jartype>
             <scope>providedscope>
-        dependency>        
+        dependency>
         <dependency>
             <groupId>org.glassfish.jersey.mediagroupId>
             <artifactId>jersey-media-moxyartifactId>
             <version>2.2version>
             <type>jartype>
             <scope>providedscope>
-        dependency>        
+        dependency>
     dependencies>
 
     <build>
+        <finalName>javaee-javascriptfinalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.pluginsgroupId>

javaee-javascript-main/README.md

@@ -0,0 +1,14 @@
+xml version="1.0" encoding="UTF-8"?>
+<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
+  <persistence-unit name="javaee-javascript-unit">
+    <properties>
+      <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
+      <property name="javax.persistence.schema-generation.create-source" value="metadata-then-script"/>
+      <property name="javax.persistence.schema-generation.drop-source" value="metadata-then-script"/>
+      <property name="javax.persistence.schema-generation.create-script-source" value="create-script.sql"/>
+      <property name="javax.persistence.schema-generation.drop-script-source" value="drop-script.sql"/>
+      <property name="javax.persistence.sql-load-script-source" value="load-script.sql"/>
+      <property name="eclipselink.logging.level" value="FINEST"/>
+    properties>
+  persistence-unit>
+persistence>

javaee-javascript-main/create-javascript-realm.bat

@@ -1,9 +1,7 @@
 xml version="1.0" encoding="UTF-8"?>
-DOCTYPE glassfish-web-app PUBLIC 
-    "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" 
-    "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
-<glassfish-web-app>
-    <context-root>javaee-javascript-maincontext-root>
+DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
+<glassfish-web-app error-url="">
+    <context-root>javaee-javascriptcontext-root>
     <security-role-mapping>
         <role-name>javascriptrole-name>
         <group-name>javascriptgroup-name>
@@ -14,4 +12,4 @@
             <description>Keep a copy of the generated servlet class' java code.description>
         property>
     jsp-config>
-glassfish-web-app>
+glassfish-web-app>

javaee-javascript-main/src/main/resources/META-INF/persistence.xml

@@ -42,7 +42,7 @@
         <user-data-constraint>
             <transport-guarantee>CONFIDENTIALtransport-guarantee>
         user-data-constraint>
-    security-constraint>    
+    security-constraint>
     <deny-uncovered-http-methods/>
     <login-config>
         <auth-method>BASICauth-method>

javaee-javascript-main/nb-configuration.xml renamed to nb-configuration.xml

@@ -10,10 +10,10 @@ Java EE as JavaScript Backend
             API for WebSocket, JSON-P, JAX-RS 2 and Java EE 7.p>
         <p>Note that while the endpoints in this application are not fully secured
             but uses TLS/SSL, in a real application they should be secured, likely using
-            some sort of federated security.p>
+            some sort of federated security scheme.p>
         <p>The WebSocket chat endpoint is at:
-            <a href="wss://localhost:8181/javaee-javascript-main/chat">
-                wss://localhost:8181/javaee-javascript-main/chata>. The
+            <a href="wss://localhost:8181/javaee-javascript/chat">
+                wss://localhost:8181/javaee-javascript/chata>. The
             endpoint communicates via JSON. Once connected, a client
             can send a chat message using this format:
         <pre>
@@ -31,13 +31,13 @@ Java EE as JavaScript Backend
          "timestamp": "the server timestamp - MM/dd/yyyy h:mm:ss a z"}
         pre>
     p>
-    <p>The REST endpoint is available at <a href="https://localhost:8181/javaee-javascript-main/resources/todo">
-            https://localhost:8181/javaee-javascript-main/resources/todoa>. The
+    <p>The REST endpoint is available at <a href="https://localhost:8181/javaee-javascript/resources/todo">
+            https://localhost:8181/javaee-javascript/resources/todoa>. The
         REST endpoint also communicates with the client using JSON.
         To do items are stored under various usernames. To retrieve
         the current to do items for a given user, the client must issue
-        a GET request to this URL: <a href="https://localhost:8181/javaee-javascript-main/resources/todo/{username}">
-            https://localhost:8181/javaee-javascript-main/resources/todo/{username}a>.
+        a GET request to this URL: <a href="https://localhost:8181/javaee-javascript/resources/todo/{username}">
+            https://localhost:8181/javaee-javascript/resources/todo/{username}a>.
         The server will respond with the list of current to do items for the
         user following this format:
     <pre>
@@ -50,26 +50,26 @@ Java EE as JavaScript Backend
          ...]
     pre>
     To add an item for a user, the client must issue a POST request to
-    this URL: <a href="https://localhost:8181/javaee-javascript-main/resources/todo/{username}">
-        https://localhost:8181/javaee-javascript-main/resources/todo/{username}a>.
+    this URL: <a href="https://localhost:8181/javaee-javascript/resources/todo/{username}">
+        https://localhost:8181/javaee-javascript/resources/todo/{username}a>.
     The POST body must follow this format:
     <pre>
         {"description": "item description"}
     pre>
     An ID will be automatically assigned and the item will be assumed to be
     incomplete. The POST response will return the ID assigned to the item as plain text (not JSON).
     To modify a to do item, the client must issue a PUT
-    request to this URL: <a href="https://localhost:8181/javaee-javascript-main/resources/todo/{username}/{id}">
-        https://localhost:8181/javaee-javascript-main/resources/todo/{username}/{id}a>.
+    request to this URL: <a href="https://localhost:8181/javaee-javascript/resources/todo/{username}/{id}">
+        https://localhost:8181/javaee-javascript/resources/todo/{username}/{id}a>.
     The PUT request body must follow this format:
     <pre>
         {"id": "to do item ID",
          "description": "item description",
          "completed": "true|false"}
     pre>
     To delete a to do item, the client must issue a DELETE request to
-    this URL: <a href="https://localhost:8181/javaee-javascript-main/resources/todo/{username}/{id}">
-        https://localhost:8181/javaee-javascript-main/resources/todo/{username}/{id}a>.
+    this URL: <a href="https://localhost:8181/javaee-javascript/resources/todo/{username}/{id}">
+        https://localhost:8181/javaee-javascript/resources/todo/{username}/{id}a>.
 p>
 body>
 html>

javaee-javascript-main/pom.xml renamed to pom.xml

@@ -4,7 +4,7 @@ var chatServices = angular.module('chatServices', []);
 
 chatServices.factory('Chat', [function() {
         return new function() {
-            var websocket = new WebSocket('wss://localhost:8181/javaee-javascript-main/chat');
+            var websocket = new WebSocket('wss://localhost:8181/javaee-javascript/chat');
             this.send = function(sender, value) {
                 websocket.send(JSON.stringify({user: sender, message: value}));
             };

javaee-javascript-main/src/main/java/org/glassfish/javaee/javascript/backend/chat/ChatMessage.java renamed to src/main/java/org/glassfish/javaee/javascript/backend/chat/ChatMessage.java

@@ -5,6 +5,6 @@ var todoServices = angular.module('todoServices', ['ngResource']);
 todoServices.factory('ToDo', ['$resource',
     function($resource) {
         return $resource(
-                'https://localhost:8181/javaee-javascript-main/resources/todo/:userId/:itemId',
+                'https://localhost:8181/javaee-javascript/resources/todo/:userId/:itemId',
                 {userId: principal, itemId: '@id'}, {'update': {method: 'PUT'}});
     }]);