Changeset 4864

Timestamp:

Feb 16, 2014, 6:03:04 PM (11 years ago)

Author:

Christian Schulte

Message:

o Updated to correctly write model objects.
o Updated to add attributes 'specificationModelFile', 'instanceModelFile' and 'moduleModuleFile' to the 'write-model' Ant task.

Closes #54
Fixes #55

Location:

jomc/trunk/jomc-ant-tasks/src

Files:

• main/java/org/jomc/ant/WriteModelTask.java (modified) (5 diffs)
• main/resources/org/jomc/ant/Messages.properties (modified) (1 diff)
• main/resources/org/jomc/ant/Messages_de.properties (modified) (1 diff)
• main/resources/org/jomc/ant/Messages_en.properties (modified) (1 diff)
• site/apt/reference.apt.vm (modified) (3 diffs)
• test/ant/org/jomc/ant/test/write-model-task-test.xml (modified) (1 diff)

jomc/trunk/jomc-ant-tasks/src/main/java/org/jomc/ant/WriteModelTask.java ¶

@@ -79 +79 @@
     private File modelFile;
 
+    /**
+     * File to write the specification to.
+     * @since 1.6
+     */
+    private File specificationModelFile;
+
+    /**
+     * File to write the instance to.
+     * @since 1.6
+     */
+    private File instanceModelFile;
+
+    /**
+     * File to write the module to.
+     * @since 1.6
+     */
+    private File moduleModelFile;
+
     /** Creates a new {@code WriteModelTask} instance. */
     public WriteModelTask()
@@ -136 +154 @@
     {
         this.modelFile = value;
+    }
+
+    /**
+     * Gets the file to write the specification to.
+     *
+     * @return The file to write the specification to or {@code null}.
+     *
+     * @see #setSpecificationModelFile(java.io.File)
+     *
+     * @since 1.6
+     */
+    public File getSpecificationModelFile()
+    {
+        return this.specificationModelFile;
+    }
+
+    /**
+     * Sets the file to write the specification to.
+     *
+     * @param value The new file to write the specification to or {@code null}.
+     *
+     * @see #getSpecificationModelFile()
+     *
+     * @since 1.6
+     */
+    public void setSpecificationModelFile( final File value )
+    {
+        this.specificationModelFile = value;
+    }
+
+    /**
+     * Gets the file to write the instance to.
+     *
+     * @return The file to write the instance to or {@code null}.
+     *
+     * @see #setInstanceModelFile(java.io.File)
+     *
+     * @since 1.6
+     */
+    public File getInstanceModelFile()
+    {
+        return this.instanceModelFile;
+    }
+
+    /**
+     * Sets the file to write the instance to.
+     *
+     * @param value The new file to write the instance to or {@code null}.
+     *
+     * @see #getInstanceModelFile()
+     *
+     * @since 1.6
+     */
+    public void setInstanceModelFile( final File value )
+    {
+        this.instanceModelFile = value;
+    }
+
+    /**
+     * Gets the file to write the module to.
+     *
+     * @return The file to write the module to or {@code null}.
+     *
+     * @see #setModuleModelFile(java.io.File)
+     *
+     * @since 1.6
+     */
+    public File getModuleModelFile()
+    {
+        return this.moduleModelFile;
+    }
+
+    /**
+     * Sets the file to write the module to.
+     *
+     * @param value The new file to write the module to or {@code null}.
+     *
+     * @see #getModuleModelFile()
+     *
+     * @since 1.6
+     */
+    public void setModuleModelFile( final File value )
+    {
+        this.moduleModelFile = value;
     }
 
@@ -351 +453 @@
             if ( s != null )
             {
-                displayModel.getAny().add( s );
+                displayModel.getAny().add( new org.jomc.model.ObjectFactory().createSpecification( s ) );
+
+                if ( this.getSpecificationModelFile() != null )
+                {
+                    this.log( Messages.getMessage( "writingSpecification", s.getIdentifier(),
+                                                   this.getSpecificationModelFile().getAbsolutePath() ),
+                              Project.MSG_INFO );
+
+                    marshaller.marshal( new org.jomc.model.ObjectFactory().createSpecification( s ),
+                                        this.getSpecificationModelFile() );
+
+                }
             }
 
