[jboss-cvs] JBossAS SVN: r65944 - in projects/metadata/trunk/src/test: java/org/jboss/test/metadata/web and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Oct 8 17:05:13 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-08 17:05:13 -0400 (Mon, 08 Oct 2007)
New Revision: 65944
Modified:
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14Everything_testEverything.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21Everything_testEverything.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar3xEverything_testEverything.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml
Log:
Correct the env-entry-type
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java 2007-10-08 20:59:59 UTC (rev 65943)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/javaee/AbstractJavaEEEverythingTest.java 2007-10-08 21:05:13 UTC (rev 65944)
@@ -356,7 +356,7 @@
assertId(prefix + "EnvEntry" + count, environmentEntryMetaData);
assertDescriptions(prefix + "EnvEntry" + count, environmentEntryMetaData.getDescriptions());
assertEquals(prefix + "EnvEntry" + count + "Name", environmentEntryMetaData.getEnvEntryName());
- assertEquals(prefix + "EnvEntry" + count + "Type", environmentEntryMetaData.getType());
+ assertEquals("java.lang.String", environmentEntryMetaData.getType());
assertEquals(prefix + "EnvEntry" + count + "Value", environmentEntryMetaData.getValue());
assertResourceGroup(prefix + "EnvEntry" + count, environmentEntryMetaData, full, count == 1);
++count;
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java 2007-10-08 20:59:59 UTC (rev 65943)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/web/WebApp5EverythingUnitTestCase.java 2007-10-08 21:05:13 UTC (rev 65944)
@@ -45,9 +45,9 @@
protected void assertEverything(WebMetaData webApp)
{
//assertEverythingWithAppMetaData(webApp);
- assertDescriptionGroup("application-client", webApp.getDescriptionGroup());
- assertRemoteEnvironment("appClient", webApp, true);
- assertMessageDestinations5("appClientMessageDestination", 2, webApp.getMessageDestinations(), true);
+ assertDescriptionGroup("web-app", webApp.getDescriptionGroup());
+ assertRemoteEnvironment("webApp", webApp, true);
+ assertMessageDestinations5("webAppMessageDestination", 2, webApp.getMessageDestinations(), true);
}
private void assertMessageDestinations5(String prefix, int size, MessageDestinationsMetaData messageDestinations, boolean full)
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14Everything_testEverything.xml 2007-10-08 20:59:59 UTC (rev 65943)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14Everything_testEverything.xml 2007-10-08 21:05:13 UTC (rev 65944)
@@ -31,7 +31,7 @@
<description xml:lang="fr">fr-appClientEnvEntry1-desc</description>
<description xml:lang="de">de-appClientEnvEntry1-desc</description>
<env-entry-name>appClientEnvEntry1Name</env-entry-name>
- <env-entry-type>appClientEnvEntry1Type</env-entry-type>
+ <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>appClientEnvEntry1Value</env-entry-value>
<mapped-name>appClientEnvEntry1MappedName</mapped-name>
<injection-target>
@@ -48,7 +48,7 @@
<description xml:lang="fr">fr-appClientEnvEntry2-desc</description>
<description xml:lang="de">de-appClientEnvEntry2-desc</description>
<env-entry-name>appClientEnvEntry2Name</env-entry-name>
- <env-entry-type>appClientEnvEntry2Type</env-entry-type>
+ <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>appClientEnvEntry2Value</env-entry-value>
<mapped-name>appClientEnvEntry2MappedName</mapped-name>
<injection-target>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml 2007-10-08 20:59:59 UTC (rev 65943)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient5Everything_testEverything.xml 2007-10-08 21:05:13 UTC (rev 65944)
@@ -31,7 +31,7 @@
<description xml:lang="fr">fr-appClientEnvEntry1-desc</description>
<description xml:lang="de">de-appClientEnvEntry1-desc</description>
<env-entry-name>appClientEnvEntry1Name</env-entry-name>
- <env-entry-type>appClientEnvEntry1Type</env-entry-type>
+ <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>appClientEnvEntry1Value</env-entry-value>
<mapped-name>appClientEnvEntry1MappedName</mapped-name>
<injection-target>
@@ -48,7 +48,7 @@
<description xml:lang="fr">fr-appClientEnvEntry2-desc</description>
<description xml:lang="de">de-appClientEnvEntry2-desc</description>
<env-entry-name>appClientEnvEntry2Name</env-entry-name>
- <env-entry-type>appClientEnvEntry2Type</env-entry-type>
+ <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>appClientEnvEntry2Value</env-entry-value>
<mapped-name>appClientEnvEntry2MappedName</mapped-name>
<injection-target>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21Everything_testEverything.xml 2007-10-08 20:59:59 UTC (rev 65943)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21Everything_testEverything.xml 2007-10-08 21:05:13 UTC (rev 65944)
@@ -68,7 +68,7 @@
<description xml:lang="fr">fr-session1EnvEntry1-desc</description>
<description xml:lang="de">de-session1EnvEntry1-desc</description>
<env-entry-name>session1EnvEntry1Name</env-entry-name>
- <env-entry-type>session1EnvEntry1Type</env-entry-type>
+ <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>session1EnvEntry1Value</env-entry-value>
</env-entry>
<env-entry id="session1EnvEntry2-id">
@@ -76,7 +76,7 @@
<description xml:lang="fr">fr-session1EnvEntry2-desc</description>
<description xml:lang="de">de-session1EnvEntry2-desc</description>
<env-entry-name>session1EnvEntry2Name</env-entry-name>
- <env-entry-type>session1EnvEntry2Type</env-entry-type>
+ <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>session1EnvEntry2Value</env-entry-value>
</env-entry>
<ejb-ref id="session1EjbRef1-id">
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar3xEverything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar3xEverything_testEverything.xml 2007-10-08 20:59:59 UTC (rev 65943)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar3xEverything_testEverything.xml 2007-10-08 21:05:13 UTC (rev 65944)
@@ -122,7 +122,7 @@
<description xml:lang="fr">fr-session1EnvEntry1-desc</description>
<description xml:lang="de">de-session1EnvEntry1-desc</description>
<env-entry-name>session1EnvEntry1Name</env-entry-name>
- <env-entry-type>session1EnvEntry1Type</env-entry-type>
+ <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>session1EnvEntry1Value</env-entry-value>
<mapped-name>session1EnvEntry1MappedName</mapped-name>
<injection-target>
@@ -139,7 +139,7 @@
<description xml:lang="fr">fr-session1EnvEntry2-desc</description>
<description xml:lang="de">de-session1EnvEntry2-desc</description>
<env-entry-name>session1EnvEntry2Name</env-entry-name>
- <env-entry-type>session1EnvEntry2Type</env-entry-type>
+ <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>session1EnvEntry2Value</env-entry-value>
<mapped-name>session1EnvEntry2MappedName</mapped-name>
<injection-target>
@@ -586,7 +586,7 @@
<description xml:lang="fr">fr-session2EnvEntry1-desc</description>
<description xml:lang="de">de-session2EnvEntry1-desc</description>
<env-entry-name>session2EnvEntry1Name</env-entry-name>
- <env-entry-type>session2EnvEntry1Type</env-entry-type>
+ <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>session2EnvEntry1Value</env-entry-value>
<mapped-name>session2EnvEntry1MappedName</mapped-name>
<injection-target>
@@ -603,7 +603,7 @@
<description xml:lang="fr">fr-session2EnvEntry2-desc</description>
<description xml:lang="de">de-session2EnvEntry2-desc</description>
<env-entry-name>session2EnvEntry2Name</env-entry-name>
- <env-entry-type>session2EnvEntry2Type</env-entry-type>
+ <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>session2EnvEntry2Value</env-entry-value>
<mapped-name>session2EnvEntry2MappedName</mapped-name>
<injection-target>
@@ -1026,7 +1026,7 @@
<description xml:lang="fr">fr-entity1EnvEntry1-desc</description>
<description xml:lang="de">de-entity1EnvEntry1-desc</description>
<env-entry-name>entity1EnvEntry1Name</env-entry-name>
- <env-entry-type>entity1EnvEntry1Type</env-entry-type>
+ <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>entity1EnvEntry1Value</env-entry-value>
<mapped-name>entity1EnvEntry1MappedName</mapped-name>
<injection-target>
@@ -1043,7 +1043,7 @@
<description xml:lang="fr">fr-entity1EnvEntry2-desc</description>
<description xml:lang="de">de-entity1EnvEntry2-desc</description>
<env-entry-name>entity1EnvEntry2Name</env-entry-name>
- <env-entry-type>entity1EnvEntry2Type</env-entry-type>
+ <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>entity1EnvEntry2Value</env-entry-value>
<mapped-name>entity1EnvEntry2MappedName</mapped-name>
<injection-target>
@@ -1455,7 +1455,7 @@
<description xml:lang="fr">fr-entity2EnvEntry1-desc</description>
<description xml:lang="de">de-entity2EnvEntry1-desc</description>
<env-entry-name>entity2EnvEntry1Name</env-entry-name>
- <env-entry-type>entity2EnvEntry1Type</env-entry-type>
+ <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>entity2EnvEntry1Value</env-entry-value>
<mapped-name>entity2EnvEntry1MappedName</mapped-name>
<injection-target>
@@ -1472,7 +1472,7 @@
<description xml:lang="fr">fr-entity2EnvEntry2-desc</description>
<description xml:lang="de">de-entity2EnvEntry2-desc</description>
<env-entry-name>entity2EnvEntry2Name</env-entry-name>
- <env-entry-type>entity2EnvEntry2Type</env-entry-type>
+ <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>entity2EnvEntry2Value</env-entry-value>
<mapped-name>entity2EnvEntry2MappedName</mapped-name>
<injection-target>
@@ -1925,7 +1925,7 @@
<description xml:lang="fr">fr-mdb1EnvEntry1-desc</description>
<description xml:lang="de">de-mdb1EnvEntry1-desc</description>
<env-entry-name>mdb1EnvEntry1Name</env-entry-name>
- <env-entry-type>mdb1EnvEntry1Type</env-entry-type>
+ <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>mdb1EnvEntry1Value</env-entry-value>
<mapped-name>mdb1EnvEntry1MappedName</mapped-name>
<injection-target>
@@ -1942,7 +1942,7 @@
<description xml:lang="fr">fr-mdb1EnvEntry2-desc</description>
<description xml:lang="de">de-mdb1EnvEntry2-desc</description>
<env-entry-name>mdb1EnvEntry2Name</env-entry-name>
- <env-entry-type>mdb1EnvEntry2Type</env-entry-type>
+ <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>mdb1EnvEntry2Value</env-entry-value>
<mapped-name>mdb1EnvEntry2MappedName</mapped-name>
<injection-target>
@@ -2330,7 +2330,7 @@
<description xml:lang="fr">fr-mdb2EnvEntry1-desc</description>
<description xml:lang="de">de-mdb2EnvEntry1-desc</description>
<env-entry-name>mdb2EnvEntry1Name</env-entry-name>
- <env-entry-type>mdb2EnvEntry1Type</env-entry-type>
+ <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>mdb2EnvEntry1Value</env-entry-value>
<mapped-name>mdb2EnvEntry1MappedName</mapped-name>
<injection-target>
@@ -2347,7 +2347,7 @@
<description xml:lang="fr">fr-mdb2EnvEntry2-desc</description>
<description xml:lang="de">de-mdb2EnvEntry2-desc</description>
<env-entry-name>mdb2EnvEntry2Name</env-entry-name>
- <env-entry-type>mdb2EnvEntry2Type</env-entry-type>
+ <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>mdb2EnvEntry2Value</env-entry-value>
<mapped-name>mdb2EnvEntry2MappedName</mapped-name>
<injection-target>
@@ -2699,7 +2699,7 @@
<description xml:lang="fr">fr-interceptor1EnvEntry1-desc</description>
<description xml:lang="de">de-interceptor1EnvEntry1-desc</description>
<env-entry-name>interceptor1EnvEntry1Name</env-entry-name>
- <env-entry-type>interceptor1EnvEntry1Type</env-entry-type>
+ <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>interceptor1EnvEntry1Value</env-entry-value>
<mapped-name>interceptor1EnvEntry1MappedName</mapped-name>
<injection-target>
@@ -2716,7 +2716,7 @@
<description xml:lang="fr">fr-interceptor1EnvEntry2-desc</description>
<description xml:lang="de">de-interceptor1EnvEntry2-desc</description>
<env-entry-name>interceptor1EnvEntry2Name</env-entry-name>
- <env-entry-type>interceptor1EnvEntry2Type</env-entry-type>
+ <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>interceptor1EnvEntry2Value</env-entry-value>
<mapped-name>interceptor1EnvEntry2MappedName</mapped-name>
<injection-target>
@@ -3064,7 +3064,7 @@
<description xml:lang="fr">fr-interceptor2EnvEntry1-desc</description>
<description xml:lang="de">de-interceptor2EnvEntry1-desc</description>
<env-entry-name>interceptor2EnvEntry1Name</env-entry-name>
- <env-entry-type>interceptor2EnvEntry1Type</env-entry-type>
+ <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>interceptor2EnvEntry1Value</env-entry-value>
<mapped-name>interceptor2EnvEntry1MappedName</mapped-name>
<injection-target>
@@ -3081,7 +3081,7 @@
<description xml:lang="fr">fr-interceptor2EnvEntry2-desc</description>
<description xml:lang="de">de-interceptor2EnvEntry2-desc</description>
<env-entry-name>interceptor2EnvEntry2Name</env-entry-name>
- <env-entry-type>interceptor2EnvEntry2Type</env-entry-type>
+ <env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>interceptor2EnvEntry2Value</env-entry-value>
<mapped-name>interceptor2EnvEntry2MappedName</mapped-name>
<injection-target>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml 2007-10-08 20:59:59 UTC (rev 65943)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/web/WebApp5Everything_testEverything.xml 2007-10-08 21:05:13 UTC (rev 65944)
@@ -73,9 +73,9 @@
<description>Property group for common configuration for all the JSP's</description>
<url-pattern>*.jsp</url-pattern>
<url-pattern>*.jspx</url-pattern>
- <scripting-invalid>false</scripting-invalid>
<el-ignored>false</el-ignored>
<page-encoding>ISO-8859-1</page-encoding>
+ <scripting-invalid>false</scripting-invalid>
<is-xml>false</is-xml>
<include-prelude>/common-jsps/prelude.jsp</include-prelude>
<include-coda>/common-jsps/coda.jsp</include-coda>
@@ -94,13 +94,6 @@
<listener-class>listener0.class</listener-class>
</listener>
- <locale-encoding-mapping-list id="locale-encoding-mapping-list0">
- <locale-encoding-mapping>
- <locale>en</locale>
- <encoding>en</encoding>
- </locale-encoding-mapping>
- </locale-encoding-mapping-list>
-
<login-config id="login-config-BASIC">
<auth-method>BASIC</auth-method>
<realm-name>login-config0-realm-name</realm-name>
@@ -125,11 +118,11 @@
<servlet id="servlet0">
<servlet-name>servlet0-name</servlet-name>
<servlet-class>servlet0.class</servlet-class>
- <init-param id="init-param0">
+ <init-param id="servlet0-init-param0">
<param-name>init-param0-name</param-name>
<param-value>init-param0-value</param-value>
</init-param>
- <init-param id="init-param1">
+ <init-param id="servlet0-init-param1">
<param-name>init-param1-name</param-name>
<param-value>init-param1-value</param-value>
</init-param>
@@ -141,12 +134,36 @@
<role-name>role1</role-name>
</security-role-ref>
</servlet>
- <servlet-mapping id="servlet0-mapping">
+ <servlet id="servlet1">
+ <servlet-name>servlet1-name</servlet-name>
+ <servlet-class>servlet1.class</servlet-class>
+ <init-param id="servlet1-init-param0">
+ <param-name>init-param0-name</param-name>
+ <param-value>init-param0-value</param-value>
+ </init-param>
+ <init-param id="servlet1-init-param1">
+ <param-name>init-param1-name</param-name>
+ <param-value>init-param1-value</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ <run-as>
+ <role-name>role0</role-name>
+ </run-as>
+ <security-role-ref>
+ <role-name>role1</role-name>
+ </security-role-ref>
+ </servlet>
+ <servlet-mapping id="servlet0-mapping">
<servlet-name>servlet0-name</servlet-name>
<url-pattern>/servlet0/*</url-pattern>
</servlet-mapping>
+ <servlet-mapping id="servlet1-mapping">
+ <servlet-name>servlet1-name</servlet-name>
+ <url-pattern>/servlet1/*</url-pattern>
+ </servlet-mapping>
<security-constraint id="security-constraint0">
+ <display-name>security-constraint0-display-name</display-name>
<web-resource-collection id="web-resource-collection0">
<web-resource-name>web-resource0-name</web-resource-name>
<url-pattern>/resource0/*</url-pattern>
@@ -480,4 +497,10 @@
<mapped-name>webAppMessageDestination2MappedName</mapped-name>
</message-destination>
-</web-app>
+ <locale-encoding-mapping-list id="locale-encoding-mapping-list0">
+ <locale-encoding-mapping>
+ <locale>en</locale>
+ <encoding>en</encoding>
+ </locale-encoding-mapping>
+ </locale-encoding-mapping-list>
+ </web-app>
More information about the jboss-cvs-commits
mailing list