db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t.@apache.org
Subject svn commit: r473821 [4/7] - in /db/torque: runtime/trunk/ runtime/trunk/conf/ runtime/trunk/etc/ runtime/trunk/notes/ runtime/trunk/proposals/eric/statement/ runtime/trunk/proposals/fedor/nqm/ runtime/trunk/proposals/henning/idtable-peer/ runtime/trunk...
Date Sat, 11 Nov 2006 22:37:32 GMT
Modified: db/torque/runtime/trunk/src/test/TestRoleConfig.xml
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/test/TestRoleConfig.xml?view=diff&rev=473821&r1=473820&r2=473821
==============================================================================
--- db/torque/runtime/trunk/src/test/TestRoleConfig.xml (original)
+++ db/torque/runtime/trunk/src/test/TestRoleConfig.xml Sat Nov 11 14:37:25 2006
@@ -1,7 +1,25 @@
+<!--
+ 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.
+-->
 <!-- This configuration file for Avalon components is used for testing the TorqueComponent -->
 <role-list>
     <role
         name="org.apache.torque.avalon.Torque"
         shorthand="TorqueComponent"
         default-class="org.apache.torque.avalon.TorqueComponent"/>
-</role-list>
\ No newline at end of file
+</role-list>

Modified: db/torque/runtime/trunk/src/test/TurbineResources.properties
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/test/TurbineResources.properties?view=diff&rev=473821&r1=473820&r2=473821
==============================================================================
--- db/torque/runtime/trunk/src/test/TurbineResources.properties (original)
+++ db/torque/runtime/trunk/src/test/TurbineResources.properties Sat Nov 11 14:37:25 2006
@@ -1,25 +1,19 @@
-# 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.
-# -------------------------------------------------------------------
-# $Id$
-#
-# This is the configuration file for Turbine.
-#
-# Note that strings containing "," (comma) characters must backslash
-# escape the comma (i.e. '\,')
-#
-# -------------------------------------------------------------------
+# 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.
 
 
 # -------------------------------------------------------------------

Modified: db/torque/runtime/trunk/src/test/org/apache/torque/BaseTestCase.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/test/org/apache/torque/BaseTestCase.java?view=diff&rev=473821&r1=473820&r2=473821
==============================================================================
--- db/torque/runtime/trunk/src/test/org/apache/torque/BaseTestCase.java (original)
+++ db/torque/runtime/trunk/src/test/org/apache/torque/BaseTestCase.java Sat Nov 11 14:37:25 2006
@@ -1,19 +1,22 @@
 package org.apache.torque;
 
 /*
- * 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.
  */
 
 import junit.framework.TestCase;

Modified: db/torque/runtime/trunk/src/test/org/apache/torque/TorqueInstanceTest.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/test/org/apache/torque/TorqueInstanceTest.java?view=diff&rev=473821&r1=473820&r2=473821
==============================================================================
--- db/torque/runtime/trunk/src/test/org/apache/torque/TorqueInstanceTest.java (original)
+++ db/torque/runtime/trunk/src/test/org/apache/torque/TorqueInstanceTest.java Sat Nov 11 14:37:25 2006
@@ -15,19 +15,22 @@
 import org.apache.torque.util.BasePeer;
 
 /*
- * 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.
  */
 
 /**
@@ -37,16 +40,16 @@
  * @version $Id$
  */
 public class TorqueInstanceTest extends TestCase
-{  
+{
     /** The name of the "default" dataSourceFactory" as used by Turbine */
     private static final String DEFAULT_NAME = "default";
-    
-    /** 
-     * The name of the "turbine" dataSourceFactory" 
+
+    /**
+     * The name of the "turbine" dataSourceFactory"
      * as used by the Turbine configuration
      */
     private static final String TURBINE_NAME = "turbine";
-    
+
     /**
      * Creates a new instance.
      *
@@ -56,7 +59,7 @@
     {
         super(name);
     }
-    
+
     /**
      * Tests whether registration of Map Builders works before and after
      * initialisation of Torque.
@@ -67,12 +70,12 @@
         Torque.registerMapBuilder(MapBuilderA.CLASS_NAME);
         Torque.init(getConfiguration());
         BasePeer.getMapBuilder(MapBuilderB.CLASS_NAME);
-        
+
         DatabaseMap databaseMap = Torque.getDatabaseMap(Torque.getDefaultDB());
         assertNotNull(databaseMap.getTable(MapBuilderA.TABLE_NAME));
         assertNotNull(databaseMap.getTable(MapBuilderB.TABLE_NAME));
     }
-    
+
     /**
      * Tests whether an external adapter is loaded correctly.
      * @throws Exception if an error occurs during the Test.
@@ -84,20 +87,20 @@
     }
 
     /**
-     * Checks whether a DataSourceFactory with the name 
+     * Checks whether a DataSourceFactory with the name
      * <code>DEFAULT_NAME</code> is defined. (TRQS 322)
      * @throws Exception if an error occurs during the Test.
      */
     public void testDefaultDataSourceFactory() throws Exception
     {
-        DataSourceFactory defaultDataSourceFactory 
+        DataSourceFactory defaultDataSourceFactory
                 = Torque.getInstance().getDataSourceFactory(DEFAULT_NAME);
         assertNotNull(
-                "The DataSourceFactory for Key " 
+                "The DataSourceFactory for Key "
                 + DEFAULT_NAME
                 + " should not be null",
                 defaultDataSourceFactory);
-        DataSourceFactory turbineDataSourceFactory 
+        DataSourceFactory turbineDataSourceFactory
                 = Torque.getInstance().getDataSourceFactory(DEFAULT_NAME);
         assertSame("The default DataSourceFactory "
                 + "and the turbine DataSourceFactory "
@@ -116,20 +119,20 @@
         Map databases = Torque.getDatabases();
         // check whether all expected databases are contained in the Map
         assertEquals(
-                "Databases should contain 2 Databases, not " 
+                "Databases should contain 2 Databases, not "
                     + databases.size(),
-                databases.size(), 
+                databases.size(),
                 2);
-        
+
         // check that the default database and the turbine database
         // refer to the same object
         Database defaultDatabase = Torque.getDatabase(DEFAULT_NAME);
         Database turbineDatabase = Torque.getDatabase(TURBINE_NAME);
-        
+
         assertNotSame("The default database and the turbine database "
                         + "are the same object",
                     defaultDatabase,
-                    turbineDatabase);    
+                    turbineDatabase);
     }
 
     public void testShutdown() throws Exception
@@ -152,7 +155,7 @@
         {
         }
     }
-    
+
     /**
      * Reads and returns the configuration out of the configuration file.
      * @return
@@ -160,11 +163,11 @@
      */
     private Configuration getConfiguration() throws ConfigurationException
     {
-        Configuration conf 
+        Configuration conf
                 = new PropertiesConfiguration(BaseTestCase.CONFIG_FILE);
         return conf;
     }
-    
+
     /**
      * The base class for the Map Builders used in this testbed.
      */
@@ -185,7 +188,7 @@
         {
             this.tableName = tableName;
         }
-        
+
         /**
          * Tells us if this DatabaseMapBuilder is built so that we
          * don't have to re-build it every time.
@@ -227,7 +230,7 @@
             tMap.addColumn(tableName + "NAME", "", 50 );
         }
     }
-    
+
     /**
      * Map builder implementation for testing.
      */
@@ -236,7 +239,7 @@
         /** The name of this class. */
         public static final String CLASS_NAME =
             MapBuilderA.class.getName();
-        
+
         /** The name of the associated table. */
         public static final String TABLE_NAME = "a";
 
@@ -245,7 +248,7 @@
             super(TABLE_NAME);
         }
     }
