[jboss-cvs] JBossAS SVN: r58373 - trunk/testsuite/src/resources/web/simple-xmlonly
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 14 21:03:48 EST 2006
Author: scott.stark at jboss.org
Date: 2006-11-14 21:03:45 -0500 (Tue, 14 Nov 2006)
New Revision: 58373
Added:
trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-beans.xml
Removed:
trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-service.xml
Modified:
trunk/testsuite/src/resources/web/simple-xmlonly/jboss-web.xml
trunk/testsuite/src/resources/web/simple-xmlonly/web.xml
Log:
Update the enc configuration
Copied: trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-beans.xml (from rev 58343, trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-service.xml)
===================================================================
--- trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-service.xml 2006-11-14 16:28:54 UTC (rev 58343)
+++ trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-beans.xml 2006-11-15 02:03:45 UTC (rev 58373)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id:$ -->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!-- Define a Jndi binding aspect/annotation that exposes beans via jndi
+ when they are registered with the kernel.
+ -->
+ <aop:lifecycle xmlns:aop="urn:jboss:aop-beans:1.0"
+ name="DependencyAdvice"
+ class="org.jboss.aop.microcontainer.aspects.jndi.JndiIntroduction"
+ classes="@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding"
+ pointcut="execution(* @org.jboss.aop.microcontainer.aspects.jndi.JndiBinding->$implements{org.jboss.kernel.spi.dependency.KernelControllerContextAware}(..))">
+ <property name="env">
+ <map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>java.naming.factory.initial</key><value>org.jboss.test.microcontainer.support.jndi.MockInitialContextFactory</value></entry>
+ </map>
+ </property>
+ </aop:lifecycle>
+
+ <!-- The jndi bindings -->
+ <bean name="ENC.MockDS" class="org.jboss.test.web.mock.MockDataSource">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="java:/MockDS")</annotation>
+ </bean>
+ <bean name="ENC/ejb/bean3" class="org.jboss.test.web.mock.SessionHomeBean">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="jbosstest/ejbs/UnsecuredEJB")</annotation>
+ </bean>
+ <bean name="ENC/ejb/local/bean3" class="org.jboss.test.web.mock.StatelessLocalHomeBean">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="jbosstest/ejbs/local/ENCBean1")</annotation>
+ </bean>
+ <bean name="ENC/ejb/CtsBmp" class="org.jboss.test.web.mock.EntityHomeBean">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="jbosstest/ejbs/CtsBmp")</annotation>
+ </bean>
+
+ <bean name="ENC/mdr/ConsumesProducesJNDIName" class="org.jboss.test.web.mock.QueueBean">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="MockQueueA")</annotation>
+ </bean>
+ <bean name="ENC/TestQueue" class="org.jboss.test.web.mock.QueueBean">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="MockQueueB")</annotation>
+ </bean>
+ <bean name="ENC/TestTopic" class="org.jboss.test.web.mock.TopicBean">
+ <annotation>@org.jboss.aop.microcontainer.aspects.jndi.JndiBinding(name="MockTopicA")</annotation>
+ </bean>
+
+</deployment>
Deleted: trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-service.xml
===================================================================
--- trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-service.xml 2006-11-15 02:02:43 UTC (rev 58372)
+++ trunk/testsuite/src/resources/web/simple-xmlonly/encbinding-service.xml 2006-11-15 02:03:45 UTC (rev 58373)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE server PUBLIC "-//JBoss//DTD MBean Service 4.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-service_4_0.dtd">
-<server>
- <mbean code="org.jboss.naming.JNDIBindingServiceMgr"
- name="jboss.tests:service=JNDIBindingServiceMgr">
- <attribute name="BindingsConfig" serialDataType="jbxb">
- <jndi:bindings
- xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:jndi="urn:jboss:jndi-binding-service:1.0"
- xs:schemaLocation="urn:jboss:jndi-binding-service:1.0 resource:jndi-binding-service_1_0.xsd"
- >
- <jndi:binding name="java:SomeSite">
- <jndi:value type="java.net.URL">http://www.somesite.com</jndi:value>
- </jndi:binding>
- <jndi:binding name="java:/Mail">
- <jndi:value type="javax.mail.Session" >http://www.somesite.com</jndi:value>
- </jndi:binding>
-
- </jndi:bindings>
- </attribute>
- </mbean>
-
-</server>
Modified: trunk/testsuite/src/resources/web/simple-xmlonly/jboss-web.xml
===================================================================
--- trunk/testsuite/src/resources/web/simple-xmlonly/jboss-web.xml 2006-11-15 02:02:43 UTC (rev 58372)
+++ trunk/testsuite/src/resources/web/simple-xmlonly/jboss-web.xml 2006-11-15 02:03:45 UTC (rev 58373)
@@ -6,7 +6,7 @@
<jboss-web>
<resource-ref>
<res-ref-name>jdbc/DefaultDS</res-ref-name>
- <jndi-name>java:/DefaultDS</jndi-name>
+ <jndi-name>java:/MockDS</jndi-name>
</resource-ref>
<resource-ref>
<res-ref-name>mail/DefaultMail</res-ref-name>
@@ -38,7 +38,11 @@
<ejb-ref-name>ejb/bean3</ejb-ref-name>
<jndi-name>jbosstest/ejbs/UnsecuredEJB</jndi-name>
</ejb-ref>
-
+ <ejb-ref>
+ <ejb-ref-name>ejb/CtsBmp</ejb-ref-name>
+ <jndi-name>jbosstest/ejbs/CtsBmp</jndi-name>
+ </ejb-ref>
+
<ejb-local-ref>
<ejb-ref-name>ejb/local/bean3</ejb-ref-name>
<local-jndi-name>jbosstest/ejbs/local/ENCBean1</local-jndi-name>
@@ -46,15 +50,15 @@
<message-destination-ref>
<message-destination-ref-name>mdr/ConsumesProducesJNDIName</message-destination-ref-name>
- <jndi-name>queue/A</jndi-name>
+ <jndi-name>MockQueueA</jndi-name>
</message-destination-ref>
<message-destination>
<message-destination-name>TestQueue</message-destination-name>
- <jndi-name>queue/testQueue</jndi-name>
+ <jndi-name>MockQueueB</jndi-name>
</message-destination>
<message-destination>
<message-destination-name>TestTopic</message-destination-name>
- <jndi-name>topic/testTopic</jndi-name>
+ <jndi-name>MockTopicA</jndi-name>
</message-destination>
</jboss-web>
Modified: trunk/testsuite/src/resources/web/simple-xmlonly/web.xml
===================================================================
--- trunk/testsuite/src/resources/web/simple-xmlonly/web.xml 2006-11-15 02:02:43 UTC (rev 58372)
+++ trunk/testsuite/src/resources/web/simple-xmlonly/web.xml 2006-11-15 02:03:45 UTC (rev 58373)
@@ -12,19 +12,6 @@
<servlet>
<servlet-name>ENCServlet</servlet-name>
<servlet-class>org.jboss.test.web.servlets.StandaloneENCServlet</servlet-class>
- <init-param>
- <param-name>expectedUserRoles</param-name>
- <param-value>AuthorizedUser,ServletUser</param-value>
- </init-param>
- <init-param>
- <param-name>unexpectedUserRoles</param-name>
- <param-value>Anonymous</param-value>
- </init-param>
- <security-role-ref>
- <description>A mapping for the ServletUser role</description>
- <role-name>ServletUser</role-name>
- <role-link>ServletUserRole</role-link>
- </security-role-ref>
</servlet>
<servlet-mapping>
@@ -37,38 +24,42 @@
<welcome-file>index.html</welcome-file>
</welcome-file-list>
- <!-- ### Security -->
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Restricted</web-resource-name>
- <description>All content is secured</description>
- <url-pattern>/*</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <description>Only authenticated users can access secure content</description>
- <role-name>AuthorizedUser</role-name>
- </auth-constraint>
- <user-data-constraint>
- <description>no description</description>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
-
- <login-config>
- <auth-method>BASIC</auth-method>
- <realm-name>UserInRoleRealm</realm-name>
- </login-config>
-
- <security-role>
- <role-name>AuthorizedUser</role-name>
- </security-role>
- <security-role>
- <role-name>ServletUserRole</role-name>
- </security-role>
- <security-role>
- <role-name>AnotherUserRole</role-name>
- </security-role>
-
+ <!-- ### Resources -->
+ <!-- JDBC DataSources (java:comp/env/jdbc) -->
+ <resource-ref>
+ <description>The default DS</description>
+ <res-ref-name>jdbc/DefaultDS</res-ref-name>
+ <res-type>javax.sql.DataSource</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+ <!-- JavaMail Connection Factories (java:comp/env/mail) -->
+ <resource-ref>
+ <description>Default Mail</description>
+ <res-ref-name>mail/DefaultMail</res-ref-name>
+ <res-type>javax.mail.Session</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+ <!-- JMS Connection Factories (java:comp/env/jms) -->
+ <resource-ref>
+ <description>Default QueueFactory</description>
+ <res-ref-name>jms/QueFactory</res-ref-name>
+ <res-type>javax.jms.QueueConnectionFactory</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+ <!-- URL Connection Factories (java:comp/env/url) -->
+ <resource-ref>
+ <description>JBoss Home Page</description>
+ <res-ref-name>url/JBossHome</res-ref-name>
+ <res-type>java.net.URL</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+ <resource-ref>
+ <description>SomeWebSite HomePage</description>
+ <res-ref-name>url/IndirectURL</res-ref-name>
+ <res-type>java.net.URL</res-type>
+ <res-auth>Container</res-auth>
+ </resource-ref>
+
<!-- ### Environment (java:comp/env/ejb) -->
<env-entry>
<description>Integer0</description>
@@ -113,28 +104,6 @@
</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>
- <home>org.jboss.test.web.mock.StatelessSessionHome</home>
- <remote>org.jboss.test.web.mock.StatelessSession</remote>
- <ejb-link>ENCBean0</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <ejb-ref-name>ejb/bean1</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>org.jboss.test.web.mock.StatelessSessionHome</home>
- <remote>org.jboss.test.web.mock.StatelessSession</remote>
- <ejb-link>ENCBean1</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <ejb-ref-name>ejb/bean2</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>org.jboss.test.web.mock.StatelessSessionHome</home>
- <remote>org.jboss.test.web.mock.StatelessSession</remote>
- <ejb-link>ENCBean1</ejb-link>
- </ejb-ref>
<!-- ejb-ref that needs jboss-web.xml -->
<ejb-ref>
<ejb-ref-name>ejb/bean3</ejb-ref-name>
@@ -143,76 +112,12 @@
<remote>org.jboss.test.web.mock.StatelessSession</remote>
</ejb-ref>
<ejb-ref>
- <ejb-ref-name>ejb/Entity</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>org.jboss.test.web.mock.EntityHome</home>
- <remote>org.jboss.test.web.mock.Entity</remote>
- <ejb-link>Entity</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <ejb-ref-name>ejb/EntityFacade</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>org.jboss.test.web.mock.EntityFacadeHome</home>
- <remote>org.jboss.test.web.mock.EntityFacade</remote>
- <ejb-link>EntityFacade</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <ejb-ref-name>ejb/OptimizedEJB</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>org.jboss.test.web.mock.StatelessSessionHome</home>
- <remote>org.jboss.test.web.mock.StatelessSession</remote>
- <ejb-link>OptimizedEJB</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <ejb-ref-name>ejb/NotOptimizedEJB</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>org.jboss.test.web.mock.StatelessSessionHome</home>
- <remote>org.jboss.test.web.mock.StatelessSession</remote>
- <ejb-link>NotOptimizedEJB</ejb-link>
- </ejb-ref>
- <ejb-ref>
<ejb-ref-name>ejb/CtsBmp</ejb-ref-name>
<ejb-ref-type>Entity</ejb-ref-type>
<home>org.jboss.test.web.mock.EntityHome</home>
<remote>org.jboss.test.web.mock.Entity</remote>
- <ejb-link>BMPBean</ejb-link>
</ejb-ref>
- <ejb-ref>
- <ejb-ref-name>ejb/SecuredEJB</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>org.jboss.test.web.mock.StatelessSessionHome</home>
- <remote>org.jboss.test.web.mock.StatelessSession</remote>
- <ejb-link>SecuredEJB</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <ejb-ref-name>ejb/UnsecuredEJB</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>org.jboss.test.web.mock.StatelessSessionHome</home>
- <remote>org.jboss.test.web.mock.StatelessSession</remote>
- <ejb-link>UnsecuredEJB</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <ejb-ref-name>ejb/StatefulEJB</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>org.jboss.test.web.mock.StatelessSessionHome</home>
- <remote>org.jboss.test.web.mock.StatelessSession</remote>
- <ejb-link>StatefulEJB</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <ejb-ref-name>ejb/local/bean0</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>org.jboss.test.web.mock.StatelessSessionLocalHome</local-home>
- <local>org.jboss.test.web.mock.StatelessSessionLocal</local>
- <ejb-link>ENCBean0</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <ejb-ref-name>ejb/local/bean1</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>org.jboss.test.web.mock.StatelessSessionLocalHome</local-home>
- <local>org.jboss.test.web.mock.StatelessSessionLocal</local>
- <ejb-link>ENCBean1</ejb-link>
- </ejb-local-ref>
<!-- ejb-local-ref that needs jboss-web.xml -->
<ejb-local-ref>
<ejb-ref-name>ejb/local/bean3</ejb-ref-name>
@@ -221,14 +126,6 @@
<local>org.jboss.test.web.mock.StatelessSessionLocal</local>
</ejb-local-ref>
- <ejb-local-ref>
- <ejb-ref-name>ejb/local/SecuredEJB</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>org.jboss.test.web.mock.StatelessSessionLocalHome</local-home>
- <local>org.jboss.test.web.mock.StatelessSessionLocal</local>
- <ejb-link>SecuredEJB</ejb-link>
- </ejb-local-ref>
-
<message-destination-ref>
<description>consumes using a link</description>
<message-destination-ref-name>mdr/ConsumesLink</message-destination-ref-name>
More information about the jboss-cvs-commits
mailing list