Changed reference to energistics namespace

Author: dponti

BetaProcedures.xsd

@@ -11,7 +11,7 @@
     <import namespace="http://diggsml.org/schema-dev/geotechnical" schemaLocation="Diggs_geo.xsd"/> -->
     <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="gml3.2Profile_diggs.xsd"/>
     <import namespace="http://www.energistics.org/energyml/data/commonv2"
-        schemaLocation="witsml/2.0/data/common/v2.1/xsd_schemas/EmlAllObjects.xsd"/>
+        schemaLocation="energistics/2.0/data/common/v2.1/xsd_schemas/EmlAllObjects.xsd"/>
 
     <element name="AggregateAbrasionValueTest" type="diggs:AggregateAbrasionValueTestType"
         abstract="false" substitutionGroup="diggs:AbstractLaboratoryTestProcedure">

Construction.xsd

@@ -14,7 +14,7 @@
     <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="gml3.2Profile_diggs.xsd"/>
     <import namespace="http://diggsml.org/schema-dev/geotechnical" schemaLocation="Diggs_geo.xsd"/>
     <import namespace="http://www.energistics.org/energyml/data/commonv2"
-        schemaLocation="witsml/2.0/data/common/v2.1/xsd_schemas/EmlAllObjects.xsd"/>
+        schemaLocation="energistics/2.0/data/common/v2.1/xsd_schemas/EmlAllObjects.xsd"/>
     <import namespace="http://www.energistics.org/energyml/data/witsmlv2"
         schemaLocation="witsmlv2Profile_diggs.xsd"/>
     <element abstract="true" name="AbstractProgramDesign" type="diggs:AbstractProgramDesignType"/>

Deprecated.xsd

@@ -14,7 +14,7 @@
 -->
     <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="gml3.2Profile_diggs.xsd"/>
     <import namespace="http://www.energistics.org/energyml/data/commonv2"
-        schemaLocation="witsml/2.0/data/common/v2.1/xsd_schemas/EmlAllObjects.xsd"/>
+        schemaLocation="energistics/2.0/data/common/v2.1/xsd_schemas/EmlAllObjects.xsd"/>
     <import namespace="http://www.energistics.org/energyml/data/witsmlv2"
         schemaLocation="witsmlv2Profile_diggs.xsd"/>
 

Diggs_geo_deprecated.xsd

@@ -15,7 +15,7 @@
     <!-- include and import other DIGGS schemas -->
     <!-- import the witsml schemas -->
     <import namespace="http://www.energistics.org/energyml/data/commonv2"
-        schemaLocation="witsml/2.0/data/common/v2.1/xsd_schemas/EmlAllObjects.xsd"/>
+        schemaLocation="energistics/2.0/data/common/v2.1/xsd_schemas/EmlAllObjects.xsd"/>
     <element abstract="false" name="TriaxialTest"
         substitutionGroup="diggs:AbstractLaboratoryTestProcedure" type="diggs_geo:TriaxialTestType">
         <annotation>

Diggs_procedures_temp.xsd

@@ -14,7 +14,7 @@
  import the gml and xlinks namespaces (original local profiles)  
 -->
     <import namespace="http://www.energistics.org/energyml/data/commonv2"
-        schemaLocation="witsml/2.0/data/common/v2.1/xsd_schemas/EmlAllObjects.xsd"/>
+        schemaLocation="energistics/2.0/data/common/v2.1/xsd_schemas/EmlAllObjects.xsd"/>
     <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="gml3.2Profile_diggs.xsd"/>
 
     <!-- Triaxia Test elements -->

Geophysics.xsd

@@ -14,7 +14,7 @@
 -->
     <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="gml3.2Profile_diggs.xsd"/>
     <import namespace="http://www.energistics.org/energyml/data/commonv2"
-        schemaLocation="witsml/2.0/data/common/v2.1/xsd_schemas/EmlAllObjects.xsd"/>
+        schemaLocation="energistics/2.0/data/common/v2.1/xsd_schemas/EmlAllObjects.xsd"/>
     <element name="GeophysicalProcessing" type="diggs:GeophysicalProcessingType"
         substitutionGroup="diggs:AbstractProcedure">
         <annotation>

Geotechnical.xsd

@@ -19,7 +19,7 @@
     <!-- include and import other DIGGS schemas -->
     <!-- import the witsml schemas -->
     <import namespace="http://www.energistics.org/energyml/data/commonv2"
