svn commit: r1593846 - in /jena/trunk/jena-maven-tools/src: main/java/org/apache/jena/tools/schemagen/Source.java test/java/org/apache/jena/tools/schemagen/SourceParameterTest.java

[sa...@apache.org]

Author: sallen
Date: Sun May 11 19:54:14 2014
New Revision: 1593846

URL: http://svn.apache.org/r1593846
Log:
JENA-693 Update maven schemagen plugin to include the new Datatype options

Modified:
    jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/Source.java
    jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SourceParameterTest.java

Modified: jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/Source.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/Source.java?rev=1593846&r1=1593845&r2=1593846&view=diff
==============================================================================
--- jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/Source.java (original)
+++ jena/trunk/jena-maven-tools/src/main/java/org/apache/jena/tools/schemagen/Source.java Sun May 11 19:54:14 2014
@@ -94,6 +94,9 @@ public class Source {
 
     @Parameter(property="individuals-section")
     private String individualsSection;
+    
+    @Parameter(property="datatypes-section")
+    private String datatypesSection;
 
     @Parameter(property="noproperties")
     private Boolean noProperties;
@@ -103,6 +106,9 @@ public class Source {
 
     @Parameter(property="noindividuals")
     private Boolean noIndividuals;
+    
+    @Parameter(property="nodatatypes")
+    private Boolean noDatatypes;
 
     @Parameter(property="noheader")
     private Boolean noHeader;
@@ -115,6 +121,9 @@ public class Source {
 
     @Parameter(property="individualtemplate")
     private String individualTemplate;
+    
+    @Parameter(property="datatypetemplate")
+    private String datatypeTemplate;
 
     @Parameter(property="uc-names")
     private Boolean ucNames;
@@ -245,6 +254,11 @@ public class Source {
     public String getIndividualsSection() {
         return individualsSection;
     }
+    
+    @SchemagenOption(opt=OPT.DATATYPES_SECTION)
+    public String getDatatypesSection() {
+        return datatypesSection;
+    }
 
     @SchemagenOption(opt=OPT.NOPROPERTIES)
     public Boolean isNoProperties() {
@@ -260,6 +274,11 @@ public class Source {
     public Boolean isNoIndividuals() {
         return noIndividuals;
     }
+    
+    @SchemagenOption(opt=OPT.NODATATYPES)
+    public Boolean isNoDatatypes() {
+        return noDatatypes;
+    }
 
     @SchemagenOption(opt=OPT.NOHEADER)
     public Boolean isNoHeader() {
@@ -280,6 +299,11 @@ public class Source {
     public String getIndividualTemplate() {
         return individualTemplate;
     }
+    
+    @SchemagenOption(opt=OPT.DATATYPE_TEMPLATE)
+    public String getDatatypeTemplate() {
+        return datatypeTemplate;
+    }
 
     @SchemagenOption(opt=OPT.UC_NAMES)
     public Boolean isUcNames() {
@@ -410,6 +434,10 @@ public class Source {
     public void setIndividualsSection(String individualsSection) {
         this.individualsSection = individualsSection;
     }
+    
+    public void setDatatypesSection(String datatypesSection) {
+        this.datatypesSection = datatypesSection;
+    }
 
     public void setNoProperties(Boolean noProperties) {
         this.noProperties = noProperties;
@@ -422,6 +450,10 @@ public class Source {
     public void setNoIndividuals(Boolean noIndividuals) {
         this.noIndividuals = noIndividuals;
     }
+    
+    public void setNoDatatypes(Boolean noDatatypes) {
+        this.noDatatypes = noDatatypes;
+    }
 
     public void setNoHeader(Boolean noHeader) {
         this.noHeader = noHeader;
@@ -438,6 +470,10 @@ public class Source {
     public void setIndividualTemplate(String individualTemplate) {
         this.individualTemplate = individualTemplate;
     }
+    
+    public void setDatatypeTemplate(String datatypeTemplate) {
+        this.datatypeTemplate = datatypeTemplate;
+    }
 
     public void setUcNames(Boolean ucNames) {
         this.ucNames = ucNames;

Modified: jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SourceParameterTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SourceParameterTest.java?rev=1593846&r1=1593845&r2=1593846&view=diff
==============================================================================
--- jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SourceParameterTest.java (original)
+++ jena/trunk/jena-maven-tools/src/test/java/org/apache/jena/tools/schemagen/SourceParameterTest.java Sun May 11 19:54:14 2014
@@ -156,6 +156,18 @@ public class SourceParameterTest
 
                 expected = optionName;
                 break;
+                
+            case DATATYPES_SECTION:
+                s.setDatatypesSection( optionName );
+
+                expected = optionName;
+                break;
+
+            case DATATYPE_TEMPLATE:
+                s.setDatatypeTemplate( optionName );
+
+                expected = optionName;
+                break;
 
             case DECLARATIONS:
                 s.setDeclarations( optionName );
@@ -283,7 +295,12 @@ public class SourceParameterTest
 
                 expected = true;
                 break;
+                
+            case NODATATYPES:
+                s.setNoDatatypes( true );
 
+                expected = true;
+                break;
             case NOHEADER:
                 s.setNoHeader( true );