jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject svn commit: r1553230 [1/2] - in /jspwiki/trunk: ./ jspwiki-it-tests/ jspwiki-it-tests/jspwiki-it-test-cma-jdbc/ jspwiki-it-tests/jspwiki-it-test-cma/ jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/ jspwiki-it-tests/jspwiki-it-test-custom-jdbc/ j...
Date Mon, 23 Dec 2013 23:38:45 GMT
Author: juanpablo
Date: Mon Dec 23 23:38:44 2013
New Revision: 1553230

URL: http://svn.apache.org/r1553230
Log:
reverting to 2.10.0-SNAPSHOT

Modified:
    jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml
    jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml
    jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml
    jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml
    jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
    jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml
    jspwiki/trunk/jspwiki-it-tests/pom.xml
    jspwiki/trunk/jspwiki-war/pom.xml
    jspwiki/trunk/jspwiki-wikipages/de/pom.xml
    jspwiki/trunk/jspwiki-wikipages/en/pom.xml
    jspwiki/trunk/jspwiki-wikipages/es/pom.xml
    jspwiki/trunk/jspwiki-wikipages/fi/pom.xml
    jspwiki/trunk/jspwiki-wikipages/fr/pom.xml
    jspwiki/trunk/jspwiki-wikipages/it/pom.xml
    jspwiki/trunk/jspwiki-wikipages/nl/pom.xml
    jspwiki/trunk/jspwiki-wikipages/pom.xml
    jspwiki/trunk/jspwiki-wikipages/pt_BR/pom.xml
    jspwiki/trunk/jspwiki-wikipages/zh_CN/pom.xml
    jspwiki/trunk/pom.xml

Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml?rev=1553230&r1=1553229&r2=1553230&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/pom.xml Mon Dec 23 23:38:44 2013
@@ -1,79 +1,79 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <parent> <!-- this enables tests reuse [1/3] -->
-    <groupId>org.apache.jspwiki.it</groupId>
-    <artifactId>jspwiki-it-builder</artifactId>
-    <version>2.10.1-SNAPSHOT</version>
-  </parent>
-
-  <!-- Container Managed Authentication using JDBC instead of XML files for user and group info -->
-  <artifactId>jspwiki-it-test-cma-jdbc</artifactId>
-  <modelVersion>4.0.0</modelVersion>
-  <description>selenium tests execution for jspwiki-it-test-container-jdbc (container auth, relative URLs, JDBC database)</description>
-  <packaging>war</packaging> <!-- this enables tests reuse [2/3] -->
-  
-  <properties> <!-- values injected at jspwiki.properties & selenium templates -->
-               <!-- this enables tests reuse [3/3] -->
-    <it-jspwiki.context>${project.artifactId}</it-jspwiki.context>
-    
-    <it-jspwiki.groupdatabase>org.apache.wiki.auth.authorize.JDBCGroupDatabase</it-jspwiki.groupdatabase>
-    <it-jspwiki.userdatabase>org.apache.wiki.auth.user.JDBCUserDatabase</it-jspwiki.userdatabase>
-    <it-jspwiki.referenceStyle>relative</it-jspwiki.referenceStyle>
-  </properties>
-  
-  <build>
-    <finalName>${project.artifactId}</finalName>
-    
-    <resources>
-      <resource>
-        <directory>${project.basedir}/../jspwiki-selenium-tests/src/main/resources</directory>
-        <filtering>true</filtering>
-      </resource>
-    </resources>
-    
-    <plugins>
-      <plugin>
-        <groupId>com.btmatthews.maven.plugins.inmemdb</groupId>
-        <artifactId>inmemdb-maven-plugin</artifactId>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.tomcat.maven</groupId>
-        <artifactId>tomcat7-maven-plugin</artifactId>
-        <configuration>
-          <!-- Using CMA, so Tomcat instance needs a tomcat-users.xml w/usernames & passwords -->
-          <tomcatUsers>
-            ${project.basedir}/../jspwiki-selenium-tests/src/main/config/tomcatconf/tomcat-users.xml
-          </tomcatUsers>
-          <!-- Using JDBC for User & Group info, so Tomcat instance needs JNDI lookups for database -->
-          <contextFile>${project.basedir}/../jspwiki-selenium-tests/src/main/config/tomcatconf/tomcat7-context.xml</contextFile>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>selenium-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-  
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent> <!-- this enables tests reuse [1/3] -->
+    <groupId>org.apache.jspwiki.it</groupId>
+    <artifactId>jspwiki-it-builder</artifactId>
+    <version>2.10.0-SNAPSHOT</version>
+  </parent>
+
+  <!-- Container Managed Authentication using JDBC instead of XML files for user and group info -->
+  <artifactId>jspwiki-it-test-cma-jdbc</artifactId>
+  <modelVersion>4.0.0</modelVersion>
+  <description>selenium tests execution for jspwiki-it-test-container-jdbc (container auth, relative URLs, JDBC database)</description>
+  <packaging>war</packaging> <!-- this enables tests reuse [2/3] -->
+  
+  <properties> <!-- values injected at jspwiki.properties & selenium templates -->
+               <!-- this enables tests reuse [3/3] -->
+    <it-jspwiki.context>${project.artifactId}</it-jspwiki.context>
+    
+    <it-jspwiki.groupdatabase>org.apache.wiki.auth.authorize.JDBCGroupDatabase</it-jspwiki.groupdatabase>
+    <it-jspwiki.userdatabase>org.apache.wiki.auth.user.JDBCUserDatabase</it-jspwiki.userdatabase>
+    <it-jspwiki.referenceStyle>relative</it-jspwiki.referenceStyle>
+  </properties>
+  
+  <build>
+    <finalName>${project.artifactId}</finalName>
+    
+    <resources>
+      <resource>
+        <directory>${project.basedir}/../jspwiki-selenium-tests/src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+    
+    <plugins>
+      <plugin>
+        <groupId>com.btmatthews.maven.plugins.inmemdb</groupId>
+        <artifactId>inmemdb-maven-plugin</artifactId>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.tomcat.maven</groupId>
+        <artifactId>tomcat7-maven-plugin</artifactId>
+        <configuration>
+          <!-- Using CMA, so Tomcat instance needs a tomcat-users.xml w/usernames & passwords -->
+          <tomcatUsers>
+            ${project.basedir}/../jspwiki-selenium-tests/src/main/config/tomcatconf/tomcat-users.xml
+          </tomcatUsers>
+          <!-- Using JDBC for User & Group info, so Tomcat instance needs JNDI lookups for database -->
+          <contextFile>${project.basedir}/../jspwiki-selenium-tests/src/main/config/tomcatconf/tomcat7-context.xml</contextFile>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>selenium-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+  
 </project>
