Author: bdaniel
Date: Mon Oct 16 13:15:15 2006
New Revision: 464649
URL: http://svn.apache.org/viewvc?view=rev&rev=464649
Log:
TUSCANY-835 Change "managed" to default to true
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java
incubator/tuscany/java/das/rdb/src/main/resources/config.xsd
Modified:
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java?view=diff&rev=464649&r1=464648&r2=464649
==============================================================================
---
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java
(original)
+++
incubator/tuscany/java/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java
Mon Oct 16 13:15:15 2006
@@ -124,7 +124,7 @@
Iterator i = table.getColumn().iterator();
while (i.hasNext()) {
Column c = (Column) i.next();
- if (c.isManaged()) {
+ if (c.isCollision() && c.isManaged()) {
return c.getPropertyName() == null ? c.getColumnName() :
c.getPropertyName();
}
}
@@ -136,7 +136,7 @@
Iterator i = table.getColumn().iterator();
while (i.hasNext()) {
Column c = (Column) i.next();
- if (c.isManaged()) {
+ if (c.isCollision() && c.isManaged()) {
return c;
}
}
Modified: incubator/tuscany/java/das/rdb/src/main/resources/config.xsd
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/das/rdb/src/main/resources/config.xsd?view=diff&rev=464649&r1=464648&r2=464649
==============================================================================
--- incubator/tuscany/java/das/rdb/src/main/resources/config.xsd (original)
+++ incubator/tuscany/java/das/rdb/src/main/resources/config.xsd Mon Oct 16
13:15:15 2006
@@ -55,6 +55,7 @@
<xsd:complexType name="Parameter">
<xsd:attribute name="columnType" type="xsd:string"/>
<xsd:attribute name="direction" type="xsd:string"/>
+ <xsd:attribute name="index" type="xsd:int"/>
</xsd:complexType>
<xsd:complexType name="Relationship">
<xsd:sequence>
@@ -101,7 +102,7 @@
<xsd:attribute name="primaryKey" type="xsd:boolean"/>
<xsd:attribute name="generated" type="xsd:boolean"/>
<xsd:attribute name="collision" type="xsd:boolean"/>
- <xsd:attribute name="managed" type="xsd:boolean"/>
+ <xsd:attribute name="managed" type="xsd:boolean" default="true"/>
</xsd:complexType>
<xsd:complexType name="ResultDescriptor">
<xsd:attribute name="columnName" type="xsd:string"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
