Fix step content-types (use shortcuts)

step-os/src/main/xml/specification.xml

@@ -171,10 +171,10 @@ reading <port>result</port> from standard output, and <port>errors</port>
 from standard error.</para>
 
 <p:declare-step type="p:os-exec">
-  <p:input port="source" primary="true" sequence="true" content-types="*/*"/>
-  <p:output port="result" primary="true" content-types="*/*"/>
-  <p:output port="errors"/>
-  <p:output port="exit-status"/>
+  <p:input port="source" sequence="true" content-types="any"/>
+  <p:output port="result" primary="true" content-types="any"/>
+  <p:output port="errors" content-types="any"/>
+  <p:output port="exit-status" content-types="application/xml"/>
   <p:option name="command" required="true" as="xs:string"/>
   <p:option name="args" select="''" as="xs:string"/>
   <p:option name="cwd" as="xs:string?"/>

step-paged-media/src/main/xml/specification.xml

@@ -95,7 +95,7 @@ The output of this step is often, but not necessarily, a PDF document.</para>
 <p:declare-step type="p:css-formatter">
   <p:input port="source" content-types="xml html"/>
   <p:input port="stylesheet" content-types="text" sequence="true"/>
-  <p:output port="result" content-types="*/*"/>
+  <p:output port="result" content-types="any"/>
   <p:option name="parameters" as="map(xs:QName,item()*)?"/>
   <p:option name="content-type" as="xs:string?"/>
 </p:declare-step>
@@ -147,8 +147,8 @@ are defined by the CSS implementation used and are
 <para>The <tag>p:xsl-formatter</tag> step receives an <biblioref linkend="xsl11"/> document and renders the content.</para>
 
 <p:declare-step type="p:xsl-formatter">
-  <p:input port="source" content-types="application/xml text/xml */*+xml"/>
-  <p:output port="result" content-types="*/*"/>
+  <p:input port="source" content-types="xml"/>
+  <p:output port="result" content-types="any"/>
   <p:option name="parameters" as="map(xs:QName,item()*)?"/>
   <p:option name="content-type" as="xs:string?"/>
 </p:declare-step>

step-rdf/src/main/xml/specification.xml

@@ -77,8 +77,8 @@
 The build for steps fails unless at least one step is defined.</para>
 
   <p:declare-step type="p:something-rdf">
-    <p:input port="source" primary="true" sequence="false" content-types="text/*"/>
-    <p:output port="result" primary="true" sequence="false" content-types="application/xhtml+xml"/>
+    <p:input port="source" primary="true" sequence="false" content-types="text"/>
+    <p:output port="result" primary="true" sequence="false" content-types="html"/>
     <p:option name="parameters" as="map(xs:QName, item()*)?"/>
   </p:declare-step>
 

step-run/src/main/xml/specification.xml

@@ -82,8 +82,8 @@ steps is assumed; for background details, see
 <para>The <tag>p:run</tag> step runs a dynamically loaded pipeline.</para>
 
 <p:declare-step type="p:run">
-  <p:input port="source" primary="true" sequence="true" content-types="*/*"/>
-  <p:output port="result" primary="true" content-types="*/*"/>
+  <p:input port="source" primary="true" sequence="true" content-types="any"/>
+  <p:output port="result" primary="true" content-types="any"/>
 </p:declare-step>
 
 <para>THIS IS UNREVIEWED PLACHOLDER TEXT</para>

step-validation/src/main/xml/specification.xml

@@ -154,7 +154,7 @@ validation steps and their semantics are
       <p:input port="nvdl" content-types="xml"/>
       <p:input port="schemas" sequence="true" content-types="text xml"/>
       <p:output port="result" primary="true" content-types="xml html"/>
-      <p:output port="report" sequence="true" content-types="application/xml json"/>
+      <p:output port="report" sequence="true" content-types="xml json"/>
       <p:option name="assert-valid" select="true()" as="xs:boolean"/>
       <p:option name="parameters" as="map(xs:QName,item()*)?"/>
     </p:declare-step>
@@ -197,7 +197,7 @@ validation to the <port>source</port> document.</para>
   <p:input port="source" primary="true"  content-types="xml html"/>
   <p:input port="schema" content-types="text xml"/>
   <p:output port="result" primary="true" content-types="xml html"/>
-  <p:output port="report" sequence="true" content-types="application/xml json"/>
+  <p:output port="report" sequence="true" content-types="xml json"/>
   <p:option name="dtd-attribute-values" select="false()" as="xs:boolean"/>
   <p:option name="dtd-id-idref-warnings" select="false()" as="xs:boolean"/>
   <p:option name="assert-valid" select="true()" as="xs:boolean"/>