\ No newline at end of file

Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml?rev=1553230&r1=1553229&r2=1553230&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/pom.xml Mon Dec 23 23:38:44 2013
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <parent> <!-- this enables tests reuse [1/3] -->
-    <groupId>org.apache.jspwiki.it</groupId>
-    <artifactId>jspwiki-it-builder</artifactId>
-    <version>2.10.1-SNAPSHOT</version>
-  </parent>
-  
-  <!-- Container Managed Authentication -->
-  <artifactId>jspwiki-it-test-cma</artifactId>
-  <modelVersion>4.0.0</modelVersion>
-  <description>selenium tests execution for jspwiki-it-test-container (container auth, relative URLs)</description>
-  <packaging>war</packaging> <!-- this enables tests reuse [2/3] -->
-  
-  <properties> <!-- values injected at jspwiki.properties & selenium templates -->
-               <!-- this enables tests reuse [3/3] -->
-    <it-jspwiki.context>${project.artifactId}</it-jspwiki.context>
-    
-    <it-jspwiki.groupdatabase>org.apache.wiki.auth.authorize.XMLGroupDatabase</it-jspwiki.groupdatabase>
-    <it-jspwiki.userdatabase>org.apache.wiki.auth.user.XMLUserDatabase</it-jspwiki.userdatabase>
-    <it-jspwiki.referenceStyle>relative</it-jspwiki.referenceStyle>
-  </properties>
-  
-  <build>
-    <finalName>${project.artifactId}</finalName>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.tomcat.maven</groupId>
-        <artifactId>tomcat7-maven-plugin</artifactId>
-        <configuration>
-          <!-- Using CMA, so Tomcat instance needs a tomcat-users.xml w/usernames & passwords -->
-          <tomcatUsers>
-            ${project.basedir}/../jspwiki-selenium-tests/src/main/config/tomcatconf/tomcat-users.xml
-          </tomcatUsers>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>selenium-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent> <!-- this enables tests reuse [1/3] -->
+    <groupId>org.apache.jspwiki.it</groupId>
+    <artifactId>jspwiki-it-builder</artifactId>
+    <version>2.10.0-SNAPSHOT</version>
+  </parent>
+  
+  <!-- Container Managed Authentication -->
+  <artifactId>jspwiki-it-test-cma</artifactId>
+  <modelVersion>4.0.0</modelVersion>
+  <description>selenium tests execution for jspwiki-it-test-container (container auth, relative URLs)</description>
+  <packaging>war</packaging> <!-- this enables tests reuse [2/3] -->
+  
+  <properties> <!-- values injected at jspwiki.properties & selenium templates -->
+               <!-- this enables tests reuse [3/3] -->
+    <it-jspwiki.context>${project.artifactId}</it-jspwiki.context>
+    
+    <it-jspwiki.groupdatabase>org.apache.wiki.auth.authorize.XMLGroupDatabase</it-jspwiki.groupdatabase>
+    <it-jspwiki.userdatabase>org.apache.wiki.auth.user.XMLUserDatabase</it-jspwiki.userdatabase>
+    <it-jspwiki.referenceStyle>relative</it-jspwiki.referenceStyle>
+  </properties>
+  
+  <build>
+    <finalName>${project.artifactId}</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.tomcat.maven</groupId>
+        <artifactId>tomcat7-maven-plugin</artifactId>
+        <configuration>
+          <!-- Using CMA, so Tomcat instance needs a tomcat-users.xml w/usernames & passwords -->
+          <tomcatUsers>
+            ${project.basedir}/../jspwiki-selenium-tests/src/main/config/tomcatconf/tomcat-users.xml
+          </tomcatUsers>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>selenium-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
\ No newline at end of file

Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml?rev=1553230&r1=1553229&r2=1553230&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/pom.xml Mon Dec 23 23:38:44 2013
@@ -1,55 +1,55 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <parent> <!-- this enables tests reuse [1/3] -->
-    <groupId>org.apache.jspwiki.it</groupId>
-    <artifactId>jspwiki-it-builder</artifactId>
-    <version>2.10.1-SNAPSHOT</version>
-  </parent>
-  
-  <artifactId>jspwiki-it-test-custom-absolute-urls</artifactId>
-  <modelVersion>4.0.0</modelVersion>
-  <description>selenium tests execution for jspwiki-it-test-custom-absolute-urls (custom auth, absolute URLs)</description>
-  <packaging>war</packaging> <!-- this enables tests reuse [2/3] -->
-  
-  <properties> <!-- values injected at jspwiki.properties & selenium templates -->
-               <!-- this enables tests reuse [3/3] -->
-    <it-jspwiki.context>${project.artifactId}</it-jspwiki.context>
-    
-    <it-jspwiki.groupdatabase>org.apache.wiki.auth.authorize.XMLGroupDatabase</it-jspwiki.groupdatabase>
-    <it-jspwiki.userdatabase>org.apache.wiki.auth.user.XMLUserDatabase</it-jspwiki.userdatabase>
-    <it-jspwiki.referenceStyle>absolute</it-jspwiki.referenceStyle>
-  </properties>
-  
-  <build>
-    <finalName>${project.artifactId}</finalName>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.tomcat.maven</groupId>
-        <artifactId>tomcat7-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>selenium-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent> <!-- this enables tests reuse [1/3] -->
+    <groupId>org.apache.jspwiki.it</groupId>
+    <artifactId>jspwiki-it-builder</artifactId>
+    <version>2.10.0-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>jspwiki-it-test-custom-absolute-urls</artifactId>
+  <modelVersion>4.0.0</modelVersion>
+  <description>selenium tests execution for jspwiki-it-test-custom-absolute-urls (custom auth, absolute URLs)</description>
+  <packaging>war</packaging> <!-- this enables tests reuse [2/3] -->
+  
+  <properties> <!-- values injected at jspwiki.properties & selenium templates -->
+               <!-- this enables tests reuse [3/3] -->
+    <it-jspwiki.context>${project.artifactId}</it-jspwiki.context>
+    
+    <it-jspwiki.groupdatabase>org.apache.wiki.auth.authorize.XMLGroupDatabase</it-jspwiki.groupdatabase>
+    <it-jspwiki.userdatabase>org.apache.wiki.auth.user.XMLUserDatabase</it-jspwiki.userdatabase>
+    <it-jspwiki.referenceStyle>absolute</it-jspwiki.referenceStyle>
+  </properties>
+  
+  <build>
+    <finalName>${project.artifactId}</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.tomcat.maven</groupId>
+        <artifactId>tomcat7-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>selenium-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
\ No newline at end of file

Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml?rev=1553230&r1=1553229&r2=1553230&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/pom.xml Mon Dec 23 23:38:44 2013
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <parent> <!-- this enables tests reuse [1/3] -->
-    <groupId>org.apache.jspwiki.it</groupId>
-    <artifactId>jspwiki-it-builder</artifactId>
-    <version>2.10.1-SNAPSHOT</version>
-  </parent>
-  
-  <artifactId>jspwiki-it-test-custom-jdbc</artifactId>
-  <modelVersion>4.0.0</modelVersion>
-  <description>selenium tests execution for jspwiki-it-test-custom (custom auth, JDBC database)</description>
-  <packaging>war</packaging> <!-- this enables tests reuse [2/3] -->
-  
-  <properties> <!-- values injected at jspwiki.properties & selenium templates -->
-               <!-- this enables tests reuse [3/3] -->
-    <it-jspwiki.context>${project.artifactId}</it-jspwiki.context>
-
-    <it-jspwiki.groupdatabase>org.apache.wiki.auth.authorize.JDBCGroupDatabase</it-jspwiki.groupdatabase>
-    <it-jspwiki.userdatabase>org.apache.wiki.auth.user.JDBCUserDatabase</it-jspwiki.userdatabase>
-    <it-jspwiki.referenceStyle>relative</it-jspwiki.referenceStyle>
-  </properties>
-  
-  <build>
-    <finalName>${project.artifactId}</finalName>
-    
-    <plugins>
-        <plugin>
-            <groupId>com.btmatthews.maven.plugins.inmemdb</groupId>
-            <artifactId>inmemdb-maven-plugin</artifactId>
-        </plugin>
-
-        <plugin>
-            <groupId>org.apache.tomcat.maven</groupId>
-            <artifactId>tomcat7-maven-plugin</artifactId>
-            <configuration>
-              <!-- Using JDBC for User & Group info, so Tomcat instance needs JNDI lookups for database -->
-              <contextFile>${project.basedir}/../jspwiki-selenium-tests/src/main/config/tomcatconf/tomcat7-context.xml</contextFile>
-            </configuration>
-        </plugin>
-
-        <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>selenium-maven-plugin</artifactId>
-        </plugin>
-    </plugins>
-  </build>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent> <!-- this enables tests reuse [1/3] -->
+    <groupId>org.apache.jspwiki.it</groupId>
+    <artifactId>jspwiki-it-builder</artifactId>
+    <version>2.10.0-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>jspwiki-it-test-custom-jdbc</artifactId>
+  <modelVersion>4.0.0</modelVersion>
+  <description>selenium tests execution for jspwiki-it-test-custom (custom auth, JDBC database)</description>
+  <packaging>war</packaging> <!-- this enables tests reuse [2/3] -->
+  
+  <properties> <!-- values injected at jspwiki.properties & selenium templates -->
+               <!-- this enables tests reuse [3/3] -->
+    <it-jspwiki.context>${project.artifactId}</it-jspwiki.context>
+
+    <it-jspwiki.groupdatabase>org.apache.wiki.auth.authorize.JDBCGroupDatabase</it-jspwiki.groupdatabase>
+    <it-jspwiki.userdatabase>org.apache.wiki.auth.user.JDBCUserDatabase</it-jspwiki.userdatabase>
+    <it-jspwiki.referenceStyle>relative</it-jspwiki.referenceStyle>
+  </properties>
+  
+  <build>
+    <finalName>${project.artifactId}</finalName>
+    
+    <plugins>
+        <plugin>
+            <groupId>com.btmatthews.maven.plugins.inmemdb</groupId>
+            <artifactId>inmemdb-maven-plugin</artifactId>
+        </plugin>
+
+        <plugin>
+            <groupId>org.apache.tomcat.maven</groupId>
+            <artifactId>tomcat7-maven-plugin</artifactId>
+            <configuration>
+              <!-- Using JDBC for User & Group info, so Tomcat instance needs JNDI lookups for database -->
+              <contextFile>${project.basedir}/../jspwiki-selenium-tests/src/main/config/tomcatconf/tomcat7-context.xml</contextFile>
+            </configuration>
+        </plugin>
+
+        <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>selenium-maven-plugin</artifactId>
+        </plugin>
+    </plugins>
+  </build>
+
 </project>
