Changeset 1770

Timestamp:

02/24/12 14:36:50 (12 years ago)

Author:

twagoo

Message:

No more indenting of XSD

Location:

ComponentRegistry/branches/ComponentRegistry-schematron/ComponentRegistry/src

Files:

• main/java/clarin/cmdi/componentregistry/MDMarshaller.java (modified) (1 diff)
• test/resources/spring-config/component-registry.xml (modified) (1 diff)

ComponentRegistry/branches/ComponentRegistry-schematron/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/MDMarshaller.java

@@ -159 +159 @@
         try {
             Transformer transformer = componentToSchemaTemplates.newTransformer();
-            transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-            // We used to also set SaxonOutputKeys.INDENT_SPACES to 1 to keep downloads smaller, but this is no longer available in Saxon-HE
             ByteArrayOutputStream out = new ByteArrayOutputStream();
             MDMarshaller.marshal(spec, out);

ComponentRegistry/branches/ComponentRegistry-schematron/ComponentRegistry/src/test/resources/spring-config/component-registry.xml

@@ -6 +6 @@
     <bean id="configuration" class="clarin.cmdi.componentregistry.Configuration" factory-method="getInstance">
         <property name="adminUsersList" value="JUnit.Admin@test.com" />
-        <property name="generalComponentSchema" value="http://www.clarin.eu/cmd/general-component-schema.xsd" />
+
+        <property name="generalComponentSchema" value="http://www.clarin.eu/cmd/general-component-schema.xsd" />
         <property name="component2SchemaXsl" value="http://www.clarin.eu/cmd/xslt/comp2schema-v2/comp2schema.xsl"/>
-<!--        <property name="component2SchemaXsl" value="file:/Users/twagoo/Documents/Repositories/svn.clarin.eu/metadata/trunk/toolkit/xslt/comp2schema-v2/comp2schema.xsl"/>-->
-        <property name="componentSpecSchemaLocation" value="http://www.clarin.eu/cmd http://www.clarin.eu/cmd/general-component-schema.xsd" />
-        <property name="isocatRestUrl" value="http://www.isocat.org/rest/" />
+
+<!--    <property name="generalComponentSchema" value="file:/Users/twagoo/Documents/Repositories/svn.clarin.eu/ComponentRegistry/branches/ComponentRegistry-schematron/CMDValidate/src/test/resources/schema/general-component-schema.xsd" />   
+        <property name="component2SchemaXsl" value="file:/Users/twagoo/Documents/Repositories/svn.clarin.eu/metadata/trunk/toolkit/xslt/comp2schema-v2/comp2schema.xsl"/>-->
+
+        <property name="componentSpecSchemaLocation" value="http://www.clarin.eu/cmd http://www.clarin.eu/cmd/general-component-schema.xsd" />
+        <property name="isocatRestUrl" value="http://www.isocat.org/rest/" />
     <!-- Extra attribute keys that are passed in a shibboleth authenticated request principal.
          You need to configure the shhaa.xml file to enable the extra attributes.
      -->
-        <property name="displayNameShibbolethKeys">
-            <list>
-                <value>displayName</value>
-                <value>commonName</value>
-            </list>
-        </property>
+        <property name="displayNameShibbolethKeys">
+            <list>
+                <value>displayName</value>
+                <value>commonName</value>
+            </list>
+        </property>
     </bean>
 </beans>