From 27e4e9afee10dc6306fcb511bfa30092f02b5222 Mon Sep 17 00:00:00 2001
From: Colin But <colinbut@users.noreply.github.com>
Date: Tue, 28 Jun 2016 21:53:55 +0100
Subject: [PATCH] Feedback changes - restructed project structure

---
 page-object/etc/page-object.ucls              |  8 ++--
 page-object/pom.xml                           | 17 +++++--
 page-object/sample-application/pom.xml        | 35 --------------
 .../java/com/iluwatar/pageobject/App.java     |  2 +-
 .../src/main/resources/credentials.txt        |  0
 .../main/resources/sample-ui/album-list.html  |  0
 .../main/resources/sample-ui/album-page.html  |  0
 .../resources/sample-ui/css/album-list.css    |  0
 .../main/resources/sample-ui/css/style.css    |  0
 .../src/main/resources/sample-ui/login.html   |  0
 .../pageobject/AlbumListPageTest.java         |  4 +-
 .../iluwatar/pageobject/AlbumPageTest.java    |  4 +-
 .../iluwatar/pageobject/LoginPageTest.java    |  4 +-
 .../pageobject}/pages/AlbumListPage.java      |  3 +-
 .../iluwatar/pageobject}/pages/AlbumPage.java |  3 +-
 .../iluwatar/pageobject}/pages/LoginPage.java |  3 +-
 .../com/iluwatar/pageobject/pages}/Page.java  |  4 +-
 page-object/test-automation/pom.xml           | 48 -------------------
 18 files changed, 28 insertions(+), 107 deletions(-)
 delete mode 100644 page-object/sample-application/pom.xml
 rename page-object/{sample-application => }/src/main/java/com/iluwatar/pageobject/App.java (97%)
 rename page-object/{sample-application => }/src/main/resources/credentials.txt (100%)
 rename page-object/{sample-application => }/src/main/resources/sample-ui/album-list.html (100%)
 rename page-object/{sample-application => }/src/main/resources/sample-ui/album-page.html (100%)
 rename page-object/{sample-application => }/src/main/resources/sample-ui/css/album-list.css (100%)
 rename page-object/{sample-application => }/src/main/resources/sample-ui/css/style.css (100%)
 rename page-object/{sample-application => }/src/main/resources/sample-ui/login.html (100%)
 rename page-object/{test-automation => }/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java (93%)
 rename page-object/{test-automation => }/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java (94%)
 rename page-object/{test-automation => }/src/test/java/com/iluwatar/pageobject/LoginPageTest.java (94%)
 rename page-object/{test-automation/src/main/java/com/iluwatar => src/test/java/com/iluwatar/pageobject}/pages/AlbumListPage.java (98%)
 rename page-object/{test-automation/src/main/java/com/iluwatar => src/test/java/com/iluwatar/pageobject}/pages/AlbumPage.java (99%)
 rename page-object/{test-automation/src/main/java/com/iluwatar => src/test/java/com/iluwatar/pageobject}/pages/LoginPage.java (98%)
 rename page-object/{test-automation/src/main/java/com/iluwatar => src/test/java/com/iluwatar/pageobject/pages}/Page.java (93%)
 delete mode 100644 page-object/test-automation/pom.xml

diff --git a/page-object/etc/page-object.ucls b/page-object/etc/page-object.ucls
index 2d6bc0722..2e633af43 100644
--- a/page-object/etc/page-object.ucls
+++ b/page-object/etc/page-object.ucls
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <class-diagram version="1.1.9" icons="true" always-add-relationships="false" generalizations="true" realizations="true" 
   associations="true" dependencies="false" nesting-relationships="true" router="FAN">  
-  <class id="1" language="java" name="com.iluwatar.pages.LoginPage" project="test-automation" 
+  <class id="1" language="java" name="java.com.iluwatar.pageobject.pages.LoginPage" project="test-automation"
     file="/test-automation/src/main/java/com/iluwatar/pages/LoginPage.java" binary="false" corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="163" y="396"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
