jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject svn commit: r1486449 - in /incubator/jspwiki/branches/MVN3_BRANCH: jspwiki-war/pom.xml mvn_cheat-sheet.txt pom.xml
Date Sun, 26 May 2013 19:13:20 GMT
Author: juanpablo
Date: Sun May 26 19:13:19 2013
New Revision: 1486449

URL: http://svn.apache.org/r1486449
Log:
moved configuration from jspwiki-war/pom.xml to ./pom.xml

some inline comments from jspwiki-war/pom.xml moved to mvn_cheat-sheet.txt

Modified:
    incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml
    incubator/jspwiki/branches/MVN3_BRANCH/mvn_cheat-sheet.txt
    incubator/jspwiki/branches/MVN3_BRANCH/pom.xml

Modified: incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml?rev=1486449&r1=1486448&r2=1486449&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/jspwiki-war/pom.xml Sun May 26 19:13:19 2013
@@ -1,553 +1,330 @@
+<?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.  
+  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>
-    <groupId>org.apache.incubator</groupId>
-    <artifactId>jspwiki</artifactId>
+<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.9.2-SNAPSHOT</version>
-    <name>Apache JSPWiki (Incubating)</name>
-    <description>Incubating Apache JSPWiki is a leading open source WikiWiki engine, feature-rich 
-    and built around standard J2EE components (Java, servlets, JSP).</description>
-    <url>http://incubator.apache.org/jspwiki/</url>
-
-    <packaging>war</packaging>
-
-    <prerequisites>
-        <maven>3.0</maven>
-    </prerequisites>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jspwiki.jdk.version>1.6</jspwiki.jdk.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>xmlrpc</groupId>
-            <artifactId>xmlrpc</artifactId>
-            <version>2.0.1</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.lucene</groupId>
-            <artifactId>lucene-highlighter</artifactId>
-            <version>3.6.0</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.sourceforge</groupId>
-            <artifactId>sandler</artifactId>
-            <version>0.5</version>
-        </dependency>
-        <dependency>
-            <groupId>opensymphony</groupId>
-            <artifactId>oscache</artifactId>
-            <version>2.3</version>
-        </dependency>
-        <dependency>
-            <groupId>oro</groupId>
-            <artifactId>oro</artifactId>
-            <version>2.0.7</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.mail</groupId>
-            <artifactId>mail</artifactId>
-            <version>1.4</version>
-        </dependency>
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.14</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
-            <version>2.0</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.metaparadigm</groupId>
-            <artifactId>json-rpc</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jvnet.hudson</groupId>
-            <artifactId>org.suigeneris.jrcs.diff</artifactId>
-            <version>0.4.2</version>
-        </dependency>
-        <dependency>
-            <groupId>jdom</groupId>
-            <artifactId>jdom</artifactId>
-            <version>1.0</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <version>1.1.2</version>
-        </dependency>
-        <dependency>
-            <groupId>org.freshcookies</groupId>
-            <artifactId>freshcookies-security</artifactId>
-            <version>0.60</version>
-        </dependency>
-        <dependency>
-            <groupId>ecs</groupId>
-            <artifactId>ecs</artifactId>
-            <version>1.4.2</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>2.6</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging-api</artifactId>
-            <version>1.0.4</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-fileupload</groupId>
-            <artifactId>commons-fileupload</artifactId>
-            <version>1.2.1</version>
-        </dependency>
-        <dependency>
-            <groupId>net.sourceforge</groupId>
-            <artifactId>akismet-java</artifactId>
-            <version>1.02</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>1.4</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>nekohtml</groupId>
-            <artifactId>nekohtml</artifactId>
-            <version>0.9.4</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>taglibs</groupId>
-            <artifactId>standard</artifactId>
-            <version>1.1.2</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>jaxen</groupId>
-            <artifactId>jaxen</artifactId>
-            <version>1.1-beta-6</version>
-            <exclusions>
-               <exclusion>
-                 <groupId>*</groupId>
-                 <artifactId>*</artifactId>
-               </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>net.sourceforge.stripes</groupId>
-            <artifactId>stripes</artifactId>
-            <version>1.5.7</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hsqldb</groupId>
-            <artifactId>hsqldb</artifactId>
-            <version>1.8.0.10</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>tomcat</groupId>
-            <artifactId>jasper-runtime</artifactId>
-            <version>5.5.23</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.jetty.aggregate</groupId>
-            <artifactId>jetty-all</artifactId>
-            <version>7.6.7.v20120910</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.2</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>selenium-java</artifactId>
-            <version>2.25.0</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+  </parent>
 