\ No newline at end of file

Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml?rev=1553230&r1=1553229&r2=1553230&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/pom.xml Mon Dec 23 23:38:44 2013
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent> <!-- this enables tests reuse [1/3] -->
-    <groupId>org.apache.jspwiki.it</groupId>
-    <artifactId>jspwiki-it-builder</artifactId>
-    <version>2.10.1-SNAPSHOT</version>
-  </parent>
-  
-  <artifactId>jspwiki-it-test-custom</artifactId>
-  <packaging>war</packaging> <!-- this enables tests reuse [2/3] -->
-  <description>selenium tests execution for jspwiki-it-test-custom (custom auth, relative URLs)</description>
-
-  <properties> <!-- values injected at jspwiki.properties & selenium templates -->
-               <!-- this enables tests reuse [3/3] -->
-    <it-jspwiki.context>${project.artifactId}</it-jspwiki.context>
-
-    <it-jspwiki.groupdatabase>org.apache.wiki.auth.authorize.XMLGroupDatabase</it-jspwiki.groupdatabase>
-    <it-jspwiki.userdatabase>org.apache.wiki.auth.user.XMLUserDatabase</it-jspwiki.userdatabase>
-    <it-jspwiki.referenceStyle>relative</it-jspwiki.referenceStyle>
-  </properties>
-  
-  <build>
-    <finalName>${project.artifactId}</finalName>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.tomcat.maven</groupId>
-        <artifactId>tomcat7-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>selenium-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent> <!-- this enables tests reuse [1/3] -->
+    <groupId>org.apache.jspwiki.it</groupId>
+    <artifactId>jspwiki-it-builder</artifactId>
+    <version>2.10.0-SNAPSHOT</version>
+  </parent>
+  
+  <artifactId>jspwiki-it-test-custom</artifactId>
+  <packaging>war</packaging> <!-- this enables tests reuse [2/3] -->
+  <description>selenium tests execution for jspwiki-it-test-custom (custom auth, relative URLs)</description>
+
+  <properties> <!-- values injected at jspwiki.properties & selenium templates -->
+               <!-- this enables tests reuse [3/3] -->
+    <it-jspwiki.context>${project.artifactId}</it-jspwiki.context>
+
+    <it-jspwiki.groupdatabase>org.apache.wiki.auth.authorize.XMLGroupDatabase</it-jspwiki.groupdatabase>
+    <it-jspwiki.userdatabase>org.apache.wiki.auth.user.XMLUserDatabase</it-jspwiki.userdatabase>
+    <it-jspwiki.referenceStyle>relative</it-jspwiki.referenceStyle>
+  </properties>
+  
+  <build>
+    <finalName>${project.artifactId}</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.tomcat.maven</groupId>
+        <artifactId>tomcat7-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>selenium-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
 </project>