@@ -10,7 +10,7 @@
       <operations public="true" package="true" protected="true" private="true" static="true"/>    
     </display>  
   </class>  
-  <class id="2" language="java" name="com.iluwatar.pages.AlbumPage" project="test-automation" 
+  <class id="2" language="java" name="java.com.iluwatar.pageobject.pages.AlbumPage" project="test-automation"
     file="/test-automation/src/main/java/com/iluwatar/pages/AlbumPage.java" binary="false" corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="487" y="416"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
@@ -19,7 +19,7 @@
       <operations public="true" package="true" protected="true" private="true" static="true"/>    
     </display>  
   </class>  
-  <class id="3" language="java" name="com.iluwatar.pages.AlbumListPage" project="test-automation" 
+  <class id="3" language="java" name="java.com.iluwatar.pageobject.pages.AlbumListPage" project="test-automation"
     file="/test-automation/src/main/java/com/iluwatar/pages/AlbumListPage.java" binary="false" corner="BOTTOM_RIGHT">    
     <position height="269" width="260" x="698" y="260"/>    
     <display autosize="false" stereotype="true" package="true" initial-value="false" signature="true" 
@@ -28,7 +28,7 @@
       <operations public="true" package="true" protected="true" private="true" static="true"/>    
     </display>  
   </class>  
-  <class id="4" language="java" name="com.iluwatar.Page" project="test-automation" 
+  <class id="4" language="java" name="java.com.iluwatar.pageobject.pages.Page" project="test-automation"
     file="/test-automation/src/main/java/com/iluwatar/Page.java" binary="false" corner="BOTTOM_RIGHT">    
     <position height="-1" width="-1" x="481" y="57"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
diff --git a/page-object/pom.xml b/page-object/pom.xml
index 00f87ac9d..537fdb197 100644
--- a/page-object/pom.xml
+++ b/page-object/pom.xml
@@ -32,9 +32,16 @@
         <version>1.12.0-SNAPSHOT</version>
     </parent>
     <artifactId>page-object</artifactId>