@@ -357 +470 @@
             if ( i != null )
             {
-                displayModel.getAny().add( i );
+                displayModel.getAny().add( new org.jomc.model.ObjectFactory().createInstance( i ) );
+
+                if ( this.getInstanceModelFile() != null )
+                {
+                    this.log( Messages.getMessage( "writingInstance", i.getIdentifier(),
+                                                   this.getInstanceModelFile().getAbsolutePath() ),
+                              Project.MSG_INFO );
+
+                    marshaller.marshal( new org.jomc.model.ObjectFactory().createInstance( i ),
+                                        this.getInstanceModelFile() );
+
+                }
             }
 
@@ -363 +487 @@
             if ( m != null )
             {
-                displayModel.getAny().add( m );
+                displayModel.getAny().add( new org.jomc.model.ObjectFactory().createModule( m ) );
+
+                if ( this.getModuleModelFile() != null )
+                {
+                    this.log( Messages.getMessage( "writingModule", m.getName(),
+                                                   this.getModuleModelFile().getAbsolutePath() ),
+                              Project.MSG_INFO );
+
+                    marshaller.marshal( new org.jomc.model.ObjectFactory().createModule( m ),
+                                        this.getModuleModelFile() );
+
+                }
             }
 

jomc/trunk/jomc-ant-tasks/src/main/resources/org/jomc/ant/Messages.properties ¶

@@ -1 +1 @@
 # $JOMC$
-separator=--------------------------------------------------------------------------------
-title=JOMC \u2051 Ant Tasks ${project.version} (${build.date})
-mandatoryAttribute=Mandatory attribute ''{0}'' is missing a value.
-unimplementedTask=Class ''{0}'' does not override method ''{1}''.
-resourceNotFound=Resource ''{0}'' not found.
-malformedLocation=Malformed location ''{0}''.{1}
-transformerNotFound=XSLT document ''{0}'' not found.
-propertiesNotFound=Properties ''{0}'' not found.
 classProcessingDisabled=Class file processing disabled.
 classProcessingSuccess=Class file processing successful.
 committingModelObjects=Committing ''{0}'' model objects ...
+excludingModlet=Excluding modlet ''{0}''.
+excludingModule=Excluding module ''{0}''.
+failedCreatingObject=Failure creating a new ''{0}'' object.
 generatingResources=Generating ''{0}'' resources ...
-specificationNotFound=Specification ''{0}'' not found.
+illegalTransformationResult=Failure transforming result document using ''{0}''. Illegal transformation result.
 implementationNotFound=Implementation ''{0}'' not found.
+includingModlet=Including modlet ''{0}''.
+includingModule=Including module ''{0}''.
+invalidModel=Invalid ''{0}'' model.
+malformedLocation=Malformed location ''{0}''.{1}
+managingSources=Managing ''{0}'' source files ...
+mandatoryAttribute=Mandatory attribute ''{0}'' is missing a value.
+mergingModlets=Merging modlets of model ''{0}'' ...
+mergingModules=Merging modules of model ''{0}'' ...
+modelValidationFailure=Model validation failure.
+modelValidationSuccess=Model validation successful.
+modletExclusion=Modlet ''{1}'' from class path resource ''{0}'' ignored.
+modletResourceNotFound=Modlet resource ''{0}'' not found.
 moduleNotFound=Module ''{0}'' not found.
-templateLocationNotFound=Template location ''{0}'' not found.
+moduleResourceNotFound=Module resource ''{0}'' not found.
 multipleElements=Multiple nested ''{0}'' elements.
-managingSources=Managing ''{0}'' source files ...
-includingModlet=Including modlet ''{0}''.
-excludingModlet=Excluding modlet ''{0}''.
-illegalTransformationResult=Failure transforming result document using ''{0}''. Illegal transformation result.
-mergingModlets=Merging modlets of model ''{0}'' ...
-includingModule=Including module ''{0}''.
-excludingModule=Excluding module ''{0}''.
-mergingModules=Merging modules of model ''{0}'' ...
+propertiesNotFound=Properties ''{0}'' not found.
+providerExclusion=Provider ''{1}'' from class path resource ''{0}'' ignored.
+reading=Reading ''{0}''.
+resourceFailure=Failed reading resource ''{0}''.{1}
+resourceNotFound=Resource ''{0}'' not found.
 resourceProcessingDisabled=Resource file processing disabled.
 resourceProcessingSuccess=Resource file processing successful.
+resourceTimeout=Timeout reading resource ''{0}''.{1}
+schemaExclusion=Schema ''{1}'' from class path resource ''{0}'' ignored.
+separator=--------------------------------------------------------------------------------
+serviceExclusion=Service ''{1}'' from class path resource ''{0}'' ignored.
+showingModelObjects=Showing ''{0}'' model objects ...
 sourceProcessingDisabled=Source file processing disabled.
 sourceProcessingSuccess=Source file processing successful.
+specificationNotFound=Specification ''{0}'' not found.
+templateLocationNotFound=Template location ''{0}'' not found.
+title=JOMC \u2051 Ant Tasks ${project.version} (${build.date})
+transformerNotFound=XSLT document ''{0}'' not found.
+unimplementedTask=Class ''{0}'' does not override method ''{1}''.
+unsupportedModletResource=Modlet resource ''{0}'' not supported.
+unsupportedModuleResource=Module resource ''{0}'' not supported.
+validatingClasspath=Validating ''{0}'' class path model objects ...
+validatingModel=Validating model ''{0}'' ...
 validatingModelObjects=Validating ''{0}'' model objects ...
-validatingClasspath=Validating ''{0}'' class path model objects ...
-modelValidationFailure=Model validation failure.
-modelValidationSuccess=Model validation successful.
-validatingModel=Validating model ''{0}'' ...
-invalidModel=Invalid ''{0}'' model.
 writingEncoded=Writing ''{0}'' using encoding ''{1}''.
+writingInstance=Writing instance ''{0}'' to ''{1}'' ...
 writingModelObjects=Writing ''{0}'' model objects to ''{1}'' ...
-showingModelObjects=Showing ''{0}'' model objects ...
-providerExclusion=Provider ''{1}'' from class path resource ''{0}'' ignored.
-serviceExclusion=Service ''{1}'' from class path resource ''{0}'' ignored.
-schemaExclusion=Schema ''{1}'' from class path resource ''{0}'' ignored.
-modletExclusion=Modlet ''{1}'' from class path resource ''{0}'' ignored.
-unsupportedModuleResource=Module resource ''{0}'' not supported.
-reading=Reading ''{0}''.
-unsupportedModletResource=Modlet resource ''{0}'' not supported.
-moduleResourceNotFound=Module resource ''{0}'' not found.
-resourceTimeout=Timeout reading resource ''{0}''.{1}
-resourceFailure=Failed reading resource ''{0}''.{1}
-modletResourceNotFound=Modlet resource ''{0}'' not found.
-failedCreatingObject=Failure creating a new ''{0}'' object.
+writingModule=Writing module ''{0}'' to ''{1}'' ...
+writingSpecification=Writing specification ''{0}'' to ''{1}'' ...

jomc/trunk/jomc-ant-tasks/src/main/resources/org/jomc/ant/Messages_de.properties ¶

@@ -1 +1 @@
 # $JOMC$
-separator=--------------------------------------------------------------------------------
-title=JOMC \u2051 Ant Tasks ${project.version} (${build.date})
-mandatoryAttribute=Mandatory attribute ''{0}'' is missing a value.
-unimplementedTask=Klasse ''{0}'' \u00fcberschreibt die ''{1}'' Methode nicht.
-resourceNotFound=Ressource ''{0}'' nicht gefunden.
-malformedLocation=Ung\u00fcltiger Ort ''{0}''.{1}
-transformerNotFound=XSLT-Dokument ''{0}'' nicht gefunden.
-propertiesNotFound=Eigenschaftendatei ''{0}'' nicht gefunden.
 classProcessingDisabled=Klassendateiverarbeitung deaktiviert.
 classProcessingSuccess=Klassendateiverarbeitung erfolgreich.
 committingModelObjects=Fixiert ''{0}'' Modell-Objekte ...
+excludingModlet=Modlet ''{0}'' ausgeschlossen.
+excludingModule=Modul ''{0}'' ausgeschlossen.
+failedCreatingObject=Fehler bei der Erstellung eines neuen ''{0}'' Objekts.
 generatingResources=Generiert ''{0}'' Ressource-Dateien ...
-specificationNotFound=Spezifikation ''{0}'' nicht gefunden.
+illegalTransformationResult=Fehler bei der Transformation des Ergebniss-Dokuments mit ''{0}''. Ung\u00fcltiges Transformations-Ergebniss.
 implementationNotFound=Implementierung ''{0}'' nicht gefunden.
+includingModlet=Modlet ''{0}'' eingeschlossen.
+includingModule=Modul ''{0}'' eingeschlossen.
+invalidModel=Ung\u00fcltiges ''{0}'' Modell.
+malformedLocation=Ung\u00fcltiger Ort ''{0}''.{1}
+managingSources=Verwaltet ''{0}'' Quelltextdateien ...
+mandatoryAttribute=Mandatory attribute ''{0}'' is missing a value.
+mergingModlets=F\u00fcgt Modlets von Modell ''{0}'' zusammen ...
+mergingModules=F\u00fcgt Module von Modell ''{0}'' zusammen ...
+modelValidationFailure=Modellpr\u00fcfung fehlgeschlagen.
+modelValidationSuccess=Modellpr\u00fcfung erfolgreich.
+modletExclusion=Modlet ''{1}'' aus Klassenpfad-Ressource ''{0}'' ignoriert.
+modletResourceNotFound=Modlet-Ressource ''{0}'' nicht gefunden.
 moduleNotFound=Modul ''{0}'' nicht gefunden.
-templateLocationNotFound=Vorlagen ''{0}'' nicht gefunden.
+moduleResourceNotFound=Modul-Ressource ''{0}'' nicht gefunden.
 multipleElements=Mehrere ''{0}'' Elemente.
-managingSources=Verwaltet ''{0}'' Quelltextdateien ...
-includingModlet=Modlet ''{0}'' eingeschlossen.
-excludingModlet=Modlet ''{0}'' ausgeschlossen.
-illegalTransformationResult=Fehler bei der Transformation des Ergebniss-Dokuments mit ''{0}''. Ung\u00fcltiges Transformations-Ergebniss.
-mergingModlets=F\u00fcgt Modlets von Modell ''{0}'' zusammen ...
-includingModule=Modul ''{0}'' eingeschlossen.
-excludingModule=Modul ''{0}'' ausgeschlossen.
-mergingModules=F\u00fcgt Module von Modell ''{0}'' zusammen ...
+propertiesNotFound=Eigenschaftendatei ''{0}'' nicht gefunden.
+providerExclusion=Provider ''{1}'' aus Klassenpfad-Ressource ''{0}'' ignoriert.
+reading=Lie\u00dft ''{0}''.
+resourceFailure=Fehler beim Lesen von Ressource ''{0}''.{1}
+resourceNotFound=Ressource ''{0}'' nicht gefunden.
 resourceProcessingDisabled=Ressourcedateiverarbeitung deaktiviert.
 resourceProcessingSuccess=Ressourcedateiverarbeitung erfolgreich.
+resourceTimeout=Zeit\u00fcberschreitung beim Lesen von Ressource ''{0}''.{1}
+schemaExclusion=Schema ''{1}'' aus Klassenpfad-Ressource ''{0}'' ignoriert.
+separator=--------------------------------------------------------------------------------
+serviceExclusion=Service ''{1}'' aus Klassenpfad-Ressource ''{0}'' ignoriert.
+showingModelObjects=Zeigt ''{0}'' Modell-Objekte ...
 sourceProcessingDisabled=Quelltextdateiverarbeitung deaktiviert.
 sourceProcessingSuccess=Quelltextdateiverarbeitung erfolgreich.
+specificationNotFound=Spezifikation ''{0}'' nicht gefunden.
+templateLocationNotFound=Vorlagen ''{0}'' nicht gefunden.
+title=JOMC \u2051 Ant Tasks ${project.version} (${build.date})
+transformerNotFound=XSLT-Dokument ''{0}'' nicht gefunden.
+unimplementedTask=Klasse ''{0}'' \u00fcberschreibt die ''{1}'' Methode nicht.
+unsupportedModletResource=Keine Unterst\u00fctzung f\u00fcr Modlet-Ressource ''{0}''.
+unsupportedModuleResource=Keine Unterst\u00fctzung f\u00fcr Modul-Ressource ''{0}''.
+validatingClasspath=Pr\u00fcft ''{0}'' Klassenpfad-Modellobjekte ...
+validatingModel=Pr\u00fcft Modell ''{0}'' ...
 validatingModelObjects=Pr\u00fcft ''{0}'' Modell-Objekte ...
-validatingClasspath=Pr\u00fcft ''{0}'' Klassenpfad-Modellobjekte ...
-modelValidationFailure=Modellpr\u00fcfung fehlgeschlagen.
-modelValidationSuccess=Modellpr\u00fcfung erfolgreich.
-validatingModel=Pr\u00fcft Modell ''{0}'' ...
-invalidModel=Ung\u00fcltiges ''{0}'' Modell.
 writingEncoded=Schreibt ''{0}'' mit Kodierung ''{1}''.
+writingInstance=Schreibt Instanz ''{0}'' nach ''{1}'' ...
 writingModelObjects=Schreibt ''{0}'' Modell-Objekte nach ''{1}'' ....
-showingModelObjects=Zeigt ''{0}'' Modell-Objekte ...
-providerExclusion=Provider ''{1}'' aus Klassenpfad-Ressource ''{0}'' ignoriert.
-serviceExclusion=Service ''{1}'' aus Klassenpfad-Ressource ''{0}'' ignoriert.
-schemaExclusion=Schema ''{1}'' aus Klassenpfad-Ressource ''{0}'' ignoriert.
-modletExclusion=Modlet ''{1}'' aus Klassenpfad-Ressource ''{0}'' ignoriert.
-unsupportedModuleResource=Keine Unterst\u00fctzung f\u00fcr Modul-Ressource ''{0}''.
-reading=Lie\u00dft ''{0}''.
-unsupportedModletResource=Keine Unterst\u00fctzung f\u00fcr Modlet-Ressource ''{0}''.
-moduleResourceNotFound=Modul-Ressource ''{0}'' nicht gefunden.
-resourceTimeout=Zeit\u00fcberschreitung beim Lesen von Ressource ''{0}''.{1}
-resourceFailure=Fehler beim Lesen von Ressource ''{0}''.{1}
-modletResourceNotFound=Modlet-Ressource ''{0}'' nicht gefunden.
-failedCreatingObject=Fehler bei der Erstellung eines neuen ''{0}'' Objekts.
+writingModule=Schreibt Modul ''{0}'' nach ''{1}'' ...
+writingSpecification=Schreibt Spezifikation ''{0}'' nach ''{1}'' ...

jomc/trunk/jomc-ant-tasks/src/main/resources/org/jomc/ant/Messages_en.properties ¶

@@ -1 +1 @@
 # $JOMC$
-separator=--------------------------------------------------------------------------------
-title=JOMC \u2051 Ant Tasks ${project.version} (${build.date})
-mandatoryAttribute=Mandatory attribute ''{0}'' is missing a value.
-unimplementedTask=Class ''{0}'' does not override method ''{1}''.
-resourceNotFound=Resource ''{0}'' not found.
-malformedLocation=Malformed location ''{0}''.{1}
-transformerNotFound=XSLT document ''{0}'' not found.
-propertiesNotFound=Properties ''{0}'' not found.
 classProcessingDisabled=Class file processing disabled.
 classProcessingSuccess=Class file processing successful.
 committingModelObjects=Committing ''{0}'' model objects ...