\ No newline at end of file

Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml?rev=1553230&r1=1553229&r2=1553230&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/pom.xml Mon Dec 23 23:38:44 2013
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <parent>
-    <groupId>org.apache.jspwiki.it</groupId>
-    <artifactId>jspwiki-it-builder</artifactId>
-    <version>2.10.1-SNAPSHOT</version>
-    <relativePath>../pom.xml</relativePath>
-  </parent>
-  
-  <artifactId>jspwiki-selenium-tests</artifactId>
-  <packaging>war</packaging>
-  <modelVersion>4.0.0</modelVersion>
-  <description>templates of selenium tests for jspwiki</description>
-  
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.jspwiki</groupId>
-      <artifactId>jspwiki-war</artifactId>
-      <version>${project.version}</version>
-      <type>war</type>
-    </dependency>
-  </dependencies>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent>
+    <groupId>org.apache.jspwiki.it</groupId>
+    <artifactId>jspwiki-it-builder</artifactId>
+    <version>2.10.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+  
+  <artifactId>jspwiki-selenium-tests</artifactId>
+  <packaging>war</packaging>
+  <modelVersion>4.0.0</modelVersion>
+  <description>templates of selenium tests for jspwiki</description>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.jspwiki</groupId>
+      <artifactId>jspwiki-war</artifactId>
+      <version>${project.version}</version>
+      <type>war</type>
+    </dependency>
+  </dependencies>
 </project>
\ No newline at end of file

