db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t.@apache.org
Subject svn commit: r473814 [1/3] - in /db/torque/generator/trunk: ./ src/conf/ src/dtd/ src/java/org/apache/torque/engine/ src/java/org/apache/torque/engine/database/model/ src/java/org/apache/torque/engine/database/transform/ src/java/org/apache/torque/engin...
Date Sat, 11 Nov 2006 22:30:33 GMT
Author: tv
Date: Sat Nov 11 14:30:30 2006
New Revision: 473814

URL: http://svn.apache.org/viewvc?view=rev&rev=473814
Log:
Re-licensed all stuff according to new rules

Modified:
    db/torque/generator/trunk/build-gump.xml
    db/torque/generator/trunk/maven.xml
    db/torque/generator/trunk/pom.xml
    db/torque/generator/trunk/project.properties
    db/torque/generator/trunk/project.xml
    db/torque/generator/trunk/src/conf/build-torque.xml
    db/torque/generator/trunk/src/conf/build.properties
    db/torque/generator/trunk/src/conf/commons-logging.properties
    db/torque/generator/trunk/src/conf/default.properties
    db/torque/generator/trunk/src/conf/log4j.properties
    db/torque/generator/trunk/src/conf/simplelog.properties
    db/torque/generator/trunk/src/dtd/database.dtd
    db/torque/generator/trunk/src/dtd/database_3_2.dtd
    db/torque/generator/trunk/src/java/org/apache/torque/engine/EngineException.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Column.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/ConstraintNameGenerator.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Database.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Domain.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/ForeignKey.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/IDMethod.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/IdMethodParameter.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Index.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Inheritance.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/JavaNameGenerator.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/NameFactory.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/NameGenerator.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/SchemaType.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Table.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/TypeMap.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Unique.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/DTDResolver.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/SQLToAppData.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/XmlToAppData.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/database/transform/XmlToData.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/Platform.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformAxionImpl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformCloudscapeImpl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDb2400Impl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDb2Impl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDefaultImpl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformDerbyImpl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformFactory.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformHypersonicImpl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformInterbaseImpl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformMsaccessImpl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformMssqlImpl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformMysqlImpl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformOracleImpl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformPostgresqlImpl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformSapdbImpl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/PlatformSybaseImpl.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/platform/package.html
    db/torque/generator/trunk/src/java/org/apache/torque/engine/sql/ParseException.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/sql/SQLScanner.java
    db/torque/generator/trunk/src/java/org/apache/torque/engine/sql/Token.java
    db/torque/generator/trunk/src/java/org/apache/torque/task/PackageAsPathTask.java
    db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataDumpTask.java
    db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataModelTask.java
    db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDataSQLTask.java
    db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueDocumentationTask.java
    db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueJDBCTransformTask.java
    db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueSQLExec.java
    db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueSQLTask.java
    db/torque/generator/trunk/src/java/org/apache/torque/task/TorqueSQLTransformTask.java
    db/torque/generator/trunk/src/java/org/apache/torque/task/package.html
    db/torque/generator/trunk/src/schema/id-table-schema.xml
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/TestPackageHandling.java
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/ColumnTest.java
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/DomainTest.java
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/HypersonicDomainTest.java
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/MssqlDomainTest.java
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/NameFactoryTest.java
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/OracleDomainTest.java
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/PostgresqlDomainTest.java
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/TableTest.java
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/TypeMapTest.java
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/domaintest-schema.xml
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/model/tabletest-schema.xml
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/package-schema.xml
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/package2-schema.xml
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/transform/SQLToAppDataTest.java
    db/torque/generator/trunk/src/test/org/apache/torque/engine/database/transform/mysql.sql
    db/torque/generator/trunk/src/test/org/apache/torque/engine/platform/PlatformFactoryTest.java
    db/torque/generator/trunk/src/test/org/apache/torque/engine/platform/PlatformMysqlImplTest.java
    db/torque/generator/trunk/xdocs/custom-templates.xml
    db/torque/generator/trunk/xdocs/how-templates-work.xml
    db/torque/generator/trunk/xdocs/index.xml
    db/torque/generator/trunk/xdocs/navigation.xml
    db/torque/generator/trunk/xdocs/properties-reference.xml
    db/torque/generator/trunk/xdocs/schema-reference.xml
    db/torque/generator/trunk/xdocs/tasks-reference.xml

Modified: db/torque/generator/trunk/build-gump.xml
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/build-gump.xml?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/build-gump.xml (original)
+++ db/torque/generator/trunk/build-gump.xml Sat Nov 11 14:30:30 2006
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2001-2005 The Apache Software Foundation.
+ 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
 
- Licensed 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
 
-     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.
+ 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.
 -->
 <project name="maven" default="jar" basedir=".">
 

Modified: db/torque/generator/trunk/maven.xml
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/maven.xml?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/maven.xml (original)
+++ db/torque/generator/trunk/maven.xml Sat Nov 11 14:30:30 2006
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2001-2005 The Apache Software Foundation.
+ 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
 