-    
+
     /**
      * Second map builder implementation for testing.
      */
@@ -254,7 +257,7 @@
         /** The name of this class. */
         public static final String CLASS_NAME =
             MapBuilderB.class.getName();
-        
+
         /** The name of the associated table. */
         public static final String TABLE_NAME = "b";
 
@@ -263,4 +266,4 @@
             super(TABLE_NAME);
         }
     }
-}
\ No newline at end of file
+}

Modified: db/torque/runtime/trunk/src/test/org/apache/torque/adapter/DBOracleTest.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/test/org/apache/torque/adapter/DBOracleTest.java?view=diff&rev=473821&r1=473820&r2=473821
==============================================================================
--- db/torque/runtime/trunk/src/test/org/apache/torque/adapter/DBOracleTest.java (original)
+++ db/torque/runtime/trunk/src/test/org/apache/torque/adapter/DBOracleTest.java Sat Nov 11 14:37:25 2006
@@ -1,72 +1,75 @@
-package org.apache.torque.adapter;
-
-/*
- * Copyright 2001-2006 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.
- */
-
-import junit.framework.TestCase;
-
-import org.apache.torque.util.Query;
-import org.apache.torque.util.UniqueList;
-
-public class DBOracleTest extends TestCase
-{
-    /**
-     * Tests whether replacing the select columns in limit/offset
-     * treatment works (double column names must be aliased)
-     */
-    public void testSelectColumnsForLimitOffset()
-    {
-        Query query = new Query();
-        UniqueList input = new UniqueList();
-        input.add("c1");
-        input.add("c2");
-        input.add("c1 a1");
-        input.add("c1 a2");
-        input.add("t.c1 a4");
-        
-        // A list with no duplicates must remain unchanged
-        query.setSelectClause(new UniqueList(input));
-        new DBOracle().generateLimits(query, 0, 1);
-        assertEquals(input, query.getSelectClause());
-
-        // double column names must be aliased 
-        input.set(1, "t.c1");
-        query.setSelectClause(new UniqueList(input));
-        new DBOracle().generateLimits(query, 0, 1);        
-        UniqueList expected = new UniqueList(input);
-        expected.set(1, "t.c1 a0");
-        assertEquals(expected, query.getSelectClause());
-        
-        // a column name which is the same as an alias name must be replaced
-        input.set(1, "c2");
-        input.set(0, "t.a1");
-        query.setSelectClause(new UniqueList(input));
-        new DBOracle().generateLimits(query, 0, 1);        
-        expected = new UniqueList(input);
-        expected.set(0, "t.a1 a0");
-        assertEquals(query.getSelectClause(), expected);
-        
-        // triple column names must be made unique
-        input.set(1, "t2.a1");
-        query.setSelectClause(new UniqueList(input));
-        new DBOracle().generateLimits(query, 0, 1);        
-        expected = new UniqueList(input);
-        expected.set(0, "t.a1 a0");
-        expected.set(1, "t2.a1 a3");
-        assertEquals(expected, query.getSelectClause());
-    }
-        
-}
+package org.apache.torque.adapter;
+
+/*
+ * 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.
+ */
+
+import junit.framework.TestCase;
+
+import org.apache.torque.util.Query;
+import org.apache.torque.util.UniqueList;
+
+public class DBOracleTest extends TestCase
+{
+    /**
+     * Tests whether replacing the select columns in limit/offset
+     * treatment works (double column names must be aliased)
+     */
+    public void testSelectColumnsForLimitOffset()
+    {
+        Query query = new Query();
+        UniqueList input = new UniqueList();
+        input.add("c1");
+        input.add("c2");
+        input.add("c1 a1");
+        input.add("c1 a2");
+        input.add("t.c1 a4");
+
+        // A list with no duplicates must remain unchanged
+        query.setSelectClause(new UniqueList(input));
+        new DBOracle().generateLimits(query, 0, 1);
+        assertEquals(input, query.getSelectClause());
+
+        // double column names must be aliased
+        input.set(1, "t.c1");
+        query.setSelectClause(new UniqueList(input));
+        new DBOracle().generateLimits(query, 0, 1);
+        UniqueList expected = new UniqueList(input);
+        expected.set(1, "t.c1 a0");
+        assertEquals(expected, query.getSelectClause());
+
+        // a column name which is the same as an alias name must be replaced
+        input.set(1, "c2");
+        input.set(0, "t.a1");
+        query.setSelectClause(new UniqueList(input));
+        new DBOracle().generateLimits(query, 0, 1);
+        expected = new UniqueList(input);
+        expected.set(0, "t.a1 a0");
+        assertEquals(query.getSelectClause(), expected);
+
+        // triple column names must be made unique
+        input.set(1, "t2.a1");
+        query.setSelectClause(new UniqueList(input));
+        new DBOracle().generateLimits(query, 0, 1);
+        expected = new UniqueList(input);
+        expected.set(0, "t.a1 a0");
+        expected.set(1, "t2.a1 a3");
+        assertEquals(expected, query.getSelectClause());
+    }
+
+}

Modified: db/torque/runtime/trunk/src/test/org/apache/torque/avalon/AvalonTest.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/test/org/apache/torque/avalon/AvalonTest.java?view=diff&rev=473821&r1=473820&r2=473821
==============================================================================
--- db/torque/runtime/trunk/src/test/org/apache/torque/avalon/AvalonTest.java (original)
+++ db/torque/runtime/trunk/src/test/org/apache/torque/avalon/AvalonTest.java Sat Nov 11 14:37:25 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.avalon;
 /*
- * Copyright 2001-2006 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.
+ */
 
 import org.apache.avalon.framework.component.ComponentException;
 import org.apache.fulcrum.testcontainer.BaseUnitTest;
