Merge branch 'revertoi' into 'master'

TUUKKA PERKELE!

Revertoidaan i18n tiedostojen poisto, siirretään ne oikeaan paikkaan ja fiksataan pom.xml

See merge request !128

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

@@ -50,7 +50,6 @@ 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,7 +27,6 @@
 					<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,6 +5,7 @@
 	<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>
@@ -15,25 +16,15 @@
 				</configuration>
 				</configuration>
 			</plugin>
 			</plugin>
 		</plugins>
 		</plugins>
-<resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-
-
 	</build>
 	</build>
-	
+
 	<dependencies>
 	<dependencies>
 		<dependency>
 		<dependency>
 			<groupId>fi.codecrew.moya</groupId>
 			<groupId>fi.codecrew.moya</groupId>
 			<artifactId>moya-beans-client</artifactId>
 			<artifactId>moya-beans-client</artifactId>
 			<version>${moya.version}</version>
 			<version>${moya.version}</version>
 		</dependency>
 		</dependency>
-			<dependency>
+		<dependency>
 			<groupId>net.bull.javamelody</groupId>
 			<groupId>net.bull.javamelody</groupId>
 			<artifactId>javamelody-core</artifactId>
 			<artifactId>javamelody-core</artifactId>
 			<version>1.52.0</version>
 			<version>1.52.0</version>
@@ -43,17 +34,17 @@
 			<artifactId>primefaces</artifactId>
 			<artifactId>primefaces</artifactId>
 			<version>5.1</version>
 			<version>5.1</version>
 		</dependency>
 		</dependency>
-			<dependency>
-				<groupId>org.primefaces.extensions</groupId>
-				<artifactId>all-themes</artifactId>
-				<version>1.0.8</version>
-				<type>pom</type>
-			</dependency>
-			<dependency>
-				<groupId>net.matlux</groupId>
-				<artifactId>jvm-breakglass</artifactId>
-				<version>0.0.7</version>
-			</dependency>
+		<dependency>
+			<groupId>org.primefaces.extensions</groupId>
+			<artifactId>all-themes</artifactId>
+			<version>1.0.8</version>
+			<type>pom</type>
+		</dependency>
+		<dependency>
+			<groupId>net.matlux</groupId>
+			<artifactId>jvm-breakglass</artifactId>
+			<version>0.0.7</version>
+		</dependency>
 	</dependencies>
 	</dependencies>
 	<parent>
 	<parent>
 		<groupId>fi.codecrew.moya</groupId>
 		<groupId>fi.codecrew.moya</groupId>