- Licensed 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
 
-     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.
+ 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.
 -->
 
 <!-- ======================================================================== -->

Modified: db/torque/generator/trunk/pom.xml
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/pom.xml?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/pom.xml (original)
+++ db/torque/generator/trunk/pom.xml Sat Nov 11 14:30:30 2006
@@ -1,136 +1,154 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-    xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <groupId>org.apache.db.torque</groupId>
-    <artifactId>torque</artifactId>
-    <version>3.2.1-SNAPSHOT</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-
-  <artifactId>generator</artifactId>
-  <packaging>jar</packaging>
-  <name>Torque Generator</name>
-
-  <dependencies>
-    <dependency>
-      <artifactId>ant</artifactId>
-      <type>jar</type>
-      <groupId>ant</groupId>
-      <version>1.6.5</version>
-    </dependency>
-    <dependency>
-      <artifactId>commons-collections</artifactId>
-      <type>jar</type>
-      <groupId>commons-collections</groupId>
-      <version>3.1</version>
-    </dependency>
-    <dependency>
-      <artifactId>commons-lang</artifactId>
-      <type>jar</type>
-      <groupId>commons-lang</groupId>
-      <version>2.1</version>
-    </dependency>
-    <dependency>
-      <artifactId>commons-logging</artifactId>
-      <type>jar</type>
-      <groupId>commons-logging</groupId>
-      <version>1.0.4</version>
-    </dependency>
-    <dependency>
-      <groupId>avalon-logkit</groupId>
-      <artifactId>avalon-logkit</artifactId>
-      <version>2.1</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.db.torque</groupId>
-      <artifactId>templates</artifactId>
-      <version>${project.version}</version>
-      <type>jar</type>
-    </dependency>
-    <dependency>
-      <artifactId>velocity</artifactId>
-      <type>jar</type>
-      <groupId>velocity</groupId>
-      <version>1.3.1</version>
-    </dependency>
-    <dependency>
-      <artifactId>village</artifactId>
-      <type>jar</type>
-      <groupId>village</groupId>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <artifactId>xercesImpl</artifactId>
-      <type>jar</type>
-      <groupId>xerces</groupId>
-      <version>2.6.2</version>
-    </dependency>
-    <dependency>
-      <artifactId>xml-apis</artifactId>
-      <type>jar</type>
-      <groupId>xml-apis</groupId>
-      <version>2.0.2</version>
-    </dependency>
-
-    <dependency>
-      <artifactId>junit</artifactId>
-      <type>jar</type>
-      <groupId>junit</groupId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <sourceDirectory>src/java</sourceDirectory>
-    <testSourceDirectory>src/test</testSourceDirectory>
-    
-    <resources>
-      <resource>
-        <targetPath>org/apache/torque</targetPath>
-        <filtering>false</filtering>
-        <directory>src/conf</directory>
-        <includes>
-          <include>default.properties</include>
-        </includes>
-      </resource>
-      <resource>
-        <targetPath>org/apache/torque/engine/database/transform</targetPath>
-        <filtering>false</filtering>
-        <directory>src/dtd</directory>
-        <includes>
-          <include>database*.dtd</include>
-        </includes>
-      </resource>
-      <resource>
-        <filtering>false</filtering>
-        <directory>src/conf</directory>
-        <includes>
-          <include>commons-logging.properties</include>
-          <include>log4j.properties</include>
-          <include>simplelog.properties</include>
-        </includes>
-      </resource>
-    </resources>
-
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <includes>
-            <include>**/*Test*.java</include>
-          </includes>
-          <excludes>
-            <exclude>**/BaseTestCase.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
+<!--
+ 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.
+-->
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.apache.db.torque</groupId>
+    <artifactId>torque</artifactId>
+    <version>3.2.1-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>generator</artifactId>
+  <packaging>jar</packaging>
+  <name>Torque Generator</name>
+
+  <dependencies>
+    <dependency>
+      <artifactId>ant</artifactId>
+      <type>jar</type>
+      <groupId>ant</groupId>
+      <version>1.6.5</version>
+    </dependency>
+    <dependency>
+      <artifactId>commons-collections</artifactId>
+      <type>jar</type>
+      <groupId>commons-collections</groupId>
+      <version>3.1</version>
+    </dependency>
+    <dependency>
+      <artifactId>commons-lang</artifactId>
+      <type>jar</type>
+      <groupId>commons-lang</groupId>
+      <version>2.1</version>
+    </dependency>
+    <dependency>
+      <artifactId>commons-logging</artifactId>
+      <type>jar</type>
+      <groupId>commons-logging</groupId>
+      <version>1.0.4</version>
+    </dependency>
+    <dependency>
+      <groupId>avalon-logkit</groupId>
+      <artifactId>avalon-logkit</artifactId>
+      <version>2.1</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.db.torque</groupId>
+      <artifactId>templates</artifactId>
+      <version>${project.version}</version>
+      <type>jar</type>
+    </dependency>
+    <dependency>
+      <artifactId>velocity</artifactId>
+      <type>jar</type>
+      <groupId>velocity</groupId>
+      <version>1.3.1</version>
+    </dependency>
+    <dependency>
+      <artifactId>village</artifactId>
+      <type>jar</type>
+      <groupId>village</groupId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <artifactId>xercesImpl</artifactId>
+      <type>jar</type>
+      <groupId>xerces</groupId>
+      <version>2.6.2</version>
+    </dependency>
+    <dependency>
+      <artifactId>xml-apis</artifactId>
+      <type>jar</type>
+      <groupId>xml-apis</groupId>
+      <version>2.0.2</version>
+    </dependency>
+
+    <dependency>
+      <artifactId>junit</artifactId>
+      <type>jar</type>
+      <groupId>junit</groupId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <sourceDirectory>src/java</sourceDirectory>
+    <testSourceDirectory>src/test</testSourceDirectory>
+    
+    <resources>
+      <resource>
+        <targetPath>org/apache/torque</targetPath>
+        <filtering>false</filtering>
+        <directory>src/conf</directory>
+        <includes>
+          <include>default.properties</include>
+        </includes>
+      </resource>
+      <resource>
+        <targetPath>org/apache/torque/engine/database/transform</targetPath>
+        <filtering>false</filtering>
+        <directory>src/dtd</directory>
+        <includes>
+          <include>database*.dtd</include>
+        </includes>
+      </resource>
+      <resource>
+        <filtering>false</filtering>
+        <directory>src/conf</directory>
+        <includes>
+          <include>commons-logging.properties</include>
+          <include>log4j.properties</include>
+          <include>simplelog.properties</include>
+        </includes>
+      </resource>
+    </resources>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <includes>
+            <include>**/*Test*.java</include>
+          </includes>
+          <excludes>
+            <exclude>**/BaseTestCase.java</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Modified: db/torque/generator/trunk/project.properties
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/project.properties?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/project.properties (original)
+++ db/torque/generator/trunk/project.properties Sat Nov 11 14:30:30 2006
@@ -1,16 +1,19 @@
-# Copyright 2001-2005 The Apache Software Foundation.
+# 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
 #
