User: starksm
Date: 01/07/08 18:06:08
Modified: src/resources/web/WEB-INF Tag: Branch_2_4 jboss-web.xml
web.xml
Log:
Merge latest changes from main to the 2.4 branch
Revision Changes Path
No revision
No revision
1.4.2.1 +0 -12 jbosstest/src/resources/web/WEB-INF/jboss-web.xml
Index: jboss-web.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/resources/web/WEB-INF/jboss-web.xml,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- jboss-web.xml 2001/06/10 00:20:18 1.4
+++ jboss-web.xml 2001/07/09 01:06:08 1.4.2.1
@@ -23,23 +23,11 @@
</resource-ref>
<ejb-ref>
- <ejb-ref-name>ejb/bean0</ejb-ref-name>
- <jndi-name>ENCBean0</jndi-name>
- </ejb-ref>
- <ejb-ref>
- <ejb-ref-name>ejb/bean1</ejb-ref-name>
- <jndi-name>ENCBean1</jndi-name>
- </ejb-ref>
- <ejb-ref>
<ejb-ref-name>ejb/UnsecuredEJB</ejb-ref-name>
<jndi-name>jbosstest/ejbs/UnsecuredEJB</jndi-name>
</ejb-ref>
<ejb-ref>
<ejb-ref-name>ejb/SecuredEJB</ejb-ref-name>
<jndi-name>jbosstest/ejbs/SecuredEJB</jndi-name>
- </ejb-ref>
- <ejb-ref>
- <ejb-ref-name>ejb/OptimizedEJB</ejb-ref-name>
- <jndi-name>OptimizedEJB</jndi-name>
</ejb-ref>
</jboss-web>
1.8.2.1 +67 -13 jbosstest/src/resources/web/WEB-INF/web.xml
Index: web.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/resources/web/WEB-INF/web.xml,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -r1.8 -r1.8.2.1
--- web.xml 2001/06/10 00:20:18 1.8
+++ web.xml 2001/07/09 01:06:08 1.8.2.1
@@ -46,6 +46,41 @@
<servlet-name>snoop</servlet-name>
<jsp-file>/snoop.jsp</jsp-file>
</servlet>
+ <servlet>
+ <servlet-name>classpath</servlet-name>
+ <jsp-file>/classpath.jsp</jsp-file>
+ </servlet>
+<!-- Default Apache SOAP 2.2 Servlets -->
+ <servlet>
+ <servlet-name>rpcrouter</servlet-name>
+ <display-name>Apache-SOAP RPC Router</display-name>
+ <description>no description</description>
+ <servlet-class>org.apache.soap.server.http.RPCRouterServlet</servlet-class>
+ <init-param>
+ <param-name>faultListener</param-name>
+ <param-value>org.apache.soap.server.DOMFaultListener</param-value>
+ </init-param>
+ </servlet>
+ <servlet>
+ <servlet-name>messagerouter</servlet-name>
+ <display-name>Apache-SOAP Message Router</display-name>
+
<servlet-class>org.apache.soap.server.http.MessageRouterServlet</servlet-class>
+ <init-param>
+ <param-name>faultListener</param-name>
+ <param-value>org.apache.soap.server.DOMFaultListener</param-value>
+ </init-param>
+ </servlet>
+ <servlet>
+ <servlet-name>secure-rpcrouter</servlet-name>
+ <display-name>Apache-SOAP RPC Router</display-name>
+ <description>no description</description>
+ <servlet-class>org.apache.soap.server.http.RPCRouterServlet</servlet-class>
+ <init-param>
+ <param-name>faultListener</param-name>
+ <param-value>org.apache.soap.server.DOMFaultListener</param-value>
+ </init-param>
+ </servlet>
+
<servlet-mapping>
<servlet-name>ENCServlet</servlet-name>
<url-pattern>/ENCServlet</url-pattern>
@@ -82,6 +117,19 @@
<servlet-name>snoop</servlet-name>
<url-pattern>*.snp</url-pattern>
</servlet-mapping>
+<!-- Apache SOAP 2.2 mappings -->
+ <servlet-mapping>
+ <servlet-name>rpcrouter</servlet-name>
+ <url-pattern>/soap/rpcrouter</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>messagerouter</servlet-name>
+ <url-pattern>/soap/messagerouter</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>secure-rpcrouter</servlet-name>
+ <url-pattern>/restricted/soap/rpcrouter</url-pattern>
+ </servlet-mapping>
<!-- The Welcome File List -->
<welcome-file-list>
@@ -148,41 +196,47 @@
<env-entry>
<description>Integer0</description>
<env-entry-name>Ints/i0</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
<env-entry-value>0</env-entry-value>
+ <env-entry-type>java.lang.Integer</env-entry-type>
</env-entry>
<env-entry>
<description>Integer1</description>
<env-entry-name>Ints/i1</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
<env-entry-value>1</env-entry-value>
+ <env-entry-type>java.lang.Integer</env-entry-type>
</env-entry>
<env-entry>
<description>Float0</description>
<env-entry-name>Floats/f0</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
<env-entry-value>0.0</env-entry-value>
+ <env-entry-type>java.lang.Float</env-entry-type>
</env-entry>
<env-entry>
<description>Float1</description>
<env-entry-name>Floats/f1</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
<env-entry-value>1.1</env-entry-value>
+ <env-entry-type>java.lang.Float</env-entry-type>
</env-entry>
<env-entry>
<description>String0</description>
<env-entry-name>Strings/s0</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>String0</env-entry-value>
+ <env-entry-type>java.lang.String</env-entry-type>
</env-entry>
<env-entry>
<description>String1</description>
<env-entry-name>Strings/s1</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>String1</env-entry-value>
+ <env-entry-type>java.lang.String</env-entry-type>
</env-entry>
+ <env-entry>
+ <env-entry-name>ejb/catalog/CatalogDAOClass</env-entry-name>
+ <env-entry-value>com.sun.model.dao.CatalogDAOImpl</env-entry-value>
+ <env-entry-type>java.lang.String</env-entry-type>
+ </env-entry>
<!-- ### EJB References (java:comp/env/ejb) -->
+ <!-- An ejb-ref that has no corresponding ejb-ref in jboss-web.xml -->
<ejb-ref>
<ejb-ref-name>ejb/bean0</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
@@ -197,7 +251,6 @@
<home>org.jboss.test.web.interfaces.StatelessSessionHome</home>
<remote>org.jboss.test.web.interfaces.StatelessSession</remote>
</ejb-ref>
- <!-- An ejb-ref that has no corresponding ejb-ref in jboss-web.xml -->
<ejb-ref>
<ejb-ref-name>ejb/bean2</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
@@ -206,23 +259,24 @@
<remote>org.jboss.test.web.interfaces.StatelessSession</remote>
</ejb-ref>
<ejb-ref>
- <ejb-ref-name>ejb/SecuredEJB</ejb-ref-name>
+ <ejb-ref-name>ejb/OptimizedEJB</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
- <ejb-link>SecuredEJB</ejb-link>
+ <ejb-link>OptimizedEJB</ejb-link>
<home>org.jboss.test.web.interfaces.StatelessSessionHome</home>
<remote>org.jboss.test.web.interfaces.StatelessSession</remote>
</ejb-ref>
+
<ejb-ref>
- <ejb-ref-name>ejb/UnsecuredEJB</ejb-ref-name>
+ <ejb-ref-name>ejb/SecuredEJB</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
- <ejb-link>UnsecuredEJB</ejb-link>
+ <ejb-link>SecuredEJB</ejb-link>
<home>org.jboss.test.web.interfaces.StatelessSessionHome</home>
<remote>org.jboss.test.web.interfaces.StatelessSession</remote>
</ejb-ref>
<ejb-ref>
- <ejb-ref-name>ejb/OptimizedEJB</ejb-ref-name>
+ <ejb-ref-name>ejb/UnsecuredEJB</ejb-ref-name>
<ejb-ref-type>Session</ejb-ref-type>
- <ejb-link>OptimizedEJB</ejb-link>
+ <ejb-link>UnsecuredEJB</ejb-link>
<home>org.jboss.test.web.interfaces.StatelessSessionHome</home>
<remote>org.jboss.test.web.interfaces.StatelessSession</remote>
</ejb-ref>
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