-    <packaging>pom</packaging>
-    <modules>
-        <module>sample-application</module>
-        <module>test-automation</module>
-    </modules>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>2.22</version>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/page-object/sample-application/pom.xml b/page-object/sample-application/pom.xml
deleted file mode 100644
index 74116fdb3..000000000
--- a/page-object/sample-application/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    The MIT License
-    Copyright (c) 2014 Ilkka Seppälä
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-
--->
-<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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>page-object</artifactId>
-    <groupId>com.iluwatar</groupId>
-    <version>1.12.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>sample-application</artifactId>
-</project>
diff --git a/page-object/sample-application/src/main/java/com/iluwatar/pageobject/App.java b/page-object/src/main/java/com/iluwatar/pageobject/App.java
similarity index 97%
rename from page-object/sample-application/src/main/java/com/iluwatar/pageobject/App.java
rename to page-object/src/main/java/com/iluwatar/pageobject/App.java
index 155097c73..67b3f947b 100644
--- a/page-object/sample-application/src/main/java/com/iluwatar/pageobject/App.java
+++ b/page-object/src/main/java/com/iluwatar/pageobject/App.java
@@ -71,7 +71,7 @@ public final class App {
 
     String currentWorkingDir = System.getProperty("user.dir");
     File applicationFile = new File(currentWorkingDir
-        + "/page-object/sample-application/src/main/resources/sample-ui/login.html");
+        + "/page-object/src/main/resources/sample-ui/login.html");
 
     // should work for unix like OS (mac, unix etc...)
     if (Desktop.isDesktopSupported()) {
diff --git a/page-object/sample-application/src/main/resources/credentials.txt b/page-object/src/main/resources/credentials.txt
similarity index 100%
rename from page-object/sample-application/src/main/resources/credentials.txt
rename to page-object/src/main/resources/credentials.txt
diff --git a/page-object/sample-application/src/main/resources/sample-ui/album-list.html b/page-object/src/main/resources/sample-ui/album-list.html
similarity index 100%
rename from page-object/sample-application/src/main/resources/sample-ui/album-list.html
rename to page-object/src/main/resources/sample-ui/album-list.html
diff --git a/page-object/sample-application/src/main/resources/sample-ui/album-page.html b/page-object/src/main/resources/sample-ui/album-page.html
similarity index 100%
rename from page-object/sample-application/src/main/resources/sample-ui/album-page.html
rename to page-object/src/main/resources/sample-ui/album-page.html
diff --git a/page-object/sample-application/src/main/resources/sample-ui/css/album-list.css b/page-object/src/main/resources/sample-ui/css/album-list.css
similarity index 100%
rename from page-object/sample-application/src/main/resources/sample-ui/css/album-list.css
rename to page-object/src/main/resources/sample-ui/css/album-list.css
diff --git a/page-object/sample-application/src/main/resources/sample-ui/css/style.css b/page-object/src/main/resources/sample-ui/css/style.css
similarity index 100%
rename from page-object/sample-application/src/main/resources/sample-ui/css/style.css
rename to page-object/src/main/resources/sample-ui/css/style.css
diff --git a/page-object/sample-application/src/main/resources/sample-ui/login.html b/page-object/src/main/resources/sample-ui/login.html
similarity index 100%
rename from page-object/sample-application/src/main/resources/sample-ui/login.html
rename to page-object/src/main/resources/sample-ui/login.html
diff --git a/page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java b/page-object/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java
similarity index 93%
rename from page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java
rename to page-object/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java
index 3b420e366..5afc05f55 100644
--- a/page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java
+++ b/page-object/src/test/java/com/iluwatar/pageobject/AlbumListPageTest.java
@@ -24,8 +24,8 @@ package com.iluwatar.pageobject;
 
 
 import com.gargoylesoftware.htmlunit.WebClient;
-import com.iluwatar.pages.AlbumListPage;
-import com.iluwatar.pages.AlbumPage;
+import com.iluwatar.pageobject.pages.AlbumListPage;
+import com.iluwatar.pageobject.pages.AlbumPage;
 import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
diff --git a/page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java b/page-object/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java
similarity index 94%
rename from page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java
rename to page-object/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java
index 8ca464165..811ffd02a 100644
--- a/page-object/test-automation/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java
+++ b/page-object/src/test/java/com/iluwatar/pageobject/AlbumPageTest.java
@@ -23,8 +23,8 @@
 package com.iluwatar.pageobject;
 
 import com.gargoylesoftware.htmlunit.WebClient;
-import com.iluwatar.pages.AlbumListPage;
-import com.iluwatar.pages.AlbumPage;
+import com.iluwatar.pageobject.pages.AlbumListPage;
+import com.iluwatar.pageobject.pages.AlbumPage;
 import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
diff --git a/page-object/test-automation/src/test/java/com/iluwatar/pageobject/LoginPageTest.java b/page-object/src/test/java/com/iluwatar/pageobject/LoginPageTest.java
similarity index 94%
rename from page-object/test-automation/src/test/java/com/iluwatar/pageobject/LoginPageTest.java
rename to page-object/src/test/java/com/iluwatar/pageobject/LoginPageTest.java
index 322a4b97c..b9e8e782d 100644
--- a/page-object/test-automation/src/test/java/com/iluwatar/pageobject/LoginPageTest.java
+++ b/page-object/src/test/java/com/iluwatar/pageobject/LoginPageTest.java
@@ -23,8 +23,8 @@
 package com.iluwatar.pageobject;
 
 import com.gargoylesoftware.htmlunit.WebClient;
-import com.iluwatar.pages.AlbumListPage;
-import com.iluwatar.pages.LoginPage;
+import com.iluwatar.pageobject.pages.AlbumListPage;
+import com.iluwatar.pageobject.pages.LoginPage;
 import org.junit.Test;
 
 import static org.junit.Assert.assertTrue;
diff --git a/page-object/test-automation/src/main/java/com/iluwatar/pages/AlbumListPage.java b/page-object/src/test/java/com/iluwatar/pageobject/pages/AlbumListPage.java
similarity index 98%
rename from page-object/test-automation/src/main/java/com/iluwatar/pages/AlbumListPage.java
rename to page-object/src/test/java/com/iluwatar/pageobject/pages/AlbumListPage.java
index 00edc5688..7f4e50fb5 100644
--- a/page-object/test-automation/src/main/java/com/iluwatar/pages/AlbumListPage.java
+++ b/page-object/src/test/java/com/iluwatar/pageobject/pages/AlbumListPage.java
@@ -20,12 +20,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.iluwatar.pages;
+package com.iluwatar.pageobject.pages;
 
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.iluwatar.Page;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
diff --git a/page-object/test-automation/src/main/java/com/iluwatar/pages/AlbumPage.java b/page-object/src/test/java/com/iluwatar/pageobject/pages/AlbumPage.java
similarity index 99%
rename from page-object/test-automation/src/main/java/com/iluwatar/pages/AlbumPage.java
rename to page-object/src/test/java/com/iluwatar/pageobject/pages/AlbumPage.java
index 5f72be8fd..b2df6ef33 100644
--- a/page-object/test-automation/src/main/java/com/iluwatar/pages/AlbumPage.java
+++ b/page-object/src/test/java/com/iluwatar/pageobject/pages/AlbumPage.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.iluwatar.pages;
+package com.iluwatar.pageobject.pages;
 
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlNumberInput;
@@ -29,7 +29,6 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlSelect;
 import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
 import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
-import com.iluwatar.Page;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
diff --git a/page-object/test-automation/src/main/java/com/iluwatar/pages/LoginPage.java b/page-object/src/test/java/com/iluwatar/pageobject/pages/LoginPage.java
similarity index 98%
rename from page-object/test-automation/src/main/java/com/iluwatar/pages/LoginPage.java
rename to page-object/src/test/java/com/iluwatar/pageobject/pages/LoginPage.java
index 19810f354..ac12f720f 100644
--- a/page-object/test-automation/src/main/java/com/iluwatar/pages/LoginPage.java
+++ b/page-object/src/test/java/com/iluwatar/pageobject/pages/LoginPage.java
@@ -20,14 +20,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.iluwatar.pages;
+package com.iluwatar.pageobject.pages;
 
 import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 import com.gargoylesoftware.htmlunit.html.HtmlPasswordInput;
 import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
 import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
-import com.iluwatar.Page;
 import java.io.IOException;
 import java.net.MalformedURLException;
 
diff --git a/page-object/test-automation/src/main/java/com/iluwatar/Page.java b/page-object/src/test/java/com/iluwatar/pageobject/pages/Page.java
similarity index 93%
rename from page-object/test-automation/src/main/java/com/iluwatar/Page.java
rename to page-object/src/test/java/com/iluwatar/pageobject/pages/Page.java
index 515872efc..340a72800 100644
--- a/page-object/test-automation/src/main/java/com/iluwatar/Page.java
+++ b/page-object/src/test/java/com/iluwatar/pageobject/pages/Page.java
@@ -20,7 +20,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-package com.iluwatar;
+package com.iluwatar.pageobject.pages;
 
 import com.gargoylesoftware.htmlunit.WebClient;
 
@@ -33,7 +33,7 @@ public abstract class Page {
    * Application Under Test path
    * This directory location is where html web pages are located
    */
-  public static final String AUT_PATH = "../sample-application/src/main/resources/sample-ui/";
+  public static final String AUT_PATH = "src/main/resources/sample-ui/";
 
   protected WebClient webClient;
 
diff --git a/page-object/test-automation/pom.xml b/page-object/test-automation/pom.xml
deleted file mode 100644
index feac74bd9..000000000
--- a/page-object/test-automation/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
-    The MIT License
-    Copyright (c) 2014 Ilkka Seppälä
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-    all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-    THE SOFTWARE.
-
--->
-<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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>page-object</artifactId>
-    <groupId>com.iluwatar</groupId>
-    <version>1.12.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>test-automation</artifactId>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>net.sourceforge.htmlunit</groupId>
-      <artifactId>htmlunit</artifactId>
-      <version>2.22</version>
-    </dependency>
-  </dependencies>
-</project>
-