db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r995637 - in /db/torque/torque4/trunk/torque-templates/src: main/resources/org/apache/torque/templates/doc/html/conf/ main/resources/org/apache/torque/templates/doc/xdoc/conf/ main/resources/org/apache/torque/templates/idtable/conf/ main/re...
Date Fri, 10 Sep 2010 01:51:29 GMT
Author: tfischer
Date: Fri Sep 10 01:51:29 2010
New Revision: 995637

URL: http://svn.apache.org/viewvc?rev=995637&view=rev
Log:
Added the original strict version of Greg's schema as second schema choice

Added:
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0-strict.xsd
Modified:
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/conf/control.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/conf/control.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/createdb/conf/control.xml
    db/torque/torque4/trunk/torque-templates/src/test/schema/ext-schema.xml
    db/torque/torque4/trunk/torque-templates/src/test/schema/extext-schema.xml
    db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/conf/control.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/conf/control.xml?rev=995637&r1=995636&r2=995637&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/conf/control.xml
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/html/conf/control.xml
Fri Sep 10 01:51:29 2010
@@ -24,10 +24,13 @@
         http://db.apache.org/torque/4.0/generator/configuration.xsd"
     xmlns="http://db.apache.org/torque/4.0/generator/configuration">
   <options xsi:type="propertiesOptions" path="options.properties"/>
-  
-  <entityReference 
+
+  <entityReference
       systemId="http://db.apache.org/torque/4.0/templates/database.xsd"
       resource="../../../xsd/database-4-0.xsd" />
+  <entityReference
+      systemId="http://db.apache.org/torque/4.0/templates/database-strict.xsd"
+      resource="../../../xsd/database-4-0-strict.xsd" />
 
   <!-- Documentation css -->
   <output name="torque.doc.html.css" file="datamodel.css">

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/conf/control.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/conf/control.xml?rev=995637&r1=995636&r2=995637&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/conf/control.xml
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/doc/xdoc/conf/control.xml
Fri Sep 10 01:51:29 2010
@@ -24,10 +24,13 @@
         http://db.apache.org/torque/4.0/generator/configuration.xsd"
     xmlns="http://db.apache.org/torque/4.0/generator/configuration">
   <options xsi:type="propertiesOptions" path="options.properties"/>
-  
-  <entityReference 
+
+  <entityReference
       systemId="http://db.apache.org/torque/4.0/templates/database.xsd"
       resource="../../../xsd/database-4-0.xsd" />
+  <entityReference
+      systemId="http://db.apache.org/torque/4.0/templates/database-strict.xsd"
+      resource="../../../xsd/database-4-0-strict.xsd" />
 
   <!-- Documentation xdoc -->
   <output name="torque.doc.xdoc.xdoc"  file="datamodel.xml">

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml?rev=995637&r1=995636&r2=995637&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/idtable/conf/control.xml
Fri Sep 10 01:51:29 2010
@@ -25,9 +25,12 @@
     xmlns="http://db.apache.org/torque/4.0/generator/configuration">
   <options xsi:type="propertiesOptions" path="options.properties"/>
 
-  <entityReference 
+  <entityReference
       systemId="http://db.apache.org/torque/4.0/templates/database.xsd"
       resource="../../xsd/database-4-0.xsd" />
+  <entityReference
+      systemId="http://db.apache.org/torque/4.0/templates/database-strict.xsd"
+      resource="../../xsd/database-4-0-strict.xsd" />
 
   <output name="torque.sql.idtable.idtable">
     <filenameOutlet

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml?rev=995637&r1=995636&r2=995637&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/om/conf/control.xml
Fri Sep 10 01:51:29 2010
@@ -24,10 +24,13 @@
         http://db.apache.org/torque/4.0/generator/configuration.xsd"
     xmlns="http://db.apache.org/torque/4.0/generator/configuration">
   <options xsi:type="propertiesOptions" path="options.properties"/>
-  
-  <entityReference 
+
+  <entityReference
       systemId="http://db.apache.org/torque/4.0/templates/database.xsd"
       resource="../../xsd/database-4-0.xsd" />
+  <entityReference
+      systemId="http://db.apache.org/torque/4.0/templates/database-strict.xsd"
+      resource="../../xsd/database-4-0-strict.xsd" />
 
   <output name="torque.om.dbObject" skipIfExists="true">
     <filenameOutlet

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml?rev=995637&r1=995636&r2=995637&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/conf/control.xml
Fri Sep 10 01:51:29 2010
@@ -26,9 +26,12 @@
 
   <options xsi:type="propertiesOptions" path="options.properties"/>
 
-  <entityReference 
+  <entityReference
       systemId="http://db.apache.org/torque/4.0/templates/database.xsd"
       resource="../../xsd/database-4-0.xsd" />
+  <entityReference
+      systemId="http://db.apache.org/torque/4.0/templates/database-strict.xsd"
+      resource="../../xsd/database-4-0-strict.xsd" />
 
   <output name="torque.sql.ddl">
     <filenameOutlet

Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/createdb/conf/control.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/createdb/conf/control.xml?rev=995637&r1=995636&r2=995637&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/createdb/conf/control.xml
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/sql/createdb/conf/control.xml
Fri Sep 10 01:51:29 2010
@@ -26,9 +26,12 @@
 
   <options xsi:type="propertiesOptions" path="options.properties"/>
 