@@ -27,7 +30,7 @@
 public class AvalonTest extends BaseUnitTest
 {
     private Torque torque = null;
-    
+
     /**
      * Constructor for test.
      *
@@ -51,7 +54,7 @@
             fail(e.getMessage());
         }
     }
-    
+
     /**
      * Verifies that the container initialization and lookup works properly.
      */

Modified: db/torque/runtime/trunk/src/test/org/apache/torque/om/ComboKeyTest.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/test/org/apache/torque/om/ComboKeyTest.java?view=diff&rev=473821&r1=473820&r2=473821
==============================================================================
--- db/torque/runtime/trunk/src/test/org/apache/torque/om/ComboKeyTest.java (original)
+++ db/torque/runtime/trunk/src/test/org/apache/torque/om/ComboKeyTest.java Sat Nov 11 14:37:25 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.om;
 
 /*
- * 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.
  */
 
 import junit.framework.Assert;

Modified: db/torque/runtime/trunk/src/test/org/apache/torque/om/NumberKeyTest.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/test/org/apache/torque/om/NumberKeyTest.java?view=diff&rev=473821&r1=473820&r2=473821
==============================================================================
--- db/torque/runtime/trunk/src/test/org/apache/torque/om/NumberKeyTest.java (original)
+++ db/torque/runtime/trunk/src/test/org/apache/torque/om/NumberKeyTest.java Sat Nov 11 14:37:25 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.om;
 
 /*
- * 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.
  */
 
 import java.util.Arrays;

Modified: db/torque/runtime/trunk/src/test/org/apache/torque/util/CriteriaTest.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/test/org/apache/torque/util/CriteriaTest.java?view=diff&rev=473821&r1=473820&r2=473821
==============================================================================
--- db/torque/runtime/trunk/src/test/org/apache/torque/util/CriteriaTest.java (original)
+++ db/torque/runtime/trunk/src/test/org/apache/torque/util/CriteriaTest.java Sat Nov 11 14:37:25 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.util;
 
 /*
- * 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.
  */
 
 import java.util.Calendar;
@@ -612,18 +615,18 @@
     {
         // we need a rudementary databaseMap for this test case to work
         DatabaseMap dbMap = Torque.getDatabaseMap(Torque.getDefaultDB());
-        
+
         TableMap tableMap = new TableMap("AUTHOR", dbMap);
         dbMap.addTable(tableMap);
-        
+
         ColumnMap columnMap = new ColumnMap("NAME", tableMap);
         columnMap.setType("");
         tableMap.addColumn(columnMap);
-        
+
         columnMap = new ColumnMap("AUTHOR_ID", tableMap);
         columnMap.setType(new Integer(0));
         tableMap.addColumn(columnMap);
-        
+
         // check that alias'ed tables are referenced by their alias
         // name when added to the select clause.
         Criteria criteria = new Criteria();
@@ -634,12 +637,12 @@
                 "a." + "AUTHOR_ID");
         criteria.addAscendingOrderByColumn(
                 "a.NAME");
-        
+
         String result = BasePeer.createQueryString(criteria);
         assertEquals("SELECT AUTHOR.NAME, a.NAME "
                     + "FROM AUTHOR, AUTHOR a "
                     + "WHERE AUTHOR.AUTHOR_ID=a.AUTHOR_ID "
-                    + "ORDER BY a.NAME ASC", 
+                    + "ORDER BY a.NAME ASC",
                 result);
     }
 

Modified: db/torque/runtime/trunk/src/test/org/apache/torque/util/QueryTest.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/test/org/apache/torque/util/QueryTest.java?view=diff&rev=473821&r1=473820&r2=473821
==============================================================================
--- db/torque/runtime/trunk/src/test/org/apache/torque/util/QueryTest.java (original)
+++ db/torque/runtime/trunk/src/test/org/apache/torque/util/QueryTest.java Sat Nov 11 14:37:25 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.util;
 
 /*
- * 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.
  */
 
 import junit.framework.TestCase;