-    <build>
-        <finalName>JSPWiki</finalName>
-        <!-- filtering: http://maven.apache.org/plugins/maven-resources-plugin/examples/filter.html -->
-        <filters>
-            <filter>src/main/filters/filters.properties</filter>        
-        </filters>
-        <resources>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>jspwiki-war</artifactId>
+  <name>Apache JSPWiki (Incubating)</name>
+  <packaging>war</packaging>
+  <description>Incubating Apache JSPWiki is a leading open source WikiWiki engine, feature-rich 
+  and built around standard J2EE components (Java, servlets, JSP).</description>
+  <url>http://incubator.apache.org/jspwiki/</url>
+
+  <dependencies>
+    <dependency>
+      <groupId>xmlrpc</groupId>
+      <artifactId>xmlrpc</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-highlighter</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>net.sourceforge</groupId>
+      <artifactId>sandler</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>opensymphony</groupId>
+      <artifactId>oscache</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>javax.servlet.jsp</groupId>
+      <artifactId>jsp-api</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>jdom</groupId>
+      <artifactId>jdom</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>
+    </dependency>
+    
+    <dependency>
+      <groupId>taglibs</groupId>
+      <artifactId>standard</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>jaxen</groupId>
+      <artifactId>jaxen</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>net.sourceforge.stripes</groupId>
+      <artifactId>stripes</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>jasper-runtime</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.eclipse.jetty.aggregate</groupId>
+      <artifactId>jetty-all</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.seleniumhq.selenium</groupId>
+      <artifactId>selenium-java</artifactId>
+      <scope>test</scope><!-- overwritting scope defined in parent dpdncyMgmt; really needed here? -->
+    </dependency>
+  </dependencies>
+
+  <build>
+    <finalName>JSPWiki</finalName>
+    <!-- filtering: http://maven.apache.org/plugins/maven-resources-plugin/examples/filter.html -->
+    <filters>
+      <filter>src/main/filters/filters.properties</filter>    
+    </filters>
+    
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <!-- No filtering yet -->
+        <!--filtering>true</filtering-->
+      </resource>
+    </resources>
+    
+    <testResources>
+      <testResource>
+        <directory>src/test/resources</directory>
+        <filtering>true</filtering>
+      </testResource>
+    </testResources>
+    
+    <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>
+      
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.7</version>
+        <executions>
+          <execution>
+            <phase>generate-resources</phase>
+            <id>create_files</id>
+            <configuration>
+              <target>
+                <!-- Creating a specific _en file presently needed just so that "English" will appear as an option on 
+                   the User Preferences page, language option (and similar issues).  FIXME: change JSP code  
+                   so this is no longer necessary.
+                -->
+                <copy file="src/main/resources/CoreResources.properties" tofile="target/classes/CoreResources_en.properties"/>
+                <copy file="src/main/resources/templates/default.properties" tofile="target/classes/templates/default_en.properties"/>
+                <copy file="src/main/resources/plugin/PluginResources.properties" tofile="target/classes/plugin/PluginResources_en.properties"/>
+
+                <!-- Create web.xml files for testing -->
+                <copy file="src/main/webapp/WEB-INF/web.xml" tofile="target/test-classes/WEB-INF/web.xml" />
+
+                <!-- For web unit tests, turn off SSL (self-signed certs b0rk
+                   the tests) and enable JDBC refs -->
+                <replace file="target/test-classes/WEB-INF/web.xml"
+                    token="CONFIDENTIAL" value="NONE" />
+                <replace file="target/test-classes/WEB-INF/web.xml"
+                    token="&lt;!--  REMOVE ME TO ENABLE JDBC DATABASE" value="" />
+                <replace file="target/test-classes/WEB-INF/web.xml"
+                    token="REMOVE ME TO ENABLE JDBC DATABASE  --&gt;" value="" />
+
+                <!-- For unit testing, turn on container auth -->
+                <replace file="target/test-classes/WEB-INF/web.xml"
+                    token="&lt;!--  REMOVE ME TO ENABLE CONTAINER-MANAGED AUTH" value="" />
+                <replace file="target/test-classes/WEB-INF/web.xml"
+                    token="REMOVE ME TO ENABLE CONTAINER-MANAGED AUTH  --&gt;" value="" />
+               </target>
+             </configuration>
+             <goals>
+               <goal>run</goal>
+             </goals>
+           </execution>
+         </executions>
+      </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>
+      
+      <!-- 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> 
+      </plugin>
+      
+      <plugin>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <webResources>
             <resource>