-  <entityReference 
+  <entityReference
       systemId="http://db.apache.org/torque/4.0/templates/database.xsd"
       resource="../../../xsd/database-4-0.xsd" />
+  <entityReference
+      systemId="http://db.apache.org/torque/4.0/templates/database-strict.xsd"
+      resource="../../../xsd/database-4-0-strict.xsd" />
 
   <output name="torque.sql.createdb">
     <filenameOutlet

Added: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0-strict.xsd
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0-strict.xsd?rev=995637&view=auto
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0-strict.xsd
(added)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0-strict.xsd
Fri Sep 10 01:51:29 2010
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!--
+    Torque XML database schema DTD
+    $Id$
+-->
+
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           targetNamespace="http://db.apache.org/torque/4.0/templates/database"
+           xmlns="http://db.apache.org/torque/4.0/templates/database"
+           elementFormDefault="qualified"
+           version="4.0">
+           
+  <xs:annotation>
+    <xs:documentation xml:lang="en">
+The XML schema used by version 4.0 and greater of the Apache Software
+Foundation Torque project(
+<a href="http://db.apache.org/torque">http://db.apache.org/torque</a> )
+to model SQL database information. 
+This model restricts the available characters in java names and sql names
+as compared to the standard database.xsd
+    </xs:documentation>
+  </xs:annotation>
+  
+  <xs:redefine schemaLocation="http://db.apache.org/torque/4.0/templates/database.xsd">
+    <xs:simpleType name="javaNameType">
+      <xs:annotation>
+        <xs:documentation xml:lang="en">
+  Java identifiers, e.g. [A-Za-z_$]A-Za-z_$0-9]*
+        </xs:documentation>
+      </xs:annotation>
+      <xs:restriction base="javaNameType">
+        <xs:pattern value="[A-Za-z_$][A-Za-z_$0-9]*" />
+      </xs:restriction>
+    </xs:simpleType>
+  
+    <xs:simpleType name="javaQualifiedNameType">
+      <xs:annotation>
+        <xs:documentation xml:lang="en">
+  Java fully qualified names (e.g. x.y.x)
+        </xs:documentation>
+      </xs:annotation>
+      <xs:restriction base="javaQualifiedNameType">
+        <xs:pattern
+                value="([A-Za-z_$][A-Za-z_$0-9]*[.])*[A-Za-z_$][A-Za-z_$0-9]*" />
+      </xs:restriction>
+    </xs:simpleType>
+  
+    <xs:simpleType name="sqlNameType">
+      <xs:annotation>
+        <xs:documentation xml:lang="en">
+  SQL Standard non-delimited identifiers.
+        </xs:documentation>
+      </xs:annotation>
+      <xs:restriction base="sqlNameType">
+        <xs:pattern value="[A-Za-z$#][A-Za-z_$#0-9]*" />
+      </xs:restriction>
+    </xs:simpleType>
+  </xs:redefine>
+
+</xs:schema>
\ No newline at end of file

Modified: db/torque/torque4/trunk/torque-templates/src/test/schema/ext-schema.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/schema/ext-schema.xml?rev=995637&r1=995636&r2=995637&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/schema/ext-schema.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/test/schema/ext-schema.xml Fri Sep 10 01:51:29
2010
@@ -17,12 +17,14 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<!--DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_2.dtd"-->
-
 <database
-  name="ext"
-  defaultIdMethod="native"
-  package="org.apache.torque.test.ext">
+    xmlns="http://db.apache.org/torque/4.0/templates/database"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database 
+        http://db.apache.org/torque/4.0/templates/database.xsd"
+    name="ext"
+    defaultIdMethod="native"
+    package="org.apache.torque.test.ext">
 
   <external-schema filename="extext-schema.xml" />
 

Modified: db/torque/torque4/trunk/torque-templates/src/test/schema/extext-schema.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/schema/extext-schema.xml?rev=995637&r1=995636&r2=995637&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/schema/extext-schema.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/test/schema/extext-schema.xml Fri Sep 10
01:51:29 2010
@@ -17,11 +17,13 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<!--DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_2.dtd"-->
-
 <database
-  name="extext"
-  defaultIdMethod="@DATABASE_ID_METHOD@">
+    xmlns="http://db.apache.org/torque/4.0/templates/database"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database
+        http://db.apache.org/torque/4.0/templates/database.xsd"
+    name="extext"
+    defaultIdMethod="idbroker">
 
   <table name="extext">
     <column

Modified: db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml?rev=995637&r1=995636&r2=995637&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml (original)
+++ db/torque/torque4/trunk/torque-templates/src/test/schema/schema.xml Fri Sep 10 01:51:29
2010
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" standalone="no" ?>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
 <!--
  Licensed to the Apache Software Foundation (ASF) under one
  or more contributor license agreements.  See the NOTICE file
@@ -17,12 +17,13 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<!--DOCTYPE database SYSTEM "http://db.apache.org/torque/dtd/database_3_3.dtd"-->
-
 <database
-  name="bookstore"
-  defaultIdMethod="native">
-
+    xmlns="http://db.apache.org/torque/4.0/templates/database"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database
+        http://db.apache.org/torque/4.0/templates/database-strict.xsd"
+    name="bookstore"
+    defaultIdMethod="native">
   <external-schema filename="ext-schema.xml" />
 
   <!-- =================================================== -->



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message