Author: tfischer
Date: Sun Aug 21 07:23:11 2005
New Revision: 234209
URL: http://svn.apache.org/viewcvs?rev=234209&view=rev
Log:
- modified project structure of templates subproject
to have standard maven project layout:
all the templates are now in the src/templates directory.
- changed project.xml according to the restructuring
- changed project.properties and project.xml to extend project-base.xml in
the subdirectory common
Added:
db/torque/branches/svn-reorganisation-branch/templates/trunk/src/
db/torque/branches/svn-reorganisation-branch/templates/trunk/src/templates/
db/torque/branches/svn-reorganisation-branch/templates/trunk/src/templates/data/
- copied from r234194,
db/torque/branches/svn-reorganisation-branch/templates/trunk/data/
db/torque/branches/svn-reorganisation-branch/templates/trunk/src/templates/doc/
- copied from r234194,
db/torque/branches/svn-reorganisation-branch/templates/trunk/doc/
db/torque/branches/svn-reorganisation-branch/templates/trunk/src/templates/ojb/
- copied from r234194,
db/torque/branches/svn-reorganisation-branch/templates/trunk/ojb/
db/torque/branches/svn-reorganisation-branch/templates/trunk/src/templates/om/
- copied from r234194,
db/torque/branches/svn-reorganisation-branch/templates/trunk/om/
db/torque/branches/svn-reorganisation-branch/templates/trunk/src/templates/sql/
- copied from r234194,
db/torque/branches/svn-reorganisation-branch/templates/trunk/sql/
Removed:
db/torque/branches/svn-reorganisation-branch/templates/trunk/data/
db/torque/branches/svn-reorganisation-branch/templates/trunk/doc/
db/torque/branches/svn-reorganisation-branch/templates/trunk/ojb/
db/torque/branches/svn-reorganisation-branch/templates/trunk/om/
db/torque/branches/svn-reorganisation-branch/templates/trunk/sql/
Modified:
db/torque/branches/svn-reorganisation-branch/templates/trunk/project.properties
db/torque/branches/svn-reorganisation-branch/templates/trunk/project.xml
Modified:
db/torque/branches/svn-reorganisation-branch/templates/trunk/project.properties
URL:
http://svn.apache.org/viewcvs/db/torque/branches/svn-reorganisation-branch/templates/trunk/project.properties?rev=234209&r1=234208&r2=234209&view=diff
==============================================================================
---
db/torque/branches/svn-reorganisation-branch/templates/trunk/project.properties
(original)
+++
db/torque/branches/svn-reorganisation-branch/templates/trunk/project.properties
Sun Aug 21 07:23:11 2005
@@ -7,19 +7,6 @@
# to do site or installation specific changes to the project build.
# -------------------------------------------------------------------
-# -------------------------------------------------------------------
-# Workaround to allow building from the source distribution.
-# In cvs, the extends path is ../../project-base.xml,
-# whereas in the source distribution, the extends path is
-# project-base.xml
-# The property in this file controls the path for the cvs version.
-# The property can be removed as soon as maven distributes a
-# project.xml where the <extends> is already resolved.
-# Outside building from the source distribution, this property has
-# no effect.
-# -------------------------------------------------------------------
-torque.project.base.path = ../../../../project-base.xml
-
#========================================================================
#
# Maven building and deploy. These settings are for deployment to
www.apache.org.
Modified:
db/torque/branches/svn-reorganisation-branch/templates/trunk/project.xml
URL:
http://svn.apache.org/viewcvs/db/torque/branches/svn-reorganisation-branch/templates/trunk/project.xml?rev=234209&r1=234208&r2=234209&view=diff
==============================================================================
--- db/torque/branches/svn-reorganisation-branch/templates/trunk/project.xml
(original)
+++ db/torque/branches/svn-reorganisation-branch/templates/trunk/project.xml
Sun Aug 21 07:23:11 2005
@@ -18,7 +18,7 @@
-->
<project>
- <extend>${torque.project.base.path}</extend>
+ <extend>common/project-base.xml</extend>
<pomVersion>3</pomVersion>
<id>torque-gen-templates</id>
<groupId>torque</groupId>
@@ -42,13 +42,9 @@
<resources>
<resource>
<targetPath></targetPath>
- <directory></directory>
+ <directory>src/templates</directory>
<includes>
- <include>data/**/*</include>
- <include>doc/**/*</include>
- <include>ojb/**/*</include>
- <include>om/**/*</include>
- <include>sql/**/*</include>
+ <include>**/*</include>
</includes>
</resource>
</resources>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