-# Licensed 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
 #
-#     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.
+# 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.
 
 # -------------------------------------------------------------------
 # P R O J E C T  P R O P E R T I E S

Modified: db/torque/generator/trunk/project.xml
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/project.xml?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/project.xml (original)
+++ db/torque/generator/trunk/project.xml Sat Nov 11 14:30:30 2006
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2001-2005 The Apache Software Foundation.
+ 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
 
- Licensed 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
 
-     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.
+ 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.
 -->
 <project>
     <extend>common/project.xml</extend>

Modified: db/torque/generator/trunk/src/conf/build-torque.xml
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/conf/build-torque.xml?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/src/conf/build-torque.xml (original)
+++ db/torque/generator/trunk/src/conf/build-torque.xml Sat Nov 11 14:30:30 2006
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- Copyright 2001-2005 The Apache Software Foundation.
-
- Licensed 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.
+ 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.
 -->
 <project name="Torque" default="main" basedir=".">
   <!--
@@ -42,30 +45,30 @@
 
   <!--
     Build the classpath used by all torque ant tasks.
-    
+
     First, defines the template/generator override directories/jars based on the
-    torque.override.dir build property.  If this property is not set, use 
-    the torque.lib.dir as a default to keep ant happy. 
-    
-    Note: To prevent version conflicts in the default case, jars being 
-    overridden need to end in "override.jar". 
-    
-    Next, specifically point to each file we're including to avoid version 
+    torque.override.dir build property.  If this property is not set, use
+    the torque.lib.dir as a default to keep ant happy.
+
+    Note: To prevent version conflicts in the default case, jars being
+    overridden need to end in "override.jar".
+
+    Next, specifically point to each file we're including to avoid version
     conflicts in the case of the torque.lib.dir being something like lib.repo.
-    However, we still need to pull in the user's database driver and since we 
-    don't know which jar that will be, after we've got all of our specific, 
-    version-safe jars, do a general inclusion of the torque.lib.dir to catch 
-    any drivers. In the maven-built versions, ${torque.jar} is in the working 
+    However, we still need to pull in the user's database driver and since we
+    don't know which jar that will be, after we've got all of our specific,
+    version-safe jars, do a general inclusion of the torque.lib.dir to catch
+    any drivers. In the maven-built versions, ${torque.jar} is in the working
     directory.
   -->
-  <condition property="valid.override.directory" 
+  <condition property="valid.override.directory"
              value="${torque.override.dir}">
-    <isset property="torque.override.dir" /> 
+    <isset property="torque.override.dir" />
   </condition>
-  <condition property="valid.override.directory" 
+  <condition property="valid.override.directory"
              value="${torque.lib.dir}">
     <not>
