geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject cvs commit: incubator-geronimo/modules/j2ee-schema/src/test-data/j2ee_1_3dtd web-23.xml web-24.xml
Date Thu, 09 Sep 2004 16:47:47 GMT
djencks     2004/09/09 09:47:46

  Modified:    modules/j2ee-schema/src/java/org/apache/geronimo/schema
                        SchemaConversionUtils.java
               modules/j2ee-schema/src/test/org/apache/geronimo/schema
                        SchemaConversionUtilsTest.java
               modules/j2ee-schema/src/test-data/j2ee_1_3dtd web-23.xml
                        web-24.xml
  Log:
  move taglib tags into new jsp-config tag.  Re-fixes GERONIMO-278
  
  Revision  Changes    Path
  1.2       +12 -1     incubator-geronimo/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java
  
  Index: SchemaConversionUtils.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/j2ee-schema/src/java/org/apache/geronimo/schema/SchemaConversionUtils.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SchemaConversionUtils.java	2 Sep 2004 06:25:08 -0000	1.1
  +++ SchemaConversionUtils.java	9 Sep 2004 16:47:46 -0000	1.2
  @@ -124,6 +124,17 @@
               cursor.toFirstChild();
               convertToDescriptionGroup(cursor, moveable);
               convertToJNDIEnvironmentRefsGroup(cursor, moveable);
  +            cursor.push();
  +            QName taglib = new QName(J2EE_NAMESPACE, "taglib");
  +            if (cursor.toNextSibling(taglib)) {
  +                cursor.toPrevSibling();
  +                moveable.toCursor(cursor);
  +                cursor.beginElement("jsp-config", J2EE_NAMESPACE);
  +                while (moveable.toNextSibling(taglib)) {
  +                    moveable.moveXml(cursor);
  +                }
  +            }
  +            cursor.pop();
               do {
                   String name = cursor.getName().getLocalPart();
                   if ("filter".equals(name) || "servlet".equals(name)) {
  
  
  
  1.3       +3 -1      incubator-geronimo/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java
  
  Index: SchemaConversionUtilsTest.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/j2ee-schema/src/test/org/apache/geronimo/schema/SchemaConversionUtilsTest.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SchemaConversionUtilsTest.java	6 Sep 2004 02:16:21 -0000	1.2
  +++ SchemaConversionUtilsTest.java	9 Sep 2004 16:47:46 -0000	1.3
  @@ -201,6 +201,8 @@
           XmlObject xmlObject = XmlObject.Factory.parse(srcXml);
           xmlObject = SchemaConversionUtils.convertToServletSchema(xmlObject);
           XmlObject expected = XmlObject.Factory.parse(expectedOutputXml);
  +//        System.out.println(xmlObject.toString());
  +//        System.out.println(expected.toString());
           List problems = new ArrayList();
           boolean ok = compareXmlObjects(xmlObject, expected, problems);
           assertTrue("Differences: " + problems, ok);
  
  
  
  1.2       +58 -0     incubator-geronimo/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/web-23.xml
  
  Index: web-23.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/web-23.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- web-23.xml	2 Sep 2004 06:25:08 -0000	1.1
  +++ web-23.xml	9 Sep 2004 16:47:46 -0000	1.2
  @@ -58,4 +58,62 @@
           </run-as>
       </servlet>
   
  +    <servlet-mapping>
  +        <servlet-name>LoginServlet</servlet-name>
  +        <url-pattern>/login</url-pattern>
  +    </servlet-mapping>
  +    <servlet-mapping>
  +        <servlet-name>LoginServlet</servlet-name>
  +        <url-pattern>/login-error</url-pattern>
  +    </servlet-mapping>
  +
  +    <taglib>
  +        <taglib-uri>/WEB-INF/tld/struts-bean.tld</taglib-uri>
  +        <taglib-location>/WEB-INF/tld/struts-bean-1.1.tld</taglib-location>
  +    </taglib>
  +
  +    <taglib>
  +        <taglib-uri>/WEB-INF/tld/struts-html.tld</taglib-uri>
  +        <taglib-location>/WEB-INF/tld/struts-html-1.1.tld</taglib-location>
  +    </taglib>
  +
  +    <taglib>
  +        <taglib-uri>/WEB-INF/tld/struts-logic.tld</taglib-uri>
  +        <taglib-location>/WEB-INF/tld/struts-logic-1.1.tld</taglib-location>
  +    </taglib>
  +    <taglib>
  +        <taglib-uri>/WEB-INF/tld/struts-tiles.tld</taglib-uri>
  +        <taglib-location>/WEB-INF/tld/struts-tiles-1.1.tld</taglib-location>
  +    </taglib>
  +
  +    <security-constraint>
  +        <web-resource-collection>
  +            <web-resource-name>Secured Content</web-resource-name>
  +            <description>Require users to authenticate</description>
  +            <url-pattern>/secure/*</url-pattern>
  +            <url-pattern>/servlets/*</url-pattern>
  +            <http-method>POST</http-method>
  +            <http-method>GET</http-method>
  +        </web-resource-collection>
  +        <auth-constraint>
  +            <description>Only allow Authenticated Users role</description>
  +            <role-name>Users</role-name>
  +        </auth-constraint>
  +        <user-data-constraint>
  +            <description>Encryption is not required for the application in general.
  +            </description>
  +            <transport-guarantee>NONE</transport-guarantee>
  +        </user-data-constraint>
  +    </security-constraint>
  +    <login-config>
  +        <auth-method>FORM</auth-method>
  +        <form-login-config>
  +            <form-login-page>/login</form-login-page>
  +            <form-error-page>/login-error</form-error-page>
  +        </form-login-config>
  +    </login-config>
  +    <security-role>
  +        <description>Users</description>
  +        <role-name>Users</role-name>
  +    </security-role>
   </web-app>
  
  
  
  1.2       +111 -59   incubator-geronimo/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/web-24.xml
  
  Index: web-24.xml
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/j2ee-schema/src/test-data/j2ee_1_3dtd/web-24.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- web-24.xml	2 Sep 2004 06:25:08 -0000	1.1
  +++ web-24.xml	9 Sep 2004 16:47:46 -0000	1.2
  @@ -1,61 +1,113 @@
  -<?xml version="1.0" encoding="UTF-8"?>
  -<web-app xmlns="http://java.sun.com/xml/ns/j2ee">
  -    <description>WebAppDescription</description>
  -    <display-name>WebAppDisplayName</display-name>
  +<web-app xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/j2ee">
  +  <description>WebAppDescription</description>
  +  <display-name>WebAppDisplayName</display-name>
  +  <icon>
  +    <small-icon>small</small-icon>
  +    <large-icon>large</large-icon>
  +  </icon>
  +  <distributable/>
  +  <filter>
  +    <description>filterDescription</description>
  +    <display-name>displayName</display-name>
       <icon>
  -        <small-icon>small</small-icon>
  -        <large-icon>large</large-icon>
  +      <small-icon>small</small-icon>
  +      <large-icon>large</large-icon>
       </icon>
  -    <distributable/>
  -    <filter>
  -        <description>filterDescription</description>
  -        <display-name>displayName</display-name>
  -        <icon>
  -            <small-icon>small</small-icon>
  -            <large-icon>large</large-icon>
  -        </icon>
  -        <filter-name>filterName</filter-name>
  -        <filter-class>MyClass</filter-class>
  -        <init-param>
  -            <description>initDescription</description>
  -            <param-name>paramName</param-name>
  -            <param-value>value</param-value>
  -        </init-param>
  -    </filter>
  -
  -    <servlet>
  -        <description>ServletDescription</description>
  -        <display-name>servletDisplayName</display-name>
  -        <icon>
  -            <small-icon>smallServlet</small-icon>
  -            <large-icon>largeServlet</large-icon>
  -        </icon>
  -        <servlet-name>myServlet</servlet-name>
  -        <servlet-class>MyServletClass</servlet-class>
  -        <init-param>
  -            <description>description</description>
  -            <param-name>paramName</param-name>
  -            <param-value>value</param-value>
  -        </init-param>
  -        <load-on-startup>1</load-on-startup>
  -        <run-as>
  -            <role-name>me</role-name>
  -        </run-as>
  -    </servlet>
  -    <servlet>
  -        <description>ServletDescription</description>
  -        <display-name>servletDisplayName</display-name>
  -        <servlet-name>myOtherServlet</servlet-name>
  -        <servlet-class>MyServletClass</servlet-class>
  -        <init-param>
  -            <description>description</description>
  -            <param-name>paramName</param-name>
  -            <param-value>value</param-value>
  -        </init-param>
  -        <load-on-startup>1</load-on-startup>
  -        <run-as>
  -            <role-name>me</role-name>
  -        </run-as>
  -    </servlet>
  -
  -</web-app>
  \ No newline at end of file
  +    <filter-name>filterName</filter-name>
  +    <filter-class>MyClass</filter-class>
  +    <init-param>
  +      <description>initDescription</description>
  +      <param-name>paramName</param-name>
  +      <param-value>value</param-value>
  +    </init-param>
  +  </filter>
  +  <servlet>
  +    <description>ServletDescription</description>
  +    <display-name>servletDisplayName</display-name>
  +    <icon>
  +      <small-icon>smallServlet</small-icon>
  +      <large-icon>largeServlet</large-icon>
  +    </icon>
  +    <servlet-name>myServlet</servlet-name>
  +    <servlet-class>MyServletClass</servlet-class>
  +    <init-param>
  +      <description>description</description>
  +      <param-name>paramName</param-name>
  +      <param-value>value</param-value>
  +    </init-param>
  +    <load-on-startup>1</load-on-startup>
  +    <run-as>
  +      <role-name>me</role-name>
  +    </run-as>
  +  </servlet>
  +  <servlet>
  +    <description>ServletDescription</description>
  +    <display-name>servletDisplayName</display-name>
  +    <servlet-name>myOtherServlet</servlet-name>
  +    <servlet-class>MyServletClass</servlet-class>
  +    <init-param>
  +      <description>description</description>
  +      <param-name>paramName</param-name>
  +      <param-value>value</param-value>
  +    </init-param>
  +    <load-on-startup>1</load-on-startup>
  +    <run-as>
  +      <role-name>me</role-name>
  +    </run-as>
  +  </servlet>
  +  <servlet-mapping>
  +    <servlet-name>LoginServlet</servlet-name>
  +    <url-pattern>/login</url-pattern>
  +  </servlet-mapping>
  +  <jsp-config>
  +    <taglib>
  +      <taglib-uri>/WEB-INF/tld/struts-bean.tld</taglib-uri>
  +      <taglib-location>/WEB-INF/tld/struts-bean-1.1.tld</taglib-location>
  +    </taglib>
  +    <taglib>
  +      <taglib-uri>/WEB-INF/tld/struts-html.tld</taglib-uri>
  +      <taglib-location>/WEB-INF/tld/struts-html-1.1.tld</taglib-location>
  +    </taglib>
  +    <taglib>
  +      <taglib-uri>/WEB-INF/tld/struts-logic.tld</taglib-uri>
  +      <taglib-location>/WEB-INF/tld/struts-logic-1.1.tld</taglib-location>
  +    </taglib>
  +    <taglib>
  +      <taglib-uri>/WEB-INF/tld/struts-tiles.tld</taglib-uri>
  +      <taglib-location>/WEB-INF/tld/struts-tiles-1.1.tld</taglib-location>
  +    </taglib>
  +  </jsp-config>
  +  <servlet-mapping>
  +    <servlet-name>LoginServlet</servlet-name>
  +    <url-pattern>/login-error</url-pattern>
  +  </servlet-mapping>
  +  <security-constraint>
  +    <web-resource-collection>
  +      <web-resource-name>Secured Content</web-resource-name>
  +      <description>Require users to authenticate</description>
  +      <url-pattern>/secure/*</url-pattern>
  +      <url-pattern>/servlets/*</url-pattern>
  +      <http-method>POST</http-method>
  +      <http-method>GET</http-method>
  +    </web-resource-collection>
  +    <auth-constraint>
  +      <description>Only allow Authenticated Users role</description>
  +      <role-name>Users</role-name>
  +    </auth-constraint>
  +    <user-data-constraint>
  +      <description>Encryption is not required for the application in general.</description>
  +      <transport-guarantee>NONE</transport-guarantee>
  +    </user-data-constraint>
  +  </security-constraint>
  +  <login-config>
  +    <auth-method>FORM</auth-method>
  +    <form-login-config>
  +      <form-login-page>/login</form-login-page>
  +      <form-error-page>/login-error</form-error-page>
  +    </form-login-config>
  +  </login-config>
  +  <security-role>
  +    <description>Users</description>
  +    <role-name>Users</role-name>
  +  </security-role>
  +</web-app>
  
  
  

Mime
View raw message