geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dwo...@apache.org
Subject svn commit: r544893 - in /geronimo/server/trunk: applications/console/geronimo-console-framework/ applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/ applications/console/geronimo-console-standard/ applications/console/geronimo-con...
Date Wed, 06 Jun 2007 17:36:51 GMT
Author: dwoods
Date: Wed Jun  6 10:36:47 2007
New Revision: 544893

URL: http://svn.apache.org/viewvc?view=rev&rev=544893
Log:
GERONIMO-3209 Removing updates as it seems the jspc-maven-plugin-2.0-20070603.144720-1.jar
creates invalid web.xml files on Windows, but works correctly on Linux with or w/o the <configuration>
and fragment comments.  Verified changes on WinXP and SLED10 by accessing the Admin Console
and deploying the servlet-examples.

Modified:
    geronimo/server/trunk/applications/console/geronimo-console-framework/pom.xml
    geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/web.xml
    geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/web.xml
    geronimo/server/trunk/applications/geronimo-ca-helper/pom.xml
    geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/WEB-INF/web.xml
    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/web.xml
    geronimo/server/trunk/applications/geronimo-ldap-demo/pom.xml
    geronimo/server/trunk/applications/geronimo-ldap-demo/src/main/webapp/WEB-INF/web.xml
    geronimo/server/trunk/applications/geronimo-remote-deploy/pom.xml
    geronimo/server/trunk/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/web.xml
    geronimo/server/trunk/applications/geronimo-uddi-server/pom.xml
    geronimo/server/trunk/applications/geronimo-uddi-server/src/main/webapp/WEB-INF/web.xml
    geronimo/server/trunk/applications/geronimo-welcome/pom.xml
    geronimo/server/trunk/applications/geronimo-welcome/src/main/webapp/WEB-INF/web.xml
    geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/src/main/webapp/WEB-INF/web.xml

