Add 'com.charego' prefix to packages

api/pom.xml

@@ -8,8 +8,8 @@
 		<version>1.0</version>
 	</parent>
 
-	<artifactId>lingo-client-api</artifactId>
-	<name>Lingo :: Client API</name>
+	<artifactId>lingo-api</artifactId>
+	<name>Lingo :: API</name>
 
 	<dependencies>
 		<dependency>

api/src/main/java/com/charego/lingo/api/Destinations.java

@@ -1,4 +1,4 @@
-package lingo.client.api;
+package com.charego.lingo.api;
 
 public class Destinations {
 

client/pom.xml

@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<version>${project.version}</version>
-			<artifactId>lingo-client-api</artifactId>
+			<artifactId>lingo-api</artifactId>
 		</dependency>
 
 		<!-- Web -->
@@ -53,7 +53,7 @@
 				<artifactId>javafx-maven-plugin</artifactId>
 				<version>8.8.3</version>
 				<configuration>
-					<mainClass>lingo.client.bootstrap.LingoClient</mainClass>
+					<mainClass>com.charego.lingo.client.bootstrap.LingoClient</mainClass>
 					<additionalAppResources>src/main/config</additionalAppResources>
 					<copyAdditionalAppResourcesToJar>true</copyAdditionalAppResourcesToJar>
 				</configuration>

client/src/main/java/com/charego/lingo/client/bootstrap/LingoClient.java

@@ -1,4 +1,4 @@
-package lingo.client.bootstrap;
+package com.charego.lingo.client.bootstrap;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

client/src/main/java/com/charego/lingo/client/bootstrap/LingoPresenter.java

@@ -1,10 +1,15 @@
-package lingo.client.bootstrap;
+package com.charego.lingo.client.bootstrap;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 
+import com.charego.lingo.client.multiplayer.MultiplayerConfig;
+import com.charego.lingo.client.multiplayer.MultiplayerPresenter;
+import com.charego.lingo.client.singleplayer.SinglePlayerPresenter;
+import com.charego.lingo.client.util.FxmlController;
+import com.charego.lingo.common.WordReader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,11 +23,6 @@ import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.layout.BorderPane;
 import javafx.stage.Stage;
-import lingo.client.multiplayer.MultiplayerConfig;
-import lingo.client.multiplayer.MultiplayerPresenter;
-import lingo.client.singleplayer.SinglePlayerPresenter;
-import lingo.client.util.FxmlController;
-import lingo.common.WordReader;
 
 @Component
 public class LingoPresenter implements FxmlController {

client/src/main/java/com/charego/lingo/client/multiplayer/MultiplayerConfig.java

@@ -1,4 +1,4 @@
-package lingo.client.multiplayer;
+package com.charego.lingo.client.multiplayer;
 
 import java.util.ArrayList;
 import java.util.List;

client/src/main/java/com/charego/lingo/client/multiplayer/MultiplayerPresenter.java

@@ -1,4 +1,4 @@
-package lingo.client.multiplayer;
+package com.charego.lingo.client.multiplayer;
 
 import java.lang.reflect.Type;
 import java.util.Arrays;
@@ -36,14 +36,14 @@ import javafx.scene.paint.Color;
 import javafx.scene.text.Font;
 import javafx.scene.text.TextAlignment;
 import javafx.scene.web.WebView;
-import lingo.client.api.Destinations;
-import lingo.client.util.FxmlController;
-import lingo.client.view.Board;
-import lingo.client.view.OpponentBoard;
-import lingo.client.view.PlayerBoard;
-import lingo.common.Game;
-import lingo.common.GameLeftMessage;
-import lingo.common.Report;
+import com.charego.lingo.api.Destinations;
+import com.charego.lingo.client.util.FxmlController;
+import com.charego.lingo.client.view.Board;
+import com.charego.lingo.client.view.OpponentBoard;
+import com.charego.lingo.client.view.PlayerBoard;
+import com.charego.lingo.common.Game;
+import com.charego.lingo.common.GameLeftMessage;
+import com.charego.lingo.common.Report;
 
 @Component
 public class MultiplayerPresenter implements FxmlController {

client/src/main/java/com/charego/lingo/client/multiplayer/StompTemplate.java

@@ -1,4 +1,4 @@
-package lingo.client.multiplayer;
+package com.charego.lingo.client.multiplayer;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;

client/src/main/java/com/charego/lingo/client/singleplayer/SinglePlayerPresenter.java

@@ -1,4 +1,4 @@
-package lingo.client.singleplayer;
+package com.charego.lingo.client.singleplayer;
 
 import java.util.Arrays;
 import java.util.List;
@@ -22,10 +22,10 @@ import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.StackPane;
 import javafx.scene.text.Font;
 import javafx.scene.text.TextAlignment;
-import lingo.client.view.PlayerBoard;
-import lingo.common.Game;
-import lingo.common.Player;
-import lingo.common.Report;
+import com.charego.lingo.client.view.PlayerBoard;
+import com.charego.lingo.common.Game;
+import com.charego.lingo.common.Player;
+import com.charego.lingo.common.Report;
 
 public class SinglePlayerPresenter {
 

client/src/main/java/com/charego/lingo/client/util/FxmlController.java

@@ -1,4 +1,4 @@
-package lingo.client.util;
+package com.charego.lingo.client.util;
 
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;

client/src/main/java/com/charego/lingo/client/view/Board.java

@@ -1,4 +1,4 @@
-package lingo.client.view;
+package com.charego.lingo.client.view;
 
 import javafx.scene.canvas.Canvas;
 import javafx.scene.canvas.GraphicsContext;

client/src/main/java/com/charego/lingo/client/view/GameBoard.java

@@ -1,4 +1,4 @@
-package lingo.client.view;
+package com.charego.lingo.client.view;
 
 import java.util.ArrayList;
 import java.util.List;

client/src/main/java/com/charego/lingo/client/view/OpponentBoard.java

@@ -1,4 +1,4 @@
-package lingo.client.view;
+package com.charego.lingo.client.view;
 
 import javafx.scene.canvas.Canvas;
 

client/src/main/java/com/charego/lingo/client/view/PlayerBoard.java

@@ -1,4 +1,4 @@
-package lingo.client.view;
+package com.charego.lingo.client.view;
 
 import java.util.ArrayList;
 import java.util.HashMap;

client/src/main/resources/fxml/Lingo.fxml

@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.VBox?>
 
 <BorderPane xmlns:fx="http://javafx.com/fxml"
-	fx:controller="lingo.client.bootstrap.LingoPresenter"
+	fx:controller="com.charego.lingo.client.bootstrap.LingoPresenter"
 	fx:id="content"
 	prefWidth="650"
 	prefHeight="420">

client/src/main/resources/fxml/LingoMultiplayer.fxml

@@ -8,7 +8,7 @@
 <?import javafx.scene.web.WebView?>
 
 <StackPane xmlns:fx="http://javafx.com/fxml"
-	fx:controller="lingo.client.multiplayer.MultiplayerPresenter"
+	fx:controller="com.charego.lingo.client.multiplayer.MultiplayerPresenter"
 	fx:id="contentPane">
 
 	<children>

common/src/main/java/com/charego/lingo/common/ChatMessage.java

@@ -1,4 +1,4 @@
-package lingo.common;
+package com.charego.lingo.common;
 
 public class ChatMessage {
 

common/src/main/java/com/charego/lingo/common/Game.java

@@ -1,4 +1,4 @@
-package lingo.common;
+package com.charego.lingo.common;
 
 import java.util.Arrays;
 import java.util.Collections;

common/src/main/java/com/charego/lingo/common/GameLeftMessage.java

@@ -1,4 +1,4 @@
-package lingo.common;
+package com.charego.lingo.common;
 
 public class GameLeftMessage {
 

common/src/main/java/com/charego/lingo/common/Player.java

@@ -1,4 +1,4 @@
-package lingo.common;
+package com.charego.lingo.common;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 

common/src/main/java/com/charego/lingo/common/Report.java

@@ -1,4 +1,4 @@
-package lingo.common;
+package com.charego.lingo.common;
 
 public class Report {
 

common/src/main/java/com/charego/lingo/common/SetUsernameMessage.java

@@ -1,4 +1,4 @@
-package lingo.common;
+package com.charego.lingo.common;
 
 public class SetUsernameMessage {
 

common/src/main/java/com/charego/lingo/common/WordReader.java

@@ -1,4 +1,4 @@
-package lingo.common;
+package com.charego.lingo.common;
 
 import java.io.BufferedReader;
 import java.io.IOException;

pom.xml

@@ -21,7 +21,7 @@
 	</properties>
 
 	<modules>
-		<module>client-api</module>
+		<module>api</module>
 		<module>common</module>
 		<module>server</module>
 	</modules>

server/pom.xml

@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<version>${project.version}</version>
-			<artifactId>lingo-client-api</artifactId>
+			<artifactId>lingo-api</artifactId>
 		</dependency>
 
 		<!-- Web -->
@@ -56,7 +56,7 @@
 						</goals>
 						<configuration>
 							<finalName>${project.artifactId}</finalName>
-							<mainClass>lingo.server.LingoServer</mainClass>
+							<mainClass>com.charego.lingo.server.LingoServer</mainClass>
 						</configuration>
 					</execution>
 				</executions>

server/src/main/java/com/charego/lingo/server/LingoController.java

@@ -1,4 +1,4 @@
-package lingo.server;
+package com.charego.lingo.server;
 
 import static org.springframework.messaging.simp.SimpMessageHeaderAccessor.SESSION_ID_HEADER;
 
@@ -24,13 +24,13 @@ import org.springframework.messaging.simp.annotation.SubscribeMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import lingo.client.api.Destinations;
-import lingo.common.ChatMessage;
-import lingo.common.Game;
-import lingo.common.GameLeftMessage;
-import lingo.common.Player;
-import lingo.common.Report;
-import lingo.common.SetUsernameMessage;
+import com.charego.lingo.api.Destinations;
+import com.charego.lingo.common.ChatMessage;
+import com.charego.lingo.common.Game;
+import com.charego.lingo.common.GameLeftMessage;
+import com.charego.lingo.common.Player;
+import com.charego.lingo.common.Report;
+import com.charego.lingo.common.SetUsernameMessage;
 
 @RestController
 public class LingoController {

server/src/main/java/com/charego/lingo/server/LingoServer.java

@@ -1,4 +1,4 @@
-package lingo.server;
+package com.charego.lingo.server;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

server/src/main/java/com/charego/lingo/server/PracticeController.java

@@ -1,4 +1,4 @@
-package lingo.server;
+package com.charego.lingo.server;
 
 import static org.springframework.messaging.simp.SimpMessageHeaderAccessor.SESSION_ID_HEADER;
 
@@ -16,10 +16,10 @@ import org.springframework.messaging.simp.SimpMessageType;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.web.bind.annotation.RestController;
 
-import lingo.client.api.Destinations;
-import lingo.common.Game;
-import lingo.common.Player;
-import lingo.common.Report;
+import com.charego.lingo.api.Destinations;
+import com.charego.lingo.common.Game;
+import com.charego.lingo.common.Player;
+import com.charego.lingo.common.Report;
 
 @RestController
 public class PracticeController {

server/src/main/java/com/charego/lingo/server/SessionManager.java

@@ -1,4 +1,4 @@
-package lingo.server;
+package com.charego.lingo.server;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -14,7 +14,7 @@ import org.springframework.web.socket.messaging.AbstractSubProtocolEvent;
 import org.springframework.web.socket.messaging.SessionConnectedEvent;
 import org.springframework.web.socket.messaging.SessionDisconnectEvent;
 
-import lingo.common.Player;
+import com.charego.lingo.common.Player;
 
 @Component
 public class SessionManager implements ApplicationListener<AbstractSubProtocolEvent> {

server/src/main/java/com/charego/lingo/server/WebSocketConfig.java

@@ -1,4 +1,4 @@
-package lingo.server;
+package com.charego.lingo.server;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.messaging.simp.config.ChannelRegistration;

server/src/main/java/com/charego/lingo/server/WordRepository.java

@@ -1,4 +1,4 @@
-package lingo.server;
+package com.charego.lingo.server;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -8,7 +8,7 @@ import java.util.Set;
 
 import org.springframework.stereotype.Component;
 
-import lingo.common.WordReader;
+import com.charego.lingo.common.WordReader;
 
 @Component
 public class WordRepository {