Author: tfischer Date: Fri Feb 1 21:01:56 2013 New Revision: 1441626 URL: http://svn.apache.org/viewvc?rev=1441626&view=rev Log: TORQUE-264 remove unused attribute package, baseClass and basePeer on database element in schema
Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd db/torque/torque4/trunk/torque-templates/src/test/schema/ext-schema.xml db/torque/torque4/trunk/torque-test/src/main/schema/default-value-schema.xml db/torque/torque4/trunk/torque-test/src/main/schema/ext-schema.xml db/torque/torque4/trunk/torque-test/src/main/schema/foreign-key-schema.xml db/torque/torque4/trunk/torque-test/src/main/schema/included-from-included-schema.xml db/torque/torque4/trunk/torque-test/src/main/schema/included-schema.xml db/torque/torque4/trunk/torque-test/src/main/schema/index.xml db/torque/torque4/trunk/torque-test/src/main/schema/pk-schema.xml db/torque/torque4/trunk/torque-test/src/main/schema/qualified-table-name-schema.xml db/torque/torque4/trunk/torque-test/src/main/schema/save-method-in-peer-schema.xml db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml db/torque/torque4/trunk/torque-test/src/main/schema/types-schema.xml Modified: db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd?rev=1441626&r1=1441625&r2=1441626&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd (original) +++ db/torque/torque4/trunk/torque-templates/src/main/resources/org/apache/torque/templates/xsd/database-4-0.xsd Fri Feb 1 21:01:56 2013 @@ -122,31 +122,6 @@ Java objects and as the default JDBC con </xs:documentation> </xs:annotation> </xs:attribute> - <xs:attribute name="package" type="javaQualifiedNameType" use="optional" > - <xs:annotation> - <xs:documentation xml:lang="en"> -The base Java package to use for the Java classes generated by this schema. -This overrides the targetPackage property in the Torque build.properties file. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="baseClass" type="javaQualifiedNameType" use="optional"> - <xs:annotation> - <xs:documentation xml:lang="en"> -The fully qualified class that the generated Java table record objects will -extend. This class does not have to extend org.apache.torque.om.BaseObject. - </xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="basePeer" type="javaQualifiedNameType" use="optional" > - <xs:annotation> - <xs:documentation xml:lang="en"> -The fully qualified class that the generated Java Peer objects will extend. -Unlike baseClass, basePeer should extend BasePeer at some point in the chain, -i.e. it needs to be the superclass. - </xs:documentation> - </xs:annotation> - </xs:attribute> <xs:attribute name="defaultJavaType" use="optional" type="javaReturnType" default="primitive" > <xs:annotation> Modified: db/torque/torque4/trunk/torque-templates/src/test/schema/ext-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-templates/src/test/schema/ext-schema.xml?rev=1441626&r1=1441625&r2=1441626&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-templates/src/test/schema/ext-schema.xml (original) +++ db/torque/torque4/trunk/torque-templates/src/test/schema/ext-schema.xml Fri Feb 1 21:01:56 2013 @@ -23,8 +23,7 @@ xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database http://db.apache.org/torque/4.0/templates/database.xsd" name="ext" - defaultIdMethod="native" - package="org.apache.torque.test.ext"> + defaultIdMethod="native"> <external-schema filename="extext-schema.xml" /> Modified: db/torque/torque4/trunk/torque-test/src/main/schema/default-value-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/default-value-schema.xml?rev=1441626&r1=1441625&r2=1441626&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/main/schema/default-value-schema.xml (original) +++ db/torque/torque4/trunk/torque-test/src/main/schema/default-value-schema.xml Fri Feb 1 21:01:56 2013 @@ -20,7 +20,6 @@ <database name="@DATABASE_DEFAULT@" defaultIdMethod="@DATABASE_ID_METHOD@" - package="org.apache.torque.test.ext" xmlns="http://db.apache.org/torque/4.0/templates/database"> <domain name="myTimestamp" type="TIMESTAMP" @CURRENT_TIMESTAMP_DEFAULT@/> Modified: db/torque/torque4/trunk/torque-test/src/main/schema/ext-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/ext-schema.xml?rev=1441626&r1=1441625&r2=1441626&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/main/schema/ext-schema.xml (original) +++ db/torque/torque4/trunk/torque-test/src/main/schema/ext-schema.xml Fri Feb 1 21:01:56 2013 @@ -20,7 +20,6 @@ <database name="@DATABASE_DEFAULT@" defaultIdMethod="@DATABASE_ID_METHOD@" - package="org.apache.torque.test.ext" xmlns="http://db.apache.org/torque/4.0/templates/database" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database Modified: db/torque/torque4/trunk/torque-test/src/main/schema/foreign-key-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/foreign-key-schema.xml?rev=1441626&r1=1441625&r2=1441626&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/main/schema/foreign-key-schema.xml (original) +++ db/torque/torque4/trunk/torque-test/src/main/schema/foreign-key-schema.xml Fri Feb 1 21:01:56 2013 @@ -23,7 +23,6 @@ <database name="@DATABASE_DEFAULT@" defaultIdMethod="@DATABASE_ID_METHOD@" - package="org.apache.torque.test" xmlns="http://db.apache.org/torque/4.0/templates/database" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database Modified: db/torque/torque4/trunk/torque-test/src/main/schema/included-from-included-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/included-from-included-schema.xml?rev=1441626&r1=1441625&r2=1441626&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/main/schema/included-from-included-schema.xml (original) +++ db/torque/torque4/trunk/torque-test/src/main/schema/included-from-included-schema.xml Fri Feb 1 21:01:56 2013 @@ -20,7 +20,6 @@ <database name="@DATABASE_DEFAULT@" defaultIdMethod="@DATABASE_ID_METHOD@" - package="org.apache.torque.test.ext" xmlns="http://db.apache.org/torque/4.0/templates/database" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database Modified: db/torque/torque4/trunk/torque-test/src/main/schema/included-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/included-schema.xml?rev=1441626&r1=1441625&r2=1441626&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/main/schema/included-schema.xml (original) +++ db/torque/torque4/trunk/torque-test/src/main/schema/included-schema.xml Fri Feb 1 21:01:56 2013 @@ -20,7 +20,6 @@ <database name="@DATABASE_DEFAULT@" defaultIdMethod="@DATABASE_ID_METHOD@" - package="org.apache.torque.test.ext" xmlns="http://db.apache.org/torque/4.0/templates/database" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database Modified: db/torque/torque4/trunk/torque-test/src/main/schema/index.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/index.xml?rev=1441626&r1=1441625&r2=1441626&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/main/schema/index.xml (original) +++ db/torque/torque4/trunk/torque-test/src/main/schema/index.xml Fri Feb 1 21:01:56 2013 @@ -21,7 +21,6 @@ <database name="@DATABASE_DEFAULT@" defaultIdMethod="@DATABASE_ID_METHOD@" - package="org.apache.torque.test" xmlns="http://db.apache.org/torque/4.0/templates/database" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database Modified: db/torque/torque4/trunk/torque-test/src/main/schema/pk-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/pk-schema.xml?rev=1441626&r1=1441625&r2=1441626&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/main/schema/pk-schema.xml (original) +++ db/torque/torque4/trunk/torque-test/src/main/schema/pk-schema.xml Fri Feb 1 21:01:56 2013 @@ -21,7 +21,6 @@ <database name="@DATABASE_DEFAULT@" defaultIdMethod="@DATABASE_ID_METHOD@" - package="org.apache.torque.test" xmlns="http://db.apache.org/torque/4.0/templates/database" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database Modified: db/torque/torque4/trunk/torque-test/src/main/schema/qualified-table-name-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/qualified-table-name-schema.xml?rev=1441626&r1=1441625&r2=1441626&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/main/schema/qualified-table-name-schema.xml (original) +++ db/torque/torque4/trunk/torque-test/src/main/schema/qualified-table-name-schema.xml Fri Feb 1 21:01:56 2013 @@ -21,7 +21,6 @@ <database name="@DATABASE_DEFAULT@" defaultIdMethod="@DATABASE_ID_METHOD@" - package="org.apache.torque.test" xmlns="http://db.apache.org/torque/4.0/templates/database" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database Modified: db/torque/torque4/trunk/torque-test/src/main/schema/save-method-in-peer-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/save-method-in-peer-schema.xml?rev=1441626&r1=1441625&r2=1441626&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/main/schema/save-method-in-peer-schema.xml (original) +++ db/torque/torque4/trunk/torque-test/src/main/schema/save-method-in-peer-schema.xml Fri Feb 1 21:01:56 2013 @@ -21,7 +21,6 @@ <database name="@DATABASE_DEFAULT@" defaultIdMethod="@DATABASE_ID_METHOD@" - package="org.apache.torque.test" defaultJavaType="object"> <table name="save_method_in_peer" saveMethodsInDbObjects="false" useManagers="false"> Modified: db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml?rev=1441626&r1=1441625&r2=1441626&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml (original) +++ db/torque/torque4/trunk/torque-test/src/main/schema/test-schema.xml Fri Feb 1 21:01:56 2013 @@ -22,7 +22,6 @@ <database name="@DATABASE_DEFAULT@" defaultIdMethod="@DATABASE_ID_METHOD@" - package="ignored" xmlns="http://db.apache.org/torque/4.0/templates/database"> <include-schema filename="included-schema.xml" /> Modified: db/torque/torque4/trunk/torque-test/src/main/schema/types-schema.xml URL: http://svn.apache.org/viewvc/db/torque/torque4/trunk/torque-test/src/main/schema/types-schema.xml?rev=1441626&r1=1441625&r2=1441626&view=diff ============================================================================== --- db/torque/torque4/trunk/torque-test/src/main/schema/types-schema.xml (original) +++ db/torque/torque4/trunk/torque-test/src/main/schema/types-schema.xml Fri Feb 1 21:01:56 2013 @@ -21,7 +21,6 @@ <database name="@DATABASE_DEFAULT@" defaultIdMethod="@DATABASE_ID_METHOD@" - package="org.apache.torque.test" xmlns="http://db.apache.org/torque/4.0/templates/database" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://db.apache.org/torque/4.0/templates/database --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org