-        <isset property="torque.override.dir" /> 
+        <isset property="torque.override.dir" />
     </not>
   </condition>
 

Modified: db/torque/generator/trunk/src/conf/build.properties
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/conf/build.properties?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/src/conf/build.properties (original)
+++ db/torque/generator/trunk/src/conf/build.properties Sat Nov 11 14:30:30 2006
@@ -1,16 +1,19 @@
-# Copyright 2001-2005 The Apache Software Foundation.
+# 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
 #
-# Licensed 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
 #
-#     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.
+# 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.
 
 # -------------------------------------------------------------------
 #

Modified: db/torque/generator/trunk/src/conf/commons-logging.properties
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/conf/commons-logging.properties?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/src/conf/commons-logging.properties (original)
+++ db/torque/generator/trunk/src/conf/commons-logging.properties Sat Nov 11 14:30:30 2006
@@ -1,19 +1,19 @@
-# Copyright 2001-2005 The Apache Software Foundation.
+# 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
 #
-# Licensed 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.
-#
-# commons-logging config
+#   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.
 
 org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.LogFactoryImpl
 org.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog

Modified: db/torque/generator/trunk/src/conf/default.properties
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/conf/default.properties?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/src/conf/default.properties (original)
+++ db/torque/generator/trunk/src/conf/default.properties Sat Nov 11 14:30:30 2006
@@ -1,16 +1,19 @@
-# Copyright 2001-2005 The Apache Software Foundation.
+# 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
 #
-# Licensed 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
 #
-#     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.
+# 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.
 
 # -------------------------------------------------------------------
 #

Modified: db/torque/generator/trunk/src/conf/log4j.properties
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/conf/log4j.properties?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/src/conf/log4j.properties (original)
+++ db/torque/generator/trunk/src/conf/log4j.properties Sat Nov 11 14:30:30 2006
@@ -1,16 +1,19 @@
-# Copyright 2001-2005 The Apache Software Foundation.
+# 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
 #
-# Licensed 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
 #
-#     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.
+# 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.
 
 # ------------------------------------------------------------------------
 #

Modified: db/torque/generator/trunk/src/conf/simplelog.properties
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/conf/simplelog.properties?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/src/conf/simplelog.properties (original)
+++ db/torque/generator/trunk/src/conf/simplelog.properties Sat Nov 11 14:30:30 2006
@@ -1,19 +1,19 @@
-# Copyright 2001-2005 The Apache Software Foundation.
+# 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
 #
-# Licensed 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.
-#
-# simplelog config
+#   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.
 
 # set log levels
 org.apache.commons.logging.simplelog.defaultlog=info

Modified: db/torque/generator/trunk/src/dtd/database.dtd
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/dtd/database.dtd?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/src/dtd/database.dtd (original)
+++ db/torque/generator/trunk/src/dtd/database.dtd Sat Nov 11 14:30:30 2006
@@ -1,17 +1,20 @@
 <!--
- Copyright 2001-2005 The Apache Software Foundation.
+ 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
 
- Licensed 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
 
-     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.
+ 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