+excludingModlet=Excluding modlet ''{0}''.
+excludingModule=Excluding module ''{0}''.
+failedCreatingObject=Failure creating a new ''{0}'' object.
 generatingResources=Generating ''{0}'' resources ...
-specificationNotFound=Specification ''{0}'' not found.
+illegalTransformationResult=Failure transforming result document using ''{0}''. Illegal transformation result.
 implementationNotFound=Implementation ''{0}'' not found.
+includingModlet=Including modlet ''{0}''.
+includingModule=Including module ''{0}''.
+invalidModel=Invalid ''{0}'' model.
+malformedLocation=Malformed location ''{0}''.{1}
+managingSources=Managing ''{0}'' source files ...
+mandatoryAttribute=Mandatory attribute ''{0}'' is missing a value.
+mergingModlets=Merging modlets of model ''{0}'' ...
+mergingModules=Merging modules of model ''{0}'' ...
+modelValidationFailure=Model validation failure.
+modelValidationSuccess=Model validation successful.
+modletExclusion=Modlet ''{1}'' from class path resource ''{0}'' ignored.
+modletResourceNotFound=Modlet resource ''{0}'' not found.
 moduleNotFound=Module ''{0}'' not found.
-templateLocationNotFound=Template location ''{0}'' not found.
+moduleResourceNotFound=Module resource ''{0}'' not found.
 multipleElements=Multiple nested ''{0}'' elements.
-managingSources=Managing ''{0}'' source files ...
-includingModlet=Including modlet ''{0}''.
-excludingModlet=Excluding modlet ''{0}''.
-illegalTransformationResult=Failure transforming result document using ''{0}''. Illegal transformation result.
-mergingModlets=Merging modlets of model ''{0}'' ...
-includingModule=Including module ''{0}''.
-excludingModule=Excluding module ''{0}''.
-mergingModules=Merging modules of model ''{0}'' ...
+propertiesNotFound=Properties ''{0}'' not found.
+providerExclusion=Provider ''{1}'' from class path resource ''{0}'' ignored.
+reading=Reading ''{0}''.
+resourceFailure=Failed reading resource ''{0}''.{1}
+resourceNotFound=Resource ''{0}'' not found.
 resourceProcessingDisabled=Resource file processing disabled.
 resourceProcessingSuccess=Resource file processing successful.
+resourceTimeout=Timeout reading resource ''{0}''.{1}
+schemaExclusion=Schema ''{1}'' from class path resource ''{0}'' ignored.
+separator=--------------------------------------------------------------------------------
+serviceExclusion=Service ''{1}'' from class path resource ''{0}'' ignored.
+showingModelObjects=Showing ''{0}'' model objects ...
 sourceProcessingDisabled=Source file processing disabled.
 sourceProcessingSuccess=Source file processing successful.
+specificationNotFound=Specification ''{0}'' not found.
+templateLocationNotFound=Template location ''{0}'' not found.
+title=JOMC \u2051 Ant Tasks ${project.version} (${build.date})
+transformerNotFound=XSLT document ''{0}'' not found.
+unimplementedTask=Class ''{0}'' does not override method ''{1}''.
+unsupportedModletResource=Modlet resource ''{0}'' not supported.
+unsupportedModuleResource=Module resource ''{0}'' not supported.
+validatingClasspath=Validating ''{0}'' class path model objects ...
+validatingModel=Validating model ''{0}'' ...
 validatingModelObjects=Validating ''{0}'' model objects ...
-validatingClasspath=Validating ''{0}'' class path model objects ...
-modelValidationFailure=Model validation failure.
-modelValidationSuccess=Model validation successful.
-validatingModel=Validating model ''{0}'' ...
-invalidModel=Invalid ''{0}'' model.
 writingEncoded=Writing ''{0}'' using encoding ''{1}''.
