You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by mc...@apache.org on 2008/04/20 05:24:26 UTC
svn commit: r649875 - in
/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/test:
java/org/apache/geronimo/jee/applicationclient/ resources/applicationclient/
Author: mcconne
Date: Sat Apr 19 20:24:24 2008
New Revision: 649875
URL: http://svn.apache.org/viewvc?rev=649875&view=rev
Log:
GERONIMODEVTOOLS-266 Additional junit testcases for the JAXB application-client schema -- Thanks to BJ Reed for the patch !!
Added:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/test/resources/applicationclient/geronimo-application-client-expected-11.xml (with props)
Modified:
geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/applicationclient/GeronimoApplicationClientTest.java
Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/applicationclient/GeronimoApplicationClientTest.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/applicationclient/GeronimoApplicationClientTest.java?rev=649875&r1=649874&r2=649875&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/applicationclient/GeronimoApplicationClientTest.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/test/java/org/apache/geronimo/jee/applicationclient/GeronimoApplicationClientTest.java Sat Apr 19 20:24:24 2008
@@ -24,6 +24,7 @@
import java.io.InputStream;
import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import javax.xml.parsers.SAXParser;
@@ -33,6 +34,37 @@
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
+import org.apache.geronimo.jee.connector.Adminobject;
+import org.apache.geronimo.jee.connector.AdminobjectInstance;
+import org.apache.geronimo.jee.connector.ConfigPropertySetting;
+import org.apache.geronimo.jee.connector.ConnectionDefinition;
+import org.apache.geronimo.jee.connector.ConnectiondefinitionInstance;
+import org.apache.geronimo.jee.connector.Connectionmanager;
+import org.apache.geronimo.jee.connector.Connector;
+import org.apache.geronimo.jee.connector.Empty;
+import org.apache.geronimo.jee.connector.OutboundResourceadapter;
+import org.apache.geronimo.jee.connector.Partitionedpool;
+import org.apache.geronimo.jee.connector.Resourceadapter;
+import org.apache.geronimo.jee.connector.ResourceadapterInstance;
+import org.apache.geronimo.jee.connector.Singlepool;
+import org.apache.geronimo.jee.connector.Xatransaction;
+import org.apache.geronimo.jee.deployment.Artifact;
+import org.apache.geronimo.jee.deployment.Dependencies;
+import org.apache.geronimo.jee.deployment.Dependency;
+import org.apache.geronimo.jee.deployment.Environment;
+import org.apache.geronimo.jee.deployment.Gbean;
+import org.apache.geronimo.jee.naming.EjbRef;
+import org.apache.geronimo.jee.naming.GbeanLocator;
+import org.apache.geronimo.jee.naming.GbeanRef;
+import org.apache.geronimo.jee.naming.MessageDestination;
+import org.apache.geronimo.jee.naming.Port;
+import org.apache.geronimo.jee.naming.PortCompletion;
+import org.apache.geronimo.jee.naming.ResourceEnvRef;
+import org.apache.geronimo.jee.naming.ResourceRef;
+import org.apache.geronimo.jee.naming.ServiceCompletion;
+import org.apache.geronimo.jee.naming.ServiceRef;
+import org.apache.geronimo.jee.security.Description;
+import org.apache.geronimo.jee.security.SubjectInfo;
import org.custommonkey.xmlunit.Diff;
import org.xml.sax.Attributes;
import org.xml.sax.InputSource;
@@ -53,7 +85,7 @@
* <li>Unmarshalling and marshalling sequence
* <li>Namespace conversion
* <li>Element conversion (TODO)
- * <li>Create a file (TODO)
+ * <li>Create XML with all fields
* </ol>
*
*
@@ -84,6 +116,10 @@
"applicationclient/geronimo-application-client-expected-3.xml");
}
+ public void testCompleteXML() throws Exception {
+ buildFullXMLFromScratch("applicationclient/geronimo-application-client-expected-11.xml");
+ }
+
/*------------------------------------------------------------------------*\
| |
@@ -208,7 +244,315 @@
}
}
+ private void buildFullXMLFromScratch (String fileExpected) throws Exception {
+ org.apache.geronimo.jee.applicationclient.ObjectFactory applicationClientFactory = new org.apache.geronimo.jee.applicationclient.ObjectFactory();
+ org.apache.geronimo.jee.deployment.ObjectFactory deploymentFactory = new org.apache.geronimo.jee.deployment.ObjectFactory();
+ org.apache.geronimo.jee.security.ObjectFactory securityFactory = new org.apache.geronimo.jee.security.ObjectFactory();
+ org.apache.geronimo.jee.naming.ObjectFactory namingFactory = new org.apache.geronimo.jee.naming.ObjectFactory();
+ org.apache.geronimo.jee.connector.ObjectFactory connectorFactory = new org.apache.geronimo.jee.connector.ObjectFactory();
+ ApplicationClient applicationClient = applicationClientFactory.createApplicationClient();
+
+ applicationClient.setCallbackHandler("callbackhandler");
+ applicationClient.setRealmName("realmname");
+
+ // set the Client Environment
+ Environment environment = deploymentFactory.createEnvironment();
+ Artifact artifact = deploymentFactory.createArtifact();
+ artifact.setGroupId("org.apache.geronimo.testsuite");
+ artifact.setArtifactId("agent-ear");
+ artifact.setVersion("2.2-SNAPSHOT");
+ artifact.setType("ear");
+ environment.setModuleId(artifact);
+ Dependencies dependencies = deploymentFactory.createDependencies();
+ Dependency dependency = deploymentFactory.createDependency();
+ dependency.setGroupId("org.apache.geronimo.testsuite");
+ dependency.setArtifactId("agent-ds");
+ dependency.setVersion("2.2-SNAPSHOT");
+ dependency.setType("car");
+ dependencies.getDependency().add(dependency);
+ environment.setDependencies(dependencies);
+ applicationClient.setClientEnvironment(environment);
+
+ // set the Subject Info
+ SubjectInfo subject = securityFactory.createSubjectInfo();
+ subject.setId("subjectinfo-id");
+ subject.setRealm("subjectinfo-realm");
+ Description description = securityFactory.createDescription();
+ description.setValue("subjectinfo-description");
+ subject.getDescription().add(description);
+ applicationClient.setDefaultSubject(subject);
+
+ // set the EJB Ref
+ EjbRef ejbRef = namingFactory.createEjbRef();
+ ejbRef.setName("ejbref-name");
+ ejbRef.setRefName("ejbref-refname");
+ ejbRef.setCssLink("ejbref-csslink");
+ ejbRef.setEjbLink("ejbref-ejblink");
+ ejbRef.setNsCorbaloc("ejbref-nscorbaloc");
+ org.apache.geronimo.jee.naming.Pattern namingPattern = namingFactory.createPattern();
+ namingPattern.setArtifactId("ejbref-css-artifactid");
+ namingPattern.setGroupId("ejbref-css-groupid");
+ namingPattern.setModule("ejbref-css-module");
+ namingPattern.setName("ejbref-css-name");
+ namingPattern.setVersion("ejbref-css-version");
+ ejbRef.setCss(namingPattern);
+ namingPattern = namingFactory.createPattern();
+ namingPattern.setArtifactId("ejbref-pattern-artifactid");
+ namingPattern.setGroupId("ejbref-pattern-groupid");
+ namingPattern.setModule("ejbref-pattern-module");
+ namingPattern.setName("ejbref-pattern-name");
+ namingPattern.setVersion("ejbref-pattern-version");
+ ejbRef.setPattern(namingPattern);
+ applicationClient.getEjbRef().add(ejbRef);
+
+ // set the GBean Ref
+ GbeanRef gbeanRef = namingFactory.createGbeanRef();
+ gbeanRef.setRefName("gbeanref-name");
+ gbeanRef.getRefType().add("gbeanref-reftype");
+ namingPattern = namingFactory.createPattern();
+ namingPattern.setArtifactId("gbeanref-pattern-artifactid");
+ namingPattern.setGroupId("gbeanref-pattern-groupid");
+ namingPattern.setModule("gbeanref-pattern-module");
+ namingPattern.setName("gbeanref-pattern-name");
+ namingPattern.setVersion("gbeanref-pattern-version");
+ gbeanRef.getPattern().add(namingPattern);
+ applicationClient.getGbeanRef().add(gbeanRef);
+
+ // set the Message Destination
+ MessageDestination messageDestination = namingFactory.createMessageDestination();
+ messageDestination.setAdminObjectLink("messagedestination-adminobjectlink");
+ messageDestination.setAdminObjectModule("messagedestination-adminobjectmodule");
+ messageDestination.setMessageDestinationName("messagedestination-name");
+ namingPattern = namingFactory.createPattern();
+ namingPattern.setArtifactId("messagedestination-pattern-artifactid");
+ namingPattern.setGroupId("messagedestination-pattern-groupid");
+ namingPattern.setModule("messagedestination-pattern-module");
+ namingPattern.setName("messagedestination-pattern-name");
+ namingPattern.setVersion("messagedestination-pattern-version");
+ messageDestination.setPattern(namingPattern);
+ applicationClient.getMessageDestination().add(messageDestination);
+
+ // set the Resource
+ Resource resource = applicationClientFactory.createResource();
+ resource.setInternalRar("resource-internalrar");
+ Connector connector = connectorFactory.createConnector();
+ Adminobject adminobject = connectorFactory.createAdminobject();
+ adminobject.setAdminobjectClass("resource-connector-adminobject-adminobjectclass");
+ adminobject.setAdminobjectInterface("resource-connector-adminobject-adminobjectinterface");
+ AdminobjectInstance adminobjectInstance = connectorFactory.createAdminobjectInstance();
+ adminobjectInstance.setMessageDestinationName("resource-connector-adminobject-instance-messagedestinationname");
+ ConfigPropertySetting configPropertySetting = connectorFactory.createConfigPropertySetting();
+ configPropertySetting.setName("resource-connector-adminobject-instance-name");
+ configPropertySetting.setValue("resource-connector-adminobject-instance-value");
+ adminobjectInstance.getConfigPropertySetting().add(configPropertySetting);
+ adminobject.getAdminobjectInstance().add(adminobjectInstance);
+ connector.getAdminobject().add(adminobject);
+ environment = deploymentFactory.createEnvironment();
+ artifact = deploymentFactory.createArtifact();
+ artifact.setGroupId("org.apache.geronimo.testsuite");
+ artifact.setArtifactId("agent-ear");
+ artifact.setVersion("2.2-SNAPSHOT");
+ artifact.setType("ear");
+ environment.setModuleId(artifact);
+ dependencies = deploymentFactory.createDependencies();
+ dependency = deploymentFactory.createDependency();
+ dependency.setGroupId("org.apache.geronimo.testsuite");
+ dependency.setArtifactId("agent-ds");
+ dependency.setVersion("2.2-SNAPSHOT");
+ dependency.setType("car");
+ dependencies.getDependency().add(dependency);
+ environment.setDependencies(dependencies);
+ connector.setEnvironment(environment);
+ Resourceadapter resourceadapter = connectorFactory.createResourceadapter();
+ ResourceadapterInstance resourceadapterInstance = connectorFactory.createResourceadapterInstance();
+ resourceadapterInstance.setResourceadapterName("resource-connector-resourceadapter-name");
+ GbeanLocator gbeanLocator = namingFactory.createGbeanLocator();
+ gbeanLocator.setGbeanLink("connector-resourceadapter-workmanager-gbeanlink");
+ namingPattern = namingFactory.createPattern();
+ namingPattern.setArtifactId("connector-resourceadapter-workmanager-pattern-artifactid");
+ namingPattern.setGroupId("connector-resourceadapter-workmanager-pattern-groupid");
+ namingPattern.setModule("connector-resourceadapter-workmanager-pattern-module");
+ namingPattern.setName("connector-resourceadapter-workmanager-pattern-name");
+ namingPattern.setVersion("connector-resourceadapter-workmanager-pattern-version");
+ gbeanLocator.setPattern(namingPattern);
+ resourceadapterInstance.setWorkmanager(gbeanLocator);
+ configPropertySetting = connectorFactory.createConfigPropertySetting();
+ configPropertySetting.setName("resource-connector-resourceadapter-instance-name");
+ configPropertySetting.setValue("resource-connector-resourceadapter-instance-value");
+ resourceadapterInstance.getConfigPropertySetting().add(configPropertySetting);
+ resourceadapter.setResourceadapterInstance(resourceadapterInstance);
+ OutboundResourceadapter outboundResourceadapter = connectorFactory.createOutboundResourceadapter();
+ ConnectionDefinition connectionDefinition = connectorFactory.createConnectionDefinition();
+ connectionDefinition.setConnectionfactoryInterface("resource-connector-resourceadapter-outbound-connectiondefinition-interface");
+ ConnectiondefinitionInstance connectionDefinitionInstance = connectorFactory.createConnectiondefinitionInstance();
+ connectionDefinitionInstance.setName("resource-connector-resourceadapter-outbound-connectiondefinition-instance-name");
+ connectionDefinitionInstance.getImplementedInterface().add("resource-connector-resourceadapter-outbound-connectiondefinition-instance-implementedinterface");
+ Connectionmanager connectionManager = connectorFactory.createConnectionmanager();
+ Empty empty = connectorFactory.createEmpty();
+ connectionManager.setContainerManagedSecurity(empty);
+ connectionManager.setLocalTransaction(empty);
+ connectionManager.setNoPool(empty);
+ connectionManager.setNoTransaction(empty);
+ connectionManager.setTransactionLog(empty);
+ Partitionedpool partitionedPool = connectorFactory.createPartitionedpool();
+ partitionedPool.setBlockingTimeoutMilliseconds(new Integer(0));
+ partitionedPool.setIdleTimeoutMinutes(new Integer(0));
+ partitionedPool.setMatchAll(empty);
+ partitionedPool.setMatchOne(empty);
+ partitionedPool.setMaxSize(new Integer(0));
+ partitionedPool.setMinSize(new Integer(0));
+ partitionedPool.setPartitionByConnectionrequestinfo(empty);
+ partitionedPool.setPartitionBySubject(empty);
+ partitionedPool.setSelectOneAssumeMatch(empty);
+ connectionManager.setPartitionedPool(partitionedPool);
+ Singlepool singlePool = connectorFactory.createSinglepool();
+ singlePool.setBlockingTimeoutMilliseconds(new Integer(0));
+ singlePool.setIdleTimeoutMinutes(new Integer(0));
+ singlePool.setMatchAll(empty);
+ singlePool.setMatchOne(empty);
+ singlePool.setMaxSize(new Integer(0));
+ singlePool.setMinSize(new Integer(0));
+ singlePool.setSelectOneAssumeMatch(empty);
+ connectionManager.setPartitionedPool(partitionedPool);
+ connectionManager.setSinglePool(singlePool);
+ Xatransaction xaTransaction = connectorFactory.createXatransaction();
+ xaTransaction.setThreadCaching(empty);
+ xaTransaction.setTransactionCaching(empty);
+ connectionManager.setXaTransaction(xaTransaction);
+ connectionDefinitionInstance.setConnectionmanager(connectionManager);
+ configPropertySetting = connectorFactory.createConfigPropertySetting();
+ configPropertySetting.setName("resource-connector-resourceadapter-outbound-connectiondefinition-instance-name");
+ configPropertySetting.setValue("resource-connector-resourceadapter-outbound-connectiondefinition-instance-value");
+ connectionDefinitionInstance.getConfigPropertySetting().add(configPropertySetting);
+ connectionDefinition.getConnectiondefinitionInstance().add(connectionDefinitionInstance);
+ outboundResourceadapter.getConnectionDefinition().add(connectionDefinition);
+ resourceadapter.setOutboundResourceadapter(outboundResourceadapter);
+ connector.getResourceadapter().add(resourceadapter);
+ Gbean gbean = deploymentFactory.createGbean();
+ gbean.setClazz("resource-connector-gbean-class");
+ gbean.setName("resource-connector-gbean-name");
+ connector.getService().add(deploymentFactory.createGbean(gbean));
+ resource.setConnector(connector);
+ org.apache.geronimo.jee.deployment.Pattern deploymentPattern = deploymentFactory.createPattern();
+ deploymentPattern.setArtifactId("resource-externalrar-artifactid");
+ deploymentPattern.setGroupId("resource-externalrar-groupid");
+ deploymentPattern.setModule("resource-externalrar-module");
+ deploymentPattern.setVersion("resource-externalrar-version");
+ deploymentPattern.setCustomFoo("resource-externalrar-customfoo");
+ deploymentPattern.setType("resource-externalrar-type");
+ resource.setExternalRar(deploymentPattern);
+ applicationClient.getResource().add(resource);
+
+ // set the resource env ref
+ ResourceEnvRef resourceEnvRef = namingFactory.createResourceEnvRef();
+ resourceEnvRef.setAdminObjectLink("resourceenvref-adminobjectlink");
+ resourceEnvRef.setAdminObjectModule("resourceenvref-adminobjectmodule");
+ resourceEnvRef.setMessageDestinationLink("resourceenvref-messagedestinationlink");
+ resourceEnvRef.setRefName("resourceenvref-refname");
+ namingPattern = namingFactory.createPattern();
+ namingPattern.setArtifactId("resourceenvref-pattern-artifactid");
+ namingPattern.setGroupId("resourceenvref-pattern-groupid");
+ namingPattern.setModule("resourceenvref-pattern-module");
+ namingPattern.setName("resourceenvref-pattern-name");
+ namingPattern.setVersion("resourceenvref-pattern-version");
+ resourceEnvRef.setPattern(namingPattern);
+ applicationClient.getResourceEnvRef().add(resourceEnvRef);
+
+ // set the resource ref
+ ResourceRef resourceRef = namingFactory.createResourceRef();
+ resourceRef.setRefName("resourceref-refname");
+ resourceRef.setResourceLink("resourceref-resourcelink");
+ resourceRef.setUrl("resourceref-url");
+ namingPattern = namingFactory.createPattern();
+ namingPattern.setArtifactId("resourceref-pattern-artifactid");
+ namingPattern.setGroupId("resourceref-pattern-groupid");
+ namingPattern.setModule("resourcref-pattern-module");
+ namingPattern.setName("resourceref-pattern-name");
+ namingPattern.setVersion("resourceref-pattern-version");
+ resourceRef.setPattern(namingPattern);
+ applicationClient.getResourceRef().add(resourceRef);
+
+ // set the Server Environment
+ environment = deploymentFactory.createEnvironment();
+ artifact = deploymentFactory.createArtifact();
+ artifact.setGroupId("org.apache.geronimo.testsuite");
+ artifact.setArtifactId("agent-ear");
+ artifact.setVersion("2.2-SNAPSHOT");
+ artifact.setType("ear");
+ environment.setModuleId(artifact);
+ dependencies = deploymentFactory.createDependencies();
+ dependency = deploymentFactory.createDependency();
+ dependency.setGroupId("org.apache.geronimo.testsuite");
+ dependency.setArtifactId("agent-ds");
+ dependency.setVersion("2.2-SNAPSHOT");
+ dependency.setType("car");
+ dependencies.getDependency().add(dependency);
+ environment.setDependencies(dependencies);
+ applicationClient.setServerEnvironment(environment);
+
+ // add the service
+ gbean = deploymentFactory.createGbean();
+ gbean.setClazz("service-gbean-class");
+ gbean.setName("service-gbean-name");
+ applicationClient.getService().add(deploymentFactory.createGbean(gbean));
+
+ // add the service ref
+ ServiceRef serviceRef = namingFactory.createServiceRef();
+ serviceRef.setServiceRefName("serviceref-refname");
+ ServiceCompletion serviceCompletion = namingFactory.createServiceCompletion();
+ serviceCompletion.setServiceName("serviceref-servicecompletion-servicename");
+ PortCompletion portCompletion = namingFactory.createPortCompletion();
+ portCompletion.setBindingName("serviceref-servicecompletion-portcompletion-bindingname");
+ Port port = namingFactory.createPort();
+ port.setCredentialsName("serviceref-servicecompletion-portcompletion-port-credentialsname");
+ port.setHost("serviceref-servicecompletion-portcompletion-port-host");
+ port.setPort(new Integer(0));
+ port.setPortName("serviceref-servicecompletion-portcompletion-port-portname");
+ port.setProtocol("serviceref-servicecompletion-portcompletion-port-protocol");
+ port.setUri("serviceref-servicecompletion-portcompletion-port-uri");
+ portCompletion.setPort(port);
+ serviceCompletion.getPortCompletion().add(portCompletion);
+ serviceRef.setServiceCompletion(serviceCompletion);
+ port = namingFactory.createPort();
+ port.setCredentialsName("serviceref-port-credentialsname");
+ port.setHost("serviceref-port-host");
+ port.setPort(new Integer(0));
+ port.setPortName("serviceref-port-portname");
+ port.setProtocol("serviceref-port-protocol");
+ port.setUri("serviceref-port-uri");
+ serviceRef.getPort().add(port);
+ applicationClient.getServiceRef().add(serviceRef);
+
+ JAXBElement<ApplicationClient> jaxbElement = applicationClientFactory.createApplicationClient(applicationClient);
+
+ //
+ // Marshall the output of the unmarshall
+ //
+ JAXBContext jaxbContext = JAXBContext.newInstance(
+ "org.apache.geronimo.jee.applicationclient:" +
+ "org.apache.geronimo.jee.naming:" +
+ "org.apache.geronimo.jee.deployment", getClass().getClassLoader() );
+ Marshaller marshaller = jaxbContext.createMarshaller();
+ marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
+ marshaller.setProperty(Marshaller.JAXB_ENCODING, "UTF-8");
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ marshaller.marshal(jaxbElement, baos);
+ String actual = new String(baos.toByteArray());
+
+ InputStream expectedInputStream = this.getClass().getClassLoader().getResourceAsStream(fileExpected);
+ String expected = readContent(expectedInputStream);
+ try {
+ Diff myDiff = new Diff(expected, actual);
+ assertTrue("Files are similar " + myDiff, myDiff.similar());
+ }
+ catch (AssertionFailedError e) {
+ System.out.println("Actual XML:\n" + actual + '\n');
+ System.out.println("[Expected XML: " + fileExpected + "]\n" + expected + '\n');
+ throw e;
+ }
+ }
+
private String readContent(InputStream in) throws IOException {
StringBuffer sb = new StringBuffer();
in = new BufferedInputStream(in);
Added: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/test/resources/applicationclient/geronimo-application-client-expected-11.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/test/resources/applicationclient/geronimo-application-client-expected-11.xml?rev=649875&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/test/resources/applicationclient/geronimo-application-client-expected-11.xml (added)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/test/resources/applicationclient/geronimo-application-client-expected-11.xml Sat Apr 19 20:24:24 2008
@@ -0,0 +1,251 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- @version $Rev$ $Date$ -->
+
+<ns4:application-client xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2" xmlns:ns2="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:ns3="http://geronimo.apache.org/xml/ns/security-2.0" xmlns:ns4="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0" xmlns:ns5="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2">
+ <client-environment>
+ <moduleId>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>agent-ear</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <type>ear</type>
+ </moduleId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>agent-ds</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ </client-environment>
+ <server-environment>
+ <moduleId>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>agent-ear</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <type>ear</type>
+ </moduleId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>agent-ds</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ </server-environment>
+ <ns2:gbean-ref>
+ <ns2:ref-name>gbeanref-name</ns2:ref-name>
+ <ns2:ref-type>gbeanref-reftype</ns2:ref-type>
+ <ns2:pattern>
+ <ns2:groupId>gbeanref-pattern-groupid</ns2:groupId>
+ <ns2:artifactId>gbeanref-pattern-artifactid</ns2:artifactId>
+ <ns2:version>gbeanref-pattern-version</ns2:version>
+ <ns2:module>gbeanref-pattern-module</ns2:module>
+ <ns2:name>gbeanref-pattern-name</ns2:name>
+ </ns2:pattern>
+ </ns2:gbean-ref>
+ <ns2:ejb-ref>
+ <ns2:ref-name>ejbref-refname</ns2:ref-name>
+ <ns2:pattern>
+ <ns2:groupId>ejbref-pattern-groupid</ns2:groupId>
+ <ns2:artifactId>ejbref-pattern-artifactid</ns2:artifactId>
+ <ns2:version>ejbref-pattern-version</ns2:version>
+ <ns2:module>ejbref-pattern-module</ns2:module>
+ <ns2:name>ejbref-pattern-name</ns2:name>
+ </ns2:pattern>
+ <ns2:ns-corbaloc>ejbref-nscorbaloc</ns2:ns-corbaloc>
+ <ns2:name>ejbref-name</ns2:name>
+ <ns2:css>
+ <ns2:groupId>ejbref-css-groupid</ns2:groupId>
+ <ns2:artifactId>ejbref-css-artifactid</ns2:artifactId>
+ <ns2:version>ejbref-css-version</ns2:version>
+ <ns2:module>ejbref-css-module</ns2:module>
+ <ns2:name>ejbref-css-name</ns2:name>
+ </ns2:css>
+ <ns2:css-link>ejbref-csslink</ns2:css-link>
+ <ns2:ejb-link>ejbref-ejblink</ns2:ejb-link>
+ </ns2:ejb-ref>
+ <ns2:service-ref>
+ <ns2:service-ref-name>serviceref-refname</ns2:service-ref-name>
+ <ns2:service-completion>
+ <ns2:service-name>serviceref-servicecompletion-servicename</ns2:service-name>
+ <ns2:port-completion>
+ <ns2:port>
+ <ns2:port-name>serviceref-servicecompletion-portcompletion-port-portname</ns2:port-name>
+ <ns2:protocol>serviceref-servicecompletion-portcompletion-port-protocol</ns2:protocol>
+ <ns2:host>serviceref-servicecompletion-portcompletion-port-host</ns2:host>
+ <ns2:port>0</ns2:port>
+ <ns2:uri>serviceref-servicecompletion-portcompletion-port-uri</ns2:uri>
+ <ns2:credentials-name>serviceref-servicecompletion-portcompletion-port-credentialsname</ns2:credentials-name>
+ </ns2:port>
+ <ns2:binding-name>serviceref-servicecompletion-portcompletion-bindingname</ns2:binding-name>
+ </ns2:port-completion>
+ </ns2:service-completion>
+ <ns2:port>
+ <ns2:port-name>serviceref-port-portname</ns2:port-name>
+ <ns2:protocol>serviceref-port-protocol</ns2:protocol>
+ <ns2:host>serviceref-port-host</ns2:host>
+ <ns2:port>0</ns2:port>
+ <ns2:uri>serviceref-port-uri</ns2:uri>
+ <ns2:credentials-name>serviceref-port-credentialsname</ns2:credentials-name>
+ </ns2:port>
+ </ns2:service-ref>
+ <ns2:resource-ref>
+ <ns2:ref-name>resourceref-refname</ns2:ref-name>
+ <ns2:pattern>
+ <ns2:groupId>resourceref-pattern-groupid</ns2:groupId>
+ <ns2:artifactId>resourceref-pattern-artifactid</ns2:artifactId>
+ <ns2:version>resourceref-pattern-version</ns2:version>
+ <ns2:module>resourcref-pattern-module</ns2:module>
+ <ns2:name>resourceref-pattern-name</ns2:name>
+ </ns2:pattern>
+ <ns2:resource-link>resourceref-resourcelink</ns2:resource-link>
+ <ns2:url>resourceref-url</ns2:url>
+ </ns2:resource-ref>
+ <ns2:resource-env-ref>
+ <ns2:ref-name>resourceenvref-refname</ns2:ref-name>
+ <ns2:pattern>
+ <ns2:groupId>resourceenvref-pattern-groupid</ns2:groupId>
+ <ns2:artifactId>resourceenvref-pattern-artifactid</ns2:artifactId>
+ <ns2:version>resourceenvref-pattern-version</ns2:version>
+ <ns2:module>resourceenvref-pattern-module</ns2:module>
+ <ns2:name>resourceenvref-pattern-name</ns2:name>
+ </ns2:pattern>
+ <ns2:message-destination-link>resourceenvref-messagedestinationlink</ns2:message-destination-link>
+ <ns2:admin-object-module>resourceenvref-adminobjectmodule</ns2:admin-object-module>
+ <ns2:admin-object-link>resourceenvref-adminobjectlink</ns2:admin-object-link>
+ </ns2:resource-env-ref>
+ <ns2:message-destination>
+ <ns2:message-destination-name>messagedestination-name</ns2:message-destination-name>
+ <ns2:pattern>
+ <ns2:groupId>messagedestination-pattern-groupid</ns2:groupId>
+ <ns2:artifactId>messagedestination-pattern-artifactid</ns2:artifactId>
+ <ns2:version>messagedestination-pattern-version</ns2:version>
+ <ns2:module>messagedestination-pattern-module</ns2:module>
+ <ns2:name>messagedestination-pattern-name</ns2:name>
+ </ns2:pattern>
+ <ns2:admin-object-module>messagedestination-adminobjectmodule</ns2:admin-object-module>
+ <ns2:admin-object-link>messagedestination-adminobjectlink</ns2:admin-object-link>
+ </ns2:message-destination>
+ <ns3:default-subject>
+ <ns3:description>subjectinfo-description</ns3:description>
+ <ns3:realm>subjectinfo-realm</ns3:realm>
+ <ns3:id>subjectinfo-id</ns3:id>
+ </ns3:default-subject>
+ <ns4:realm-name>realmname</ns4:realm-name>
+ <ns4:callback-handler>callbackhandler</ns4:callback-handler>
+ <ns4:resource>
+ <ns4:external-rar>
+ <groupId>resource-externalrar-groupid</groupId>
+ <artifactId>resource-externalrar-artifactid</artifactId>
+ <version>resource-externalrar-version</version>
+ <module>resource-externalrar-module</module>
+ <type>resource-externalrar-type</type>
+ <name>resource-externalrar-customfoo</name>
+ </ns4:external-rar>
+ <ns4:internal-rar>resource-internalrar</ns4:internal-rar>
+ <ns5:connector>
+ <environment>
+ <moduleId>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>agent-ear</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <type>ear</type>
+ </moduleId>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.testsuite</groupId>
+ <artifactId>agent-ds</artifactId>
+ <version>2.2-SNAPSHOT</version>
+ <type>car</type>
+ </dependency>
+ </dependencies>
+ </environment>
+ <ns5:resourceadapter>
+ <ns5:resourceadapter-instance>
+ <ns5:resourceadapter-name>resource-connector-resourceadapter-name</ns5:resourceadapter-name>
+ <ns5:config-property-setting name="resource-connector-resourceadapter-instance-name">resource-connector-resourceadapter-instance-value</ns5:config-property-setting>
+ <ns2:workmanager>
+ <ns2:pattern>
+ <ns2:groupId>connector-resourceadapter-workmanager-pattern-groupid</ns2:groupId>
+ <ns2:artifactId>connector-resourceadapter-workmanager-pattern-artifactid</ns2:artifactId>
+ <ns2:version>connector-resourceadapter-workmanager-pattern-version</ns2:version>
+ <ns2:module>connector-resourceadapter-workmanager-pattern-module</ns2:module>
+ <ns2:name>connector-resourceadapter-workmanager-pattern-name</ns2:name>
+ </ns2:pattern>
+ <ns2:gbean-link>connector-resourceadapter-workmanager-gbeanlink</ns2:gbean-link>
+ </ns2:workmanager>
+ </ns5:resourceadapter-instance>
+ <ns5:outbound-resourceadapter>
+ <ns5:connection-definition>
+ <ns5:connectionfactory-interface>resource-connector-resourceadapter-outbound-connectiondefinition-interface</ns5:connectionfactory-interface>
+ <ns5:connectiondefinition-instance>
+ <ns5:name>resource-connector-resourceadapter-outbound-connectiondefinition-instance-name</ns5:name>
+ <ns5:implemented-interface>resource-connector-resourceadapter-outbound-connectiondefinition-instance-implementedinterface</ns5:implemented-interface>
+ <ns5:config-property-setting name="resource-connector-resourceadapter-outbound-connectiondefinition-instance-name">resource-connector-resourceadapter-outbound-connectiondefinition-instance-value</ns5:config-property-setting>
+ <ns5:connectionmanager>
+<ns5:container-managed-security/>
+<ns5:no-transaction/>
+<ns5:local-transaction/>
+<ns5:xa-transaction>
+ <ns5:transaction-caching/>
+ <ns5:thread-caching/>
+</ns5:xa-transaction>
+<ns5:transaction-log/>
+<ns5:no-pool/>
+<ns5:single-pool>
+ <ns5:max-size>0</ns5:max-size>
+ <ns5:min-size>0</ns5:min-size>
+ <ns5:blocking-timeout-milliseconds>0</ns5:blocking-timeout-milliseconds>
+ <ns5:idle-timeout-minutes>0</ns5:idle-timeout-minutes>
+ <ns5:match-one/>
+ <ns5:match-all/>
+ <ns5:select-one-assume-match/>
+</ns5:single-pool>
+<ns5:partitioned-pool>
+ <ns5:max-size>0</ns5:max-size>
+ <ns5:min-size>0</ns5:min-size>
+ <ns5:blocking-timeout-milliseconds>0</ns5:blocking-timeout-milliseconds>
+ <ns5:idle-timeout-minutes>0</ns5:idle-timeout-minutes>
+ <ns5:match-one/>
+ <ns5:match-all/>
+ <ns5:select-one-assume-match/>
+ <ns5:partition-by-subject/>
+ <ns5:partition-by-connectionrequestinfo/>
+</ns5:partitioned-pool>
+ </ns5:connectionmanager>
+ </ns5:connectiondefinition-instance>
+ </ns5:connection-definition>
+ </ns5:outbound-resourceadapter>
+ </ns5:resourceadapter>
+ <ns5:adminobject>
+ <ns5:adminobject-interface>resource-connector-adminobject-adminobjectinterface</ns5:adminobject-interface>
+ <ns5:adminobject-class>resource-connector-adminobject-adminobjectclass</ns5:adminobject-class>
+ <ns5:adminobject-instance>
+ <ns5:message-destination-name>resource-connector-adminobject-instance-messagedestinationname</ns5:message-destination-name>
+ <ns5:config-property-setting name="resource-connector-adminobject-instance-name">resource-connector-adminobject-instance-value</ns5:config-property-setting>
+ </ns5:adminobject-instance>
+ </ns5:adminobject>
+ <gbean name="resource-connector-gbean-name" class="resource-connector-gbean-class"/>
+ </ns5:connector>
+ </ns4:resource>
+ <gbean name="service-gbean-name" class="service-gbean-class"/>
+</ns4:application-client>
\ No newline at end of file
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/test/resources/applicationclient/geronimo-application-client-expected-11.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/test/resources/applicationclient/geronimo-application-client-expected-11.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/test/resources/applicationclient/geronimo-application-client-expected-11.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml