svn commit: r1367984 - in /jena/trunk/jena-core/etc: schemagen.rdf schemagen_example.rdf

[ij...@apache.org]

Author: ijd
Date: Wed Aug  1 13:39:23 2012
New Revision: 1367984

URL: http://svn.apache.org/viewvc?rev=1367984&view=rev
Log:
Ensure that example schemagen config file is not accidentally used as the real one, especially in unit tests

Added:
    jena/trunk/jena-core/etc/schemagen_example.rdf
      - copied, changed from r1363288, jena/trunk/jena-core/etc/schemagen.rdf
Removed:
    jena/trunk/jena-core/etc/schemagen.rdf

Copied: jena/trunk/jena-core/etc/schemagen_example.rdf (from r1363288, jena/trunk/jena-core/etc/schemagen.rdf)
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/etc/schemagen_example.rdf?p2=jena/trunk/jena-core/etc/schemagen_example.rdf&p1=jena/trunk/jena-core/etc/schemagen.rdf&r1=1363288&r2=1367984&rev=1367984&view=diff
==============================================================================
--- jena/trunk/jena-core/etc/schemagen.rdf (original)
+++ jena/trunk/jena-core/etc/schemagen_example.rdf Wed Aug  1 13:39:23 2012
@@ -21,32 +21,33 @@
 >
 
 <!--
-	Example schemagen configuration for use with jena.schemagen
+  Example schemagen configuration for use with jena.schemagen
     Not all possible options are used in this example, see Javadoc and Howto for full details.
-    
-	Author: Ian Dickinson, mailto:ian_dickinson@users.sourceforge.net
-	CVS:    $Id: schemagen.rdf,v 1.3 2009-10-06 13:04:42 ian_dickinson Exp $
+    Need to be named 'schemagen.rdf' in practice.
+
+  Author: Ian Dickinson, mailto:ian_dickinson@users.sourceforge.net
+  CVS:    $Id: schemagen.rdf,v 1.3 2009-10-06 13:04:42 ian_dickinson Exp $
 -->
 
 <sgen:Config>
     <!-- specifies that the  source document uses OWL -->
     <sgen:owl rdf:datatype="&xsd;boolean">true</sgen:owl>
-    
+
     <!-- specifies that we want the generated vocab to use OntClass, OntProperty, etc, not Resource and Property -->
     <sgen:ontology rdf:datatype="&xsd;boolean">true</sgen:ontology>
-    
+
     <!-- specifies that we want names mapped to uppercase (as standard Java constants) -->
     <sgen:uppercase rdf:datatype="&xsd;boolean">true</sgen:uppercase>
-    
+
     <!-- append Vocab to class name, so input beer.owl becomes BeerVocab.java -->
     <sgen:classnamesuffix rdf:datatype="&xsd;string">Vocab</sgen:classnamesuffix>
-    
+
     <!-- the java package that the vocabulary is in -->
     <sgen:package rdf:datatype="&xsd;string">com.example.vocabulary</sgen:package>
-    
+
     <!-- the directory or file to write the results out to -->
     <sgen:output rdf:datatype="&xsd;string">src/com/example/vocabulary</sgen:output>
-    
+
     <!-- the template for the file header -->
 <sgen:header rdf:datatype="&xsd;string">/*****************************************************************************
  * Source code information
@@ -60,9 +61,6 @@
  * Revision           $Revision: 1.3 $
  * Release status     @releaseStatus@ $State: Exp $
  *
- * Last modified on   $Date: 2009-10-06 13:04:42 $
- *               by   $Author: ian_dickinson $
- *
  * @copyright@
  *****************************************************************************/
 
@@ -90,12 +88,6 @@
 */
 </sgen:footer>
 
-<!-- template for extra declarations at the top of the class file -->
-<sgen:declarations rdf:datatype="&xsd;string">
-    /** Factory for generating symbols */
-    private static KsValueFactory s_vf = new DefaultValueFactory();
-</sgen:declarations>
-
 <!-- template for introducing the properties in the vocabulary -->
 <sgen:propSection rdf:datatype="&xsd;string">
     // Vocabulary properties
@@ -118,7 +110,7 @@
 <sgen:individualTemplate rdf:datatype="&xsd;string">public static final KsSymbol %valname% = s_vf.newSymbol( "%valuri%" );
 
     /** Ontology individual corresponding to {@link #%valname%} */
-    public static final %valclass% _%valname% = m_model.%valcreator%( %valtype%, "%valuri%" );
+    public static final %valclass% _%valname% = m_model.%valcreator%( "%valuri%", %valtype% );
 </sgen:individualTemplate>
 
 </sgen:Config>