Modified: db/torque/generator/trunk/src/dtd/database_3_2.dtd
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/dtd/database_3_2.dtd?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/src/dtd/database_3_2.dtd (original)
+++ db/torque/generator/trunk/src/dtd/database_3_2.dtd Sat Nov 11 14:30:30 2006
@@ -1,184 +1,187 @@
-<!--
- Copyright 2001-2005 The Apache Software Foundation.
-
- Licensed 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$
--->
-
-<!--
-For: database.defaultIdMethod and table.idMethod
-
-Do not use autoincrement or sequence. They are deprecated in favor of
-using native which will use the Connection pool to determine
-which database it is talking to (yes, it knows that) and then use
-whatever native database methodology for insert increments that it can.
-Otherwise, you should use idbroker or none. none is good if you have a
-table that is just a join table. idbroker is good if you want a
-centralized repository for brokering out clumps of id's in a database
-agnostic way.
--->
-
-<!--
-
-defaultJavaNamingMethod determines how a table or column name,
-from the name attribute in the xml database file, is converted to a
-Java class or method name.
-
-     nochange   - indicates not change is performed.
-     underscore - Underscores and dots are removed, first letter is
-              capitalized, first letter after an underscore
-              is capitalized, first letter after a dot is capitalized,
-              the rest of the letters are converted to lowercase.
-     underscoreOmitSchema - The section of the name before and including
-              the last dot in the name is removed. For the remaining part,
-              underscores are removed, first letter is capitalized,
-              first letter after an underscore is capitalized,
-              the rest of the letters are converted to lowercase.
-     javaname   - same as underscore, but no letters are converted
-              to lowercase.
--->
-
-<!ELEMENT database (external-schema*, domain*, table+)>
-<!ATTLIST database
-  name CDATA #REQUIRED
-  defaultIdMethod (idbroker|native|none) "none"
-  defaultJavaType (object|primitive) "primitive"
-  package CDATA #IMPLIED
-  baseClass CDATA #IMPLIED
-  basePeer CDATA #IMPLIED
-  defaultJavaNamingMethod (nochange|underscore|underscoreOmitSchema|javaname) "underscore"
-  heavyIndexing (true|false) "false"
->
-
-<!ELEMENT external-schema EMPTY>
-<!ATTLIST external-schema
-  filename CDATA #REQUIRED
->
-
-<!ELEMENT domain EMPTY>
-<!ATTLIST domain
-  name CDATA #REQUIRED
-  type
-    (
-          BIT  | TINYINT | SMALLINT    | INTEGER    | BIGINT    | FLOAT
-        | REAL | NUMERIC | DECIMAL     | CHAR       | VARCHAR   | LONGVARCHAR
-        | DATE | TIME    | TIMESTAMP   | BINARY     | VARBINARY | LONGVARBINARY
-        | NULL | OTHER   | JAVA_OBJECT | DISTINCT   | STRUCT    | ARRAY
-        | BLOB | CLOB    | REF         | BOOLEANINT | BOOLEANCHAR
-        | DOUBLE
-    ) "VARCHAR"
-  size CDATA #IMPLIED
-  scale CDATA #IMPLIED
-  default CDATA #IMPLIED
-  description CDATA #IMPLIED
->
-
-
-<!--
-     note: the interface="true", requires that useManagers=true in the
-     properties file.
--->
-<!ELEMENT table (column+,(foreign-key|index|unique|id-method-parameter)*)>
-<!ATTLIST table
-  name CDATA #REQUIRED
-  javaName CDATA #IMPLIED
-  idMethod (idbroker|native|none|null) "null"
-  skipSql (true|false) "false"
-  abstract (true|false) "false"
-  baseClass CDATA #IMPLIED
-  basePeer CDATA #IMPLIED
-  alias CDATA #IMPLIED
-  interface CDATA #IMPLIED
-  javaNamingMethod (nochange|underscore|underscoreOmitSchema|javaname) #IMPLIED
-  heavyIndexing (true|false) #IMPLIED
-  description CDATA #IMPLIED
->
-
-<!ELEMENT id-method-parameter EMPTY>
-<!ATTLIST id-method-parameter
-  name CDATA "default"
-  value CDATA #REQUIRED
->
-
-<!ELEMENT column (inheritance*)>
-<!ATTLIST column
-  name CDATA #REQUIRED
-  javaName CDATA #IMPLIED
-  primaryKey (true|false) "false"
-  required (true|false) "false"
-  protected (true|false) "false"
-  domain CDATA #IMPLIED
-  type
-    (
-          BIT  | TINYINT | SMALLINT    | INTEGER    | BIGINT    | FLOAT
-        | REAL | NUMERIC | DECIMAL     | CHAR       | VARCHAR   | LONGVARCHAR
-        | DATE | TIME    | TIMESTAMP   | BINARY     | VARBINARY | LONGVARBINARY
-        | NULL | OTHER   | JAVA_OBJECT | DISTINCT   | STRUCT    | ARRAY
-        | BLOB | CLOB    | REF         | BOOLEANINT | BOOLEANCHAR
-        | DOUBLE
-    ) #IMPLIED
-  javaType (object|primitive) #IMPLIED
-  size CDATA #IMPLIED
-  scale CDATA #IMPLIED
-  default CDATA #IMPLIED
-  autoIncrement (true|false) #IMPLIED
-  inheritance (single|false) "false"
-  inputValidator CDATA #IMPLIED
-  javaNamingMethod (nochange|underscore|javaname) #IMPLIED
-  description CDATA #IMPLIED
->
-
-<!ELEMENT inheritance EMPTY>
-<!ATTLIST inheritance
-  key CDATA #REQUIRED
-  class CDATA #REQUIRED
-  extends CDATA #IMPLIED
->
-
-<!ELEMENT foreign-key (reference+)>
-<!ATTLIST foreign-key
-  foreignTable CDATA #REQUIRED
-  name CDATA #IMPLIED
-  onUpdate (cascade|setnull|restrict|none) "none"
-  onDelete (cascade|setnull|restrict|none) "none"
->
-
-<!ELEMENT reference EMPTY>
-<!ATTLIST reference
-  local CDATA #REQUIRED
-  foreign CDATA #REQUIRED
->
-
-<!ELEMENT index (index-column+)>
-<!ATTLIST index
-  name CDATA #IMPLIED
->
-
-<!ELEMENT index-column EMPTY>
-<!ATTLIST index-column
-  name CDATA #REQUIRED
-  size CDATA #IMPLIED
->
-
-<!ELEMENT unique (unique-column+)>
-<!ATTLIST unique
-  name CDATA #IMPLIED
->
-
-<!ELEMENT unique-column EMPTY>
-<!ATTLIST unique-column
-  name CDATA #REQUIRED
->
+<!--
+ 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$
+-->
+
+<!--
+For: database.defaultIdMethod and table.idMethod
+
+Do not use autoincrement or sequence. They are deprecated in favor of
+using native which will use the Connection pool to determine
+which database it is talking to (yes, it knows that) and then use
+whatever native database methodology for insert increments that it can.
+Otherwise, you should use idbroker or none. none is good if you have a
+table that is just a join table. idbroker is good if you want a
+centralized repository for brokering out clumps of id's in a database
+agnostic way.
+-->
+
+<!--
+
+defaultJavaNamingMethod determines how a table or column name,
+from the name attribute in the xml database file, is converted to a
+Java class or method name.
+
+     nochange   - indicates not change is performed.
+     underscore - Underscores and dots are removed, first letter is
+              capitalized, first letter after an underscore
+              is capitalized, first letter after a dot is capitalized,
+              the rest of the letters are converted to lowercase.
+     underscoreOmitSchema - The section of the name before and including
+              the last dot in the name is removed. For the remaining part,
+              underscores are removed, first letter is capitalized,
+              first letter after an underscore is capitalized,
+              the rest of the letters are converted to lowercase.
+     javaname   - same as underscore, but no letters are converted
+              to lowercase.
+-->
+
+<!ELEMENT database (external-schema*, domain*, table+)>
+<!ATTLIST database
+  name CDATA #REQUIRED
+  defaultIdMethod (idbroker|native|none) "none"
+  defaultJavaType (object|primitive) "primitive"
+  package CDATA #IMPLIED
+  baseClass CDATA #IMPLIED
+  basePeer CDATA #IMPLIED
+  defaultJavaNamingMethod (nochange|underscore|underscoreOmitSchema|javaname) "underscore"
+  heavyIndexing (true|false) "false"
+>
+
+<!ELEMENT external-schema EMPTY>
+<!ATTLIST external-schema
+  filename CDATA #REQUIRED
+>
+
+<!ELEMENT domain EMPTY>
+<!ATTLIST domain
+  name CDATA #REQUIRED
+  type
+    (
+          BIT  | TINYINT | SMALLINT    | INTEGER    | BIGINT    | FLOAT
+        | REAL | NUMERIC | DECIMAL     | CHAR       | VARCHAR   | LONGVARCHAR
+        | DATE | TIME    | TIMESTAMP   | BINARY     | VARBINARY | LONGVARBINARY
+        | NULL | OTHER   | JAVA_OBJECT | DISTINCT   | STRUCT    | ARRAY
+        | BLOB | CLOB    | REF         | BOOLEANINT | BOOLEANCHAR
+        | DOUBLE
+    ) "VARCHAR"
+  size CDATA #IMPLIED
+  scale CDATA #IMPLIED
+  default CDATA #IMPLIED
+  description CDATA #IMPLIED
+>
+
+
+<!--
+     note: the interface="true", requires that useManagers=true in the
+     properties file.
+-->
+<!ELEMENT table (column+,(foreign-key|index|unique|id-method-parameter)*)>
+<!ATTLIST table
+  name CDATA #REQUIRED
+  javaName CDATA #IMPLIED
+  idMethod (idbroker|native|none|null) "null"
+  skipSql (true|false) "false"
+  abstract (true|false) "false"
+  baseClass CDATA #IMPLIED
+  basePeer CDATA #IMPLIED
+  alias CDATA #IMPLIED
+  interface CDATA #IMPLIED
+  javaNamingMethod (nochange|underscore|underscoreOmitSchema|javaname) #IMPLIED
+  heavyIndexing (true|false) #IMPLIED
+  description CDATA #IMPLIED
+>
+
+<!ELEMENT id-method-parameter EMPTY>
+<!ATTLIST id-method-parameter
+  name CDATA "default"
+  value CDATA #REQUIRED
+>
+
+<!ELEMENT column (inheritance*)>
+<!ATTLIST column
+  name CDATA #REQUIRED
+  javaName CDATA #IMPLIED
+  primaryKey (true|false) "false"
+  required (true|false) "false"
+  protected (true|false) "false"
+  domain CDATA #IMPLIED
+  type
+    (
+          BIT  | TINYINT | SMALLINT    | INTEGER    | BIGINT    | FLOAT
+        | REAL | NUMERIC | DECIMAL     | CHAR       | VARCHAR   | LONGVARCHAR
+        | DATE | TIME    | TIMESTAMP   | BINARY     | VARBINARY | LONGVARBINARY
+        | NULL | OTHER   | JAVA_OBJECT | DISTINCT   | STRUCT    | ARRAY
+        | BLOB | CLOB    | REF         | BOOLEANINT | BOOLEANCHAR
+        | DOUBLE
+    ) #IMPLIED
+  javaType (object|primitive) #IMPLIED
+  size CDATA #IMPLIED
+  scale CDATA #IMPLIED
+  default CDATA #IMPLIED
+  autoIncrement (true|false) #IMPLIED
+  inheritance (single|false) "false"
+  inputValidator CDATA #IMPLIED
+  javaNamingMethod (nochange|underscore|javaname) #IMPLIED
+  description CDATA #IMPLIED
+>
+
+<!ELEMENT inheritance EMPTY>
+<!ATTLIST inheritance
+  key CDATA #REQUIRED
+  class CDATA #REQUIRED
+  extends CDATA #IMPLIED
+>
+
+<!ELEMENT foreign-key (reference+)>
+<!ATTLIST foreign-key
+  foreignTable CDATA #REQUIRED
+  name CDATA #IMPLIED
+  onUpdate (cascade|setnull|restrict|none) "none"
+  onDelete (cascade|setnull|restrict|none) "none"
+>
+
+<!ELEMENT reference EMPTY>
+<!ATTLIST reference
+  local CDATA #REQUIRED
+  foreign CDATA #REQUIRED
+>
+
+<!ELEMENT index (index-column+)>
+<!ATTLIST index
+  name CDATA #IMPLIED
+>
+
+<!ELEMENT index-column EMPTY>
+<!ATTLIST index-column
+  name CDATA #REQUIRED
+  size CDATA #IMPLIED
+>
+
+<!ELEMENT unique (unique-column+)>
+<!ATTLIST unique
+  name CDATA #IMPLIED
+>
+
+<!ELEMENT unique-column EMPTY>
+<!ATTLIST unique-column
+  name CDATA #REQUIRED
+>

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/EngineException.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/EngineException.java?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/EngineException.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/EngineException.java Sat Nov 11 14:30:30 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.engine;
 
 /*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed 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
  *
- *     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.
+ * 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.
  */
 
 import org.apache.commons.lang.exception.NestableException;

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Column.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Column.java?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Column.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Column.java Sat Nov 11 14:30:30 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.engine.database.model;
 
 /*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed 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
  *
- *     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.
+ * 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.
  */
 
 import java.util.ArrayList;
