jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gma...@apache.org
Subject svn commit: r1463763 - in /incubator/jspwiki/trunk: ChangeLog build.xml pom.xml
Date Tue, 02 Apr 2013 21:37:34 GMT
Author: gmazza
Date: Tue Apr  2 21:37:34 2013
New Revision: 1463763

URL: http://svn.apache.org/r1463763
Log:
Removed Stripes library from WAR (please re-add if needed); Maven POM updated to bring in
JARs and other WEB-INF artifacts into the WAR.

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/build.xml
    incubator/jspwiki/trunk/pom.xml

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1463763&r1=1463762&r2=1463763&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Tue Apr  2 21:37:34 2013
@@ -1,3 +1,9 @@
+2013-04-02 Glen Mazza (glenmazza AT apache DOT org)
+
+      * Removed apparently unused stripes library from WAR created by build.xml
+
+      * Updated Maven WAR plugin to bring in WEB-INF artifacts: classes, JARs, etc.
+
 2013-04-01 Glen Mazza (glenmazza AT apache DOT org)
 
       * Added YUICompressor Maven plugin into pom.xml to do the same compression

Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1463763&r1=1463762&r2=1463763&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Tue Apr  2 21:37:34 2013
@@ -237,7 +237,7 @@
                      url="${central.url}/org/freshcookies/freshcookies-security/0.60/freshcookies-security-0.60.jar"
/>
         <get-element to-file="${libs.main}/standard-1.1.2.jar" url="${central.url}/taglibs/standard/1.1.2/standard-1.1.2.jar"
/>
         <get-element to-file="${libs.main}/jstl-1.1.2.jar" url="${central.url}/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar"
/>
-        <get-element to-file="${libs.main}/jaxen-1.1-beta-6.jar" url="${central.url}/jaxen/jaxen/1.1-beta-6/jaxen-1.1-beta-6.jar"
/>
+        <get-element to-file="${libs.main}/jaxen-1.1-beta-6.jar" url="${central.url}/jaxen/jaxen/1.1-beta-6/jaxen-1.1-beta-6.jar"/>
         <get-element to-file="${libs.main}/jdom-1.0.jar" url="${central.url}/jdom/jdom/1.0/jdom-1.0.jar"
/>
         <get-element to-file="${libs.main}/jrcs-diff-0.4.2.jar" 
                      url="${central.url}/org/jvnet/hudson/org.suigeneris.jrcs.diff/0.4.2/org.suigeneris.jrcs.diff-0.4.2.jar"
/>
@@ -523,7 +523,7 @@
          webxml="etc/web.xml">
        <lib dir="${libs.main}" includes="*.jar" excludes="servlet-api-*.jar jsp-api-*.jar"/>
        <lib file="${jarfile}" />
-       <lib file="${libs.tests}/stripes*.jar" />
+       <!--lib file="${libs.tests}/stripes*.jar"/-->
        <fileset dir="${code.src}/webdocs" includes="**" excludes="**/FCK/jsp" />
        <webinf dir="etc">
          <include name="dtd/**" />

Modified: incubator/jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1463763&r1=1463762&r2=1463763&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Tue Apr  2 21:37:34 2013
@@ -54,6 +54,7 @@
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
             <version>2.4</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>net.sourceforge</groupId>
@@ -84,6 +85,7 @@
             <groupId>javax.servlet.jsp</groupId>
             <artifactId>jsp-api</artifactId>
             <version>2.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.metaparadigm</groupId>
@@ -154,6 +156,11 @@
             <scope>runtime</scope>
         </dependency>
         <dependency>
+            <groupId>jaxen</groupId>
+            <artifactId>jaxen</artifactId>
+            <version>1.1-beta-6</version>
+        </dependency>
+        <dependency>
             <groupId>net.sourceforge.stripes</groupId>
             <artifactId>stripes</artifactId>
             <version>1.5.7</version>
@@ -189,12 +196,6 @@
             <version>2.25.0</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>jaxen</groupId>
-            <artifactId>jaxen</artifactId>
-            <version>1.1-beta-6</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
 
@@ -408,21 +409,28 @@
                 <version>2.3</version>
                 <configuration>
                     <webXml>etc/web.xml</webXml>
+                    <archiveClasses>true</archiveClasses>
                     <webResources>
-                        <!--resource>
+                        <resource>
                             <directory>etc</directory>
                             <targetPath>WEB-INF</targetPath>
                             <includes>
-                                <include name="dtd/**" />
-                                <include name="commons-logging.properties" />
-                                <include name="jspwiki.policy" />
-                                <include name="jspwiki.properties" />
-                                <include name="*.tld" />
-                                <include name="userdatabase.xml" />
-                                <include name="groupdatabase.xml" />
+                                <include>userdatabase.xml</include>
+                                <include>dtd/**</include>
+                                <include>groupdatabase.xml</include>
                                 <include>geronimo-web.xml</include>
+                                <include>jspwiki.policy</include>
+                                <include>*.tld</include>
+                                <include>jspwiki.properties</include>
                             </includes>
-                        </resource-->
+                        </resource>
+                        <resource>
+                            <directory>etc</directory>
+                            <targetPath>WEB-INF/classes</targetPath>
+                            <includes>
+                                <include>oscache.properties</include>
+                            </includes>
+                        </resource>
                         <resource>
                             <directory>src/webdocs</directory>
                             <includes>



Mime
View raw message