[jboss-cvs] JBossAS SVN: r66096 - in projects/metadata/trunk/src/test: resources/org/jboss/test/metadata/client and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Oct 12 14:16:19 EDT 2007
Author: wolfc
Date: 2007-10-12 14:16:19 -0400 (Fri, 12 Oct 2007)
New Revision: 66096
Modified:
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14EverythingUnitTestCase.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14Everything_testEverything.xml
Log:
JBAS-4506: removed JavaEE 5 constructs from application client 1.4 unit test
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14EverythingUnitTestCase.java 2007-10-12 17:56:09 UTC (rev 66095)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14EverythingUnitTestCase.java 2007-10-12 18:16:19 UTC (rev 66096)
@@ -21,9 +21,14 @@
*/
package org.jboss.test.metadata.client;
+import java.util.Set;
+
import org.jboss.metadata.client.spec.ApplicationClient14MetaData;
+import org.jboss.metadata.javaee.spec.LifecycleCallbacksMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
+import org.jboss.metadata.javaee.spec.PersistenceUnitReferencesMetaData;
+import org.jboss.metadata.javaee.spec.ResourceInjectionTargetMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
@@ -41,6 +46,21 @@
super(name);
}
+ @Override
+ protected void assertJndiName(String prefix, boolean full, String jndiName)
+ {
+ // an application client 1.4 doens't have a mapped name
+ assertNull(jndiName);
+ }
+
+ @Override
+ protected void assertLifecycleCallbacks(String ejbName, String type, int size,
+ LifecycleCallbacksMetaData lifecycleCallbacksMetaData)
+ {
+ // an application client 1.4 doens't have any lifecycle callbacks
+ assertNull(lifecycleCallbacksMetaData);
+ }
+
private void assertMessageDestinations14(String prefix, int size, MessageDestinationsMetaData messageDestinations, boolean full)
{
assertNotNull("no message destinations are set", messageDestinations);
@@ -53,6 +73,21 @@
}
}
+ @Override
+ protected void assertPersistenceUnitRefs(String prefix, int size,
+ PersistenceUnitReferencesMetaData persistenceUnitReferencesMetaData)
+ {
+ // An application client 1.4 doesn't have any persistence unit refs
+ assertNull(persistenceUnitReferencesMetaData);
+ }
+
+ @Override
+ protected void assertResourceInjectionTargets(String prefix, int size, Set<ResourceInjectionTargetMetaData> targets)
+ {
+ // An application client 1.4 doesn't have any injection targets
+ assertNull(targets);
+ }
+
public static SchemaBindingResolver initResolver()
{
return schemaResolverForClass(ApplicationClient14MetaData.class);
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-12 17:56:09 UTC (rev 66095)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient14Everything_testEverything.xml 2007-10-12 18:16:19 UTC (rev 66096)
@@ -3,7 +3,6 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/javaee/application-client_1_4.xsd"
version="1.4"
- metadata-complete="true"
id="appclient-test">
<!-- description group -->
<description>en-application-client-desc</description>
@@ -33,15 +32,6 @@
<env-entry-name>appClientEnvEntry1Name</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>appClientEnvEntry1Value</env-entry-value>
- <mapped-name>appClientEnvEntry1MappedName</mapped-name>
- <injection-target>
- <injection-target-class>appClientEnvEntry1Injection1Class</injection-target-class>
- <injection-target-name>appClientEnvEntry1Injection1Name</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>appClientEnvEntry1Injection2Class</injection-target-class>
- <injection-target-name>appClientEnvEntry1Injection2Name</injection-target-name>
- </injection-target>
</env-entry>
<env-entry id="appClientEnvEntry2-id">
<description>en-appClientEnvEntry2-desc</description>
@@ -50,15 +40,6 @@
<env-entry-name>appClientEnvEntry2Name</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
<env-entry-value>appClientEnvEntry2Value</env-entry-value>
- <mapped-name>appClientEnvEntry2MappedName</mapped-name>
- <injection-target>
- <injection-target-class>appClientEnvEntry2Injection1Class</injection-target-class>
- <injection-target-name>appClientEnvEntry2Injection1Name</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>appClientEnvEntry2Injection2Class</injection-target-class>
- <injection-target-name>appClientEnvEntry2Injection2Name</injection-target-name>
- </injection-target>
</env-entry>
<!-- ejb ref -->
@@ -71,15 +52,6 @@
<home>appClientEjbRef1Home</home>
<remote>appClientEjbRef1Remote</remote>
<ejb-link>appClientEjbRef1EjbLink</ejb-link>
- <mapped-name>appClientEjbRef1MappedName</mapped-name>
- <injection-target>
- <injection-target-class>appClientEjbRef1Injection1Class</injection-target-class>
- <injection-target-name>appClientEjbRef1Injection1Name</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>appClientEjbRef1Injection2Class</injection-target-class>
- <injection-target-name>appClientEjbRef1Injection2Name</injection-target-name>
- </injection-target>
</ejb-ref>
<ejb-ref id="appClientEjbRef2-id">
<description>en-appClientEjbRef2-desc</description>
@@ -90,15 +62,6 @@
<home>appClientEjbRef2Home</home>
<remote>appClientEjbRef2Remote</remote>
<ejb-link>appClientEjbRef2EjbLink</ejb-link>
- <mapped-name>appClientEjbRef2MappedName</mapped-name>
- <injection-target>
- <injection-target-class>appClientEjbRef2Injection1Class</injection-target-class>
- <injection-target-name>appClientEjbRef2Injection1Name</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>appClientEjbRef2Injection2Class</injection-target-class>
- <injection-target-name>appClientEjbRef2Injection2Name</injection-target-name>
- </injection-target>
</ejb-ref>
<!-- resource ref -->
@@ -110,15 +73,6 @@
<res-type>appClientResourceRef1Type</res-type>
<res-auth>Application</res-auth>
<res-sharing-scope>Shareable</res-sharing-scope>
- <mapped-name>appClientResourceRef1MappedName</mapped-name>
- <injection-target>
- <injection-target-class>appClientResourceRef1Injection1Class</injection-target-class>
- <injection-target-name>appClientResourceRef1Injection1Name</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>appClientResourceRef1Injection2Class</injection-target-class>
- <injection-target-name>appClientResourceRef1Injection2Name</injection-target-name>
- </injection-target>
</resource-ref>
<resource-ref id="appClientResourceRef2-id">
<description>en-appClientResourceRef2-desc</description>
@@ -128,15 +82,6 @@
<res-type>appClientResourceRef2Type</res-type>
<res-auth>Container</res-auth>
<res-sharing-scope>Unshareable</res-sharing-scope>
- <mapped-name>appClientResourceRef2MappedName</mapped-name>
- <injection-target>
- <injection-target-class>appClientResourceRef2Injection1Class</injection-target-class>
- <injection-target-name>appClientResourceRef2Injection1Name</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>appClientResourceRef2Injection2Class</injection-target-class>
- <injection-target-name>appClientResourceRef2Injection2Name</injection-target-name>
- </injection-target>
</resource-ref>
<!-- resource env ref -->
@@ -146,15 +91,6 @@
<description xml:lang="de">de-appClientResourceEnvRef1-desc</description>
<resource-env-ref-name>appClientResourceEnvRef1Name</resource-env-ref-name>
<resource-env-ref-type>appClientResourceEnvRef1Type</resource-env-ref-type>
- <mapped-name>appClientResourceEnvRef1MappedName</mapped-name>
- <injection-target>
- <injection-target-class>appClientResourceEnvRef1Injection1Class</injection-target-class>
- <injection-target-name>appClientResourceEnvRef1Injection1Name</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>appClientResourceEnvRef1Injection2Class</injection-target-class>
- <injection-target-name>appClientResourceEnvRef1Injection2Name</injection-target-name>
- </injection-target>
</resource-env-ref>
<resource-env-ref id="appClientResourceEnvRef2-id">
<description>en-appClientResourceEnvRef2-desc</description>
@@ -162,15 +98,6 @@
<description xml:lang="de">de-appClientResourceEnvRef2-desc</description>
<resource-env-ref-name>appClientResourceEnvRef2Name</resource-env-ref-name>
<resource-env-ref-type>appClientResourceEnvRef2Type</resource-env-ref-type>
- <mapped-name>appClientResourceEnvRef2MappedName</mapped-name>
- <injection-target>
- <injection-target-class>appClientResourceEnvRef2Injection1Class</injection-target-class>
- <injection-target-name>appClientResourceEnvRef2Injection1Name</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>appClientResourceEnvRef2Injection2Class</injection-target-class>
- <injection-target-name>appClientResourceEnvRef2Injection2Name</injection-target-name>
- </injection-target>
</resource-env-ref>
<!-- message destination ref -->
@@ -182,15 +109,6 @@
<message-destination-type>appClientMessageDestinationRef1Type</message-destination-type>
<message-destination-usage>Consumes</message-destination-usage>
<message-destination-link>appClientMessageDestinationRef1Link</message-destination-link>
- <mapped-name>appClientMessageDestinationRef1MappedName</mapped-name>
- <injection-target>
- <injection-target-class>appClientMessageDestinationRef1Injection1Class</injection-target-class>
- <injection-target-name>appClientMessageDestinationRef1Injection1Name</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>appClientMessageDestinationRef1Injection2Class</injection-target-class>
- <injection-target-name>appClientMessageDestinationRef1Injection2Name</injection-target-name>
- </injection-target>
</message-destination-ref>
<message-destination-ref id="appClientMessageDestinationRef2-id">
<description>en-appClientMessageDestinationRef2-desc</description>
@@ -200,15 +118,6 @@
<message-destination-type>appClientMessageDestinationRef2Type</message-destination-type>
<message-destination-usage>Produces</message-destination-usage>
<message-destination-link>appClientMessageDestinationRef2Link</message-destination-link>
- <mapped-name>appClientMessageDestinationRef2MappedName</mapped-name>
- <injection-target>
- <injection-target-class>appClientMessageDestinationRef2Injection1Class</injection-target-class>
- <injection-target-name>appClientMessageDestinationRef2Injection1Name</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>appClientMessageDestinationRef2Injection2Class</injection-target-class>
- <injection-target-name>appClientMessageDestinationRef2Injection2Name</injection-target-name>
- </injection-target>
</message-destination-ref>
<message-destination-ref id="appClientMessageDestinationRef3-id">
<description>en-appClientMessageDestinationRef3-desc</description>
@@ -218,71 +127,8 @@
<message-destination-type>appClientMessageDestinationRef3Type</message-destination-type>
<message-destination-usage>ConsumesProduces</message-destination-usage>
<message-destination-link>appClientMessageDestinationRef3Link</message-destination-link>
- <mapped-name>appClientMessageDestinationRef3MappedName</mapped-name>
- <injection-target>
- <injection-target-class>appClientMessageDestinationRef3Injection1Class</injection-target-class>
- <injection-target-name>appClientMessageDestinationRef3Injection1Name</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>appClientMessageDestinationRef3Injection2Class</injection-target-class>
- <injection-target-name>appClientMessageDestinationRef3Injection2Name</injection-target-name>
- </injection-target>
</message-destination-ref>
- <!-- persistence unit ref -->
- <persistence-unit-ref id="appClientPersistenceUnitRef1-id">
- <description>en-appClientPersistenceUnitRef1-desc</description>
- <description xml:lang="fr">fr-appClientPersistenceUnitRef1-desc</description>
- <description xml:lang="de">de-appClientPersistenceUnitRef1-desc</description>
- <persistence-unit-ref-name>appClientPersistenceUnitRef1Name</persistence-unit-ref-name>
- <persistence-unit-name>appClientPersistenceUnitRef1Unit</persistence-unit-name>
- <mapped-name>appClientPersistenceUnitRef1MappedName</mapped-name>
- <injection-target>
- <injection-target-class>appClientPersistenceUnitRef1Injection1Class</injection-target-class>
- <injection-target-name>appClientPersistenceUnitRef1Injection1Name</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>appClientPersistenceUnitRef1Injection2Class</injection-target-class>
- <injection-target-name>appClientPersistenceUnitRef1Injection2Name</injection-target-name>
- </injection-target>
- </persistence-unit-ref>
- <persistence-unit-ref id="appClientPersistenceUnitRef2-id">
- <description>en-appClientPersistenceUnitRef2-desc</description>
- <description xml:lang="fr">fr-appClientPersistenceUnitRef2-desc</description>
- <description xml:lang="de">de-appClientPersistenceUnitRef2-desc</description>
- <persistence-unit-ref-name>appClientPersistenceUnitRef2Name</persistence-unit-ref-name>
- <persistence-unit-name>appClientPersistenceUnitRef2Unit</persistence-unit-name>
- <mapped-name>appClientPersistenceUnitRef2MappedName</mapped-name>
- <injection-target>
- <injection-target-class>appClientPersistenceUnitRef2Injection1Class</injection-target-class>
- <injection-target-name>appClientPersistenceUnitRef2Injection1Name</injection-target-name>
- </injection-target>
- <injection-target>
- <injection-target-class>appClientPersistenceUnitRef2Injection2Class</injection-target-class>
- <injection-target-name>appClientPersistenceUnitRef2Injection2Name</injection-target-name>
- </injection-target>
- </persistence-unit-ref>
-
- <!-- post-construct -->
- <post-construct>
- <lifecycle-callback-class>appClientPostConstruct1Class</lifecycle-callback-class>
- <lifecycle-callback-method>appClientPostConstruct1Method</lifecycle-callback-method>
- </post-construct>
- <post-construct>
- <lifecycle-callback-class>appClientPostConstruct2Class</lifecycle-callback-class>
- <lifecycle-callback-method>appClientPostConstruct2Method</lifecycle-callback-method>
- </post-construct>
-
- <!-- pre-destroy -->
- <pre-destroy>
- <lifecycle-callback-class>appClientPreDestroy1Class</lifecycle-callback-class>
- <lifecycle-callback-method>appClientPreDestroy1Method</lifecycle-callback-method>
- </pre-destroy>
- <pre-destroy>
- <lifecycle-callback-class>appClientPreDestroy2Class</lifecycle-callback-class>
- <lifecycle-callback-method>appClientPreDestroy2Method</lifecycle-callback-method>
- </pre-destroy>
-
<!-- callback handler -->
<callback-handler id="appClientCallbackHandler-id">org.jboss.test.metadata.client.AppClientCallbackHandler</callback-handler>
@@ -307,7 +153,6 @@
<large-icon>de-appClientMessageDestination1-large-icon</large-icon>
</icon>
<message-destination-name>appClientMessageDestination1Name</message-destination-name>
- <mapped-name>appClientMessageDestination1MappedName</mapped-name>
</message-destination>
<message-destination id="appClientMessageDestination2-id">
<description>en-appClientMessageDestination2-desc</description>
@@ -329,6 +174,5 @@
<large-icon>de-appClientMessageDestination2-large-icon</large-icon>
</icon>
<message-destination-name>appClientMessageDestination2Name</message-destination-name>
- <mapped-name>appClientMessageDestination2MappedName</mapped-name>
</message-destination>
</application-client>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list