Author: jdoyle Date: 2009-05-28 22:26:41 -0400 (Thu, 28 May 2009) New Revision: 1008 Added: trunk/connectors/connector-xml/src/test/resources/documents/File/ trunk/connectors/connector-xml/src/test/resources/documents/File/.project trunk/connectors/connector-xml/src/test/resources/documents/File/po_list.xmi trunk/connectors/connector-xml/src/test/resources/documents/File/purchaseOrder.xmi trunk/connectors/connector-xml/src/test/resources/documents/File/purchase_orders.vdb Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPExecutor.java Log: Resolving missing import and adding test resources. Modified: trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPExecutor.java =================================================================== --- trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPExecutor.java 2009-05-28 19:37:45 UTC (rev 1007) +++ trunk/connectors/connector-xml/src/main/java/com/metamatrix/connector/xml/soap/SOAPExecutor.java 2009-05-29 02:26:41 UTC (rev 1008) @@ -42,8 +42,6 @@ import javax.xml.ws.Service; import javax.xml.ws.soap.SOAPBinding; -import net.sf.saxon.dom.DOMNodeList; - import org.jdom.Document; import org.jdom.Element; import org.jdom.output.DOMOutputter; @@ -151,9 +149,7 @@ requestNodes = dummyNode.getChildNodes().item(0).getChildNodes(); } else { org.w3c.dom.Document document = domOutputter.output(doc); - List singleNode = new ArrayList(); - singleNode.add(document.getFirstChild()); - requestNodes = new DOMNodeList(singleNode); + requestNodes = document.getChildNodes(); } } catch (Exception e) { throw new ConnectorException(e); Added: trunk/connectors/connector-xml/src/test/resources/documents/File/.project =================================================================== --- trunk/connectors/connector-xml/src/test/resources/documents/File/.project (rev 0) +++ trunk/connectors/connector-xml/src/test/resources/documents/File/.project 2009-05-29 02:26:41 UTC (rev 1008) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>PurchaseOrder</name> + <comment>MetaMatrix Enterprise Designer, version 5.5</comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>com.metamatrix.modeler.core.modelBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>com.metamatrix.modeler.core.modelNature</nature> + </natures> +</projectDescription> Added: trunk/connectors/connector-xml/src/test/resources/documents/File/po_list.xmi =================================================================== --- trunk/connectors/connector-xml/src/test/resources/documents/File/po_list.xmi (rev 0) +++ trunk/connectors/connector-xml/src/test/resources/documents/File/po_list.xmi 2009-05-29 02:26:41 UTC (rev 1008) @@ -0,0 +1,120 @@ +<?xml version="1.0" encoding="ASCII"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:diagram="http://www.metamatrix.com/metamodels/Diagram" xmlns:jdbc="http://www.metamatrix.com/metamodels/JDBC" xmlns:mmcore="http://www.metamatrix.com/metamodels/Core" xmlns:relational="http://www.metamatrix.com/metamodels/Relational&qu... + <mmcore:ModelAnnotation xmi:uuid="mmuuid:94231cc0-4a54-111b-bb0a-ea1884adcb79" primaryMetamodelUri="http://www.metamatrix.com/metamodels/Relational... modelType="PHYSICAL" ProducerName="MetaMatrix" ProducerVersion="5.5"> + <modelImports xmi:uuid="mmuuid:9aa25200-4a54-111b-bb0a-ea1884adcb79" name="XMLFileConnectorExtensions" modelLocation="../XMLExtensionsProject/XMLFileConnectorExtensions.xmi" uuid="mmuuid:61d94280-b86d-1ffe-bb3d-c715e2d4aaf4" modelType="EXTENSION" primaryMetamodelUri="http://www.metamatrix.com/metamodels/Extension&... + <modelImports xmi:uuid="mmuuid:9a748b40-4a54-111b-bb0a-ea1884adcb79" name="XMLSchema" modelLocation="http://www.w3.org/2001/XMLSchema" modelType="TYPE" primaryMetamodelUri="http://www.eclipse.org/xsd/2002/XSD"/> + <extensionPackage href="../XMLExtensionsProject/XMLFileConnectorExtensions.xmi#mmuuid/61d94286-b86d-1ffe-bb3d-c715e2d4aaf4"/> + </mmcore:ModelAnnotation> + <mmcore:AnnotationContainer xmi:uuid="mmuuid:97e46a82-4a54-111b-bb0a-ea1884adcb79"> + <annotations xmi:uuid="mmuuid:97e46a83-4a54-111b-bb0a-ea1884adcb79" annotatedObject="mmuuid/97e46a80-4a54-111b-bb0a-ea1884adcb79"> + <tags xmi:uuid="mmuuid:97e46a84-4a54-111b-bb0a-ea1884adcb79" key="NamespacePrefixes" value="xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:po='http://www.example.com/PO1'"/> + </annotations> + <annotations xmi:uuid="mmuuid:9802ef08-4a54-111b-bb0a-ea1884adcb79" annotatedObject="mmuuid/9802ef06-4a54-111b-bb0a-ea1884adcb79"> + <tags xmi:uuid="mmuuid:9802ef09-4a54-111b-bb0a-ea1884adcb79" key="NamespacePrefixes" value="xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:po='http://www.example.com/PO1'"/> + </annotations> + <annotations xmi:uuid="mmuuid:983ff805-4a54-111b-bb0a-ea1884adcb79" annotatedObject="mmuuid/983ff803-4a54-111b-bb0a-ea1884adcb79"> + <tags xmi:uuid="mmuuid:983ff806-4a54-111b-bb0a-ea1884adcb79" key="NamespacePrefixes" value="xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:po='http://www.example.com/PO1'"/> + </annotations> + </mmcore:AnnotationContainer> + <relational:BaseTable xmi:uuid="mmuuid:97e46a80-4a54-111b-bb0a-ea1884adcb79" name="item" nameInSource="((((/po:purchaseOrder) | (/po:purchaseOrders/order))/items) | (/po:purchaseOrder/items) | (/po:purchaseOrders/order/items))/item"> + <columns xmi:uuid="mmuuid:97f3acc0-4a54-111b-bb0a-ea1884adcb79" name="mmid" nameInSource=&quot;(a)com.metamatrix.xml.xpathpart&quot; nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue="" uniqueKeys="mmuuid/9802ef05-4a54-111b-bb0a-ea1884adcb79"> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:97f3acc1-4a54-111b-bb0a-ea1884adcb79" name="partNum" nameInSource="@partNum" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:97f3acc2-4a54-111b-bb0a-ea1884adcb79" name="productName" nameInSource="productName/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:9802ef00-4a54-111b-bb0a-ea1884adcb79" name="quantity" nameInSource="quantity/text()" nativeType="java.lang.String" length="20" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:9802ef01-4a54-111b-bb0a-ea1884adcb79" name="USPrice" nameInSource="USPrice/text()" nativeType="java.lang.String" length="20" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:9802ef02-4a54-111b-bb0a-ea1884adcb79" name="comment" nameInSource="po:comment/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:9802ef03-4a54-111b-bb0a-ea1884adcb79" name="shipDate" nameInSource="shipDate/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:9802ef04-4a54-111b-bb0a-ea1884adcb79" name="order_mmid" nameInSource=&quot;../../(a)com.metamatrix.xml.xpathpart&quot; nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue="" foreignKeys="mmuuid/984f3a42-4a54-111b-bb0a-ea1884adcb79"> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <foreignKeys xmi:uuid="mmuuid:984f3a42-4a54-111b-bb0a-ea1884adcb79" name="fk_item_order" nameInSource="fk_/po:purchaseOrders/order/items/item_/po:purchaseOrders/order" foreignKeyMultiplicity="UNSPECIFIED" primaryKeyMultiplicity="UNSPECIFIED" columns="mmuuid/9802ef04-4a54-111b-bb0a-ea1884adcb79" uniqueKey="mmuuid/983ff802-4a54-111b-bb0a-ea1884adcb79"/> + <primaryKey xmi:uuid="mmuuid:9802ef05-4a54-111b-bb0a-ea1884adcb79" name="pkitem" nameInSource="pk_((((/po:purchaseOrder) | (/po:purchaseOrders/order))/items) | (/po:purchaseOrder/items) | (/po:purchaseOrders/order/items))/item" columns="mmuuid/97f3acc0-4a54-111b-bb0a-ea1884adcb79"/> + </relational:BaseTable> + <relational:BaseTable xmi:uuid="mmuuid:9802ef06-4a54-111b-bb0a-ea1884adcb79" name="order" nameInSource="/po:purchaseOrders/order"> + <columns xmi:uuid="mmuuid:98217380-4a54-111b-bb0a-ea1884adcb79" name="purchaseOrders_mmid" nameInSource=&quot;../(a)com.metamatrix.xml.xpathpart&quot; nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue="" foreignKeys="mmuuid/984f3a43-4a54-111b-bb0a-ea1884adcb79"> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:98217381-4a54-111b-bb0a-ea1884adcb79" name="mmid" nameInSource=&quot;(a)com.metamatrix.xml.xpathpart&quot; nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue="" uniqueKeys="mmuuid/983ff802-4a54-111b-bb0a-ea1884adcb79"> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:98217382-4a54-111b-bb0a-ea1884adcb79" name="orderDate" nameInSource="@orderDate" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:9830b5c0-4a54-111b-bb0a-ea1884adcb79" name="shipTo_country" nameInSource="shipTo/@country" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:9830b5c1-4a54-111b-bb0a-ea1884adcb79" name="shipTo_name" nameInSource="shipTo/name/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:9830b5c2-4a54-111b-bb0a-ea1884adcb79" name="shipTo_street" nameInSource="shipTo/street/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:9830b5c3-4a54-111b-bb0a-ea1884adcb79" name="shipTo_city" nameInSource="shipTo/city/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:9830b5c4-4a54-111b-bb0a-ea1884adcb79" name="shipTo_state" nameInSource="shipTo/state/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:9830b5c5-4a54-111b-bb0a-ea1884adcb79" name="shipTo_zip" nameInSource="shipTo/zip/text()" nativeType="java.lang.String" length="20" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:9830b5c6-4a54-111b-bb0a-ea1884adcb79" name="billTo_country" nameInSource="billTo/@country" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:9830b5c7-4a54-111b-bb0a-ea1884adcb79" name="billTo_name" nameInSource="billTo/name/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:9830b5c8-4a54-111b-bb0a-ea1884adcb79" name="billTo_street" nameInSource="billTo/street/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:9830b5c9-4a54-111b-bb0a-ea1884adcb79" name="billTo_city" nameInSource="billTo/city/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:9830b5ca-4a54-111b-bb0a-ea1884adcb79" name="billTo_state" nameInSource="billTo/state/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:983ff800-4a54-111b-bb0a-ea1884adcb79" name="billTo_zip" nameInSource="billTo/zip/text()" nativeType="java.lang.String" length="20" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:983ff801-4a54-111b-bb0a-ea1884adcb79" name="comment" nameInSource="po:comment/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <foreignKeys xmi:uuid="mmuuid:984f3a43-4a54-111b-bb0a-ea1884adcb79" name="fk_order_purchaseOrders" foreignKeyMultiplicity="UNSPECIFIED" primaryKeyMultiplicity="UNSPECIFIED" columns="mmuuid/98217380-4a54-111b-bb0a-ea1884adcb79" uniqueKey="mmuuid/984f3a41-4a54-111b-bb0a-ea1884adcb79"/> + <primaryKey xmi:uuid="mmuuid:983ff802-4a54-111b-bb0a-ea1884adcb79" name="pkorder" nameInSource="pk_/po:purchaseOrders/order" columns="mmuuid/98217381-4a54-111b-bb0a-ea1884adcb79" foreignKeys="mmuuid/984f3a42-4a54-111b-bb0a-ea1884adcb79"/> + </relational:BaseTable> + <relational:BaseTable xmi:uuid="mmuuid:983ff803-4a54-111b-bb0a-ea1884adcb79" name="purchaseOrders" nameInSource="/po:purchaseOrders"> + <columns xmi:uuid="mmuuid:984f3a40-4a54-111b-bb0a-ea1884adcb79" name="mmid" nameInSource=&quot;(a)com.metamatrix.xml.xpathpart&quot; nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue="" uniqueKeys="mmuuid/984f3a41-4a54-111b-bb0a-ea1884adcb79"> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <primaryKey xmi:uuid="mmuuid:984f3a41-4a54-111b-bb0a-ea1884adcb79" name="pkpurchaseOrders" nameInSource="pk_/po:purchaseOrders" columns="mmuuid/984f3a40-4a54-111b-bb0a-ea1884adcb79" foreignKeys="mmuuid/984f3a43-4a54-111b-bb0a-ea1884adcb79"/> + </relational:BaseTable> + <jdbc:JdbcSource xmi:uuid="mmuuid:50f37689-4a4e-111b-bb0a-ea1884adcb79" driverName="com.metamatrix.modeler.modelgenerator.xml.wizards.jdbc.XmlImporterJdbcDriver" driverClass="com.metamatrix.modeler.modelgenerator.xml.wizards.jdbc.XmlImporterJdbcDriver" username="" url="xsd:file:/NotBackedUp/jdoyle/workspaces/XML.tests/po.xsd"> + <importSettings xmi:uuid="mmuuid:50f3768a-4a4e-111b-bb0a-ea1884adcb79" createCatalogsInModel="false" includeApproximateIndexes="false"> + <includedCatalogPaths>/Global</includedCatalogPaths> + <includedCatalogPaths>/http___www_example_com_PO1</includedCatalogPaths> + <includedTableTypes>ELEMENT</includedTableTypes> + <includedTableTypes>RELATIONSHIP</includedTableTypes> + </importSettings> + </jdbc:JdbcSource> + <diagram:DiagramContainer xmi:uuid="mmuuid:b841f040-4a54-111b-bb0a-ea1884adcb79"> + <diagram xmi:uuid="mmuuid:b8513280-4a54-111b-bb0a-ea1884adcb79" type="packageDiagramType" target="mmuuid/94231cc0-4a54-111b-bb0a-ea1884adcb79"> + <diagramEntity xmi:uuid="mmuuid:c254ac80-4a54-111b-bb0a-ea1884adcb79" modelObject="mmuuid/97e46a80-4a54-111b-bb0a-ea1884adcb79" xPosition="348" yPosition="235"/> + <diagramEntity xmi:uuid="mmuuid:c263eec0-4a54-111b-bb0a-ea1884adcb79" modelObject="mmuuid/9802ef06-4a54-111b-bb0a-ea1884adcb79" xPosition="30" yPosition="36"/> + <diagramEntity xmi:uuid="mmuuid:c263eec1-4a54-111b-bb0a-ea1884adcb79" modelObject="mmuuid/983ff803-4a54-111b-bb0a-ea1884adcb79" xPosition="356" yPosition="30"/> + </diagram> + </diagram:DiagramContainer> +</xmi:XMI> Added: trunk/connectors/connector-xml/src/test/resources/documents/File/purchaseOrder.xmi =================================================================== --- trunk/connectors/connector-xml/src/test/resources/documents/File/purchaseOrder.xmi (rev 0) +++ trunk/connectors/connector-xml/src/test/resources/documents/File/purchaseOrder.xmi 2009-05-29 02:26:41 UTC (rev 1008) @@ -0,0 +1,105 @@ +<?xml version="1.0" encoding="ASCII"?> +<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:diagram="http://www.metamatrix.com/metamodels/Diagram" xmlns:jdbc="http://www.metamatrix.com/metamodels/JDBC" xmlns:mmcore="http://www.metamatrix.com/metamodels/Core" xmlns:relational="http://www.metamatrix.com/metamodels/Relational&qu... + <mmcore:ModelAnnotation xmi:uuid="mmuuid:25983900-54a6-111b-9708-f3d85bed2dda" primaryMetamodelUri="http://www.metamatrix.com/metamodels/Relational... modelType="PHYSICAL" ProducerName="MetaMatrix" ProducerVersion="5.5"> + <modelImports xmi:uuid="mmuuid:36d20340-54a6-111b-9708-f3d85bed2dda" name="XMLFileConnectorExtensions" modelLocation="../XMLExtensionsProject/XMLFileConnectorExtensions.xmi" uuid="mmuuid:61d94280-b86d-1ffe-bb3d-c715e2d4aaf4" modelType="EXTENSION" primaryMetamodelUri="http://www.metamatrix.com/metamodels/Extension&... + <modelImports xmi:uuid="mmuuid:35dddf40-54a6-111b-9708-f3d85bed2dda" name="XMLSchema" modelLocation="http://www.w3.org/2001/XMLSchema" modelType="TYPE" primaryMetamodelUri="http://www.eclipse.org/xsd/2002/XSD"/> + <extensionPackage href="../XMLExtensionsProject/XMLFileConnectorExtensions.xmi#mmuuid/61d94286-b86d-1ffe-bb3d-c715e2d4aaf4"/> + </mmcore:ModelAnnotation> + <mmcore:AnnotationContainer xmi:uuid="mmuuid:2b9d5c41-54a6-111b-9708-f3d85bed2dda"> + <annotations xmi:uuid="mmuuid:2b9d5c42-54a6-111b-9708-f3d85bed2dda" annotatedObject="mmuuid/2b7ed7c0-54a6-111b-9708-f3d85bed2dda"> + <tags xmi:uuid="mmuuid:2bac9e80-54a6-111b-9708-f3d85bed2dda" key="NamespacePrefixes" value="xmlns:xsd='http://www.w3.org/2001/XMLSchema'"/> + </annotations> + <annotations xmi:uuid="mmuuid:2cce8942-54a6-111b-9708-f3d85bed2dda" annotatedObject="mmuuid/2cce8940-54a6-111b-9708-f3d85bed2dda"> + <tags xmi:uuid="mmuuid:2cce8943-54a6-111b-9708-f3d85bed2dda" key="NamespacePrefixes" value="xmlns:xsd='http://www.w3.org/2001/XMLSchema'"/> + </annotations> + </mmcore:AnnotationContainer> + <relational:BaseTable xmi:uuid="mmuuid:2b7ed7c0-54a6-111b-9708-f3d85bed2dda" name="purchaseOrder" nameInSource="/purchaseOrder"> + <columns xmi:uuid="mmuuid:2c547740-54a6-111b-9708-f3d85bed2dda" name="mmid" nameInSource=&quot;(a)com.metamatrix.xml.xpathpart&quot; nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue="" uniqueKeys="mmuuid/2c918040-54a6-111b-9708-f3d85bed2dda"> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:2c72fbc0-54a6-111b-9708-f3d85bed2dda" name="orderDate" nameInSource="@orderDate" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:2c72fbc1-54a6-111b-9708-f3d85bed2dda" name="shipTo_country" nameInSource="shipTo/@country" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:2c72fbc2-54a6-111b-9708-f3d85bed2dda" name="shipTo_name" nameInSource="shipTo/name/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:2c72fbc3-54a6-111b-9708-f3d85bed2dda" name="shipTo_street" nameInSource="shipTo/street/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:2c823e00-54a6-111b-9708-f3d85bed2dda" name="shipTo_city" nameInSource="shipTo/city/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:2c823e01-54a6-111b-9708-f3d85bed2dda" name="shipTo_state" nameInSource="shipTo/state/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:2c823e02-54a6-111b-9708-f3d85bed2dda" name="shipTo_zip" nameInSource="shipTo/zip/text()" nativeType="java.lang.String" length="20" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:2c823e03-54a6-111b-9708-f3d85bed2dda" name="billTo_country" nameInSource="billTo/@country" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:2c823e04-54a6-111b-9708-f3d85bed2dda" name="billTo_name" nameInSource="billTo/name/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:2c823e05-54a6-111b-9708-f3d85bed2dda" name="billTo_street" nameInSource="billTo/street/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:2c823e06-54a6-111b-9708-f3d85bed2dda" name="billTo_city" nameInSource="billTo/city/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:2c823e07-54a6-111b-9708-f3d85bed2dda" name="billTo_state" nameInSource="billTo/state/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:2c823e08-54a6-111b-9708-f3d85bed2dda" name="billTo_zip" nameInSource="billTo/zip/text()" nativeType="java.lang.String" length="20" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:2c823e09-54a6-111b-9708-f3d85bed2dda" name="comment" nameInSource="comment/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <primaryKey xmi:uuid="mmuuid:2c918040-54a6-111b-9708-f3d85bed2dda" name="pkpurchaseOrder" nameInSource="pk_/purchaseOrder" columns="mmuuid/2c547740-54a6-111b-9708-f3d85bed2dda" foreignKeys="mmuuid/2d57dd80-54a6-111b-9708-f3d85bed2dda"/> + </relational:BaseTable> + <relational:BaseTable xmi:uuid="mmuuid:2cce8940-54a6-111b-9708-f3d85bed2dda" name="item" nameInSource="/purchaseOrder/items/item"> + <columns xmi:uuid="mmuuid:2cddcb80-54a6-111b-9708-f3d85bed2dda" name="purchaseOrder_mmid" nameInSource=&quot;../../(a)com.metamatrix.xml.xpathpart&quot; nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue="" foreignKeys="mmuuid/2d57dd80-54a6-111b-9708-f3d85bed2dda"> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:2cddcb81-54a6-111b-9708-f3d85bed2dda" name="mmid" nameInSource=&quot;(a)com.metamatrix.xml.xpathpart&quot; nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue="" uniqueKeys="mmuuid/2cddcb88-54a6-111b-9708-f3d85bed2dda"> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:2cddcb82-54a6-111b-9708-f3d85bed2dda" name="partNum" nameInSource="@partNum" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:2cddcb83-54a6-111b-9708-f3d85bed2dda" name="productName" nameInSource="productName/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:2cddcb84-54a6-111b-9708-f3d85bed2dda" name="quantity" nameInSource="quantity/text()" nativeType="java.lang.String" length="20" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:2cddcb85-54a6-111b-9708-f3d85bed2dda" name="USPrice" nameInSource="USPrice/text()" nativeType="java.lang.String" length="20" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:2cddcb86-54a6-111b-9708-f3d85bed2dda" name="comment" nameInSource="comment/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <columns xmi:uuid="mmuuid:2cddcb87-54a6-111b-9708-f3d85bed2dda" name="shipDate" nameInSource="shipDate/text()" nativeType="java.lang.String" length="255" nullable="NULLABLE_UNKNOWN" defaultValue=""> + <type href="http://www.w3.org/2001/XMLSchema#string"/> + </columns> + <foreignKeys xmi:uuid="mmuuid:2d57dd80-54a6-111b-9708-f3d85bed2dda" name="fk_item_purchaseOrder" nameInSource="fk_/purchaseOrder/items/item_/purchaseOrder" foreignKeyMultiplicity="UNSPECIFIED" primaryKeyMultiplicity="UNSPECIFIED" columns="mmuuid/2cddcb80-54a6-111b-9708-f3d85bed2dda" uniqueKey="mmuuid/2c918040-54a6-111b-9708-f3d85bed2dda"/> + <primaryKey xmi:uuid="mmuuid:2cddcb88-54a6-111b-9708-f3d85bed2dda" name="pkitem" nameInSource="pk_/purchaseOrder/items/item" columns="mmuuid/2cddcb81-54a6-111b-9708-f3d85bed2dda"/> + </relational:BaseTable> + <jdbc:JdbcSource xmi:uuid="mmuuid:2ff54189-54a2-111b-9708-f3d85bed2dda" driverName="com.metamatrix.modeler.modelgenerator.xml.wizards.jdbc.XmlImporterJdbcDriver" driverClass="com.metamatrix.modeler.modelgenerator.xml.wizards.jdbc.XmlImporterJdbcDriver" username="" url="xsd:file:/NotBackedUp/jdoyle/workspaces/XML.tests/po_orig.xsd"> + <importSettings xmi:uuid="mmuuid:2ff5418a-54a2-111b-9708-f3d85bed2dda" createCatalogsInModel="false" includeApproximateIndexes="false"> + <includedCatalogPaths>/Global</includedCatalogPaths> + <includedTableTypes>ELEMENT</includedTableTypes> + <includedTableTypes>RELATIONSHIP</includedTableTypes> + </importSettings> + </jdbc:JdbcSource> + <diagram:DiagramContainer xmi:uuid="mmuuid:4a9bee40-54a6-111b-9708-f3d85bed2dda"> + <diagram xmi:uuid="mmuuid:4a9bee41-54a6-111b-9708-f3d85bed2dda" type="packageDiagramType" target="mmuuid/25983900-54a6-111b-9708-f3d85bed2dda"> + <diagramEntity xmi:uuid="mmuuid:4b624b80-54a6-111b-9708-f3d85bed2dda" modelObject="mmuuid/2b7ed7c0-54a6-111b-9708-f3d85bed2dda" xPosition="343" yPosition="30"/> + <diagramEntity xmi:uuid="mmuuid:4b901240-54a6-111b-9708-f3d85bed2dda" modelObject="mmuuid/2cce8940-54a6-111b-9708-f3d85bed2dda" xPosition="30" yPosition="78"/> + </diagram> + </diagram:DiagramContainer> +</xmi:XMI> Added: trunk/connectors/connector-xml/src/test/resources/documents/File/purchase_orders.vdb =================================================================== (Binary files differ) Property changes on: trunk/connectors/connector-xml/src/test/resources/documents/File/purchase_orders.vdb ___________________________________________________________________ Name: svn:mime-type + application/octet-stream