Modified: geronimo/server/trunk/applications/console/geronimo-console-framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-framework/pom.xml?view=diff&rev=544893&r1=544892&r2=544893
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-framework/pom.xml (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-framework/pom.xml Wed Jun
 6 10:36:47 2007
@@ -86,9 +86,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo.jspc</groupId>
                 <artifactId>jspc-maven-plugin</artifactId>
-                <configuration>
-                    <injectString>&lt;!-- [INSERT FRAGMENT HERE] --&gt;</injectString>
-                </configuration>
             </plugin>
             
             <plugin>

Modified: geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/web.xml?view=diff&rev=544893&r1=544892&r2=544893
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/WEB-INF/web.xml
Wed Jun  6 10:36:47 2007
@@ -147,8 +147,6 @@
     </servlet>
     -->
 
-<!-- [INSERT FRAGMENT HERE] -->
-
     <servlet-mapping>
         <servlet-name>se-console</servlet-name>
         <url-pattern>/portal/*</url-pattern>

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml?view=diff&rev=544893&r1=544892&r2=544893
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/pom.xml Wed Jun 
6 10:36:47 2007
@@ -142,9 +142,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo.jspc</groupId>
                 <artifactId>jspc-maven-plugin</artifactId>
-                <configuration>
-                    <injectString>&lt;!-- [INSERT FRAGMENT HERE] --&gt;</injectString>
-                </configuration>
             </plugin>
             
             <plugin>

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/web.xml?view=diff&rev=544893&r1=544892&r2=544893
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/web.xml
Wed Jun  6 10:36:47 2007
@@ -842,8 +842,6 @@
         </init-param>
     </servlet>
 
-<!-- [INSERT FRAGMENT HERE] -->
-
     <servlet-mapping>
         <servlet-name>LDAPViewer</servlet-name>
         <url-pattern>/LDAPViewer/*</url-pattern>

Modified: geronimo/server/trunk/applications/geronimo-ca-helper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-ca-helper/pom.xml?view=diff&rev=544893&r1=544892&r2=544893
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/pom.xml (original)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/pom.xml Wed Jun  6 10:36:47 2007
@@ -73,9 +73,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo.jspc</groupId>
                 <artifactId>jspc-maven-plugin</artifactId>
-                <configuration>
-                    <injectString>&lt;!-- [INSERT FRAGMENT HERE] --&gt;</injectString>
-                </configuration>
             </plugin>
 
             <plugin>

Modified: geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/WEB-INF/web.xml?view=diff&rev=544893&r1=544892&r2=544893
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/server/trunk/applications/geronimo-ca-helper/src/main/webapp/WEB-INF/web.xml
Wed Jun  6 10:36:47 2007
@@ -37,7 +37,7 @@
             org.apache.geronimo.ca.helper.DownloadCertificateServlet
         </servlet-class>
     </servlet>
-    <!-- [INSERT FRAGMENT HERE] --> 
+
     <servlet-mapping>
         <servlet-name>CertificateRequestServlet</servlet-name>
         <url-pattern>/CertificateRequestServlet</url-pattern>

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=544893&r1=544892&r2=544893
==============================================================================
--- 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 10:36:47 2007
@@ -60,9 +60,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo.jspc</groupId>
                 <artifactId>jspc-maven-plugin</artifactId>
-                <configuration>
-                    <injectString>&lt;!-- [INSERT FRAGMENT HERE] --&gt;</injectString>
-                </configuration>
             </plugin>
             
             <plugin>

Modified: geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/web.xml?view=diff&rev=544893&r1=544892&r2=544893
==============================================================================
--- geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/server/trunk/applications/geronimo-examples/geronimo-jsp-examples/src/main/webapp/WEB-INF/web.xml
Wed Jun  6 10:36:47 2007
@@ -124,8 +124,6 @@
         </servlet-class>
     </servlet>
     
-    <!-- [INSERT FRAGMENT HERE] -->
-    
     <servlet-mapping>
         <servlet-name>
             CompressionFilterTestServlet

Modified: geronimo/server/trunk/applications/geronimo-ldap-demo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-ldap-demo/pom.xml?view=diff&rev=544893&r1=544892&r2=544893
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ldap-demo/pom.xml (original)
+++ geronimo/server/trunk/applications/geronimo-ldap-demo/pom.xml Wed Jun  6 10:36:47 2007
@@ -46,9 +46,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo.jspc</groupId>
                 <artifactId>jspc-maven-plugin</artifactId>
-                <configuration>
-                    <injectString>&lt;!-- [INSERT FRAGMENT HERE] --&gt;</injectString>
-                </configuration>
             </plugin>
             
             <plugin>

Modified: geronimo/server/trunk/applications/geronimo-ldap-demo/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-ldap-demo/src/main/webapp/WEB-INF/web.xml?view=diff&rev=544893&r1=544892&r2=544893
==============================================================================
--- geronimo/server/trunk/applications/geronimo-ldap-demo/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/server/trunk/applications/geronimo-ldap-demo/src/main/webapp/WEB-INF/web.xml
Wed Jun  6 10:36:47 2007
@@ -21,8 +21,6 @@
          xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
          version="2.4">
 
-  <!-- [INSERT FRAGMENT HERE] --> 
-
     <!-- Welcome File List -->
     <welcome-file-list>
         <welcome-file>index.html</welcome-file>

Modified: geronimo/server/trunk/applications/geronimo-remote-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-remote-deploy/pom.xml?view=diff&rev=544893&r1=544892&r2=544893
==============================================================================
--- geronimo/server/trunk/applications/geronimo-remote-deploy/pom.xml (original)
+++ geronimo/server/trunk/applications/geronimo-remote-deploy/pom.xml Wed Jun  6 10:36:47
2007
@@ -60,9 +60,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo.jspc</groupId>
                 <artifactId>jspc-maven-plugin</artifactId>
-                <configuration>
-                    <injectString>&lt;!-- [INSERT FRAGMENT HERE] --&gt;</injectString>
-                </configuration>
             </plugin>
             
             <plugin>

Modified: geronimo/server/trunk/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/web.xml?view=diff&rev=544893&r1=544892&r2=544893
==============================================================================
--- geronimo/server/trunk/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/server/trunk/applications/geronimo-remote-deploy/src/main/webapp/WEB-INF/web.xml
Wed Jun  6 10:36:47 2007
@@ -40,8 +40,6 @@
         <servlet-class>org.apache.geronimo.deployment.remote.BarfServlet</servlet-class>
     </servlet>
 
-    <!-- [INSERT FRAGMENT HERE] --> 
-
     <servlet-mapping>
         <servlet-name>file-upload</servlet-name>
         <url-pattern>/upload</url-pattern>

Modified: geronimo/server/trunk/applications/geronimo-uddi-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-uddi-server/pom.xml?view=diff&rev=544893&r1=544892&r2=544893
==============================================================================
--- geronimo/server/trunk/applications/geronimo-uddi-server/pom.xml (original)
+++ geronimo/server/trunk/applications/geronimo-uddi-server/pom.xml Wed Jun  6 10:36:47 2007
@@ -54,9 +54,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo.jspc</groupId>
                 <artifactId>jspc-maven-plugin</artifactId>
-                <configuration>
-                    <injectString>&lt;!-- [INSERT FRAGMENT HERE] --&gt;</injectString>
-                </configuration>
             </plugin>
 
             <plugin>

Modified: geronimo/server/trunk/applications/geronimo-uddi-server/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-uddi-server/src/main/webapp/WEB-INF/web.xml?view=diff&rev=544893&r1=544892&r2=544893
==============================================================================
--- geronimo/server/trunk/applications/geronimo-uddi-server/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/server/trunk/applications/geronimo-uddi-server/src/main/webapp/WEB-INF/web.xml
Wed Jun  6 10:36:47 2007
@@ -59,8 +59,6 @@
         <servlet-class>org.apache.juddi.registry.PublishService</servlet-class>
     </servlet>
 
-    <!-- [INSERT FRAGMENT HERE] --> 
-
     <servlet-mapping>
         <servlet-name>jUDDIAdminService</servlet-name>
         <url-pattern>/admin</url-pattern>

Modified: geronimo/server/trunk/applications/geronimo-welcome/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-welcome/pom.xml?view=diff&rev=544893&r1=544892&r2=544893
==============================================================================
--- geronimo/server/trunk/applications/geronimo-welcome/pom.xml (original)
+++ geronimo/server/trunk/applications/geronimo-welcome/pom.xml Wed Jun  6 10:36:47 2007
@@ -66,9 +66,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo.jspc</groupId>
                 <artifactId>jspc-maven-plugin</artifactId>
-                <configuration>
-                    <injectString>&lt;!-- [INSERT FRAGMENT HERE] --&gt;</injectString>
-                </configuration>
             </plugin>
 
             <plugin>

Modified: geronimo/server/trunk/applications/geronimo-welcome/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/geronimo-welcome/src/main/webapp/WEB-INF/web.xml?view=diff&rev=544893&r1=544892&r2=544893
==============================================================================
--- geronimo/server/trunk/applications/geronimo-welcome/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/applications/geronimo-welcome/src/main/webapp/WEB-INF/web.xml Wed
Jun  6 10:36:47 2007
@@ -53,8 +53,6 @@
         </init-param>
     </servlet>
 
-    <!-- [INSERT FRAGMENT HERE] --> 
-
     <servlet-mapping>
         <servlet-name>jsp_sample_installer</servlet-name>
         <url-pattern>/jsp-examples/*</url-pattern>

Modified: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/src/main/webapp/WEB-INF/web.xml?view=diff&rev=544893&r1=544892&r2=544893
==============================================================================
--- geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-war/src/main/webapp/WEB-INF/web.xml
Wed Jun  6 10:36:47 2007
@@ -31,8 +31,6 @@
         <load-on-startup>0</load-on-startup>
     </servlet>
 
-    <!-- [INSERT FRAGMENT HERE] --> 
-
     <servlet-mapping>
         <servlet-name>servlet</servlet-name>
         <url-pattern>/servlet</url-pattern>



Mime
View raw message