svn commit: r385093 - /db/ddlutils/trunk/pom.xml

2006-03-11 Thread mvdb
Author: mvdb
Date: Sat Mar 11 07:36:01 2006
New Revision: 385093

URL: http://svn.apache.org/viewcvs?rev=385093view=rev
Log:
Apply patch provided by Carlos Sanchesz (DDLUTILS-58).
Just changes the version of the parent pom to 1 instead of 1.0

Thanx for the patch.

Modified:
db/ddlutils/trunk/pom.xml

Modified: db/ddlutils/trunk/pom.xml
URL: 
http://svn.apache.org/viewcvs/db/ddlutils/trunk/pom.xml?rev=385093r1=385092r2=385093view=diff
==
--- db/ddlutils/trunk/pom.xml (original)
+++ db/ddlutils/trunk/pom.xml Sat Mar 11 07:36:01 2006
@@ -1,6 +1,11 @@
 project xmlns=http://maven.apache.org/POM/4.0.0; 
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
   xsi:schemaLocation=http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd;
   modelVersion4.0.0/modelVersion
+  parent
+groupIdorg.apache/groupId
+artifactIdapache/artifactId
+version1/version
+  /parent
   groupIdorg.apache.db.ddlutils/groupId
   artifactIdddlutils/artifactId
   packagingjar/packaging
@@ -12,13 +17,13 @@
   groupIdjunit/groupId
   artifactIdjunit/artifactId
   version3.8.1/version
-  scopetest/scope
 /dependency
 dependency
   groupIdant/groupId
   artifactIdant/artifactId
   version1.6.5/version
   scopecompile/scope
+  optionaltrue/optional
 /dependency
 dependency
   groupIdcommons-betwixt/groupId
@@ -60,15 +65,34 @@
   artifactIdcommons-codec/artifactId
   version1.3/version
 /dependency
+dependency
+  groupIdoro/groupId
+  artifactIdoro/artifactId
+  version2.0.8/version
+/dependency
   /dependencies
 
+  properties
+jdbc.properties.filejdbc.properties.hsqldb/jdbc.properties.file
+  /properties
+
   build
- sourceDirectorysrc/java/sourceDirectory
- testSourceDirectorysrc/test/testSourceDirectory
+sourceDirectorysrc/java/sourceDirectory
+testSourceDirectorysrc/test/testSourceDirectory
+plugins
+  plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-surefire-plugin/artifactId
+configuration
+  systemProperties
+property
+  namejdbc.properties.file/name
+  value${jdbc.properties.file}/value
+/property
+  /systemProperties
+/configuration
+  /plugin
+/plugins
   /build
 
-   reporting
-  plugins
-  /plugins
-   /reporting
 /project




svn commit: r385095 - in /db/ddlutils/trunk/src/java/org/apache/ddlutils: platform/PlatformImplBase.java task/DatabaseToDdlTask.java

2006-03-11 Thread tomdz
Author: tomdz
Date: Sat Mar 11 07:37:15 2006
New Revision: 385095

URL: http://svn.apache.org/viewcvs?rev=385095view=rev
Log:
Added attribute to the DatabaseToDdlTask that allows to specify the name of the 
model read from the database

Modified:

db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PlatformImplBase.java
db/ddlutils/trunk/src/java/org/apache/ddlutils/task/DatabaseToDdlTask.java

Modified: 
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PlatformImplBase.java
URL: 
http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PlatformImplBase.java?rev=385095r1=385094r2=385095view=diff
==
--- 
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PlatformImplBase.java 
(original)
+++ 
db/ddlutils/trunk/src/java/org/apache/ddlutils/platform/PlatformImplBase.java 
Sat Mar 11 07:37:15 2006
@@ -66,6 +66,9 @@
  */
 public abstract class PlatformImplBase extends JdbcSupport implements Platform
 {
+/** The default name for models read from the database, if no name as 
given.*/
+protected static final String MODEL_DEFAULT_NAME = default;
+
 /** The log for this platform. */
 private final Log _log = LogFactory.getLog(getClass());
 
@@ -1635,6 +1638,10 @@
 Databasemodel  = reader.getDatabase(connection, name, 
catalog, schema, tableTypes);
 
 postprocessModelFromDatabase(model);
+if ((model.getName() == null) || (model.getName().length() == 0))
+{
+model.setName(MODEL_DEFAULT_NAME);
+}
 return model;
 }
 catch (SQLException ex)

Modified: 
db/ddlutils/trunk/src/java/org/apache/ddlutils/task/DatabaseToDdlTask.java
URL: 
http://svn.apache.org/viewcvs/db/ddlutils/trunk/src/java/org/apache/ddlutils/task/DatabaseToDdlTask.java?rev=385095r1=385094r2=385095view=diff
==
--- db/ddlutils/trunk/src/java/org/apache/ddlutils/task/DatabaseToDdlTask.java 
(original)
+++ db/ddlutils/trunk/src/java/org/apache/ddlutils/task/DatabaseToDdlTask.java 
Sat Mar 11 07:37:15 2006
@@ -37,6 +37,8 @@
 private String _catalog;
 /** The table types to recognize when reading the model from the database. 
*/
 private String _tableTypes;