@@ -309,10 +312,10 @@
     {
         return StringUtils.uncapitalize(getJavaName());
     }
-    
+
     /**
      * Returns the name of the constant that is used for the column in the Peer
-     * class, e.g., RecordPeer.COLVARNAME.  
+     * class, e.g., RecordPeer.COLVARNAME.
      * Generally this will be a straight conversion to upper case.
      * But if the column name is equals to TABLE_NAME or
      * DATABASE_NAME (Torque predefined vars), the column name will have an _
@@ -320,13 +323,13 @@
      * <p>
      * TODO: Handle delimited column names that have non-Java identifier
      * characters in them.
-     * 
+     *
      * @return The name to use in defining the Peer class column variable.
      */
     public String getPeerJavaName()
     {
         String peerName = name.toUpperCase();
-        if ( peerName.equals("TABLE_NAME") || 
+        if ( peerName.equals("TABLE_NAME") ||
              peerName.equals("DATABASE_NAME")) {
             peerName = "_" + peerName;
         }
@@ -773,12 +776,12 @@
      * If size attribute is an integer number, it will be returned.
      * If size attribute is of the format "Precision,Scale", then Precision
      * will be returned.
-     * If size is null or the size value is not an valid integer, 
+     * If size is null or the size value is not an valid integer,
      * null is returned.
      * <p>
      * Note: Unparseable values will be logged as a warning.
-     * 
-     * @return The precision portion of the size attribute.  
+     *
+     * @return The precision portion of the size attribute.
      */
     public String getPrecision()
     {
@@ -792,11 +795,11 @@
         {
             size = size.substring(0, cLoc);
         }
-        try 
+        try
         {
             Integer.parseInt(size);
-        } 
-        catch ( NumberFormatException e  ) 
+        }
+        catch ( NumberFormatException e  )
         {
             log.warn("getPrecision(): Size attribute found ("
                     + getSize()
@@ -807,17 +810,17 @@
     }
 
     /**
-     * Try to determine the scale of the field from the scale and size 
+     * Try to determine the scale of the field from the scale and size
      * attribute.
      * If scale attribute is an integer number, it will be returned.
      * If size attribute is of the format "Precision,Scale", then Scale
      * will be returned.
-     * If scale and size attributes are null or the scale value found 
+     * If scale and size attributes are null or the scale value found
      * is not an valid integer, a null value is returned.
      * <p>
      * Note: Unparseable values will be logged as a warning.
-     * 
-     * @return The precision portion of the size attribute.  
+     *
+     * @return The precision portion of the size attribute.
      */
     public String getScale()
     {
@@ -839,11 +842,11 @@
         }
 
         // Validate that scale string found is integer.
-        try 
+        try
         {
             Integer.parseInt(scale);
         }
-        catch ( NumberFormatException e  ) 
+        catch ( NumberFormatException e  )
         {
             log.warn("getScale(): Scale (or size=\"p,s\") attribute found ("
                     + scale
@@ -1202,17 +1205,17 @@
 
     /**
      * Get the value of the inheritance attribute defined in the schema XML.
-     * 
+     *
      * @return Returns the inheritanceType.
      */
     public String getInheritanceType()
     {
         return inheritanceType;
     }
-    
+
     /**
      * Add an XML Specified option key/value pair to this element's option set.
-     * 
+     *
      * @param key the key of the option.
      * @param value the value of the option.
      */
@@ -1220,11 +1223,11 @@
     {
         options.put( key, value );
     }
-    
+
     /**
-     * Get the value that was associated with this key in an XML option 
+     * Get the value that was associated with this key in an XML option
      * element.
-     * 
+     *
      * @param key the key of the option.
      * @return The value for the key or a null.
      */
@@ -1232,18 +1235,18 @@
     {
         return (String) options.get(key);
     }
-    
+
     /**
      * Gets the full ordered hashtable array of items specified by XML option
      * statements under this element.<p>
-     * 
-     * Note, this is not thread save but since it's only used for 
-     * generation which is single threaded, there should be minimum 
+     *
+     * Note, this is not thread save but since it's only used for
+     * generation which is single threaded, there should be minimum
      * danger using this in Velocity.
-     * 
+     *
      * @return An Map of all options. Will not be null but may be empty.
      */
-    public Map getOptions() 
+    public Map getOptions()
     {
         return options;
     }

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/ConstraintNameGenerator.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/ConstraintNameGenerator.java?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/ConstraintNameGenerator.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/ConstraintNameGenerator.java Sat Nov 11 14:30:30 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.engine.database.model;
 
 /*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed 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
  *
- *     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.
+ * 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.
  */
 
 import java.util.List;

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Database.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Database.java?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Database.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Database.java Sat Nov 11 14:30:30 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.engine.database.model;
 
 /*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed 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
  *
- *     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.
+ * 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.
  */
 
 import java.util.ArrayList;

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Domain.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Domain.java?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Domain.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Domain.java Sat Nov 11 14:30:30 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.engine.database.model;
 
 /*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed 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
  *
- *     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.
+ * 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.
  */
 
 import org.apache.commons.lang.StringUtils;

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/ForeignKey.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/ForeignKey.java?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/ForeignKey.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/ForeignKey.java Sat Nov 11 14:30:30 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.engine.database.model;
 
 /*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed 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
  *
- *     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.
+ * 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.
  */
 
 import java.util.ArrayList;

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/IDMethod.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/IDMethod.java?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/IDMethod.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/IDMethod.java Sat Nov 11 14:30:30 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.engine.database.model;
 
 /*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed 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
  *
- *     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.
+ * 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.
  */
 
 /**

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/IdMethodParameter.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/IdMethodParameter.java?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/IdMethodParameter.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/IdMethodParameter.java Sat Nov 11 14:30:30 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.engine.database.model;
 
 /*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed 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
  *
- *     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.
+ * 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.
  */
 
 import org.xml.sax.Attributes;

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Index.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Index.java?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Index.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Index.java Sat Nov 11 14:30:30 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.engine.database.model;
 
 /*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed 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
  *
- *     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.
+ * 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.
  */
 
 import java.util.ArrayList;

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Inheritance.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Inheritance.java?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Inheritance.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Inheritance.java Sat Nov 11 14:30:30 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.engine.database.model;
 
 /*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed 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
  *
- *     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.
+ * 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.
  */
 
 import org.xml.sax.Attributes;

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/JavaNameGenerator.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/JavaNameGenerator.java?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/JavaNameGenerator.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/JavaNameGenerator.java Sat Nov 11 14:30:30 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.engine.database.model;
 
 /*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed 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
  *
- *     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.
+ * 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.
  */
 
 import java.util.List;

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/NameFactory.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/NameFactory.java?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/NameFactory.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/NameFactory.java Sat Nov 11 14:30:30 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.engine.database.model;
 
 /*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed 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
  *
- *     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.
+ * 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.
  */
 
 import java.util.Hashtable;

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/NameGenerator.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/NameGenerator.java?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/NameGenerator.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/NameGenerator.java Sat Nov 11 14:30:30 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.engine.database.model;
 
 /*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed 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
  *
- *     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.
+ * 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.
  */
 
 import java.util.List;

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/SchemaType.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/SchemaType.java?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/SchemaType.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/SchemaType.java Sat Nov 11 14:30:30 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.engine.database.model;
 
 /*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed 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
  *
- *     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.
+ * 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.
  */
 
 import java.util.Iterator;

Modified: db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Table.java
URL: http://svn.apache.org/viewvc/db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Table.java?view=diff&rev=473814&r1=473813&r2=473814
==============================================================================
--- db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Table.java (original)
+++ db/torque/generator/trunk/src/java/org/apache/torque/engine/database/model/Table.java Sat Nov 11 14:30:30 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.engine.database.model;
 
 /*
- * Copyright 2001-2006 The Apache Software Foundation.
+ * 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
  *
- * Licensed 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
  *
- *     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.
+ * 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.
  */
 
 import java.util.ArrayList;



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