@@ -256,8 +256,8 @@ processing to the <port>source</port> document.</para>
 <p:declare-step type="p:validate-with-schematron">
   <p:input port="source" primary="true" content-types="xml html"/>
   <p:input port="schema" content-types="xml"/>
-  <p:output port="result" primary="true" content-types="application/xml"/>
-  <p:output port="report" sequence="true" content-types="application/xml json"/>
+  <p:output port="result" primary="true" content-types="xml"/>
+  <p:output port="report" sequence="true" content-types="xml json"/>
   <p:option name="parameters" as="map(xs:QName,item()*)?"/>
   <p:option name="phase" select="'#DEFAULT'" as="xs:string"/>
   <p:option name="assert-valid" select="true()" as="xs:boolean"/>
@@ -319,7 +319,7 @@ validity assessment to the <port>source</port> input.</para>
   <p:input port="source" primary="true"  content-types="xml html"/>
   <p:input port="schema" sequence="true" content-types="xml"/>
   <p:output port="result" primary="true" content-types="xml html"/>
-  <p:output port="report" sequence="true" content-types="application/xml json"/>
+  <p:output port="report" sequence="true" content-types="xml json"/>
   <p:option name="use-location-hints" select="false()" as="xs:boolean"/>
   <p:option name="try-namespaces" select="false()" as="xs:boolean"/>
   <p:option name="assert-valid" select="true()" as="xs:boolean"/>

steps/src/main/xml/steps/archive.xml

@@ -12,7 +12,7 @@
 
   <p:declare-step type="p:archive">
     <p:input port="source" primary="true" content-types="any" sequence="true"/>
-    <p:input port="manifest" content-types="application/xml" sequence="true">
+    <p:input port="manifest" content-types="xml" sequence="true">
       <p:empty/>
     </p:input>
     <p:input port="archive" content-types="any" sequence="true">

steps/src/main/xml/steps/cast-content-type.xml

@@ -11,8 +11,8 @@
    the same, this document will appear unchanged on <port>result</port> port.</para>
 
    <p:declare-step type="p:cast-content-type">
-      <p:input port="source" content-types="*/*"/>
-      <p:output port="result" content-types="*/*"/>
+      <p:input port="source" content-types="any"/>
+      <p:output port="result" content-types="any"/>
       <p:option name="content-type" required="true" as="xs:string"/>
       <p:option name="parameters" as="map(xs:QName,item()*)?"/>
    </p:declare-step>

steps/src/main/xml/steps/compare.xml

@@ -8,10 +8,10 @@
 equality.</para>
 
 <p:declare-step type="p:compare">
-   <p:input port="source" primary="true" content-types="*/*"/>
-   <p:input port="alternate" content-types="*/*"/>
+   <p:input port="source" primary="true" content-types="any"/>
+   <p:input port="alternate" content-types="any"/>
    <p:output port="result" content-types="application/xml"/>
-   <p:output port="differences" content-types="*/*" sequence="true"/>
+   <p:output port="differences" content-types="any" sequence="true"/>
    <p:option name="parameters" as="map(xs:QName,item()*)?"/>
    <p:option name="method" as="xs:QName?"/>
    <p:option name="fail-if-not-equal" as="xs:boolean" select="false()"/>

steps/src/main/xml/steps/count.xml

@@ -9,7 +9,7 @@ string representation of the number of documents in the
 sequence.</para>
 
 <p:declare-step type="p:count">
-   <p:input port="source" content-types="*/*" sequence="true"/>
+   <p:input port="source" content-types="any" sequence="true"/>
    <p:output port="result" content-types="application/xml"/>
    <p:option name="limit" as="xs:integer" select="0"/>
 </p:declare-step>

steps/src/main/xml/steps/http-request.xml

@@ -15,8 +15,8 @@ the method, resource, and other request properties as well as possibly
 including an entity body (content) for the request.</para>
 
 <p:declare-step type="p:http-request">
-  <p:input port="source" content-types="*/*"/>
-  <p:output port="result" sequence="true" content-types="*/*"/>
+  <p:input port="source" content-types="any"/>
+  <p:output port="result" sequence="true" content-types="any"/>
   <p:option name="serialization" as="map(xs:QName,item()*)?"/>
 </p:declare-step>
 

steps/src/main/xml/steps/text-join.xml

@@ -6,8 +6,8 @@
   <para>The <code>p:text-join</code> step concatenates text documents.</para>
 
   <p:declare-step type="p:text-join">
-    <p:output port="source" primary="true" sequence="true" content-types="text"/>
-    <p:output port="result" primary="true" sequence="false" content-types="text"/>
+    <p:input port="source" sequence="true" content-types="text"/>
+    <p:output port="result" content-types="text/plain"/>
     <p:option name="separator" as="xs:string?"/>
     <p:option name="prefix" as="xs:string?"/>
     <p:option name="suffix" as="xs:string?"/>