cleanup, and regex fix

code/moya-angular/WebContent/WEB-INF/pretty-config.xml

@@ -3,6 +3,6 @@
                xsi:schemaLocation="http://ocpsoft.org/schema/rewrite-config-prettyfaces
                xsi:schemaLocation="http://ocpsoft.org/schema/rewrite-config-prettyfaces
                       http://ocpsoft.org/xml/ns/prettyfaces/rewrite-config-prettyfaces.xsd">
                       http://ocpsoft.org/xml/ns/prettyfaces/rewrite-config-prettyfaces.xsd">
 
 
-    <rewrite match="^(?!.*\.(js|css|jpg|gif|png|ico|html)).*$" substitute="/index.html" redirect="chain" />
+    <rewrite match="^(?!.*\.(js|css|jpg|gif|png|ico|html)$).*$" substitute="/index.html" redirect="chain" />
 
 
   </pretty-config>
   </pretty-config>

code/moya-angular/WebContent/WEB-INF/web.xml

@@ -3,63 +3,7 @@
 	xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:web="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:web="http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
 	version="3.1">
 	version="3.1">
 	<display-name>MoyaAngularWeb</display-name>
 	<display-name>MoyaAngularWeb</display-name>
-	<context-param>
-		<param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
-		<param-value>true</param-value>
-	</context-param>
-
-	<!-- Asetetaan PROJECT_STAGE JNDI:llä, ja fallbackataan arvoon Development -->
-	<resource-ref>
-		<res-ref-name>jsf/ProjectStage</res-ref-name>
-		<res-type>java.lang.String</res-type>
-	</resource-ref>
-	<!-- Handle hostname filter BEFORE jsonp so errors are transmitted correctly -->
-	<absolute-ordering>
-		<name>com_ocpsoft_rewrite</name>
-	</absolute-ordering>
-
-
-
-	<session-config>
-		<session-timeout>10</session-timeout>
-	</session-config>
 	<welcome-file-list>
 	<welcome-file-list>
 		<welcome-file>index.html</welcome-file>
 		<welcome-file>index.html</welcome-file>
-		<welcome-file>index.jsf</welcome-file>
-		<welcome-file>index.jsp</welcome-file>
-		<welcome-file>index.wtf</welcome-file>
 	</welcome-file-list>
 	</welcome-file-list>
-	<error-page>
-		<exception-type>java.lang.Exception</exception-type>
-		<location>/error.jsf</location>
-	</error-page>
-
-	<security-constraint>
-		<display-name>Forbidden resource</display-name>
-		<web-resource-collection>
-			<web-resource-name>Forbidden</web-resource-name>
-			<url-pattern>*.xhtml</url-pattern>
-			<url-pattern>/layout/*</url-pattern>
-			<url-pattern>/resources/tools/*</url-pattern>
-		</web-resource-collection>
-		<auth-constraint>
-			<description>Thou shall not read the sources or use utils directly
-			</description>
-		</auth-constraint>
-		<user-data-constraint>
-			<transport-guarantee>CONFIDENTIAL</transport-guarantee>
-		</user-data-constraint>
-	</security-constraint>
-	<login-config>
-		<auth-method>FORM</auth-method>
-		<realm-name>moyaRealm</realm-name>
-		<form-login-config>
-			<form-login-page>/auth/login.jsf</form-login-page>
-			<form-error-page>/auth/loginError.jsf</form-error-page>
-		</form-login-config>
-	</login-config>
-	<persistence-unit-ref>
-		<persistence-unit-ref-name>BortalEMF</persistence-unit-ref-name>
-	</persistence-unit-ref>
-
 </web-app>
 </web-app>