continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r794947 - in /continuum/trunk/continuum-webapp: ./ pom.xml src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp
Date Fri, 17 Jul 2009 02:39:30 GMT
Author: brett
Date: Fri Jul 17 02:39:29 2009
New Revision: 794947

URL: http://svn.apache.org/viewvc?rev=794947&view=rev
Log:
fix jetty:run
Merged from: r794946

Modified:
    continuum/trunk/continuum-webapp/   (props changed)
    continuum/trunk/continuum-webapp/pom.xml
    continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java
  (props changed)
    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp
  (props changed)

Propchange: continuum/trunk/continuum-webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jul 17 02:39:29 2009
@@ -0,0 +1,4 @@
+/continuum/branches/continuum-1.2.x/continuum-webapp:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339,722279,722624,723119,723487,724016,724024,725845,726103,726239,726462
+/continuum/branches/continuum-1.3.x/continuum-webapp:766106,766120-766121,766641,766645,766669,766977,767397,767792,767796,768222,786863,794946
+/continuum/branches/continuum-distributed-builds/continuum-webapp:713270-734307
+/continuum/tags/continuum-1.2.3/continuum-webapp:733253

Modified: continuum/trunk/continuum-webapp/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/pom.xml?rev=794947&r1=794946&r2=794947&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/pom.xml (original)
+++ continuum/trunk/continuum-webapp/pom.xml Fri Jul 17 02:39:29 2009
@@ -105,8 +105,7 @@
           <!-- Some versions of maven-war-plugin (snapshots) have this incorrectly defaulted
to true.
                Specifically setting this to false to avoid accidental jar file creation.
-->
           <archiveClasses>false</archiveClasses>
-          <dependentWarExcludes>META-INF/**,WEB-INF/web.xml,WEB-INF/classes/xwork.xml,WEB-INF/lib/**
-          </dependentWarExcludes>
+          <dependentWarExcludes>META-INF/**,WEB-INF/web.xml,WEB-INF/classes/xwork.xml,WEB-INF/lib/**</dependentWarExcludes>
         </configuration>
         <!-- TODO: would be good to make the jetty plugin aware of these and remove the
below -->
         <executions>
@@ -137,10 +136,10 @@
             <configuration>
               <tasks>
                 <delete includeemptydirs="true">
-                  <fileset dir="${basedir}/src/main/webapp/WEB-INF/lib" includes="**/struts2*.jar"
/>
+                  <fileset dir="${basedir}/src/main/webapp/WEB-INF/lib" includes="struts2*.jar"
/>
                 </delete>
                 <delete includeemptydirs="true">
-                  <fileset dir="${basedir}/src/main/webapp/WEB-INF/classes" includes="**/struts.*"
/>
+                  <fileset dir="${basedir}/src/main/webapp/WEB-INF/classes" includes="struts.xml,struts-security.xml"
/>
                 </delete>
               </tasks>
             </configuration>

Propchange: continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 17 02:39:29 2009
@@ -1,2 +1,2 @@
-/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java:766106,766120-766121,766641,766645,766669,766977,767397,767792,767796,768222,786863,794908,794914,794925,794930
+/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java:766106,766120-766121,766641,766645,766669,766977,767397,767792,767796,768222,786863,794908,794914,794925,794930,794946
 /continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/action/admin/BuildAgentAction.java:713270-724659,724671-733412

Propchange: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jul 17 02:39:29 2009
@@ -1,2 +1,2 @@
 /continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/configurationDeleteBuildAgent.jsp:690684,690689-690799,698449-698533,698817-698819,699529,700250,700273,700936,705894,705910,708339
-/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp:766106,766120-766121,766641,766645,766669,766977,767397,767792,767796,768222,786863,794908,794914,794925,794930
+/continuum/branches/continuum-1.3.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteBuildAgent.jsp:766106,766120-766121,766641,766645,766669,766977,767397,767792,767796,768222,786863,794908,794914,794925,794930,794946



Mime
View raw message