Modified: jspwiki/trunk/jspwiki-it-tests/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/pom.xml?rev=1553230&r1=1553229&r2=1553230&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/pom.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/pom.xml Mon Dec 23 23:38:44 2013
@@ -1,190 +1,190 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <parent>
-    <groupId>org.apache.jspwiki</groupId>
-    <artifactId>jspwiki-builder</artifactId>
-    <version>2.10.1-SNAPSHOT</version>
-  </parent>
-  
-  <groupId>org.apache.jspwiki.it</groupId>
-  <artifactId>jspwiki-it-builder</artifactId>
-  <modelVersion>4.0.0</modelVersion>
-  <description>selenium tests execution for jspwiki</description>
-  <packaging>pom</packaging>
-  
-  <modules>
-    <module>jspwiki-selenium-tests</module>
-    <module>jspwiki-it-test-custom</module>
-    <module>jspwiki-it-test-custom-absolute-urls</module>
-    <module>jspwiki-it-test-custom-jdbc</module>
-    <module>jspwiki-it-test-cma</module>
-    <module>jspwiki-it-test-cma-jdbc</module>
-  </modules>
-  
-  <profiles>
-    <profile>
-      <id>integration-tests</id>
-      <build>
-        <finalName>${project.artifactId}</finalName>
-        <testResources><!-- this enables tests reuse [1/2] -->
-          <testResource>
-            <directory>${project.basedir}/../jspwiki-selenium-tests/src/test/resources</directory>
-            <filtering>true</filtering>
-          </testResource>
-        </testResources>
-
-        <resources>
-          <resource><!-- this enables tests reuse [2/2] -->
-            <directory>${project.basedir}/../jspwiki-selenium-tests/src/main/resources</directory>
-            <filtering>true</filtering>
-          </resource>
-        </resources>
-
-        <pluginManagement>
-        <plugins>
-          <plugin>
-            <artifactId>maven-war-plugin</artifactId>
-            <version>2.4</version>
-          </plugin>
-
-          <!-- Activates the HSQLDB database for IT tests -->
-          <plugin>
-            <groupId>com.btmatthews.maven.plugins.inmemdb</groupId>
-            <artifactId>inmemdb-maven-plugin</artifactId>
-            <version>1.3.0</version>
-            <configuration>
-              <monitorKey>inmem</monitorKey>
-              <monitorPort>11157</monitorPort>
-            </configuration>
-            <executions>
-              <execution>
-                <id>run</id>
-                <phase>pre-integration-test</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <daemon>true</daemon>
-                  <type>hsqldb</type>
-                  <database>jspwiki</database>
-                  <username>sa</username>
-                  <password />
-                  <sources>
-                    <script>
-                      <sourceFile>jspwiki-selenium-tests/src/main/config/hsql-userdb-setup.sql</sourceFile>
-                    </script>
-                  </sources>
-                </configuration>
-              </execution>
-              <execution>
-                <id>stop</id>
-                <phase>post-integration-test</phase>
-                <goals>
-                  <goal>stop</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-
-            <!-- <browser>*firefox</browser> -->
-            <!-- <browser>*iexplore</browser> -->
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>selenium-maven-plugin</artifactId>
-            <version>2.3</version>
-            <configuration>
-              <browser>*googlechrome</browser>
-              <startURL>http://localhost:8080/${project.artifactId}/</startURL>
-              <suite>target/test-classes/selenium/TestSuite.html</suite>
-              <background>true</background>
-            </configuration>
-            <executions>
-              <execution>
-                <id>test</id>
-                <phase>integration-test</phase>
-                <goals>
-                  <goal>selenese</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-
-          <!-- Additional Tomcat configuration (JNDI lookups for DB access, tomcat-users.xml file)
-               located in pom.xml of submodules using them. -->
-          <plugin>
-            <groupId>org.apache.tomcat.maven</groupId>
-            <artifactId>tomcat7-maven-plugin</artifactId>
-            <version>2.1</version>
-            <executions>
-              <execution>
-                <id>tomcat-run</id>
-                <goals>
-                  <goal>run-war</goal>
-                </goals>
-                <phase>pre-integration-test</phase>
-                <configuration>
-                  <fork>true</fork>
-                  <systemProperties>
-                    <user.language>en</user.language>
-                    <user.region>US</user.region>
-                  </systemProperties>
-                </configuration>
-              </execution>
-              <execution>
-                <id>tomcat-shutdown</id>
-                <goals>
-                  <goal>shutdown</goal>
-                </goals>
-                <phase>post-integration-test</phase>
-              </execution>
-            </executions>
-            <dependencies>
-              <dependency>
-                <groupId>org.hsqldb</groupId>
-                <artifactId>hsqldb</artifactId>
-                <version>2.3.0</version>
-              </dependency>
-            </dependencies>
-          </plugin>
-        </plugins>
-        </pluginManagement>
-      </build>
-
-      <dependencies>
-        <dependency>
-          <groupId>org.apache.jspwiki</groupId>
-          <artifactId>jspwiki-war</artifactId>
-          <version>${project.version}</version>
-          <type>war</type>
-        </dependency>
-
-        <dependency>
-          <groupId>org.seleniumhq.selenium</groupId>
-          <!-- (un)comment based on your browser preferences for tests execution -->
-          <artifactId>selenium-chrome-driver</artifactId>
-          <!-- <artifactId>selenium-ie-driver</artifactId> -->
-          <!-- <artifactId>selenium-firefox-driver</artifactId> -->
-        </dependency>
-      </dependencies>
-    </profile>
-  </profiles>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent>
+    <groupId>org.apache.jspwiki</groupId>
+    <artifactId>jspwiki-builder</artifactId>
+    <version>2.10.0-SNAPSHOT</version>
+  </parent>
+  
+  <groupId>org.apache.jspwiki.it</groupId>
+  <artifactId>jspwiki-it-builder</artifactId>
+  <modelVersion>4.0.0</modelVersion>
+  <description>selenium tests execution for jspwiki</description>
+  <packaging>pom</packaging>
+  
+  <modules>
+    <module>jspwiki-selenium-tests</module>
+    <module>jspwiki-it-test-custom</module>
+    <module>jspwiki-it-test-custom-absolute-urls</module>
+    <module>jspwiki-it-test-custom-jdbc</module>
+    <module>jspwiki-it-test-cma</module>
+    <module>jspwiki-it-test-cma-jdbc</module>
+  </modules>
+  
+  <profiles>
+    <profile>
+      <id>integration-tests</id>
+      <build>
+        <finalName>${project.artifactId}</finalName>
+        <testResources><!-- this enables tests reuse [1/2] -->
+          <testResource>
+            <directory>${project.basedir}/../jspwiki-selenium-tests/src/test/resources</directory>
+            <filtering>true</filtering>
+          </testResource>
+        </testResources>
+
+        <resources>
+          <resource><!-- this enables tests reuse [2/2] -->
+            <directory>${project.basedir}/../jspwiki-selenium-tests/src/main/resources</directory>
+            <filtering>true</filtering>
+          </resource>
+        </resources>
+
+        <pluginManagement>
+        <plugins>
+          <plugin>
+            <artifactId>maven-war-plugin</artifactId>
+            <version>2.4</version>
+          </plugin>
+
+          <!-- Activates the HSQLDB database for IT tests -->
+          <plugin>
+            <groupId>com.btmatthews.maven.plugins.inmemdb</groupId>
+            <artifactId>inmemdb-maven-plugin</artifactId>
+            <version>1.3.0</version>
+            <configuration>
+              <monitorKey>inmem</monitorKey>
+              <monitorPort>11157</monitorPort>
+            </configuration>
+            <executions>
+              <execution>
+                <id>run</id>
+                <phase>pre-integration-test</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <daemon>true</daemon>
+                  <type>hsqldb</type>
+                  <database>jspwiki</database>
+                  <username>sa</username>
+                  <password />
+                  <sources>
+                    <script>
+                      <sourceFile>jspwiki-selenium-tests/src/main/config/hsql-userdb-setup.sql</sourceFile>
+                    </script>
+                  </sources>
+                </configuration>
+              </execution>
+              <execution>
+                <id>stop</id>
+                <phase>post-integration-test</phase>
+                <goals>
+                  <goal>stop</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+
+            <!-- <browser>*firefox</browser> -->
+            <!-- <browser>*iexplore</browser> -->
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>selenium-maven-plugin</artifactId>
+            <version>2.3</version>
+            <configuration>
+              <browser>*googlechrome</browser>
+              <startURL>http://localhost:8080/${project.artifactId}/</startURL>
+              <suite>target/test-classes/selenium/TestSuite.html</suite>
+              <background>true</background>
+            </configuration>
+            <executions>
+              <execution>
+                <id>test</id>
+                <phase>integration-test</phase>
+                <goals>
+                  <goal>selenese</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+
+          <!-- Additional Tomcat configuration (JNDI lookups for DB access, tomcat-users.xml file)
+               located in pom.xml of submodules using them. -->
+          <plugin>
+            <groupId>org.apache.tomcat.maven</groupId>
+            <artifactId>tomcat7-maven-plugin</artifactId>
+            <version>2.1</version>
+            <executions>
+              <execution>
+                <id>tomcat-run</id>
+                <goals>
+                  <goal>run-war</goal>
+                </goals>
+                <phase>pre-integration-test</phase>
+                <configuration>
+                  <fork>true</fork>
+                  <systemProperties>
+                    <user.language>en</user.language>
+                    <user.region>US</user.region>
+                  </systemProperties>
+                </configuration>
+              </execution>
+              <execution>
+                <id>tomcat-shutdown</id>
+                <goals>
+                  <goal>shutdown</goal>
+                </goals>
+                <phase>post-integration-test</phase>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>org.hsqldb</groupId>
+                <artifactId>hsqldb</artifactId>
+                <version>2.3.0</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+        </pluginManagement>
+      </build>
+
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.jspwiki</groupId>
+          <artifactId>jspwiki-war</artifactId>
+          <version>${project.version}</version>
+          <type>war</type>
+        </dependency>
+
+        <dependency>
+          <groupId>org.seleniumhq.selenium</groupId>
+          <!-- (un)comment based on your browser preferences for tests execution -->
+          <artifactId>selenium-chrome-driver</artifactId>
+          <!-- <artifactId>selenium-ie-driver</artifactId> -->
+          <!-- <artifactId>selenium-firefox-driver</artifactId> -->
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
+</project>

