Merge branch 'maven_pomfix' into 'master'

Maven pomfix

Pomfix so we can compile this with maven and still use it with glassfish

See merge request !125

code/moya-utils/src/test/java/fi/codecrew/moya/utilities/JsonUtilsTest.java

@@ -50,6 +50,7 @@ public class JsonUtilsTest {
 		JsonValue expected = jsonObject("{\"quuz\":\"plop\"}");
 		JsonValue expected = jsonObject("{\"quuz\":\"plop\"}");
 		JsonValue actual = JsonUtils.getSubObject(meta, path);
 		JsonValue actual = JsonUtils.getSubObject(meta, path);
 		Assert.assertEquals(expected.toString(), actual.toString());
 		Assert.assertEquals(expected.toString(), actual.toString());
+
 	}
 	}
 
 
 	@Test
 	@Test

code/moya-web/WebContent/META-INF/MANIFEST.MF

-Manifest-Version: 1.0
-Class-Path: lib/MoyaUtilities.jar
-

code/moya-web/WebContent/foodadmin/createTemplate.xhtml

@@ -27,6 +27,7 @@
 					<p:tab id="basicinfo" title="#{i18n['foodwavetemplate.basicinfo']}"> -->
 					<p:tab id="basicinfo" title="#{i18n['foodwavetemplate.basicinfo']}"> -->
 				<h:panelGrid columns="3">
 				<h:panelGrid columns="3">
 					<h:outputLabel for="name" value="#{i18n['foodwavetemplate.name']}" />
 					<h:outputLabel for="name" value="#{i18n['foodwavetemplate.name']}" />
+
 					<h:inputText id="name" value="#{foodWaveView.template.name}"
 					<h:inputText id="name" value="#{foodWaveView.template.name}"
 						required="true" requiredMessage="Name required" />
 						required="true" requiredMessage="Name required" />
 					<h:message for="name" />
 					<h:message for="name" />

code/moya-web/pom.xml

@@ -5,7 +5,6 @@
 	<packaging>war</packaging>
 	<packaging>war</packaging>
 	<build>
 	<build>
 		<plugins>
 		<plugins>
-		
 			<plugin>
 			<plugin>
 				<artifactId>maven-war-plugin</artifactId>
 				<artifactId>maven-war-plugin</artifactId>
 				<version>2.4</version>
 				<version>2.4</version>
@@ -16,6 +15,16 @@
 				</configuration>
 				</configuration>
 			</plugin>
 			</plugin>
 		</plugins>
 		</plugins>
+<resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <excludes>
+                    <exclude>**/*.java</exclude>
+                </excludes>
+            </resource>
+        </resources>
+
+
 	</build>
 	</build>
 	
 	
 	<dependencies>
 	<dependencies>