geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r544915 - in /geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples: pom.xml src/main/webapp/WEB-INF/jsp/debug-taglib.tld src/main/webapp/WEB-INF/jsp/example-taglib.tld src/main/webapp/WEB-INF/lib/
Date Wed, 06 Jun 2007 18:38:47 GMT
Author: dwoods
Date: Wed Jun  6 11:38:46 2007
New Revision: 544915

URL: http://svn.apache.org/viewvc?view=rev&rev=544915
Log:
GERONIMO-3215 Correct deployment errors with jsp-examples sample.  Removed jspc-maven-plugin
usage as it breaks the sample and isn't worth the time to fix it....

Removed:
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/lib/
Modified:
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/jsp/debug-taglib.tld
    geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/jsp/example-taglib.tld

Modified: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml?view=diff&rev=544915&r1=544914&r2=544915
==============================================================================
--- geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml (original)
+++ geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/pom.xml Wed
Jun  6 11:38:46 2007
@@ -58,13 +58,11 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.mojo.jspc</groupId>
-                <artifactId>jspc-maven-plugin</artifactId>
-            </plugin>
-            
-            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <webXml>${pom.basedir}/src/main/webapp/WEB-INF/web.xml</webXml>
+                </configuration>
             </plugin>
         </plugins>
     </build>

Modified: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/jsp/debug-taglib.tld
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/jsp/debug-taglib.tld?view=diff&rev=544915&r1=544914&r2=544915
==============================================================================
--- geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/jsp/debug-taglib.tld
(original)
+++ geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/jsp/debug-taglib.tld
Wed Jun  6 11:38:46 2007
@@ -40,7 +40,7 @@
   <tag>
     <name>log</name>
     <tag-class>examples.LogTag</tag-class>
-    <body-content>TAGDEPENDENT</body-content>
+    <body-content>tagdependent</body-content>
     <description>
 	Perform a server side action; Log the message.
     </description>

Modified: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/jsp/example-taglib.tld
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/jsp/example-taglib.tld?view=diff&rev=544915&r1=544914&r2=544915
==============================================================================
--- geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/jsp/example-taglib.tld
(original)
+++ geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/jsp/example-taglib.tld
Wed Jun  6 11:38:46 2007
@@ -70,7 +70,7 @@
   <tag>
     <name>log</name>
     <tag-class>examples.LogTag</tag-class>
-    <body-content>TAGDEPENDENT</body-content>
+    <body-content>tagdependent</body-content>
     <description>
 	Perform a server side action; Log the message.
     </description>



Mime
View raw message