Author: jmitchell
Date: Fri Jan 21 08:42:27 2005
New Revision: 125940

URL: http://svn.apache.org/viewcvs?view=rev&rev=125940
Log:
fix apps, deprecate old target, fix mailreader so that a mailreader jar is 
produced
Modified:
   struts/apps/trunk/maven.xml
   struts/apps/trunk/project.xml
   struts/apps/trunk/shared/project.xml

Modified: struts/apps/trunk/maven.xml
Url: 
http://svn.apache.org/viewcvs/struts/apps/trunk/maven.xml?view=diff&rev=125940&p1=struts/apps/trunk/maven.xml&r1=125939&p2=struts/apps/trunk/maven.xml&r2=125940
==============================================================================
--- struts/apps/trunk/maven.xml (original)
+++ struts/apps/trunk/maven.xml Fri Jan 21 08:42:27 2005
@@ -9,15 +9,31 @@
        <j:set var="core.dist.lib.dir"             value="../../core/dist/lib"/>

        <j:set var="core.conf.share.dir" value="../../core/conf/share"/>

        

-       

     <goal name="apps:build-all">

+    

+       
<echo>=================================================================</echo>

+       <echo>                                                                 
</echo>

+       <echo>   apps:build target is no longer used, use 'dist' instead       
</echo>

+       <echo>                                                                 
</echo>

+       
<echo>=================================================================</echo>

+    

+       <fail message="apps:build target is no longer used, use 'dist' 
instead"/>

+    </goal>

+    

+    <goal name="dist">

 

+               <!-- 

+                       todo: this builds a struts-mailreader-1.3.0-dev.jar

+                             but the other apps do not use it

+               

+               -->

         <maven:reactor  basedir="${basedir}"

                         includes="shared/project.xml"

-                        goals="java:compile, war:webapp, war:war"

+                        goals="java:compile, jar:install, war:webapp, war:war"

                         banner="Building default mailreader app"

                         ignoreFailures="false"/>

-                        

+               

+               

         <maven:reactor  basedir="${basedir}"

                         includes="*/project.xml"

                         excludes="shared/project.xml"


Modified: struts/apps/trunk/project.xml
Url: 
http://svn.apache.org/viewcvs/struts/apps/trunk/project.xml?view=diff&rev=125940&p1=struts/apps/trunk/project.xml&r1=125939&p2=struts/apps/trunk/project.xml&r2=125940
==============================================================================
--- struts/apps/trunk/project.xml       (original)
+++ struts/apps/trunk/project.xml       Fri Jan 21 08:42:27 2005
@@ -4,7 +4,7 @@
   <id>struts</id>

 

   <name>struts</name>

-  <groupId>Apache Struts</groupId>

+  <groupId>struts</groupId>

   <currentVersion>1.3.0-dev</currentVersion>

 

 

@@ -281,7 +281,7 @@
     <dependency>

       <groupId>servletapi</groupId>

       <artifactId>servletapi</artifactId>

-      <version>2.2</version>

+      <version>2.3</version>

     </dependency>

     <!-- for unit tests -->

     <dependency>


Modified: struts/apps/trunk/shared/project.xml
Url: 
http://svn.apache.org/viewcvs/struts/apps/trunk/shared/project.xml?view=diff&rev=125940&p1=struts/apps/trunk/shared/project.xml&r1=125939&p2=struts/apps/trunk/shared/project.xml&r2=125940
==============================================================================
--- struts/apps/trunk/shared/project.xml        (original)
+++ struts/apps/trunk/shared/project.xml        Fri Jan 21 08:42:27 2005
@@ -2,7 +2,8 @@
 

 <project>

   <extend>${basedir}/../project.xml</extend>

-  <id>mailreader</id>

+  <id>struts</id>

+  <artifactId>struts-mailreader</artifactId>

   <name>Struts mailreader web application</name>

   <package>org.apache.struts.webapp.example.*</package>

 


---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to