Modified: jspwiki/trunk/jspwiki-war/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/pom.xml?rev=1553230&r1=1553229&r2=1553230&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/pom.xml (original)
+++ jspwiki/trunk/jspwiki-war/pom.xml Mon Dec 23 23:38:44 2013
@@ -1,350 +1,350 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <parent>
-    <groupId>org.apache.jspwiki</groupId>
-    <artifactId>jspwiki-builder</artifactId>
-    <version>2.10.1-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>jspwiki-war</artifactId>
-  <name>Apache JSPWiki Main War</name>
-  <packaging>war</packaging>
-
-  <dependencies>
-    <dependency>
-      <groupId>xmlrpc</groupId>
-      <artifactId>xmlrpc</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-queryparser</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-highlighter</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-analyzers-common</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.servlet.jsp</groupId>
-      <artifactId>jsp-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>net.sourceforge</groupId>
-      <artifactId>sandler</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>net.sf.ehcache</groupId>
-      <artifactId>ehcache-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>oro</groupId>
-      <artifactId>oro</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.mail</groupId>
-      <artifactId>mail</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-    </dependency>
-
-      <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-log4j12</artifactId>
-      </dependency>
-
-    <dependency>
-      <groupId>com.metaparadigm</groupId>
-      <artifactId>json-rpc</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jvnet.hudson</groupId>
-      <artifactId>org.suigeneris.jrcs.diff</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jdom</groupId>
-      <artifactId>jdom2</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>jaxen</groupId>
-      <artifactId>jaxen</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.freshcookies</groupId>
-      <artifactId>freshcookies-security</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>ecs</groupId>
-      <artifactId>ecs</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-lang</groupId>
-      <artifactId>commons-lang</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-fileupload</groupId>
-      <artifactId>commons-fileupload</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>net.sourceforge</groupId>
-      <artifactId>akismet-java</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-httpclient</groupId>
-      <artifactId>commons-httpclient</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>nekohtml</groupId>
-      <artifactId>nekohtml</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>net.sourceforge.stripes</groupId>
-      <artifactId>stripes</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.hsqldb</groupId>
-      <artifactId>hsqldb</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.hsqldb</groupId>
-      <artifactId>sqltool</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.eclipse.jetty.aggregate</groupId>
-      <artifactId>jetty-all</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <finalName>JSPWiki</finalName>
-    <plugins>
-      <!-- With below plugin can deploy to an embedded Tomcat instance via:
-         mvn clean install tomcat7:run-war [-Dmaven.test.skip]
-         ...or standalone by adding a <server /> entry "myTomcat":
-         http://www.jroller.com/gmazza/entry/web_service_tutorial#maventomcat
-         and running tomcat7:redeploy instead of run-war in
-         string above.
-
-         Either way, JSPWiki URL will be
-         http://localhost:8080/JSPWiki
-      -->
-      <plugin>
-        <groupId>org.apache.tomcat.maven</groupId>
-        <artifactId>tomcat7-maven-plugin</artifactId>
-        <configuration>
-          <server>myTomcat</server>
-          <url>http://localhost:8080/manager/text</url>
-          <path>/${project.build.finalName}</path>
-        </configuration>
-      </plugin>
-
-      <!-- Surefire plugin (running unit tests):
-         http://maven.apache.org/surefire/maven-surefire-plugin/
-
-         Individual tests can be run command line via:
-         mvn clean test -Dtest=WikiEngineTest,AclImplTest,...
-
-         All tests can be skipped via -Dmaven.test.skip
-       -->
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <!-- time-consuming tests excluded by default -->
-            <exclude>**/StressTestVersioningProvider.java</exclude>
-            <exclude>**/StressTestSpeed.java</exclude>
-          </excludes>
-          <includes>
-            <include>**/*Test.java</include>
-          </includes>
-        </configuration>
-      </plugin>
-
-      <!-- wro4j Web Resource Optimizer for Java (http://http://code.google.com/p/wro4j/)
-        Merge and compress CSS and JS files using the WRO4J.
-        - use UglifyJS for JS compression
-        - use Less as advanced CSS preprocessor
-      -->
-
-      <plugin>
-        <groupId>ro.isdc.wro4j</groupId>
-        <artifactId>wro4j-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>compile</phase>
-            <goals>
-              <goal>run</goal>
-              <!--<goal>jshint</goal>-->
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <!--
-          <targetGroups>all</targetGroups>
-          <minimize>true</minimize>
-          <cssDestinationFolder>d:/static/css/</cssDestinationFolder>
-          <jsDestinationFolder>d:/static/js/</jsDestinationFolder>
-          <ignoreMissingResources>false</ignoreMissingResources>
-          -->
-          <wroManagerFactory>ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory</wroManagerFactory>
-          <jsDestinationFolder>${project.build.directory}/generated-sources/wro/scripts</jsDestinationFolder>
-          <cssDestinationFolder>${project.build.directory}/generated-sources/wro/templates/default/</cssDestinationFolder>
-          <contextFolder>${basedir}/src/main/</contextFolder>
-          <wroFile>src/main/config/wro/wro.xml</wroFile>
-          <extraConfigFile>src/main/config/wro/wro.properties</extraConfigFile>
-        </configuration>
-      </plugin>
-
-      <!-- Compress certain CSS and JS files using the YUICompressor
-         (http://alchim.sourceforge.net/yuicompressor-maven-plugin/)
-      <plugin>
-        <groupId>net.alchim31.maven</groupId>
-        <artifactId>yuicompressor-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>compressJSfiles</id>
-            <goals>
-              <goal>compress</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <excludeResources>true</excludeResources>
-          <nosuffix>true</nosuffix>
-          <webappDirectory>${project.build.directory}/generated-sources/yuicompress</webappDirectory>
-          *** relying on jslint-maven-plugin instead, which allows
-               better customization ***
-          <jswarn>false</jswarn>
-        </configuration>
-      </plugin>
-      -->
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>jslint-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>checkJSPWikiFiles</id>
-            <goals>
-              <goal>jslint</goal>
-            </goals>
-            <configuration>
-              <sourceJsFolder>src/main/webapp/scripts</sourceJsFolder>
-              <failOnIssues>false</failOnIssues>
-              <excludes>
-                <exclude>prettify.js</exclude>
-              </excludes>
-            </configuration>
-          </execution>
-          <!-- Some third party JSs have many multiple number of VARs per function
-               block, are outside of our control so suppressing such messages -->
-          <execution>
-            <id>checkThirdParty</id>
-            <goals>
-              <goal>jslint</goal>
-            </goals>
-            <configuration>
-              <sourceJsFolder>src/main/webapp/scripts</sourceJsFolder>
-              <failOnIssues>false</failOnIssues>
-              <includes>
-                 <include>prettify.js</include>
-              </includes>
-              <allowOneVarStatementPerFunction>false</allowOneVarStatementPerFunction>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <attachClasses>true</attachClasses>
-          <webResources>
-            <!-- Output directory configured above with the YUICompressor Maven plugin
-            <resource>
-              <directory>${project.build.directory}/generated-sources/yuicompress</directory>
-            </resource>
-            -->
-            <resource>
-              <directory>${project.build.directory}/generated-sources/wro</directory>
-            </resource>
-          </webResources>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent>
+    <groupId>org.apache.jspwiki</groupId>
+    <artifactId>jspwiki-builder</artifactId>
+    <version>2.10.0-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>jspwiki-war</artifactId>
+  <name>Apache JSPWiki Main War</name>
+  <packaging>war</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>xmlrpc</groupId>
+      <artifactId>xmlrpc</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-queryparser</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-highlighter</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-analyzers-common</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>net.sourceforge</groupId>
+      <artifactId>sandler</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>net.sf.ehcache</groupId>
+      <artifactId>ehcache-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+
+      <dependency>
+          <groupId>org.slf4j</groupId>
+          <artifactId>slf4j-log4j12</artifactId>
+      </dependency>
+
+    <dependency>
+      <groupId>com.metaparadigm</groupId>
+      <artifactId>json-rpc</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jvnet.hudson</groupId>
+      <artifactId>org.suigeneris.jrcs.diff</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jdom</groupId>
+      <artifactId>jdom2</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>jaxen</groupId>
+      <artifactId>jaxen</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>jstl</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.freshcookies</groupId>
+      <artifactId>freshcookies-security</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>ecs</groupId>
+      <artifactId>ecs</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>net.sourceforge</groupId>
+      <artifactId>akismet-java</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>nekohtml</groupId>
+      <artifactId>nekohtml</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>net.sourceforge.stripes</groupId>
+      <artifactId>stripes</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>sqltool</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.eclipse.jetty.aggregate</groupId>
+      <artifactId>jetty-all</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <finalName>JSPWiki</finalName>
+    <plugins>
+      <!-- With below plugin can deploy to an embedded Tomcat instance via:
+         mvn clean install tomcat7:run-war [-Dmaven.test.skip]
+         ...or standalone by adding a <server /> entry "myTomcat":
+         http://www.jroller.com/gmazza/entry/web_service_tutorial#maventomcat
+         and running tomcat7:redeploy instead of run-war in
+         string above.
+
+         Either way, JSPWiki URL will be
+         http://localhost:8080/JSPWiki
+      -->
+      <plugin>
+        <groupId>org.apache.tomcat.maven</groupId>
+        <artifactId>tomcat7-maven-plugin</artifactId>
+        <configuration>
+          <server>myTomcat</server>
+          <url>http://localhost:8080/manager/text</url>
+          <path>/${project.build.finalName}</path>
+        </configuration>
+      </plugin>
+
+      <!-- Surefire plugin (running unit tests):
+         http://maven.apache.org/surefire/maven-surefire-plugin/
+
+         Individual tests can be run command line via:
+         mvn clean test -Dtest=WikiEngineTest,AclImplTest,...
+
+         All tests can be skipped via -Dmaven.test.skip
+       -->
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <!-- time-consuming tests excluded by default -->
+            <exclude>**/StressTestVersioningProvider.java</exclude>
+            <exclude>**/StressTestSpeed.java</exclude>
+          </excludes>
+          <includes>
+            <include>**/*Test.java</include>
+          </includes>
+        </configuration>
+      </plugin>
+
+      <!-- wro4j Web Resource Optimizer for Java (http://http://code.google.com/p/wro4j/)
+        Merge and compress CSS and JS files using the WRO4J.
+        - use UglifyJS for JS compression
+        - use Less as advanced CSS preprocessor
+      -->
+
+      <plugin>
+        <groupId>ro.isdc.wro4j</groupId>
+        <artifactId>wro4j-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>compile</phase>
+            <goals>
+              <goal>run</goal>
+              <!--<goal>jshint</goal>-->
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <!--
+          <targetGroups>all</targetGroups>
+          <minimize>true</minimize>
+          <cssDestinationFolder>d:/static/css/</cssDestinationFolder>
+          <jsDestinationFolder>d:/static/js/</jsDestinationFolder>
+          <ignoreMissingResources>false</ignoreMissingResources>
+          -->
+          <wroManagerFactory>ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory</wroManagerFactory>
+          <jsDestinationFolder>${project.build.directory}/generated-sources/wro/scripts</jsDestinationFolder>
+          <cssDestinationFolder>${project.build.directory}/generated-sources/wro/templates/default/</cssDestinationFolder>
+          <contextFolder>${basedir}/src/main/</contextFolder>
+          <wroFile>src/main/config/wro/wro.xml</wroFile>
+          <extraConfigFile>src/main/config/wro/wro.properties</extraConfigFile>
+        </configuration>
+      </plugin>
+
+      <!-- Compress certain CSS and JS files using the YUICompressor
+         (http://alchim.sourceforge.net/yuicompressor-maven-plugin/)
+      <plugin>
+        <groupId>net.alchim31.maven</groupId>
+        <artifactId>yuicompressor-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>compressJSfiles</id>
+            <goals>
+              <goal>compress</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <excludeResources>true</excludeResources>
+          <nosuffix>true</nosuffix>
+          <webappDirectory>${project.build.directory}/generated-sources/yuicompress</webappDirectory>
+          *** relying on jslint-maven-plugin instead, which allows
+               better customization ***
+          <jswarn>false</jswarn>
+        </configuration>
+      </plugin>
+      -->
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>jslint-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>checkJSPWikiFiles</id>
+            <goals>
+              <goal>jslint</goal>
+            </goals>
+            <configuration>
+              <sourceJsFolder>src/main/webapp/scripts</sourceJsFolder>
+              <failOnIssues>false</failOnIssues>
+              <excludes>
+                <exclude>prettify.js</exclude>
+              </excludes>
+            </configuration>
+          </execution>
+          <!-- Some third party JSs have many multiple number of VARs per function
+               block, are outside of our control so suppressing such messages -->
+          <execution>
+            <id>checkThirdParty</id>
+            <goals>
+              <goal>jslint</goal>
+            </goals>
+            <configuration>
+              <sourceJsFolder>src/main/webapp/scripts</sourceJsFolder>
+              <failOnIssues>false</failOnIssues>
+              <includes>
+                 <include>prettify.js</include>
+              </includes>
+              <allowOneVarStatementPerFunction>false</allowOneVarStatementPerFunction>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <attachClasses>true</attachClasses>
+          <webResources>
+            <!-- Output directory configured above with the YUICompressor Maven plugin
+            <resource>
+              <directory>${project.build.directory}/generated-sources/yuicompress</directory>
+            </resource>
+            -->
+            <resource>
+              <directory>${project.build.directory}/generated-sources/wro</directory>
+            </resource>
+          </webResources>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Modified: jspwiki/trunk/jspwiki-wikipages/de/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/de/pom.xml?rev=1553230&r1=1553229&r2=1553230&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-wikipages/de/pom.xml (original)
+++ jspwiki/trunk/jspwiki-wikipages/de/pom.xml Mon Dec 23 23:38:44 2013
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <parent>
-    <groupId>org.apache.jspwiki.wikipages</groupId>
-    <artifactId>jspwiki-wikipages-builder</artifactId>
-    <version>2.10.1-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>jspwiki-wikipages-de</artifactId>
-  <name>Apache JSPWiki initial wiki pages (de)</name>
-  
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent>
+    <groupId>org.apache.jspwiki.wikipages</groupId>
+    <artifactId>jspwiki-wikipages-builder</artifactId>
+    <version>2.10.0-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>jspwiki-wikipages-de</artifactId>
+  <name>Apache JSPWiki initial wiki pages (de)</name>
+  
+</project>

Modified: jspwiki/trunk/jspwiki-wikipages/en/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/en/pom.xml?rev=1553230&r1=1553229&r2=1553230&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-wikipages/en/pom.xml (original)
+++ jspwiki/trunk/jspwiki-wikipages/en/pom.xml Mon Dec 23 23:38:44 2013
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <parent>
-    <groupId>org.apache.jspwiki.wikipages</groupId>
-    <artifactId>jspwiki-wikipages-builder</artifactId>
-    <version>2.10.1-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>jspwiki-wikipages-en</artifactId>
-  <name>Apache JSPWiki initial wiki pages (en)</name>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent>
+    <groupId>org.apache.jspwiki.wikipages</groupId>
+    <artifactId>jspwiki-wikipages-builder</artifactId>
+    <version>2.10.0-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>jspwiki-wikipages-en</artifactId>
+  <name>Apache JSPWiki initial wiki pages (en)</name>
+
+</project>

Modified: jspwiki/trunk/jspwiki-wikipages/es/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/es/pom.xml?rev=1553230&r1=1553229&r2=1553230&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-wikipages/es/pom.xml (original)
+++ jspwiki/trunk/jspwiki-wikipages/es/pom.xml Mon Dec 23 23:38:44 2013
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <parent>
-    <groupId>org.apache.jspwiki.wikipages</groupId>
-    <artifactId>jspwiki-wikipages-builder</artifactId>
-    <version>2.10.1-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>jspwiki-wikipages-es</artifactId>
-  <name>Apache JSPWiki initial wiki pages (es)</name>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent>
+    <groupId>org.apache.jspwiki.wikipages</groupId>
+    <artifactId>jspwiki-wikipages-builder</artifactId>
+    <version>2.10.0-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>jspwiki-wikipages-es</artifactId>
+  <name>Apache JSPWiki initial wiki pages (es)</name>
+
+</project>

Modified: jspwiki/trunk/jspwiki-wikipages/fi/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/fi/pom.xml?rev=1553230&r1=1553229&r2=1553230&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-wikipages/fi/pom.xml (original)
+++ jspwiki/trunk/jspwiki-wikipages/fi/pom.xml Mon Dec 23 23:38:44 2013
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <parent>
-    <groupId>org.apache.jspwiki.wikipages</groupId>
-    <artifactId>jspwiki-wikipages-builder</artifactId>
-    <version>2.10.1-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>jspwiki-wikipages-fi</artifactId>
-  <name>Apache JSPWiki initial wiki pages (fi)</name>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent>
+    <groupId>org.apache.jspwiki.wikipages</groupId>
+    <artifactId>jspwiki-wikipages-builder</artifactId>
+    <version>2.10.0-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>jspwiki-wikipages-fi</artifactId>
+  <name>Apache JSPWiki initial wiki pages (fi)</name>
+
+</project>



Mime
View raw message