changelog: merge of Torque_3_1_BRANCH with HEAD

[Thomas Fischer <Fi...@seitenbau.net>]

Hi,

I will commit the merge of the TORQUE_3_1_BRANCH with HEAD in few minutes.
I did/will do the following:

- Tagged current state of TORQUE_3_1_BRANCH as
TORQUE_3_1_BRANCH_BEFORE_MERGE
- Tagged current state of HEAD as TORQUE_HEAD_BEFORE_MERGE_OF_3_1_BRANCH
- Took the generator from HEAD and the runtime and maven plugin from the
3_1_Branch and merged them. I also took the few improvements in the
generator in the 3_1_Branch which are not in HEAD over to HEAD
(correctGetters and the Derby support plus small changes) over to HEAD. The
complete list of changes can be found below.
- Checked that the test cases and runtime tests work (I only checked
against Oracle 9.2). The runtime tests write a lot of warnings, but they
also did that before merging in HEAD.

PLEASE test the new cvs HEAD.

These are the things which I am not sure whether they are ok:
- run the runtime tests against other databases. Especially, I do not know whether postgresql and Derby support works as expected (in postgres, check
especially columns.vm and table.vm templates)
- check that removal of src/conf /database directory is ok
- replaced all occurences of version number 3.1.2 with 3.2
- the docs/release-changes.html page is not generated, no idea why. But it is also not generated in the 3_1_branch, nor does it appear in the
navigation there.


Changed files:
/////////////////////////////////////////////////////////////////////////////////
RUNTIME:
/////////////////////////////////////////////////////////////////////////////////

Note that I replaced all java files HEAD by their 3-1-version to keep a consistent version of the license header.
(only in the runtime !!!) Only files which have also other changes are mentioned here

root directory:
README.txt (replaced)
build.xml (reinserted)
maven.xml (taken bugfix and Goal dist:build-bin over from 3_1, but otherwise used the head version)
project-base.xml (merged manually, current version set to 3.2-dev)
project.xml (replaced: <id>-tags were replaced by <artifactId> and <groupId>)

notes directory:
PoolTest.java: (inserted)

profile directory:
henning.profile (inserted)

proposals directory:
proposals/henning/column-javaname: not replaced because the diff would not be valid anymore anyway
henning/idtable-peer.patch (replaced)
henning/skipidbroker: (inserted)

xdocs directory:
tutorial/step1 (replaced) (changes in mail archives address)
tutorial/step1 (replaced)(minimal changes)
changes.xml: (merged manually as far as they apply to the new version)
configuration-howto (merged manually)
criteria-howto (replaced)
maven.howto: not replaced despite small changes (difference in plugin-id)
navigation: (merged manually)
oracle-howto: not replaced as the changes mentioned in 3-1 were reverted
release-changes.xml (replaced) (changes are in changes.xml now)
schema-howto.xml (inserted)
status.xml (replaced)
user-guide not replaced despite small changes (difference in plugin-id)

src/conf directory:
database directory: was added in HEAD, left as it is
master/Torque.master: left as it is, though there are changes in 3_1.
Torque.properties: left as it is, though there are changes in 3_1.
roleConfiguration.xml: left as it is (newer in HEAD)

src/java/org/apache/torque
Torque (replaced)
TorqueInstance (replaced)

src/org/apache/torque/adapter
DBDerby (inserted)
DBFactory (replaced)
DBNone (replaced)
DBPostgres (replaced)

src/org/apache/torque/dsfactory
AbstractDataSourceFactory (replaced)
DataSourceFactory (replaced)
JndiDataSourceFactory (replaced)
PerUserDataSourceFactory (replaced)
SharedPoolDataSourceFactory (replaced)
TorqueDataSourceFactory (not included, was removed in HEAD)

src/org/apache/torque/manager
AbstractBaseManager (replaced)

src/org/apache/torque/oid
AutoIncrementIdGenerator (replaced)
IdBroker (replaced)
SequenceIdGenerator (replaced)

src/org/apache/torque/om
BaseObject (replaced)

src/org/apache/torque/pool
not inserted, was removed in head

src/org/apache/torque/util
BasePeer (replaced)
CountHelper (inserted)
Criteria (replaced)
JoinBuilder (inserted)
LimitHelper (inserted)
Query (replaced)
SqlBuilder (inserted)
SqlEnum (replaced)
VillageUtils (inserted)

src/rttest:
bookstore-schema.new not inserted because not used anywhere
bookstore-schema.xml (replaced except dtd)
ext-schema.xml (not replaced, only dtd changed in head)
extext-schema.xml (not replaced, only dtd changed in head)
id-table-schema.xml (not replaced, only dtd changed in head)
test-schema.xml (not replaced, only dtd changed in head)
org/apache/torque/engine/database/transform/SQLToAppDataTest left as it is, though there are changes in 3_1.
org/apache/torque/util/copyTest (replaced)
org/apache/torque/DataTest (replaced)
org/apache/torque/DocsTest (inserted)

src/test:
TurbineResources.properties (replaced)
org/apache/torque/om/ComboKeyTest (replaced)
org/apache/torque/om/util/CriteriaTest (replaced)
org/apache/torque/om/util/QueryTest (replaced)
rg/apache/torque/om/util/SqlExpressionTest (replaced)

/////////////////////////////////////////////////////////////////////////////////
GENERATOR: (directories relative to src/generator)
/////////////////////////////////////////////////////////////////////////////////

Root Directory:
build.xml (inserted)
maven.xml (replaced)
project.xml (replaced)

xdocs:
properties-reference.xml (replaced)

src/conf:
build-torque.xml (merged manually)

src/java/org/apache/torque/engine/database/model
Column (Merged the correctGetters from 3_1)
Table (Merged the correctGetters from 3_1)


src/templates/om
Control.vm: (merged manually)
Object.cm (merged manually)
ObjectWithManager (merged manually)
Peer.vm (replaced)

src/templates/sql/base/derby (inserted with files)

src/templates/sql/id-table:
idtable.derby (inserted)

src/templates/sql/load/derby (inserted with files)

src/test (left as it is)


/////////////////////////////////////////////////////////////////////////////////
MAVEN-PLUGIN (files relative to src/maven-plugin)
/////////////////////////////////////////////////////////////////////////////////

src/maven-plugin:
src/plugin-resources/templates/index.jelly (inserted)
xdocs/changes (replaced)
xdocs/index (replaced)
plugin.jelly (merged manually)
plugin.properties (replaced)
project.properties (replaced)
project.xml (merged manually)


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