+writingInstance=Writing instance ''{0}'' to ''{1}'' ...
 writingModelObjects=Writing ''{0}'' model objects to ''{1}'' ...
-showingModelObjects=Showing ''{0}'' model objects ...
-providerExclusion=Provider ''{1}'' from class path resource ''{0}'' ignored.
-serviceExclusion=Service ''{1}'' from class path resource ''{0}'' ignored.
-schemaExclusion=Schema ''{1}'' from class path resource ''{0}'' ignored.
-modletExclusion=Modlet ''{1}'' from class path resource ''{0}'' ignored.
-unsupportedModuleResource=Module resource ''{0}'' not supported.
-reading=Reading ''{0}''.
-unsupportedModletResource=Modlet resource ''{0}'' not supported.
-moduleResourceNotFound=Module resource ''{0}'' not found.
-resourceTimeout=Timeout reading resource ''{0}''.{1}
-resourceFailure=Failed reading resource ''{0}''.{1}
-modletResourceNotFound=Modlet resource ''{0}'' not found.
-failedCreatingObject=Failure creating a new ''{0}'' object.
+writingModule=Writing module ''{0}'' to ''{1}'' ...
+writingSpecification=Writing specification ''{0}'' to ''{1}'' ...

jomc/trunk/jomc-ant-tasks/src/site/apt/reference.apt.vm ¶

@@ -1339 +1339 @@
 |                                             | write.                                     |                        |
 *---------------------------------------------+--------------------------------------------+------------------------+
+| <<<instanceModelFile>>>                     | File to write the instance to.             | No.                    |
+|                                             | <Since 1.6>                                |                        |
+*---------------------------------------------+--------------------------------------------+------------------------+
 | <<<model>>>                                 | The public identifier of the model to      | No. Defaults to the    |
 |                                             | process.                                   | JOMC model public id.  |
@@ -1376 +1379 @@
 |                                             | modules.                                   |                        |
 *---------------------------------------------+--------------------------------------------+------------------------+
+| <<<moduleModelFile>>>                       | File to write the module to.               | No.                    |
+|                                             | <Since 1.6>                                |                        |
+*---------------------------------------------+--------------------------------------------+------------------------+
 | <<<platformProviderLocation>>>              | The location searched for platform         | No. {{{H}[H]}}         |
 |                                             | provider resources.                        |                        |
@@ -1384 +1390 @@
 | <<<specification>>>                         | The identifier of a specification to       | No.                    |
 |                                             | write.                                     |                        |
+*---------------------------------------------+--------------------------------------------+------------------------+
+| <<<specificationModelFile>>>                | File to write the specification to.        | No.                    |
+|                                             | <Since 1.6>                                |                        |
 *---------------------------------------------+--------------------------------------------+------------------------+
 | <<<transformerLocation>>>                   | The class path location searched for       | No. {{{J}[J]}}         |

jomc/trunk/jomc-ant-tasks/src/test/ant/org/jomc/ant/test/write-model-task-test.xml ¶

@@ -122 +122 @@
   <target name="test-write-model-all-attributes">
     <jomc:write-model modelEncoding="US-ASCII"
-                      modelFile="${empty.dir}/jomc-model.xml"
-                      specification="TEST"
-                      implementation="TEST"
-                      module="TEST"
-                      moduleLocation="TEST"
+                      modelFile="${empty.dir}/model.xml"
+                      specification="org.jomc.ant.test.ClassFileProcessorTask"
+                      specificationModelFile="${empty.dir}/specification.xml"
+                      implementation="org.jomc.ant.test.ClassFileProcessorTask"
+                      instanceModelFile="${empty.dir}/instance.xml"
+                      module="JOMC Ant Tasks Tests"
+                      moduleLocation="META-INF/jomc.xml"
+                      moduleModelFile="${empty.dir}/module.xml"
                       transformerLocation="TEST"
                       modelObjectClasspathResolutionEnabled="false"