Remove references to moya-angular

code/moya-ear/pom.xml

@@ -32,11 +32,7 @@
 							<artifactId>moya-mgmt</artifactId>
 							<artifactId>moya-mgmt</artifactId>
 							<contextRoot>/mgmt</contextRoot>
 							<contextRoot>/mgmt</contextRoot>
 						</webModule>
 						</webModule>
-						<webModule>
-							<groupId>fi.codecrew.moya</groupId>
-							<artifactId>moya-angular</artifactId>
-							<contextRoot>/MoyaNG</contextRoot>
-						</webModule>
+
 						<webModule>
 						<webModule>
 							<groupId>fi.codecrew.moya</groupId>
 							<groupId>fi.codecrew.moya</groupId>
 							<artifactId>moya-terminal-web</artifactId>
 							<artifactId>moya-terminal-web</artifactId>
@@ -68,14 +64,6 @@
 			<version>1.2-SNAPSHOT</version>
 			<version>1.2-SNAPSHOT</version>
 			<type>war</type>
 			<type>war</type>
 		</dependency>
 		</dependency>
-
-		<dependency>
-			<groupId>fi.codecrew.moya</groupId>
-			<artifactId>moya-angular</artifactId>
-			<version>1.2-SNAPSHOT</version>
-			<type>war</type>
-		</dependency>
-
 		<dependency>
 		<dependency>
 			<groupId>fi.codecrew.moya</groupId>
 			<groupId>fi.codecrew.moya</groupId>
 			<artifactId>moya-terminal-web</artifactId>
 			<artifactId>moya-terminal-web</artifactId>

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/reader/ReaderView.java

@@ -27,7 +27,7 @@ import javax.faces.model.ListDataModel;
 import javax.inject.Inject;
 import javax.inject.Inject;
 import javax.inject.Named;
 import javax.inject.Named;
 
 
-import fi.codecrew.moya.model.role.Role;
+import fi.codecrew.moya.model.Role;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/OrgRoleView.java

@@ -26,7 +26,7 @@ import fi.codecrew.moya.entitysearch.UserSearchQuery;
 import fi.codecrew.moya.enums.apps.UserPermission;
 import fi.codecrew.moya.enums.apps.UserPermission;
 import fi.codecrew.moya.model.OrgRole;
 import fi.codecrew.moya.model.OrgRole;
 import fi.codecrew.moya.model.User;
 import fi.codecrew.moya.model.User;
-import fi.codecrew.moya.model.role.Role;
+import fi.codecrew.moya.model.Role;
 import fi.codecrew.moya.utilities.SearchResult;
 import fi.codecrew.moya.utilities.SearchResult;
 import fi.codecrew.moya.web.cdiview.GenericCDIView;
 import fi.codecrew.moya.web.cdiview.GenericCDIView;
 import org.slf4j.Logger;
 import org.slf4j.Logger;

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/user/RoleDataView.java

@@ -20,7 +20,7 @@ package fi.codecrew.moya.web.cdiview.user;
 
 
 import fi.codecrew.moya.beans.RoleBeanLocal;
 import fi.codecrew.moya.beans.RoleBeanLocal;
 import fi.codecrew.moya.enums.apps.UserPermission;
 import fi.codecrew.moya.enums.apps.UserPermission;
-import fi.codecrew.moya.model.role.Role;
+import fi.codecrew.moya.model.Role;
 import fi.codecrew.moya.web.cdiview.GenericCDIView;
 import fi.codecrew.moya.web.cdiview.GenericCDIView;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;

code/moya-web/src/main/java/fi/codecrew/moya/web/converter/RoleConverter.java

@@ -19,7 +19,7 @@
 package fi.codecrew.moya.web.converter;
 package fi.codecrew.moya.web.converter;
 
 
 import fi.codecrew.moya.beans.RoleBeanLocal;
 import fi.codecrew.moya.beans.RoleBeanLocal;
-import fi.codecrew.moya.model.role.Role;
+import fi.codecrew.moya.model.Role;
 import fi.codecrew.moya.utilities.jsf.GenericIntegerEntityConverter;
 import fi.codecrew.moya.utilities.jsf.GenericIntegerEntityConverter;
 
 
 import javax.ejb.EJB;
 import javax.ejb.EJB;

code/pom.xml

@@ -99,6 +99,11 @@
 			<url>https://iudex.fi/maven/</url>
 			<url>https://iudex.fi/maven/</url>
 		</repository>
 		</repository>
 		<repository>
 		<repository>
+			<id>payara</id>
+			<name>payara</name>
+			<url>https://nexus.payara.fish/repository/payara-artifacts/</url>
+		</repository>
+		<repository>
 			<id>jvnet-nexus-releases</id>
 			<id>jvnet-nexus-releases</id>
 			<name>jvnet-nexus-releases</name>
 			<name>jvnet-nexus-releases</name>
 			<url>https://maven.java.net/content/repositories/releases/</url>
 			<url>https://maven.java.net/content/repositories/releases/</url>