+/** The name of the model read from the database. */
+private String _modelName;
 
 /**
  * Sets the database schema to access.
@@ -69,6 +71,17 @@
 }
 
 /**
+ * Sets the name that the model read from the database shall have.
+ * Use codenull/code or an empty string for the default name.
+ * 
+ * @param modelName The model name
+ */
+public void setModelName(String modelName)
+{
+_modelName = modelName;
+}
+
+/**
  * Adds the create dtd-command.
  * 
  * @param command The command
@@ -157,7 +170,7 @@
 
 try
 {
-return getPlatform().readModelFromDatabase(null, _catalog, 
_schema, getTableTypes());
+return getPlatform().readModelFromDatabase(_modelName, _catalog, 
_schema, getTableTypes());
 }
 catch (Exception ex)
 {




[jira] Commented: (DDLUTILS-56) Create JIRA components for DdlUtils project

2006-03-11 Thread Martin van den Bemt (JIRA)
[ 
http://issues.apache.org/jira/browse/DDLUTILS-56?page=comments#action_12369998 
] 

Martin van den Bemt commented on DDLUTILS-56:
-

Thomas what is your pov about this ?
I am in favor of adding components per database implementation and maybe adding 
API, Ant Plugin and Maven Plugin (not there yet, so can wait).
If you don't have any objections I will have a go at it tonight..
For issues that seem like specific db issues, but should have a generic 
solution, we just can create a new issue and attach that to the db specific 
issue.
Thoughts ?

 Create JIRA components for DdlUtils project
 ---

  Key: DDLUTILS-56
  URL: http://issues.apache.org/jira/browse/DDLUTILS-56
  Project: DdlUtils
 Type: Task
 Reporter: Ken Weiner
 Assignee: Thomas Dudziak


 There are currently no components configured in JIRA for DdlUtils.  This task 
 is to create a set of components.  For example, one could be created for each 
 database implementation supported by DdlUtils.

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators:
   http://issues.apache.org/jira/secure/Administrators.jspa
-
For more information on JIRA, see:
   http://www.atlassian.com/software/jira



Back to active mode

2006-03-11 Thread Martin van den Bemt

Hi everyone,

Was kind of inactive lately, since I was moving jobs and because of some private things that needed 
my attention. Not saying that I am back at full strength yet, but will definitely have a lot more 
time for ddlutils and other projects I am involved with :)


Mvgr,
Martin


[jira] Commented: (DDLUTILS-56) Create JIRA components for DdlUtils project

2006-03-11 Thread Thomas Dudziak (JIRA)
[ 
http://issues.apache.org/jira/browse/DDLUTILS-56?page=comments#action_1236 
] 

Thomas Dudziak commented on DDLUTILS-56:


I think per database is too much, that's what the environment field is for, and 
it does not provide us any real benefit. But these components seem useful:

Core (this is the API  the db implementations), Ant tasks, Documentation, 
Tests (for when there is a bug in the tests, or the like)

(and Maven plugin, once there is something of the like).

 Create JIRA components for DdlUtils project
 ---

  Key: DDLUTILS-56
  URL: http://issues.apache.org/jira/browse/DDLUTILS-56
  Project: DdlUtils
 Type: Task
 Reporter: Ken Weiner
 Assignee: Thomas Dudziak


 There are currently no components configured in JIRA for DdlUtils.  This task 
 is to create a set of components.  For example, one could be created for each 
 database implementation supported by DdlUtils.

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators:
   http://issues.apache.org/jira/secure/Administrators.jspa
-
For more information on JIRA, see:
   http://www.atlassian.com/software/jira



[jira] Commented: (DDLUTILS-56) Create JIRA components for DdlUtils project

2006-03-11 Thread Ken Weiner (JIRA)
[ 
http://issues.apache.org/jira/browse/DDLUTILS-56?page=comments#action_12370013 
] 

Ken Weiner commented on DDLUTILS-56:


Having components per db implementation would make it much easier for people 
who use DdlUtils primarily with one database to track the issues related to 
their database.  I often want to view the roadmap and then filter for certain 
databsaes to see what issues might affect me.  Using environment for this 
limits the ability to do this because people may enter whatever they want for 
environment and filtering will be more difficult.  Anyway, those are my 2 cents.

 Create JIRA components for DdlUtils project
 ---

  Key: DDLUTILS-56
  URL: http://issues.apache.org/jira/browse/DDLUTILS-56
  Project: DdlUtils
 Type: Task
 Reporter: Ken Weiner
 Assignee: Thomas Dudziak


 There are currently no components configured in JIRA for DdlUtils.  This task 
 is to create a set of components.  For example, one could be created for each 
 database implementation supported by DdlUtils.

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators:
   http://issues.apache.org/jira/secure/Administrators.jspa
-
For more information on JIRA, see:
   http://www.atlassian.com/software/jira