Return-Path: 
 <torque-dev-return-3184-apmail-db-torque-dev-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-torque-dev-archive@db.apache.org
Received: (qmail 88304 invoked by uid 500); 9 Jul 2003 12:49:46 -0000
Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:torque-dev-unsubscribe@db.apache.org>
List-Subscribe: <mailto:torque-dev-subscribe@db.apache.org>
List-Help: <mailto:torque-dev-help@db.apache.org>
List-Post: <mailto:torque-dev@db.apache.org>
List-Id: "Turbine Torque Developers List" <torque-dev.db.apache.org>
Reply-To: "Turbine Torque Developers List" <torque-dev@db.apache.org>
Delivered-To: mailing list torque-dev@db.apache.org
Received: (qmail 88286 invoked from network); 9 Jul 2003 12:49:45 -0000
Received: from babsi.intermeta.de (HELO mail.intermeta.de) (212.34.181.3)
  by daedalus.apache.org with SMTP; 9 Jul 2003 12:49:45 -0000
Received: from forge.intermeta.de (forge.intermeta.de [192.168.2.4])
	(authenticated bits=0)
	by mail.intermeta.de (8.12.9/8.12.9) with ESMTP id h69Cng8V029188
	(version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NO);
	Wed, 9 Jul 2003 14:49:43 +0200
Subject: Patch for Maven Torque Plugin
From: Henning Schmiedehausen <hps@intermeta.de>
To: dev@maven.apache.org
Cc: torque-dev@db.apache.org
Content-Type: multipart/mixed; boundary="=-xJd/I3V6T/lp1jvLh++f"
Organization: INTERMETA - Gesellschaft für Mehrwertdienste mbH
Message-Id: <1057754982.15342.94.camel@forge.intermeta.de>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.2.4 
Date: 09 Jul 2003 14:49:42 +0200
X-Spam-Score: -0.5 () PATCH_UNIFIED_DIFF
X-Scanned-By: MIMEDefang 2.33 (www . roaringpenguin . com / mimedefang)
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

--=-xJd/I3V6T/lp1jvLh++f
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hi,

to whom it may concern:

property names in maven (at least up to b9, don't know about b10) must
not contain "-". The torque plugin unfortunately contains two of these
which are promptly interpreted by jelly as xxxx.foo - bar.yyy instead
of xxxx.foo-bar.yyy

Please apply the attached patch to the torque plugin, which fixes this.

	Regards
		Henning


-- 
Dipl.-Inf. (Univ.) Henning P. Schmiedehausen          INTERMETA GmbH
hps@intermeta.de        +49 9131 50 654 0   http://www.intermeta.de/

Java, perl, Solaris, Linux, xSP Consulting, Web Services 
freelance consultant -- Jakarta Turbine Development  -- hero for hire

--- Quote of the week: "It is pointless to tell people anything when
you know that they won't process the message." --- Jonathan Revusky

--=-xJd/I3V6T/lp1jvLh++f
Content-Disposition: attachment; filename=torque-maven.patch
Content-Type: text/x-patch; name=torque-maven.patch; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit

Index: plugin.jelly
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/torque/plugin.jelly,v
retrieving revision 1.6
diff -u -b -r1.6 plugin.jelly
--- plugin.jelly	22 May 2003 04:59:36 -0000	1.6
+++ plugin.jelly	9 Jul 2003 12:49:27 -0000
@@ -354,8 +354,8 @@
           templatePath="${torque.templatePath}"
           useClasspath="${torque.useClasspath}">
           <fileset dir="${torque.schema.dir}"
-            includes="${torque.schema.create-db.includes}"
-            excludes="${torque.schema.create-db.excludes}"
+            includes="${torque.schema.createdb.includes}"
+            excludes="${torque.schema.createdb.excludes}"
           />
         </torque-data-model>
 
@@ -471,8 +471,8 @@
       templatePath="${torque.templatePath}"
       useClasspath="${torque.useClasspath}">
       <fileset dir="${torque.schema.dir}"
-        includes="${torque.schema.init-sql.includes}"
-        excludes="${torque.schema.init-sql.excludes}"
+        includes="${torque.schema.initsql.includes}"
+        excludes="${torque.schema.initsql.excludes}"
       />
     </torque-sql>
 
Index: plugin.properties
===================================================================
RCS file: /home/cvspublic/maven/src/plugins-build/torque/plugin.properties,v
retrieving revision 1.1
diff -u -b -r1.1 plugin.properties
--- plugin.properties	26 Feb 2003 23:30:46 -0000	1.1
+++ plugin.properties	9 Jul 2003 12:49:27 -0000
@@ -183,10 +183,10 @@
 torque.schema.sql.excludes =
 torque.schema.doc.includes = *-schema.xml
 torque.schema.doc.excludes =
-torque.schema.create-db.includes = *-schema.xml
-torque.schema.create-db.excludes =
-torque.schema.init-sql.includes = *-schema.xml
-torque.schema.init-sql.excludes = id-table-schema.xml
+torque.schema.createdb.includes = *-schema.xml
+torque.schema.createdb.excludes =
+torque.schema.initsql.includes = *-schema.xml
+torque.schema.initsql.excludes = id-table-schema.xml
 torque.schema.om.includes = *-schema.xml
 torque.schema.om.excludes = id-table-schema.xml
 torque.schema.ojb.includes = *-schema.xml


--=-xJd/I3V6T/lp1jvLh++f
Content-Type: text/plain; charset=us-ascii

---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org
--=-xJd/I3V6T/lp1jvLh++f--