You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by jm...@apache.org on 2005/01/20 04:11:25 UTC

svn commit: r125700 - /struts/apps/trunk/README.txt /struts/apps/trunk/build-tests.xml /struts/apps/trunk/build-webapp.xml /struts/apps/trunk/build-webapps.xml /struts/apps/trunk/maven.xml /struts/apps/trunk/project.xml /struts/apps/trunk/test

Author: jmitchell
Date: Wed Jan 19 19:11:25 2005
New Revision: 125700

URL: http://svn.apache.org/viewcvs?view=rev&rev=125700
Log:
move taglib tests and config to apps
Added:
   struts/apps/trunk/build-tests.xml
      - copied unchanged from r125346, struts/core/trunk/build-tests.xml
   struts/apps/trunk/build-webapp.xml
      - copied unchanged from r125346, struts/core/trunk/build-webapp.xml
   struts/apps/trunk/build-webapps.xml
      - copied unchanged from r125346, struts/core/trunk/build-webapps.xml
   struts/apps/trunk/test/
      - copied from r125346, struts/core/trunk/conf/test/
Modified:
   struts/apps/trunk/README.txt
   struts/apps/trunk/maven.xml
   struts/apps/trunk/project.xml

Modified: struts/apps/trunk/README.txt
Url: http://svn.apache.org/viewcvs/struts/apps/trunk/README.txt?view=diff&rev=125700&p1=struts/apps/trunk/README.txt&r1=125699&p2=struts/apps/trunk/README.txt&r2=125700
==============================================================================
--- struts/apps/trunk/README.txt	(original)
+++ struts/apps/trunk/README.txt	Wed Jan 19 19:11:25 2005
@@ -1,11 +1,11 @@
 This file lays out the plan for and progress status of the 
-various mailreader sample applications.
+various mailreader (and other) sample applications.
 
 
 To build all applications under "apps":
 
 maven apps:build-all
-
+ant dist
 
 
 The plan (to do):
@@ -159,4 +159,36 @@
   '  '    [+] resources
   '  '    [+] test
   '  '    [+] webapp
+
+
+
+Current TODO
+------------
+I've got the mailreader application finally running under tomcat.
+The only things outside of maven or ant that I had to do was copy
+the *.dtd, *.tld, and config.xml from core
+
+
+copy .properties from src/java
+
+
+
+all 
+	- projects need to be able to grab tld dtd
+	- projects need junit tests
+	- projects need clover coverage
+	
+tiles 
+	- add maven.xml to tiles and fire off tiles-documentation war
+	- create a build.xml
+
+core
+	- current\taglib\src\webapp\test\java\org\apache\struts\action
+	   is almost the same as
+	  current\core\src\test\org\apache\struts\action
+
+	- core/conf/test needs to move
+
+apps
+	- finish changing mailreader-el
 

Copied: struts/apps/trunk/build-tests.xml (from r125346, struts/core/trunk/build-tests.xml)
Url: http://svn.apache.org/viewcvs/struts/apps/trunk/build-tests.xml?view=diff&rev=125700&p1=struts/core/trunk/build-tests.xml&r1=125346&p2=struts/apps/trunk/build-tests.xml&r2=125700
==============================================================================

Copied: struts/apps/trunk/build-webapp.xml (from r125346, struts/core/trunk/build-webapp.xml)
Url: http://svn.apache.org/viewcvs/struts/apps/trunk/build-webapp.xml?view=diff&rev=125700&p1=struts/core/trunk/build-webapp.xml&r1=125346&p2=struts/apps/trunk/build-webapp.xml&r2=125700
==============================================================================

Copied: struts/apps/trunk/build-webapps.xml (from r125346, struts/core/trunk/build-webapps.xml)
Url: http://svn.apache.org/viewcvs/struts/apps/trunk/build-webapps.xml?view=diff&rev=125700&p1=struts/core/trunk/build-webapps.xml&r1=125346&p2=struts/apps/trunk/build-webapps.xml&r2=125700
==============================================================================

Modified: struts/apps/trunk/maven.xml
Url: http://svn.apache.org/viewcvs/struts/apps/trunk/maven.xml?view=diff&rev=125700&p1=struts/apps/trunk/maven.xml&r1=125699&p2=struts/apps/trunk/maven.xml&r2=125700
==============================================================================
--- struts/apps/trunk/maven.xml	(original)
+++ struts/apps/trunk/maven.xml	Wed Jan 19 19:11:25 2005
@@ -5,7 +5,9 @@
             xmlns:ant="jelly:ant"
             xmlns:maven="jelly:maven">
             
-	<j:set var="shared.war.dir" value="../shared/target/mailreader"/>
+	<j:set var="shared.war.dir"      value="../shared/target/mailreader"/>
+	<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">
@@ -39,6 +41,18 @@
 
 	<postGoal name="war:webapp">
 	
+		<ant:copy todir="${maven.war.webapp.dir}/WEB-INF" overwrite="false">
+			<ant:fileset dir="${core.dist.lib.dir}"
+				includes="*.tld, *.dtd">
+			</ant:fileset>
+		</ant:copy>
+		
+		<ant:copy todir="${maven.war.webapp.dir}/WEB-INF" overwrite="false">
+			<ant:fileset dir="${core.conf.share.dir}"
+				includes="*.xml">
+			</ant:fileset>
+		</ant:copy>
+		
 	  <j:if test="${pom.name.indexOf('mailreader-') != '-1'}">
 		<ant:copy todir="${maven.war.webapp.dir}" overwrite="false">
 			<ant:fileset dir="${shared.war.dir}"
@@ -46,6 +60,7 @@
 			</ant:fileset>
 		</ant:copy>
 	  </j:if>
+	  
 	</postGoal>
 	
 </project>

Modified: struts/apps/trunk/project.xml
Url: http://svn.apache.org/viewcvs/struts/apps/trunk/project.xml?view=diff&rev=125700&p1=struts/apps/trunk/project.xml&r1=125699&p2=struts/apps/trunk/project.xml&r2=125700
==============================================================================
--- struts/apps/trunk/project.xml	(original)
+++ struts/apps/trunk/project.xml	Wed Jan 19 19:11:25 2005
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
-
 <project>
   <pomVersion>3</pomVersion>
   <id>struts</id>
-  <groupId>Apache Struts</groupId>
-  <currentVersion>1.2.6</currentVersion>
+
   <name>struts</name>
+  <groupId>Apache Struts</groupId>
+  <currentVersion>1.3.0-dev</currentVersion>
 
 
     <!-- ################################################################ -->
@@ -173,7 +173,7 @@
     <dependency>
       <groupId>struts</groupId>
       <artifactId>struts</artifactId>
-      <version>1.2.6</version>
+      <version>1.3.0-dev</version>
       <url>http://struts.apache.org/</url>
       <properties>
         <war.bundle>true</war.bundle>
@@ -184,7 +184,7 @@
     <dependency>
 	  <groupId>struts</groupId>
 	  <artifactId>struts-taglib</artifactId>
-	  <version>1.0-SNAPSHOT</version>
+	  <version>1.3-dev</version>
       <properties>
         <war.bundle>true</war.bundle>
         <cactus.bundle>true</cactus.bundle>
@@ -387,8 +387,10 @@
     <report>maven-tasklist-plugin</report>
     <report>maven-pmd-plugin</report>
     <report>maven-simian-plugin</report>
+
     <!-- 
-    
+
+
     -->
   </reports>
 </project>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org