Modified: db/torque/runtime/trunk/src/test/org/apache/torque/util/SqlBuilderTest.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/test/org/apache/torque/util/SqlBuilderTest.java?view=diff&rev=473821&r1=473820&r2=473821
==============================================================================
--- db/torque/runtime/trunk/src/test/org/apache/torque/util/SqlBuilderTest.java (original)
+++ db/torque/runtime/trunk/src/test/org/apache/torque/util/SqlBuilderTest.java Sat Nov 11 14:37:25 2006
@@ -1,131 +1,134 @@
-package org.apache.torque.util;
-
-/*
- * Copyright 2001-2006 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.
- */
-
-import org.apache.torque.BaseTestCase;
-import org.apache.torque.TorqueException;
-
-/**
- * Tests for SqlExpression
- *
- * @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
- * @author <a href="mailto:seade@backstagetech.com.au">Scott Eade</a>
- * @version $Id: SqlExpressionTest.java 239636 2005-08-24 12:38:09Z henning $
- */
-public class SqlBuilderTest extends BaseTestCase
-{
-    /**
-     * Creates a new instance.
-     *
-     * @param name the name of the test case to run
-     */
-    public SqlBuilderTest(String name)
-    {
-        super(name);
-    }
-
-    public void testExtractTableName() throws TorqueException
-    {
-        // standard cases with / without schema
-        String columnName = "table.column";
-        String tableName = SQLBuilder.getTableName(columnName, null);
-        assertEquals("table", tableName);
-
-        columnName = "schema.table.column";
-        tableName = SQLBuilder.getTableName(columnName, null);
-        assertEquals("schema.table", tableName);
-
-        // functions
-        columnName = "function(table.column)";
-        tableName = SQLBuilder.getTableName(columnName, null);
-        assertEquals("table", tableName);
-
-        columnName = "function(1,table.column,2)";
-        tableName = SQLBuilder.getTableName(columnName, null);
-        assertEquals("table", tableName);
-
-        // comparisons
-        columnName = "table.column < 10";
-        tableName = SQLBuilder.getTableName(columnName, null);
-        assertEquals("table", tableName);
-
-        columnName = "table.column<10";
-        tableName = SQLBuilder.getTableName(columnName, null);
-        assertEquals("table", tableName);
-
-        columnName = "10 > table.column";
-        tableName = SQLBuilder.getTableName(columnName, null);
-        assertEquals("table", tableName);
-
-        columnName = "10>table.column";
-        tableName = SQLBuilder.getTableName(columnName, null);
-        assertEquals("table", tableName);
-
-        columnName = "10>table.column";
-        tableName = SQLBuilder.getTableName(columnName, null);
-        assertEquals("table", tableName);
-
-        // in clause
-        columnName = "table.column in (1,2,3)";
-        tableName = SQLBuilder.getTableName(columnName, null);
-        assertEquals("table", tableName);
-
-        // wildcard
-        columnName = "*";
-        tableName = SQLBuilder.getTableName(columnName, null);
-        assertEquals(null, tableName);
-
-        // function with wildcard
-        columnName = "count(*)";
-        tableName = SQLBuilder.getTableName(columnName, null);
-        assertEquals(null, tableName);
- 
-        // empty String and null
-        columnName = "";
-        try
-        {
-            tableName = SQLBuilder.getTableName(columnName, null);
-            fail("getTableName() should fail for empty column name");
-        }
-        catch (TorqueException e)
-        {
-        }
-
-        columnName = null;
-        try
-        {
-            tableName = SQLBuilder.getTableName(columnName, null);
-            fail("getTableName() should fail for null as column name");
-        }
-        catch (TorqueException e)
-        {
-        }
-        
-        // failure: no dot or wildcard
-        columnName = "column";
-        try
-        {
-            tableName = SQLBuilder.getTableName(columnName, null);
-            fail("getTableName() should fail for column name "
-                    + "without a dot or wildcard");
-        }
-        catch (TorqueException e)
-        {
-        }
-        
-    }
-}
+package org.apache.torque.util;
+
+/*
+ * 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.
+ */
+
+import org.apache.torque.BaseTestCase;
+import org.apache.torque.TorqueException;
+
+/**
+ * Tests for SqlExpression
+ *
+ * @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
+ * @author <a href="mailto:seade@backstagetech.com.au">Scott Eade</a>
+ * @version $Id: SqlExpressionTest.java 239636 2005-08-24 12:38:09Z henning $
+ */
+public class SqlBuilderTest extends BaseTestCase
+{
+    /**
+     * Creates a new instance.
+     *
+     * @param name the name of the test case to run
+     */
+    public SqlBuilderTest(String name)
+    {
+        super(name);
+    }
+
+    public void testExtractTableName() throws TorqueException
+    {
+        // standard cases with / without schema
+        String columnName = "table.column";
+        String tableName = SQLBuilder.getTableName(columnName, null);
+        assertEquals("table", tableName);
+
+        columnName = "schema.table.column";
+        tableName = SQLBuilder.getTableName(columnName, null);
+        assertEquals("schema.table", tableName);
+
+        // functions
+        columnName = "function(table.column)";
+        tableName = SQLBuilder.getTableName(columnName, null);
+        assertEquals("table", tableName);
+
+        columnName = "function(1,table.column,2)";
+        tableName = SQLBuilder.getTableName(columnName, null);
+        assertEquals("table", tableName);
+
+        // comparisons
+        columnName = "table.column < 10";
+        tableName = SQLBuilder.getTableName(columnName, null);
+        assertEquals("table", tableName);
+
+        columnName = "table.column<10";
+        tableName = SQLBuilder.getTableName(columnName, null);
+        assertEquals("table", tableName);
+
+        columnName = "10 > table.column";
+        tableName = SQLBuilder.getTableName(columnName, null);
+        assertEquals("table", tableName);
+
+        columnName = "10>table.column";
+        tableName = SQLBuilder.getTableName(columnName, null);
+        assertEquals("table", tableName);
+
+        columnName = "10>table.column";
+        tableName = SQLBuilder.getTableName(columnName, null);
+        assertEquals("table", tableName);
+
+        // in clause
+        columnName = "table.column in (1,2,3)";
+        tableName = SQLBuilder.getTableName(columnName, null);
+        assertEquals("table", tableName);
+
+        // wildcard
+        columnName = "*";
+        tableName = SQLBuilder.getTableName(columnName, null);
+        assertEquals(null, tableName);
+
+        // function with wildcard
+        columnName = "count(*)";
+        tableName = SQLBuilder.getTableName(columnName, null);
+        assertEquals(null, tableName);
+
+        // empty String and null
+        columnName = "";
+        try
+        {
+            tableName = SQLBuilder.getTableName(columnName, null);
+            fail("getTableName() should fail for empty column name");
+        }
+        catch (TorqueException e)
+        {
+        }
+
+        columnName = null;
+        try
+        {
+            tableName = SQLBuilder.getTableName(columnName, null);
+            fail("getTableName() should fail for null as column name");
+        }
+        catch (TorqueException e)
+        {
+        }
+
+        // failure: no dot or wildcard
+        columnName = "column";
+        try
+        {
+            tableName = SQLBuilder.getTableName(columnName, null);
+            fail("getTableName() should fail for column name "
+                    + "without a dot or wildcard");
+        }
+        catch (TorqueException e)
+        {
+        }
+
+    }
+}

Modified: db/torque/runtime/trunk/src/test/org/apache/torque/util/SqlExpressionTest.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/test/org/apache/torque/util/SqlExpressionTest.java?view=diff&rev=473821&r1=473820&r2=473821
==============================================================================
--- db/torque/runtime/trunk/src/test/org/apache/torque/util/SqlExpressionTest.java (original)
+++ db/torque/runtime/trunk/src/test/org/apache/torque/util/SqlExpressionTest.java Sat Nov 11 14:37:25 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.util;
 
 /*
- * 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.
  */
 
 import java.lang.reflect.Array;
@@ -123,7 +126,7 @@
         String result = SqlExpression.buildLike(
                 "COL", "fre%", SqlEnum.LIKE, false, db);
         assertEquals("COL LIKE fre%", result);
-        
+
         result = SqlExpression.buildLike(
                 "COL", "50\\\\%", SqlEnum.LIKE, false, db);
         assertEquals("COL = 50%", result);

Modified: db/torque/runtime/trunk/src/test/org/apache/torque/util/UniqueListTest.java
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/test/org/apache/torque/util/UniqueListTest.java?view=diff&rev=473821&r1=473820&r2=473821
==============================================================================
--- db/torque/runtime/trunk/src/test/org/apache/torque/util/UniqueListTest.java (original)
+++ db/torque/runtime/trunk/src/test/org/apache/torque/util/UniqueListTest.java Sat Nov 11 14:37:25 2006
@@ -1,19 +1,22 @@
 package org.apache.torque.util;
 
 /*
- * 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.
  */
 
 import junit.framework.TestCase;

Modified: db/torque/runtime/trunk/src/test/run.sh
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/src/test/run.sh?view=diff&rev=473821&r1=473820&r2=473821
==============================================================================
--- db/torque/runtime/trunk/src/test/run.sh (original)
+++ db/torque/runtime/trunk/src/test/run.sh Sat Nov 11 14:37:25 2006
@@ -1,17 +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.
-# !/bin/sh
+# 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.
 
 SCARAB=../../../scarab
 # SCARAB=.

Modified: db/torque/runtime/trunk/xdocs/index.xml
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/xdocs/index.xml?view=diff&rev=473821&r1=473820&r2=473821
==============================================================================
--- db/torque/runtime/trunk/xdocs/index.xml (original)
+++ db/torque/runtime/trunk/xdocs/index.xml Sat Nov 11 14:37:25 2006
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <!--
- 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.
 -->
 
 <document>

