issue #285 - remove schematron config from all config files

Signed-off-by: Lee Surprenant <lmsurpre@us.ibm.com>
LinuxForHealth · Oct 25, 2019 · c809ddb · c809ddb
1 parent 5130afa
commit c809ddb
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 26 deletions.
diff --git a/fhir-bulkimportexport-webapp/pom.xml b/fhir-bulkimportexport-webapp/pom.xml
@@ -79,7 +79,7 @@
                     <groupId>${project.groupId}</groupId>
                     <artifactId>fhir-core</artifactId>
                 </exclusion>
-            </exclusions>          
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/fhir-config/src/test/resources/fhirConfig.json b/fhir-config/src/test/resources/fhirConfig.json
@@ -6,9 +6,6 @@
             "truststoreLocation":"resources/security/fhirTruststore.jks",
             "truststorePassword":"change-password"
         },
-        "validation":{
-            "userDefinedSchematronEnabled":true
-        },
         "virtualResources":{
             "enabled":true,
             "allowableResourceTypes":[

diff --git a/fhir-server/liberty-config-tenants/config/tenant1/fhir-server-config.json b/fhir-server/liberty-config-tenants/config/tenant1/fhir-server-config.json
@@ -1,9 +1,6 @@
 {
 	"__comment": "FHIR Server configuration for mythical tenant id 'tenant1'",
 	"fhirServer": {
-		"core": {
-			"userDefinedSchematronEnabled": true
-		},
 		"searchParameterFilter": {
 			"Observation": ["subject",
 			"patient",

diff --git a/fhir-server/liberty-config-tenants/config/tenant1/schematron/patient.sch b/fhir-server/liberty-config-tenants/config/tenant1/schematron/patient.sch
diff --git a/fhir-server/liberty-config-tenants/config/tenant2/fhir-server-config.json b/fhir-server/liberty-config-tenants/config/tenant2/fhir-server-config.json
diff --git a/fhir-server/liberty-config-tenants/config/tenant2/schematron/.empty b/fhir-server/liberty-config-tenants/config/tenant2/schematron/.empty
diff --git a/fhir-server/liberty-config/config/default/fhir-server-config.json b/fhir-server/liberty-config/config/default/fhir-server-config.json
@@ -4,7 +4,6 @@
         "core": {
             "truststoreLocation": "resources/security/fhirTruststore.jks",
             "truststorePassword": "change-password",
-            "userDefinedSchematronEnabled": false,
             "tenantIdHeaderName": "X-FHIR-TENANT-ID",
             "datastoreIdHeaderName": "X-FHIR-DSID",
             "jsonParserLenient": false,

diff --git a/fhir-server/liberty-config/config/default/schematron/.empty b/fhir-server/liberty-config/config/default/schematron/.empty