Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 38853 invoked from network); 11 Oct 2006 20:04:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 11 Oct 2006 20:04:09 -0000 Received: (qmail 71288 invoked by uid 500); 11 Oct 2006 20:04:00 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 71205 invoked by uid 500); 11 Oct 2006 20:03:59 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 71163 invoked by uid 99); 11 Oct 2006 20:03:59 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Oct 2006 13:03:59 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Oct 2006 13:03:57 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 025E31A981A; Wed, 11 Oct 2006 13:03:37 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r462923 - in /geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory: CustomArrayDataTypeFactory.java CustomColumnFactory.java CustomDataTypeFactory.java CustomUserFactory.java Date: Wed, 11 Oct 2006 20:03:36 -0000 To: scm@geronimo.apache.org From: chirino@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061011200337.025E31A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: chirino Date: Wed Oct 11 13:03:35 2006 New Revision: 462923 URL: http://svn.apache.org/viewvc?view=rev&rev=462923 Log: cleaned up the the base class a bit. Modified: geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomArrayDataTypeFactory.java geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomColumnFactory.java geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomDataTypeFactory.java geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomUserFactory.java Modified: geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomArrayDataTypeFactory.java URL: http://svn.apache.org/viewvc/geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomArrayDataTypeFactory.java?view=diff&rev=462923&r1=462922&r2=462923 ============================================================================== --- geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomArrayDataTypeFactory.java (original) +++ geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomArrayDataTypeFactory.java Wed Oct 11 13:03:35 2006 @@ -16,29 +16,41 @@ */ package org.apache.xbean.factory.model.factory; -import org.apache.xbean.factory.FactoryBeanSupport; -import org.apache.xbean.factory.model.DataType; - -import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; + +import org.apache.xbean.factory.FactoryBeanSupport; +import org.apache.xbean.factory.model.ArrayDataType; /** * @version $Revision: $ */ -@XmlRootElement(name = "dataType") -public class CustomArrayDataTypeFactory extends FactoryBeanSupport { +@XmlRootElement(name = "arrayDataType") +public class CustomArrayDataTypeFactory extends FactoryBeanSupport { private String name; + private int dimensions; public CustomArrayDataTypeFactory() { } - public CustomArrayDataTypeFactory(DataType value) { + public CustomArrayDataTypeFactory(ArrayDataType value) { name = value.getName(); + dimensions = value.getDimensions(); } - public DataType getObject() { - DataType datatype = new DataType(); + @XmlTransient + @Override + public Class get_objectType() { + return ArrayDataType.class; + } + + @XmlTransient + @Override + public ArrayDataType getObject() { + ArrayDataType datatype = new ArrayDataType(); datatype.setName(name); + datatype.setDimensions(dimensions); return datatype; } @@ -50,4 +62,13 @@ public void setName(String name) { this.name = name; } + + @XmlAttribute + public int getDimensions() { + return dimensions; + } + + public void setDimensions(int dimensions) { + this.dimensions = dimensions; + } } Modified: geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomColumnFactory.java URL: http://svn.apache.org/viewvc/geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomColumnFactory.java?view=diff&rev=462923&r1=462922&r2=462923 ============================================================================== --- geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomColumnFactory.java (original) +++ geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomColumnFactory.java Wed Oct 11 13:03:35 2006 @@ -16,13 +16,14 @@ */ package org.apache.xbean.factory.model.factory; -import org.apache.xbean.factory.FactoryBeanSupport; -import org.apache.xbean.factory.model.Column; - import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlIDREF; import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; + +import org.apache.xbean.factory.FactoryBeanSupport; +import org.apache.xbean.factory.model.Column; /** * @version $Revision: $ @@ -43,6 +44,14 @@ name = value.getName(); } + @XmlTransient + @Override + public Class get_objectType() { + return Column.class; + } + + @XmlTransient + @Override public Column getObject() { Column column = new Column(); if (dataType != null) { Modified: geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomDataTypeFactory.java URL: http://svn.apache.org/viewvc/geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomDataTypeFactory.java?view=diff&rev=462923&r1=462922&r2=462923 ============================================================================== --- geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomDataTypeFactory.java (original) +++ geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomDataTypeFactory.java Wed Oct 11 13:03:35 2006 @@ -16,12 +16,13 @@ */ package org.apache.xbean.factory.model.factory; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; + import org.apache.xbean.factory.FactoryBeanSupport; import org.apache.xbean.factory.model.DataType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlAttribute; - /** * @version $Revision: $ */ @@ -36,6 +37,14 @@ name = value.getName(); } + @XmlTransient + @Override + public Class get_objectType() { + return DataType.class; + } + + @XmlTransient + @Override public DataType getObject() { DataType datatype = new DataType(); datatype.setName(name); Modified: geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomUserFactory.java URL: http://svn.apache.org/viewvc/geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomUserFactory.java?view=diff&rev=462923&r1=462922&r2=462923 ============================================================================== --- geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomUserFactory.java (original) +++ geronimo/xbean/sandbox/xbean-factory/src/main/java/org/apache/xbean/factory/model/factory/CustomUserFactory.java Wed Oct 11 13:03:35 2006 @@ -16,11 +16,12 @@ */ package org.apache.xbean.factory.model.factory; +import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.XmlTransient; + import org.apache.xbean.factory.FactoryBeanSupport; import org.apache.xbean.factory.model.User; -import javax.xml.bind.annotation.XmlRootElement; - /** * @version $Revision: $ */ @@ -30,6 +31,7 @@ private String name; private String fullName; private String phoneNumber; + public CustomUserFactory() { } @@ -40,7 +42,15 @@ phoneNumber = value.getPhoneNumber(); pk = value.getPk(); } + + @XmlTransient + @Override + public Class get_objectType() { + return User.class; + } + @XmlTransient + @Override public User getObject() { User user = new User(); user.setFullName(fullName); @@ -49,7 +59,7 @@ user.setPk(pk); return user; } - + public long getPk() { return pk; @@ -82,6 +92,5 @@ public void setPhoneNumber(String phoneNumber) { this.phoneNumber = phoneNumber; } - }