Modified: db/torque/runtime/trunk/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/xdocs/navigation.xml?view=diff&rev=473821&r1=473820&r2=473821
==============================================================================
--- db/torque/runtime/trunk/xdocs/navigation.xml (original)
+++ db/torque/runtime/trunk/xdocs/navigation.xml Sat Nov 11 14:37:25 2006
@@ -1,19 +1,22 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- 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.
--->
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ 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.
+-->
 <!DOCTYPE project [
 <!ENTITY torque-nav SYSTEM "../../torque-nav-inc.xml">
 <!ENTITY project-nav SYSTEM "../../project-nav-inc.xml">
@@ -27,59 +30,59 @@
 
 	&torque-nav;
 	
-    <menu name="Module Documentation">
-      <item name="Overview"              href="../../../documentation/index.html"/>
-      <item name="Torque 3.2"            href="../../../documentation/torque-3.2.html">
-        <item name="Generator"           href="../generator/index.html" collapse="true">
-          <item name="dummy"/>
-        </item>
-        <item name="Maven Plugin"        href="../maven-plugin/index.html" collapse="true">
-          <item name="dummy"/>
-        </item>
-        <item name="Runtime"             href="/index.html" collapse="true">
-          <item name="Reference"         href="/reference/index.html" collapse="true">
-            <item name="Initialisation"  href="/reference/initialisation-configuration.html"/>
-            <item name="Reading from the DB" href="/reference/read-from-db.html"/>
-            <item name="Writing to the DB" href="/reference/write-to-db.html"/>
-            <item name="Extending classes" href="/reference/extend-classes.html"/>
-            <item name="Connections"     href="/reference/connections-transactions.html"/>
-            <item name="Managers and Cache" href="/reference/managers-cache.html"/>
-            <item name="Beans"           href="/reference/beans.html"/>
-            <item name="Relevant classes" href="/reference/relevant-classes.html"/>
-            <item name="Supporting a new DB" href="/reference/new-database-support.html"/>
-          </item>
-          <item name="Dependencies"      href="/dependencies.html"/>
-          <item name="Project Reports"   href="/maven-reports.html" collapse="true">
-            <item name="Metrics"         href="/jdepend-report.html"/>
-            <item name="Checkstyle"      href="/checkstyle-report.html"/>
-            <item name="Change Log"      href="/changelog-report.html"/>
-            <item name="File Activity"   href="/file-activity-report.html"/>
-            <item name="Developer Activity" href="/developer-activity-report.html"/>
-            <item name="JavaDocs"        href="/apidocs/index.html" target="_blank" />
-            <item name="JavaDoc Report"  href="/javadoc.html"/>
-            <item name="JavaDoc Warnings Report" href="/javadoc-warnings-report.html"/>
-            <item name="Source Xref"     href="/xref/index.html" target="_blank" />
-            <item name="Test Xref"       href="/xref-test/index.html" target="_blank" />
-            <item name="Unit Tests"      href="/junit-report.html"/>
-            <item name="Project License" href="/license.html"/>
-            <item name="Task List"       href="/task-list.html"/>
-            <item name="PMD Report"      href="/pmd-report.html"/>
-            <item name="Simian Report"   href="/simian-report.html"/>
-            <item name="JCoverage"       href="/jcoverage/index.html" target="_blank"/>
-            <item name="FindBugs Report" href="/findbugs-report.html"/>
-            <item name="Link Check Report" href="/linkcheck.html"/>
-          </item>
-        </item>
-        <item name="Tutorial"            href="../tutorial/index.html" collapse="true">
-          <item name="dummy"/>
-        </item>
-      </item>
-      <item name="Previous releases"     href="../../../documentation/previous-releases.html" collapse="true">
-        <item name="dummy"/>
-     </item>
-    </menu>
-
-    &project-nav;
-
-  </body>
-</project>
\ No newline at end of file
+    <menu name="Module Documentation">
+      <item name="Overview"              href="../../../documentation/index.html"/>
+      <item name="Torque 3.2"            href="../../../documentation/torque-3.2.html">
+        <item name="Generator"           href="../generator/index.html" collapse="true">
+          <item name="dummy"/>
+        </item>
+        <item name="Maven Plugin"        href="../maven-plugin/index.html" collapse="true">
+          <item name="dummy"/>
+        </item>
+        <item name="Runtime"             href="/index.html" collapse="true">
+          <item name="Reference"         href="/reference/index.html" collapse="true">
+            <item name="Initialisation"  href="/reference/initialisation-configuration.html"/>
+            <item name="Reading from the DB" href="/reference/read-from-db.html"/>
+            <item name="Writing to the DB" href="/reference/write-to-db.html"/>
+            <item name="Extending classes" href="/reference/extend-classes.html"/>
+            <item name="Connections"     href="/reference/connections-transactions.html"/>
+            <item name="Managers and Cache" href="/reference/managers-cache.html"/>
+            <item name="Beans"           href="/reference/beans.html"/>
+            <item name="Relevant classes" href="/reference/relevant-classes.html"/>
+            <item name="Supporting a new DB" href="/reference/new-database-support.html"/>
+          </item>
+          <item name="Dependencies"      href="/dependencies.html"/>
+          <item name="Project Reports"   href="/maven-reports.html" collapse="true">
+            <item name="Metrics"         href="/jdepend-report.html"/>
+            <item name="Checkstyle"      href="/checkstyle-report.html"/>
+            <item name="Change Log"      href="/changelog-report.html"/>
+            <item name="File Activity"   href="/file-activity-report.html"/>
+            <item name="Developer Activity" href="/developer-activity-report.html"/>
+            <item name="JavaDocs"        href="/apidocs/index.html" target="_blank" />
+            <item name="JavaDoc Report"  href="/javadoc.html"/>
+            <item name="JavaDoc Warnings Report" href="/javadoc-warnings-report.html"/>
+            <item name="Source Xref"     href="/xref/index.html" target="_blank" />
+            <item name="Test Xref"       href="/xref-test/index.html" target="_blank" />
+            <item name="Unit Tests"      href="/junit-report.html"/>
+            <item name="Project License" href="/license.html"/>
+            <item name="Task List"       href="/task-list.html"/>
+            <item name="PMD Report"      href="/pmd-report.html"/>
+            <item name="Simian Report"   href="/simian-report.html"/>
+            <item name="JCoverage"       href="/jcoverage/index.html" target="_blank"/>
+            <item name="FindBugs Report" href="/findbugs-report.html"/>
+            <item name="Link Check Report" href="/linkcheck.html"/>
+          </item>
+        </item>
+        <item name="Tutorial"            href="../tutorial/index.html" collapse="true">
+          <item name="dummy"/>
+        </item>
+      </item>
+      <item name="Previous releases"     href="../../../documentation/previous-releases.html" collapse="true">
+        <item name="dummy"/>
+     </item>
+    </menu>
+
+    &project-nav;
+
+  </body>
+</project>

Modified: db/torque/runtime/trunk/xdocs/reference/beans.xml
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/xdocs/reference/beans.xml?view=diff&rev=473821&r1=473820&r2=473821
==============================================================================
--- db/torque/runtime/trunk/xdocs/reference/beans.xml (original)
+++ db/torque/runtime/trunk/xdocs/reference/beans.xml Sat Nov 11 14:37:25 2006
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <!--
- 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.
 -->
 
 <document>

Modified: db/torque/runtime/trunk/xdocs/reference/connections-transactions.xml
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/xdocs/reference/connections-transactions.xml?view=diff&rev=473821&r1=473820&r2=473821
==============================================================================
--- db/torque/runtime/trunk/xdocs/reference/connections-transactions.xml (original)
+++ db/torque/runtime/trunk/xdocs/reference/connections-transactions.xml Sat Nov 11 14:37:25 2006
@@ -1,179 +1,182 @@
-<?xml version="1.0"?>
-<!--
- 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.
--->
-
-<document>
- <properties>
-   <title>Torque Runtime Reference - Reading from the database</title>
-   <author email="fischer@seitenbau.de">Thomas Fischer</author>
- </properties>
-
- <body>
-
-  <section name="Connection and transaction handling">
-    <p>
-      To read data from  or write data to the database, a connection to the
-      database is required. To be able to connect to a database,
-      you need to add the relevant information to Torque's configuration, 
-      see the section about 
-      <a href="initialisation-configuration.html">initialisation and configuration</a>.
-    </p>
-    
-    <p>
-      Connection and Transaction handling cannot be treated separately
-      from each other. Some databases, e.g. oracle, may automatically start
-      a transaction on an sql command, so you might not be able to
-      get a database connection without a transaction. Then, transactions live
-      in database connections, so it is not possible to get a transaction
-      without a database connection.
-    </p>
-    
-    <p>
-      There are two ways of connection and transaction handling:
-      <ul>
-        <li>Let Torque take care of it.</li>
-        <li>Do it yourself.</li>
-      </ul>
-      Unless you know what you are doing, the first approach is recommended.
-      If you choose the second approach and write incorrect code, this may lead
-      to connection leaks and/or blocked connections.  You have been warned.
-    </p>
-  </section>
-
-  <section name="Torque's connection and transaction handling">
-
-    <p>
-      When you use Torque, you need not bother about connections and 
-      transactions.  The only thing you have to do is to configure Torque 
-      correctly, then Torque is able to create a database connection whenever
-      it needs one.  For example, if you call the save() method of some object,
-      Torque retrieves a connection from its internal connection pool, 
-      uses it to save the connection, and returns it to the pool. 
-    </p>
-    
-    <p>
-      If the database supports transactions and autocommit is turned off,
-      one Transaction is used for every method which needs a database 
-      connection. See the source code for details.
-    </p>
-
-  </section>
-  
-  <section name="Handle connections and transactions yourself">
-
-    <p>
-      If you want to manipulate the database in some way which is not
-      incorporated into Torque, or want to execute several commands in one
-      transaction, you need to handle connections and transaction 
-      yourself.  This is potentially dangerous, as incorrect handling of
-      connections and transaction may lead to connection leaks 
-      (resulting in errors because no more connections can be opened to the 
-      database) or blocked connections (because some transaction has been 
-      left open).  Typically, these conditions appear if a database operation
-      fails, because error handling is insufficient.
-    </p>
-    
-    <p>
-      The following code is recommended if you need to handle connections 
-      and/or transactions yourself:
-    </p>
-
-<source>
-Connection connection = null;
-try
-{
-    connection = Transaction.begin();
-
-    // do something with connection, e.g.
-    // someObject.save(connection);
-
-    Transaction.commit(connection);
-    connection = null;
-}
-finally
-{
-    if (connection != null)
-    {
-        Transaction.safeRollback(connection);
-    }
-}
-</source>
-
-    <p>
-      This code ensures that if any error occurs within the try block,
-      an attempt is made to rollback the transaction and return it into the
-      pool.
-    </p>
-
-    <p>
-      If the database supports transactions and autocomit is turned off,
-      all database operations are executed in a single transaction. 
-      This has the following effect: For example, you execute two saves in the
-      try block, and the second save fails. The first save operation will be
-      rolled back, i.e. the database reverts the changes made by the first save.
-      If you do not like this behaviour, the safe way is to wrap everything in 
-      its own try ... finally block.
-      The alternative is to use
-      <code>Transaction.beginOptional(Torque.getDefaultDB(), false)</code>
-      instead of <code>Transaction.begin()</code> and make sure your 
-      connection pool returns connections in autocommit mode. This might
-      not work with CLOB and BLOB data fields, however.
-    </p>
-    
-    <p>
-      If you use more than one database, you might want to use 
-      <code>Transaction.begin(String databaseName)</code> instead of
-      <code>Transaction.begin()</code>.
-    </p>
-    
-    <p>
-      The following code is <em>NOT</em> recommended, as some databases
-      (like Oracle) start transactions automatically, and some pools 
-      (like dbcp, Torque's default pool) do not rollback automatically if
-      a connection is returned to the pool.  So under certain conditions,
-      you might have leftovers from the last transaction in a "fresh" 
-      connection from the pool, or, even worse, the connection blocks 
-      because the pool attempts to set some transaction property which 
-      needs to be set as first command in a transaction.
-    </p>
-
-<source>
-Connection connection = null;
-try
-{
-    // Bad ! No defined transaction state afterwards !
-    connection = Torque.getConnection();
-
-    // do something with connection, e.g.
-    // someObject.save(connection);
-
-    Transaction.commit(connection);
-    connection = null;
-}
-finally
-{
-    if (connection != null)
-    {
-        // Bad ! No rollback or commit !
-        Torque.closeConnection(connection);
-    }
-}
-</source>
-
-  </section>
-
- </body>
-</document>
\ No newline at end of file
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+
+<document>
+ <properties>
+   <title>Torque Runtime Reference - Reading from the database</title>
+   <author email="fischer@seitenbau.de">Thomas Fischer</author>
+ </properties>
+
+ <body>
+
+  <section name="Connection and transaction handling">
+    <p>
+      To read data from  or write data to the database, a connection to the
+      database is required. To be able to connect to a database,
+      you need to add the relevant information to Torque's configuration, 
+      see the section about 
+      <a href="initialisation-configuration.html">initialisation and configuration</a>.
+    </p>
+    
+    <p>
+      Connection and Transaction handling cannot be treated separately
+      from each other. Some databases, e.g. oracle, may automatically start
+      a transaction on an sql command, so you might not be able to
+      get a database connection without a transaction. Then, transactions live
+      in database connections, so it is not possible to get a transaction
+      without a database connection.
+    </p>
+    
+    <p>
+      There are two ways of connection and transaction handling:
+      <ul>
+        <li>Let Torque take care of it.</li>
+        <li>Do it yourself.</li>
+      </ul>
+      Unless you know what you are doing, the first approach is recommended.
+      If you choose the second approach and write incorrect code, this may lead
+      to connection leaks and/or blocked connections.  You have been warned.
+    </p>
+  </section>
+
+  <section name="Torque's connection and transaction handling">
+
+    <p>
+      When you use Torque, you need not bother about connections and 
+      transactions.  The only thing you have to do is to configure Torque 
+      correctly, then Torque is able to create a database connection whenever
+      it needs one.  For example, if you call the save() method of some object,
+      Torque retrieves a connection from its internal connection pool, 
+      uses it to save the connection, and returns it to the pool. 
+    </p>
+    
+    <p>
+      If the database supports transactions and autocommit is turned off,
+      one Transaction is used for every method which needs a database 
+      connection. See the source code for details.
+    </p>
+
+  </section>
+  
+  <section name="Handle connections and transactions yourself">
+
+    <p>
+      If you want to manipulate the database in some way which is not
+      incorporated into Torque, or want to execute several commands in one
+      transaction, you need to handle connections and transaction 
+      yourself.  This is potentially dangerous, as incorrect handling of
+      connections and transaction may lead to connection leaks 
+      (resulting in errors because no more connections can be opened to the 
+      database) or blocked connections (because some transaction has been 
+      left open).  Typically, these conditions appear if a database operation
+      fails, because error handling is insufficient.
+    </p>
+    
+    <p>
+      The following code is recommended if you need to handle connections 
+      and/or transactions yourself:
+    </p>
+
+<source>
+Connection connection = null;
+try
+{
+    connection = Transaction.begin();
+
+    // do something with connection, e.g.
+    // someObject.save(connection);
+
+    Transaction.commit(connection);
+    connection = null;
+}
+finally
+{
+    if (connection != null)
+    {
+        Transaction.safeRollback(connection);
+    }
+}
+</source>
+
+    <p>
+      This code ensures that if any error occurs within the try block,
+      an attempt is made to rollback the transaction and return it into the
+      pool.
+    </p>
+
+    <p>
+      If the database supports transactions and autocomit is turned off,
+      all database operations are executed in a single transaction. 
+      This has the following effect: For example, you execute two saves in the
+      try block, and the second save fails. The first save operation will be
+      rolled back, i.e. the database reverts the changes made by the first save.
+      If you do not like this behaviour, the safe way is to wrap everything in 
+      its own try ... finally block.
+      The alternative is to use
+      <code>Transaction.beginOptional(Torque.getDefaultDB(), false)</code>
+      instead of <code>Transaction.begin()</code> and make sure your 
+      connection pool returns connections in autocommit mode. This might
+      not work with CLOB and BLOB data fields, however.
+    </p>
+    
+    <p>
+      If you use more than one database, you might want to use 
+      <code>Transaction.begin(String databaseName)</code> instead of
+      <code>Transaction.begin()</code>.
+    </p>
+    
+    <p>
+      The following code is <em>NOT</em> recommended, as some databases
+      (like Oracle) start transactions automatically, and some pools 
+      (like dbcp, Torque's default pool) do not rollback automatically if
+      a connection is returned to the pool.  So under certain conditions,
+      you might have leftovers from the last transaction in a "fresh" 
+      connection from the pool, or, even worse, the connection blocks 
+      because the pool attempts to set some transaction property which 
+      needs to be set as first command in a transaction.
+    </p>
+
+<source>
+Connection connection = null;
+try
+{
+    // Bad ! No defined transaction state afterwards !
+    connection = Torque.getConnection();
+
+    // do something with connection, e.g.
+    // someObject.save(connection);
+
+    Transaction.commit(connection);
+    connection = null;
+}
+finally
+{
+    if (connection != null)
+    {
+        // Bad ! No rollback or commit !
+        Torque.closeConnection(connection);
+    }
+}
+</source>
+
+  </section>
+
+ </body>
+</document>

Modified: db/torque/runtime/trunk/xdocs/reference/extend-classes.xml
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/xdocs/reference/extend-classes.xml?view=diff&rev=473821&r1=473820&r2=473821
==============================================================================
--- db/torque/runtime/trunk/xdocs/reference/extend-classes.xml (original)
+++ db/torque/runtime/trunk/xdocs/reference/extend-classes.xml Sat Nov 11 14:37:25 2006
@@ -1,77 +1,80 @@
-<?xml version="1.0"?>
-<!--
- 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.
--->
-
-<document>
-
- <properties>
-    <title>Torque Runtime Reference - Extending the Base Classes</title>
-    <author email="fischer@seitenbau.de">Thomas Fischer</author>
-    <author email="leon@opticode.co.za">Leon Messerschmidt</author>
-    <author email="jvanzyl@periapt.com">Jason van Zyl</author>
-    <author email="seade@backstagetech.com.au">Scott Eade</author>
- </properties>
- 
- <body>
-  <section name="Extending the Base Classes">
-    <p>
-      Much of the power of Torque stems from the fact that you can easily add to
-      and change the behaviour of the generated Peer and Data Object classes 
-      by adding or overriding methods. To keep your changes apart from the 
-      autogenerated code, Torque provides two Peer classes and two
-      Data Object classes per table:  The Base&lt;table-name&gt;Peer and 
-      Base&lt;table-name&gt; classes are overwritten each time you regenerate
-      the classes from the schema and contain all functionality provided by 
-      Torque.  
-      The &lt;table-name&gt;Peer and &lt;table-name&gt; classes inherit from their 
-      respective Base Classes, but are empty initially.  They are not overwritten
-      if you regenerate the classes from the schema.  All code which you add 
-      to the data model should go into the &lt;table-name&gt;Peer and 
-      &lt;table-name&gt; classes.
-    </p>
-  </section>
-  
-  
-  <section name="Adding Methods to Peers">
- 
-    <p>
-      Adding methods to Peers will be one of the most common things you will do
-      while using Torque. 
-      For example, if you want to retrieve objects from the database without
-      creating a Criteria objects, you would typically add a corresponding 
-      method to the Peer class.
-    </p>
-  
-    <p>
-      As an example, consider the bookstore example from the Tutorial. 
-      If you often retrieve Books by their ISBN number, you would add the 
-      following method to the BookPeer class:
-    </p>
- 
-<source><![CDATA[
-public List doSelectByISBN(String isbn)
-{
-    Criteria crit = new Criteria();
-    crit.add(BookPeer.ISBN, isbn);
-    List books = BookPeer.doSelect(crit);
-    return books;
-}
-]]></source>
-    
-  </section>
-  
- </body>
-</document>
\ No newline at end of file
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+
+<document>
+
+ <properties>
+    <title>Torque Runtime Reference - Extending the Base Classes</title>
+    <author email="fischer@seitenbau.de">Thomas Fischer</author>
+    <author email="leon@opticode.co.za">Leon Messerschmidt</author>
+    <author email="jvanzyl@periapt.com">Jason van Zyl</author>
+    <author email="seade@backstagetech.com.au">Scott Eade</author>
+ </properties>
+ 
+ <body>
+  <section name="Extending the Base Classes">
+    <p>
+      Much of the power of Torque stems from the fact that you can easily add to
+      and change the behaviour of the generated Peer and Data Object classes 
+      by adding or overriding methods. To keep your changes apart from the 
+      autogenerated code, Torque provides two Peer classes and two
+      Data Object classes per table:  The Base&lt;table-name&gt;Peer and 
+      Base&lt;table-name&gt; classes are overwritten each time you regenerate
+      the classes from the schema and contain all functionality provided by 
+      Torque.  
+      The &lt;table-name&gt;Peer and &lt;table-name&gt; classes inherit from their 
+      respective Base Classes, but are empty initially.  They are not overwritten
+      if you regenerate the classes from the schema.  All code which you add 
+      to the data model should go into the &lt;table-name&gt;Peer and 
+      &lt;table-name&gt; classes.
+    </p>
+  </section>
+  
+  
+  <section name="Adding Methods to Peers">
+ 
+    <p>
+      Adding methods to Peers will be one of the most common things you will do
+      while using Torque. 
+      For example, if you want to retrieve objects from the database without
+      creating a Criteria objects, you would typically add a corresponding 
+      method to the Peer class.
+    </p>
+  
+    <p>
+      As an example, consider the bookstore example from the Tutorial. 
+      If you often retrieve Books by their ISBN number, you would add the 
+      following method to the BookPeer class:
+    </p>
+ 
+<source><![CDATA[
+public List doSelectByISBN(String isbn)
+{
+    Criteria crit = new Criteria();
+    crit.add(BookPeer.ISBN, isbn);
+    List books = BookPeer.doSelect(crit);
+    return books;
+}
+]]></source>
+    
+  </section>
+  
+ </body>
+</document>

Modified: db/torque/runtime/trunk/xdocs/reference/index.xml
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/xdocs/reference/index.xml?view=diff&rev=473821&r1=473820&r2=473821
==============================================================================
--- db/torque/runtime/trunk/xdocs/reference/index.xml (original)
+++ db/torque/runtime/trunk/xdocs/reference/index.xml Sat Nov 11 14:37:25 2006
@@ -1,54 +1,57 @@
-<?xml version="1.0"?>
-<!--
- 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.
--->
-
-<document>
-
- <properties>
-  <title>Torque Runtime Reference</title>
-  <author email="fischer@seitenbau.de">Thomas Fischer</author>
- </properties>
-
- <body>
- 
-  <section name="Contents">
-    
-    <p>
-     <br/>
-     <a href="initialisation-configuration.html">Initialisation and Configuration</a>
-     <br/><br/>
-     <a href="read-from-db.html">Reading from the database</a>
-     <br/><br/>
-     <a href="write-to-db.html">Writing to the database</a>
-     <br/><br/>
-     <a href="extend-classes.html">Extending the base classes</a>
-     <br/><br/>
-     <a href="connections-transactions.html">Connection and Transaction handling</a>
-     <br/><br/>
-     <a href="managers-cache.html">Managers and Caching</a>
-     <br/><br/>    
-     <a href="beans.html">Beans</a>
-     <br/><br/>
-     <a href="relevant-classes.html">Relevant classes</a>
-     <br/><br/>
-     <a href="new-database-support.html">Supporting a new Database</a>
-     <br/><br/>
-    </p>
- 
-  </section>
-
- </body>
-</document>
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+
+<document>
+
+ <properties>
+  <title>Torque Runtime Reference</title>
+  <author email="fischer@seitenbau.de">Thomas Fischer</author>
+ </properties>
+
+ <body>
+ 
+  <section name="Contents">
+    
+    <p>
+     <br/>
+     <a href="initialisation-configuration.html">Initialisation and Configuration</a>
+     <br/><br/>
+     <a href="read-from-db.html">Reading from the database</a>
+     <br/><br/>
+     <a href="write-to-db.html">Writing to the database</a>
+     <br/><br/>
+     <a href="extend-classes.html">Extending the base classes</a>
+     <br/><br/>
+     <a href="connections-transactions.html">Connection and Transaction handling</a>
+     <br/><br/>
+     <a href="managers-cache.html">Managers and Caching</a>
+     <br/><br/>    
+     <a href="beans.html">Beans</a>
+     <br/><br/>
+     <a href="relevant-classes.html">Relevant classes</a>
+     <br/><br/>
+     <a href="new-database-support.html">Supporting a new Database</a>
+     <br/><br/>
+    </p>
+ 
+  </section>
+
+ </body>
+</document>

Modified: db/torque/runtime/trunk/xdocs/reference/initialisation-configuration.xml
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/xdocs/reference/initialisation-configuration.xml?view=diff&rev=473821&r1=473820&r2=473821
==============================================================================
--- db/torque/runtime/trunk/xdocs/reference/initialisation-configuration.xml (original)
+++ db/torque/runtime/trunk/xdocs/reference/initialisation-configuration.xml Sat Nov 11 14:37:25 2006
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <!--
- 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.
 -->
 
 <document>

Modified: db/torque/runtime/trunk/xdocs/reference/managers-cache.xml
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/xdocs/reference/managers-cache.xml?view=diff&rev=473821&r1=473820&r2=473821
==============================================================================
--- db/torque/runtime/trunk/xdocs/reference/managers-cache.xml (original)
+++ db/torque/runtime/trunk/xdocs/reference/managers-cache.xml Sat Nov 11 14:37:25 2006
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <!--
- 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.
 -->
 
 <document>
@@ -297,4 +300,4 @@
   </section>
 
  </body>
-</document>
\ No newline at end of file
+</document>

Modified: db/torque/runtime/trunk/xdocs/reference/new-database-support.xml
URL: http://svn.apache.org/viewvc/db/torque/runtime/trunk/xdocs/reference/new-database-support.xml?view=diff&rev=473821&r1=473820&r2=473821
==============================================================================
--- db/torque/runtime/trunk/xdocs/reference/new-database-support.xml (original)
+++ db/torque/runtime/trunk/xdocs/reference/new-database-support.xml Sat Nov 11 14:37:25 2006
@@ -1,18 +1,21 @@
 <?xml version="1.0"?>
 <!--
- 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.
 -->
 
 <document>



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