-        schemaLocation="witsml/2.0/data/common/v2.1/xsd_schemas/EmlAllObjects.xsd"/>
+        schemaLocation="energistics/2.0/data/common/v2.1/xsd_schemas/EmlAllObjects.xsd"/>
     <import namespace="http://www.energistics.org/energyml/data/witsmlv2"
         schemaLocation="witsmlv2Profile_diggs.xsd"/>
     <element name="AtterbergLimitsTest" type="diggs_geo:AtterbergLimitsTestType" abstract="false"

Instances/SchematroTest.xml

@@ -865,13 +865,15 @@
 	</measurement>
 
 	<measurement>
-		<Test gml:id="Water_Levels_PZ-B-03-23">
+		<Monitor gml:id="Water_Levels_PZ-B-03-23">
 			<investigationTarget>Natural Ground</investigationTarget>
 			<!-- Same as above with mandatory investigationTarget -->
 			<projectRef xlink:href="#p1"/>
 			<!-- projectRef is required -->
 			<samplingFeatureRef xlink:href="#DGS99EB-F2F-36FF-F807-3D075"/>
-					<responseZoneLocation xlink:href="#DGS819B-509-4AC2-5FD0-1DF9"/>
+			<reading>
+				<Reading gml:id="reading1">
+			<responseZoneLocation xlink:href="#DGS819B-509-4AC2-5FD0-1DF9"/>
 					<outcome>
 						<MonitorResult gml:id="Result_Water_Levels_PZ-B-03-23">
 							<timeDomain>
@@ -934,6 +936,7 @@
 							</results>
 						</MonitorResult>
 					</outcome>
+
 					<sensor>
 						<Sensor gml:id="PZ-B-03-23">
 							<!-- Here the sensor is the measuring device, which I'm assuming is a pressure transducer. The Piezometer is the Well -->
@@ -951,7 +954,10 @@
 							</detector>
 						</Sensor>
 					</sensor>
-		</Test>
+				</Reading>
+			</reading>		</Monitor>
+
+		
 	</measurement>
 
 	<measurement>

Kernel.xsd

@@ -36,7 +36,7 @@
     <import namespace="http://www.w3.org/1999/xlink" schemaLocation="xlinks.xsd"/>
     <import namespace="http://www.opengis.net/gml/3.3/lr" schemaLocation="glrProfile_diggs.xsd"/>
     <import namespace="http://www.energistics.org/energyml/data/commonv2"
-        schemaLocation="witsml/2.0/data/common/v2.1/xsd_schemas/EmlAllObjects.xsd"/>
+        schemaLocation="energistics/2.0/data/common/v2.1/xsd_schemas/EmlAllObjects.xsd"/>
     <import namespace="http://www.energistics.org/energyml/data/witsmlv2"
         schemaLocation="witsmlv2Profile_diggs.xsd"/>
     <element name="AbstractConstructionActivity" type="diggs:AbstractConstructionActivityType"

Piling.xsd

@@ -13,7 +13,7 @@
     <import namespace="http://www.opengis.net/gml/3.2" schemaLocation="gml3.2Profile_diggs.xsd"/>
     <import namespace="http://diggsml.org/schema-dev/geotechnical" schemaLocation="Diggs_geo.xsd"/>
     <import namespace="http://www.energistics.org/energyml/data/commonv2"
-        schemaLocation="witsml/2.0/data/common/v2.1/xsd_schemas/EmlAllObjects.xsd"/>
+        schemaLocation="energistics/2.0/data/common/v2.1/xsd_schemas/EmlAllObjects.xsd"/>
     <complexType name="AbstractPileType" abstract="true">
         <annotation>
             <documentation>Abstract supertype for all pile types.</documentation>

TestProcedures.xsd

@@ -17,7 +17,7 @@
     <!-- include and import other DIGGS schemas -->
     <!-- import the witsml schemas -->
     <import namespace="http://www.energistics.org/energyml/data/commonv2"
-        schemaLocation="witsml/2.0/data/common/v2.1/xsd_schemas/EmlAllObjects.xsd"/>
+        schemaLocation="energistics/2.0/data/common/v2.1/xsd_schemas/EmlAllObjects.xsd"/>
     <import namespace="http://www.energistics.org/energyml/data/witsmlv2"
         schemaLocation="witsmlv2Profile_diggs.xsd"/>