Merge branch 'angular-prettyfaces' into 'master'

Add prettyfaces for url redirecting for angular integration

Also cleanup old versions from other projects..

See merge request !359

code/moya-mgmt-web/WebContent/WEB-INF/pretty-config.xml

-<pretty-config xmlns="http://ocpsoft.org/prettyfaces/3.3.3"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://ocpsoft.org/prettyfaces/3.3.3">
-
-
-<!-- 
-
-// Tell prettyfaces to use this bean when the pattern matches and show the manageUsers page. Also support a Query Param (cid).
-@URLMapping(id = "manageUsers", pattern = "/us2ers/manage", viewId = "/pages/users/manageUsers.xhtml")
-...
-    @SuppressWarnings("unused")
-    @URLQueryParameter("cid")
-    private String cid;
-    
-    TAI
-    
-	<url-mapping id="some-page">
-		<pattern value="/some/page" />
-		<query-param name="cid">#{convid.cid}</query-param>
-		<view-id value="/some/page.xhtml" />
-	</url-mapping>
- -->
-
-<url-mapping id="index">
-	<pattern value="/index" />
-	<view-id value="/index.xhtml" />
-</url-mapping>
-
-</pretty-config>
\ No newline at end of file

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

@@ -82,21 +82,9 @@
 			<form-error-page>/auth/loginError.jsf</form-error-page>
 			<form-error-page>/auth/loginError.jsf</form-error-page>
 		</form-login-config>
 		</form-login-config>
 	</login-config>
 	</login-config>
-	<filter>
-		<filter-name>Pretty Filter</filter-name>
-		<filter-class>com.ocpsoft.pretty.PrettyFilter</filter-class>
-		<async-supported>true</async-supported>
-	</filter>
 	<filter-mapping>
 	<filter-mapping>
 		<filter-name>PrimefacesFileupload</filter-name>
 		<filter-name>PrimefacesFileupload</filter-name>
 		<servlet-name>Faces Servlet</servlet-name>
 		<servlet-name>Faces Servlet</servlet-name>
 	</filter-mapping>
 	</filter-mapping>
-	<filter-mapping>
-		<filter-name>Pretty Filter</filter-name>
-		<url-pattern>/*</url-pattern>
-		<dispatcher>FORWARD</dispatcher>
-		<dispatcher>REQUEST</dispatcher>
-		<dispatcher>ERROR</dispatcher>
-		<dispatcher>ASYNC</dispatcher>
-	</filter-mapping>
+
 </web-app>
 </web-app>
\ No newline at end of file

code/moya-mgmt-web/pom.xml

@@ -29,11 +29,7 @@
 			<artifactId>primefaces</artifactId>
 			<artifactId>primefaces</artifactId>
 			<version>${primefaces.version}</version>
 			<version>${primefaces.version}</version>
 		</dependency>
 		</dependency>
-		<dependency>
-			<groupId>com.ocpsoft</groupId>
-			<artifactId>prettyfaces-core</artifactId>
-			<version>3.3.2</version>
-		</dependency>
+
 	</dependencies>
 	</dependencies>
 	<parent>
 	<parent>
 		<groupId>fi.codecrew.moya</groupId>
 		<groupId>fi.codecrew.moya</groupId>

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

+<pretty-config xmlns="http://ocpsoft.org/schema/rewrite-config-prettyfaces"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="http://ocpsoft.org/schema/rewrite-config-prettyfaces
+                      http://ocpsoft.org/xml/ns/prettyfaces/rewrite-config-prettyfaces.xsd">
+
+    <rewrite match="^/angular/.*" substitute="/angular.jsf" redirect="chain" />
+
+  </pretty-config>
\ No newline at end of file

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

@@ -20,6 +20,7 @@
 	</resource-ref>
 	</resource-ref>
 	<!-- Handle hostname filter BEFORE jsonp so errors are transmitted correctly -->
 	<!-- Handle hostname filter BEFORE jsonp so errors are transmitted correctly -->
 	<absolute-ordering>
 	<absolute-ordering>
+		<name>com_ocpsoft_rewrite</name>
 		<name>jsonpFilter</name>
 		<name>jsonpFilter</name>
 		<name>hostnameFilter</name>
 		<name>hostnameFilter</name>
 	</absolute-ordering>
 	</absolute-ordering>

code/moya-web/pom.xml

@@ -12,7 +12,7 @@
 				<configuration>
 				<configuration>
 					<warSourceDirectory>WebContent</warSourceDirectory>
 					<warSourceDirectory>WebContent</warSourceDirectory>
 					<failOnMissingWebXml>false</failOnMissingWebXml>
 					<failOnMissingWebXml>false</failOnMissingWebXml>
-					<packagingIncludes>WEB-INF/lib/moya-restpojo*,WEB-INF/lib/primefaces*,WEB-INF/lib/all-themes-*.jar,**/*.xml,**/*.xhtml,**/*.properties,**/*.class,**/*.png,**/*.css,**/*.js,resources/*,swagger/**</packagingIncludes>
+					<packagingIncludes>WEB-INF/lib/rewrite-*.jar,WEB-INF/lib/moya-restpojo*,WEB-INF/lib/primefaces*,WEB-INF/lib/all-themes-*.jar,**/*.xml,**/*.xhtml,**/*.properties,**/*.class,**/*.png,**/*.css,**/*.js,resources/*,swagger/**</packagingIncludes>
 				</configuration>
 				</configuration>
 			</plugin>
 			</plugin>
 		</plugins>
 		</plugins>
@@ -63,7 +63,16 @@
 			<version>2.16</version>
 			<version>2.16</version>
 			<scope>provided</scope>
 			<scope>provided</scope>
 		</dependency>
 		</dependency>
-
+		<dependency>
+			<groupId>org.ocpsoft.rewrite</groupId>
+			<artifactId>rewrite-servlet</artifactId>
+			<version>3.4.1.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>org.ocpsoft.rewrite</groupId>
+			<artifactId>rewrite-config-prettyfaces</artifactId>
+			<version>3.4.1.Final</version>
+		</dependency>
 	</dependencies>
 	</dependencies>
 
 
 	<parent>
 	<parent>