db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tfisc...@apache.org
Subject svn commit: r995633 - in /db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates: doc/html/conf/ doc/xdoc/conf/ idtable/conf/ om/conf/ sql/conf/ sql/createdb/conf/ xsd/
Date Fri, 10 Sep 2010 01:31:36 GMT
Author: tfischer
Date: Fri Sep 10 01:31:35 2010
New Revision: 995633

URL: http://svn.apache.org/viewvc?rev=995633&view=rev
Log:
Add entity references on database xsd

Added:
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd
      - copied, changed from r991294, db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/torque-database.xsd
Removed:
    db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/torque-database.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

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=995633&r1=995632&r2=995633&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:31:35 2010
@@ -20,10 +20,15 @@
 
 <control loglevel="info"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"
+    xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration
+        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 
+      systemId="http://db.apache.org/torque/4.0/templates/database.xsd"
+      resource="../../../xsd/database-4-0.xsd" />
+
   <!-- Documentation css -->
   <output name="torque.doc.html.css" file="datamodel.css">
     <source xsi:type="fileSource" elements="database">

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=995633&r1=995632&r2=995633&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:31:35 2010
@@ -20,10 +20,15 @@
 
 <control loglevel="info"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"
+    xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration
+        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 
+      systemId="http://db.apache.org/torque/4.0/templates/database.xsd"
+      resource="../../../xsd/database-4-0.xsd" />
+
   <!-- Documentation xdoc -->
   <output name="torque.doc.xdoc.xdoc"  file="datamodel.xml">
     <source xsi:type="fileSource" elements="database">

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=995633&r1=995632&r2=995633&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:31:35 2010
@@ -20,9 +20,15 @@
 
 <control loglevel="info"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"
+    xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration
+        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 
+      systemId="http://db.apache.org/torque/4.0/templates/database.xsd"
+      resource="../../xsd/database-4-0.xsd" />
+
   <output name="torque.sql.idtable.idtable">
     <filenameOutlet
         xsi:type="javaOutlet"

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=995633&r1=995632&r2=995633&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:31:35 2010
@@ -20,10 +20,15 @@
 
 <control loglevel="info"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"
+    xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration
+        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 
+      systemId="http://db.apache.org/torque/4.0/templates/database.xsd"
+      resource="../../xsd/database-4-0.xsd" />
+
   <output name="torque.om.dbObject" skipIfExists="true">
     <filenameOutlet
         xsi:type="javaOutlet"

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=995633&r1=995632&r2=995633&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:31:35 2010
@@ -20,11 +20,16 @@
 
 <control loglevel="info"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"
+    xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration
+        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 
+      systemId="http://db.apache.org/torque/4.0/templates/database.xsd"
+      resource="../../xsd/database-4-0.xsd" />
+
   <output name="torque.sql.ddl">
     <filenameOutlet
         xsi:type="javaOutlet"

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=995633&r1=995632&r2=995633&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:31:35 2010
@@ -20,11 +20,16 @@
 
 <control loglevel="info"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration http://db.apache.org/torque/4.0/generator/configuration.xsd"
+    xsi:schemaLocation="http://db.apache.org/torque/4.0/generator/configuration
+        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 
+      systemId="http://db.apache.org/torque/4.0/templates/database.xsd"
+      resource="../../../xsd/database-4-0.xsd" />
+
   <output name="torque.sql.createdb">
     <filenameOutlet
         xsi:type="javaOutlet"

Copied: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd
(from r991294, db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/torque-database.xsd)
URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd?p2=db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd&p1=db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/torque-database.xsd&r1=991294&r2=995633&rev=995633&view=diff
==============================================================================
--- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/torque-database.xsd
(original)
+++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd
Fri Sep 10 01:31:35 2010
@@ -24,8 +24,8 @@
 -->
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           targetNamespace="http://db.apache.org/torque4.0"
-           xmlns="http://db.apache.org/torque4.0"
+           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">
            
@@ -956,9 +956,7 @@ null       = Use the value previously se
 Java identifiers, e.g. [A-Za-z_$]A-Za-z_$0-9]*
       </xs:documentation>
     </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:pattern value="[A-Za-z_$][A-Za-z_$0-9]*" />
-    </xs:restriction>
+    <xs:restriction base="xs:string"/>
   </xs:simpleType>
 
   <xs:simpleType name="javaQualifiedNameType">
@@ -967,10 +965,7 @@ Java identifiers, e.g. [A-Za-z_$]A-Za-z_
 Java fully qualified names (e.g. x.y.x)
       </xs:documentation>
     </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:pattern
-              value="([A-Za-z_$][A-Za-z_$0-9]*[.])*[A-Za-z_$][A-Za-z_$0-9]*" />
-    </xs:restriction>
+    <xs:restriction base="xs:string"/>
   </xs:simpleType>
 
   <xs:simpleType name="sqlNameType">
@@ -979,9 +974,7 @@ Java fully qualified names (e.g. x.y.x)
 SQL Standard non-delimited identifiers.
       </xs:documentation>
     </xs:annotation>
-    <xs:restriction base="xs:string">
-      <xs:pattern value="[A-Za-z$#][A-Za-z_$#0-9]*" />
-    </xs:restriction>
+    <xs:restriction base="xs:string" />
   </xs:simpleType>
 
 </xs:schema>
\ No newline at end of file



---------------------------------------------------------------------
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