-                <directory>src/main/resources</directory>
-                <!-- No filtering yet -->
-                <!--filtering>true</filtering-->
+              <directory>src/main/webapp/WEB-INF</directory>
+              <targetPath>WEB-INF</targetPath>
+              <includes>
+                <include>jspwiki.properties</include>
+              </includes>
+              <filtering>true</filtering>
             </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/resources</directory>
-                <filtering>true</filtering>
-            </testResource>
-        </testResources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-eclipse-plugin</artifactId>
-                <version>2.9</version>
-                <configuration>
-                    <additionalConfig>
-                        <file>
-                            <name>.checkstyle</name>
-                            <location>src/main/config/dev/jspwiki-checkstyle.xml</location>
-                        </file>
-                        <file>
-                            <name>.settings/org.eclipse.jdt.core.prefs</name>
-                            <location>src/main/config/dev/jspwiki-eclipse-codestyle.xml</location>
-                        </file>
-                    </additionalConfig>
-                    <additionalProjectnatures>
-                        <projectnature>net.sourceforge.metrics.nature</projectnature>
-                        <projectnature>net.sf.eclipsecs.core.CheckstyleNature</projectnature>                        
-                    </additionalProjectnatures>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.0</version>
-                <configuration>
-                    <source>${jspwiki.jdk.version}</source>
-                    <target>${jspwiki.jdk.version}</target>
-                </configuration>
-            </plugin>
-            <!-- 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>
-                <version>2.1</version>
-                <configuration>
-                    <server>myTomcat</server>
-                    <url>http://localhost:8080/manager/text</url>
-                    <path>/${project.build.finalName}</path>
-                </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.7</version>
-                <executions>
-                    <execution>
-                        <phase>generate-resources</phase>
-                        <id>create_files</id>
-                        <configuration>
-                            <target>
-                                <!-- Creating a specific _en file presently needed just so that "English" will appear as an option on 
-                                     the User Preferences page, language option (and similar issues).  FIXME: change JSP code  
-                                     so this is no longer necessary.
-                                -->
-                                <copy file="src/main/resources/CoreResources.properties" tofile="target/classes/CoreResources_en.properties"/>
-                                <copy file="src/main/resources/templates/default.properties" tofile="target/classes/templates/default_en.properties"/>
-                                <copy file="src/main/resources/plugin/PluginResources.properties" tofile="target/classes/plugin/PluginResources_en.properties"/>
-
-                                <!-- Create web.xml files for testing -->
-                                <copy file="src/main/webapp/WEB-INF/web.xml" tofile="target/test-classes/WEB-INF/web.xml" />
-
-                                <!-- For web unit tests, turn off SSL (self-signed certs b0rk
-                                     the tests) and enable JDBC refs -->
-                                <replace file="target/test-classes/WEB-INF/web.xml"
-                                        token="CONFIDENTIAL" value="NONE" />
-                                <replace file="target/test-classes/WEB-INF/web.xml"
-                                        token="&lt;!--  REMOVE ME TO ENABLE JDBC DATABASE" value="" />
-                                <replace file="target/test-classes/WEB-INF/web.xml"
-                                        token="REMOVE ME TO ENABLE JDBC DATABASE  --&gt;" value="" />
-
-                                <!-- For unit testing, turn on container auth -->
-                                <replace file="target/test-classes/WEB-INF/web.xml"
-                                        token="&lt;!--  REMOVE ME TO ENABLE CONTAINER-MANAGED AUTH" value="" />
-                                <replace file="target/test-classes/WEB-INF/web.xml"
-                                        token="REMOVE ME TO ENABLE CONTAINER-MANAGED AUTH  --&gt;" value="" />
-                           </target>
-                       </configuration>
-                       <goals>
-                           <goal>run</goal>
-                       </goals>
-                   </execution>
-               </executions>
-            </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>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.12.4</version>
-                <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>
-            <!-- 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>
-                <version>1.3.2</version>
-                <executions>
-                    <execution>
-                        <id>compressJSfiles</id>
-                        <goals>
-                            <goal>compress</goal>
-                        </goals>
-                        <configuration>
-                            <nosuffix>true</nosuffix>
-                            <excludeResources>true</excludeResources>
-                            <webappDirectory>${project.build.directory}/generated-sources/yuicompress</webappDirectory>
-                        </configuration>
-                    </execution>
-                </executions> 
-            </plugin>
-            <plugin>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>2.3</version>
-                <configuration>
-                    <archiveClasses>true</archiveClasses>
-                    <webResources>
-                        <resource>
-                            <directory>src/main/webapp/WEB-INF</directory>
-                            <targetPath>WEB-INF</targetPath>
-                            <includes>
-                                <include>jspwiki.properties</include>
-                            </includes>
-                            <filtering>true</filtering>
-                        </resource>
-                        <!-- Output directory configured above with the YUICompressor Maven plugin -->
-                        <resource>
-                            <directory>${project.build.directory}/generated-sources/yuicompress</directory>
-                        </resource>
-                    </webResources>
-                </configuration>
-            </plugin>
-            <!-- Below plugin for Selenium tests (mvn integration-test, not yet working) -->
-            <!--plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
-                <version>8.0.0.M3</version>
-                <configuration>
-                        <scanIntervalSeconds>10</scanIntervalSeconds>
-                        <contextPath>/</contextPath>
-                        <scanIntervalSeconds>10</scanIntervalSeconds>
-                        <stopKey>STOP</stopKey>
-                        <stopPort>8005</stopPort>
-                        <port>8080</port>
-                </configuration>
-                <executions>
-                        <execution>
-                            <id>start-jetty</id>
-                            <phase>pre-integration-test</phase>
-                            <goals>
-                                <goal>stop</goal>
-                                <goal>run-exploded</goal>
-                            </goals>
-                            <configuration>
-                                <scanIntervalSeconds>0</scanIntervalSeconds>
-                                <daemon>true</daemon>
-                            </configuration>
-                        </execution>
-                        <execution>
-                            <id>stop-jetty</id>
-                            <phase>post-integration-test</phase>
-                            <goals>
-                                <goal>stop</goal>
-                            </goals>
-                        </execution>
-                    </executions>        
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>selenium-maven-plugin</artifactId>
-                <version>2.3</version>
-                <configuration>
-                    <browser>*firefox</browser>
-                    <suite>tests/build/webtests/test-custom/selenium/TestSuite.html</suite>
-                    <startURL>http://localhost:8080/JSPWiki</startURL>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>Run-Selenese-Scripts</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                           <goal>selenese</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin-->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>clirr-maven-plugin</artifactId>
-                <version>2.5</version>
-            </plugin>
-            <plugin>
-               <artifactId>maven-javadoc-plugin</artifactId>
-               <version>2.9</version>
-               <configuration>
-                   <quiet>true</quiet>
-               </configuration>
-               <executions>
-                   <execution>
-                       <goals>
-                           <goal>jar</goal>
-                       </goals>
-                   </execution>
-               </executions>
-            </plugin>
-            <!-- 
-                Cobertura unit test coverage checker, see
-                http://mojo.codehaus.org/cobertura-maven-plugin/usage.html
-                http://www.ibm.com/developerworks/java/library/j-cobertura/
-                activate via mvn cobertura:cobertura, check target/site
-                folder for results.
-            -->               
-            <plugin>
-		<groupId>org.codehaus.mojo</groupId>
-		<artifactId>cobertura-maven-plugin</artifactId>
-		<version>2.5.2</version>
-		<configuration>
-		    <formats>
-		        <format>html</format>
-		        <format>xml</format>
-		    </formats>
-		</configuration>
-            </plugin>
-  	    <!-- Sonar software quality checker, 
-  	         http://mojo.codehaus.org/sonar-maven-plugin/plugin-info.html
-  	         Sonar Server must be downloaded and running first  
-	         (test: should be able to access http://localhost:9000/):
-	         http://docs.codehaus.org/display/SONAR/Get+started+in+2+minutes
-	         Apparently activates its own, closely similar, unit test  
-	         coverage (not necessary to run cobertura plugin above)
-	         Activate via mvn sonar:sonar
-	    -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>sonar-maven-plugin</artifactId>
-                <version>2.0</version>
-            </plugin>
-	    <!-- Run via mvn apache-rat:check (http://creadur.apache.org/rat/apache-rat-plugin/plugin-info.html) 
-	         using rat:check activates old Codehaus plugin instead.
-	    -->
-            <plugin>
-                <groupId>org.apache.rat</groupId>
-                <artifactId>apache-rat-plugin</artifactId>
-                <version>0.8</version>
-                <configuration>
-                    <excludes>
-                        <exclude>src/main/config/doc/LICENSE.*</exclude> <!-- License files -->
-                        <exclude>src/main/config/wikipages/**</exclude> <!-- Default wikipages -->
-                        <!-- ChangeLog excluded by default, this is, well, an old ChangeLog -->
-                        <exclude>src/main/config/dev/OldChangeLog</exclude> 
-                        <exclude>src/main/webapp/scripts/*.js</exclude>              <!-- minified files -->
-                        <exclude>src/test/resources/TextFormattingRules.txt</exclude> <!-- test input data -->
-                        <!-- license, required by Silk Icon set cfr. NOTICE, LICENSE, etc. -->
-                        <exclude>src/main/webapp/templates/default/images/SilkIconSet-readme.txt</exclude>     
-                        <exclude>tests/**</exclude> <!-- legacy stuff used by Ant -->
-                        <exclude>build/**</exclude> <!-- legacy stuff used by Ant -->
-                        <exclude>rss.rdf</exclude> <!-- can this go in config/dev? -->
-                    </excludes>
-                </configuration>
-  	        </plugin>
-        </plugins>
-        <pluginManagement>
-        	<plugins>
-        		<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-        		<plugin>
-        			<groupId>org.eclipse.m2e</groupId>
-        			<artifactId>lifecycle-mapping</artifactId>
-        			<version>1.0.0</version>
-        			<configuration>
-        				<lifecycleMappingMetadata>
-        					<pluginExecutions>
-        						<pluginExecution>
-        							<pluginExecutionFilter>
-        								<groupId>org.apache.maven.plugins</groupId>
-        								<artifactId>maven-antrun-plugin</artifactId>
-        								<versionRange>[1.7,)</versionRange>
-        								<goals><goal>run</goal></goals>
-        							</pluginExecutionFilter>
-        							<action><ignore></ignore></action>
-        						</pluginExecution>
-        						<pluginExecution>
-        							<pluginExecutionFilter>
-        								<groupId>net.alchim31.maven</groupId>
-        								<artifactId>yuicompressor-maven-plugin</artifactId>
-        								<versionRange>[1.3.2,)</versionRange>
-        								<goals><goal>compress</goal></goals>
-        							</pluginExecutionFilter>
-        							<action><ignore></ignore></action>
-        						</pluginExecution>
-        					</pluginExecutions>
-        				</lifecycleMappingMetadata>
-        			</configuration>
-        		</plugin>
-        	</plugins>
-        </pluginManagement>
-    </build>
+            <!-- Output directory configured above with the YUICompressor Maven plugin -->
+            <resource>
+              <directory>${project.build.directory}/generated-sources/yuicompress</directory>
+            </resource>
+          </webResources>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>

Modified: incubator/jspwiki/branches/MVN3_BRANCH/mvn_cheat-sheet.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/mvn_cheat-sheet.txt?rev=1486449&r1=1486448&r2=1486449&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/mvn_cheat-sheet.txt (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/mvn_cheat-sheet.txt Sun May 26 19:13:19 2013
@@ -8,7 +8,7 @@ Build specific
 mvn clean install                                        : performs a build
 mvn clean install -Dmaven.skip.test                      : performs a build, skipping the tests (not recommended)
 mvn clean test                                           : compiles the source and executes the tests
-mvn tomcat7:run                                          : (from a war module) starts JSPWiki on a 
+mvn tomcat7:run-war                                      : (from a war module) starts JSPWiki on a 
                                                            Tomcat7 instance at http://localhost:8080/JSPWiki
 mvn clean deploy -Prelease -Dgpg.passphrase=<passphrase> : deploys generated artifact to a repository
                                                            If -Dgpg.passphrase is not given, it'll be asked
@@ -16,8 +16,14 @@ mvn clean install -Pintegration-tests   
 
 Reports specific
 ****************
-mvn apache-rat:check    : creates an Apache RAT report
-mvn cobertura:cobertura : generates a cobertura maven report
+mvn apache-rat:check    : creates an Apache RAT report. See:
+                            http://creadur.apache.org/rat/apache-rat-plugin/plugin-info.html
+mvn cobertura:cobertura : generates a cobertura maven report. See:
+                            http://mojo.codehaus.org/cobertura-maven-plugin/usage.html
+                            http://www.ibm.com/developerworks/java/library/j-cobertura/
 mvn javadoc:javadoc     : creates javadocs; if graphviz binaries (www.graphviz.org) 
                           are found on $PATH, the javadocs will display some UML 
-                          class/package level diagrams
\ No newline at end of file
+                          class/package level diagrams
+mvn sonar:sonar         : generates a Sonar report. Expects a Sonar server running at http://localhost:9000/ See:
+                            http://mojo.codehaus.org/sonar-maven-plugin/plugin-info.html
+                            http://docs.codehaus.org/display/SONAR/Get+started+in+2+minutes
\ No newline at end of file

Modified: incubator/jspwiki/branches/MVN3_BRANCH/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/MVN3_BRANCH/pom.xml?rev=1486449&r1=1486448&r2=1486449&view=diff
==============================================================================
--- incubator/jspwiki/branches/MVN3_BRANCH/pom.xml (original)
+++ incubator/jspwiki/branches/MVN3_BRANCH/pom.xml Sun May 26 19:13:19 2013
@@ -310,6 +310,20 @@
           <configuration>
             <downloadSources>true</downloadSources>
             <downloadJavadocs>true</downloadJavadocs>
+            <additionalConfig>
+              <file>
+                <name>.checkstyle</name>
+                <location>src/main/config/dev/jspwiki-checkstyle.xml</location>
+              </file>
+              <file>
+                <name>.settings/org.eclipse.jdt.core.prefs</name>
+                <location>src/main/config/dev/jspwiki-eclipse-codestyle.xml</location>
+              </file>
+            </additionalConfig>
+            <additionalProjectnatures>
+              <projectnature>net.sourceforge.metrics.nature</projectnature>
+              <projectnature>net.sf.eclipsecs.core.CheckstyleNature</projectnature>            
+            </additionalProjectnatures>
           </configuration>
         </plugin>
         
@@ -356,7 +370,7 @@
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>2.9</version>
           <configuration>
-          <additionalparam>
+            <additionalparam>
             -charset ${project.build.sourceEncoding}
             -docencoding ${project.build.sourceEncoding}
             -version
@@ -368,15 +382,16 @@
             -bottom ""
             -doctitle "${project.name} ${project.version}"
             -link {project.organization.url}
-          </additionalparam>
-          <bottom>Copyright &#169; {inceptionYear}-{currentYear} ${project.organization.name}. All rights reserved.</bottom>
-          <doclet>org.jboss.apiviz.APIviz</doclet>
+            </additionalparam>
+            <bottom>Copyright &#169; {inceptionYear}-{currentYear} ${project.organization.name}. All rights reserved.</bottom>
+            <doclet>org.jboss.apiviz.APIviz</doclet>
             <docletArtifact>
-            <groupId>org.jboss.apiviz</groupId>
-            <artifactId>apiviz</artifactId>
-            <version>1.3.2.GA</version>
-          </docletArtifact>
-          <encoding>${project.build.sourceEncoding}</encoding>
+              <groupId>org.jboss.apiviz</groupId>
+              <artifactId>apiviz</artifactId>
+              <version>1.3.2.GA</version>
+            </docletArtifact>
+            <encoding>${project.build.sourceEncoding}</encoding>
+            <quiet>true</quiet>
           </configuration>
         </plugin>
         
@@ -437,8 +452,8 @@
           <artifactId>yuicompressor-maven-plugin</artifactId>
           <version>1.3.2</version>
           <configuration>
+            <excludeResources>true</excludeResources>
             <nosuffix>true</nosuffix>
-            <warSourceDirectory>${project.basedir}/src/webdocs</warSourceDirectory>
             <webappDirectory>${project.build.directory}/generated-sources/yuicompress</webappDirectory>
           </configuration>
         </plugin>
@@ -450,15 +465,13 @@
           <configuration>
             <excludes>
               <exclude>mvn_cheat-sheet.txt</exclude> <!-- handy list of maven commands; will be moved to site once we've switched to Maven -->
-              <exclude>OldChangeLog</exclude> <!-- ChangeLog excluded by default, this is, well, an old ChangeLog -->
-              <exclude>**/doc/2.10-API.txt</exclude>                  <!-- placeholder for JSPWIKI-303; once completed will be moved to site -->
-              <exclude>**/doc/LICENSE.*</exclude>                     <!-- 3rd party licenses -->
-              <exclude>**/wikipages/**</exclude>                      <!-- default wikipages -->
-              <exclude>**/webdocs/scripts/*.js</exclude>              <!-- minified files -->
-              <exclude>**/dependencyfindertasks.properties</exclude>  <!-- conf. file for dependency finder Ant task -->
-              <exclude>**/tests/etc/TextFormattingRules.txt</exclude> <!-- test input data -->
-              <exclude>**/etc/dtd/web-app_2_3.dtd</exclude>           <!-- Sun's DTD -->
-              <exclude>**/images/SilkIconSet-readme.txt</exclude>     <!-- license, required by Silk Icon set cfr. NOTICE, LICENSE, etc. -->
+              <exclude>**/src/main/config/doc/LICENSE.*</exclude>    <!-- 3rd party License files -->
+              <exclude>**/src/main/config/wikipages/**</exclude>     <!-- Default wikipages -->
+              <exclude>**/src/main/config/dev/OldChangeLog</exclude> <!-- ChangeLog excluded by default, this is, well, an old ChangeLog -->
+              <exclude>**/src/main/webapp/scripts/*.js</exclude>     <!-- minified files -->
+              <exclude>**/src/test/resources/TextFormattingRules.txt</exclude> <!-- test input data -->
+              <exclude>**/src/test/resources/test-repo/*.txt</exclude> <!-- web tests input data -->
+              <exclude>**/src/main/webapp/templates/default/images/SilkIconSet-readme.txt</exclude> <!-- license, required by Silk Icon set cfr. NOTICE, LICENSE, etc. -->
             </excludes>
           </configuration>
         </plugin>
@@ -484,6 +497,10 @@
           <artifactId>cobertura-maven-plugin</artifactId>
           <version>2.5.2</version>
           <configuration>
+            <formats>
+              <format>html</format>
+              <format>xml</format>
+            </formats>
             <systemProperties>
               <property>
                 <name>net.sourceforge.cobertura.datafile</name>



Mime
View raw message