Merge branch 'mavenfixes' into 'master'

Random minor fixes

Some random minor fixes to stuff. See commit messages

See merge request !276

code/moya-web/WebContent/auth/userSessionList.xhtml

@@ -10,7 +10,7 @@
 		<ui:define name="content">
 		<ui:define name="content">
 
 
 			<h:form>
 			<h:form>
-				<p:dataTable sort value="#{userSessionView.sessions}" var="sess" sortBy="#{sess.id}">
+				<p:dataTable value="#{userSessionView.sessions}" var="sess" sortBy="#{sess.id}">
 					<p:column headerText="#{i18n['httpsession.id']}">
 					<p:column headerText="#{i18n['httpsession.id']}">
 						<h:outputText value="#{sess.id}" />
 						<h:outputText value="#{sess.id}" />
 					</p:column>
 					</p:column>

code/moya-web/src/main/java/fi/codecrew/moya/web/helper/HttpSessionWrapper.java

@@ -154,10 +154,16 @@ public class HttpSessionWrapper implements HttpSession
 	}
 	}
 
 
 	public static List<HttpSessionWrapper> wrap(Set<HttpSession> sessions, SessionMgmtBeanLocal sessionMgmt) {
 	public static List<HttpSessionWrapper> wrap(Set<HttpSession> sessions, SessionMgmtBeanLocal sessionMgmt) {
-		ArrayList<HttpSessionWrapper> ret = new ArrayList<>();
+		List<HttpSessionWrapper> ret = new ArrayList<>();
 		for (HttpSession s : sessions) {
 		for (HttpSession s : sessions) {
 			UserContainer uc = sessionMgmt.getUsername(s.getId());
 			UserContainer uc = sessionMgmt.getUsername(s.getId());
-			ret.add(new HttpSessionWrapper(s, uc.getUsername(), uc.getHostname()));
+			String username = null;
+			String hostname = null;
+			if (uc != null) {
+				username = uc.getUsername();
+				hostname = uc.getHostname();
+			}
+			ret.add(new HttpSessionWrapper(s, username, hostname));
 		}
 		}
 		Collections.sort(ret, new LastSeenComparator());
 		Collections.sort(ret, new LastSeenComparator());
 
 

code/pom.xml

@@ -7,13 +7,13 @@
 	<name>Moya Online Youth Accumulator</name>
 	<name>Moya Online Youth Accumulator</name>
 	<packaging>pom</packaging>
 	<packaging>pom</packaging>
 	<version>1.2-SNAPSHOT</version>
 	<version>1.2-SNAPSHOT</version>
-	
+
 	<modules>
 	<modules>
-	  <module>moya-parent</module>
-	  <module>moya-authmodule</module>
-	  <module>moya-cardprinter</module>
+		<module>moya-parent</module>
+		<module>moya-authmodule</module>
+		<module>moya-cardprinter</module>
 	</modules>
 	</modules>
-	
+
 	<properties>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<java-version>1.8</java-version>
 		<java-version>1.8</java-version>
@@ -33,7 +33,7 @@
 		<testng.version>6.8.21</testng.version>
 		<testng.version>6.8.21</testng.version>
 		<javamelody.version>1.55.0</javamelody.version>
 		<javamelody.version>1.55.0</javamelody.version>
 		<primefaces.version>5.1</primefaces.version>
 		<primefaces.version>5.1</primefaces.version>
-	
+
 	</properties>
 	</properties>
 
 
 	<url>http://codecrew.fi</url>
 	<url>http://codecrew.fi</url>
@@ -42,8 +42,9 @@
 		<url>http://codecrew.fi</url>
 		<url>http://codecrew.fi</url>
 	</organization>
 	</organization>
 	<scm>
 	<scm>
-		<connection>scm:git@gitlab.codecrew.fi:codecrew/moya.git</connection>
-		<url>http://gitlab.codecrew.fi</url>
+	    <connection>scm:git:https://gitlab.codecrew.fi/codecrew/moya.git</connection>
+		<developerConnection>scm:git:git@gitlab.codecrew.fi:codecrew/moya.git</developerConnection>
+		<url>https://gitlab.codecrew.fi/codecrew/moya</url>
 	</scm>
 	</scm>
 	<build>
 	<build>
 		<pluginManagement>
 		<pluginManagement>