Author: lisbor Date: 2008-12-09 05:14:26 -0500 (Tue, 09 Dec 2008) New Revision: 674 Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/Column.java trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/Database.java trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/DatabaseNamedObject.java trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/ForeignKey.java trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/ResultSetConcurrencyType.java trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/SqlTypeConversionPair.java trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/TableType.java trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/UserDefinedType.java trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/spi/DatabaseBean.java Log: DNA-37 Federate schema information from relational sources https://jira.jboss.org/jira/browse/DNA-37 Illegal character removed from spi module Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/Column.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/Column.java 2008-12-08 20:20:41 UTC (rev 673) +++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/Column.java 2008-12-09 10:14:26 UTC (rev 674) @@ -172,7 +172,7 @@ /** * For char types sets the maximum number of bytes in the column. Otherwise -1. * - * @param CharOctetLength For char types sets the maximum number of bytes in the column. Otherwise -1. + * @param charOctetLength For char types sets the maximum number of bytes in the column. Otherwise -1. */ void setCharOctetLength( Integer charOctetLength ); Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/Database.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/Database.java 2008-12-08 20:20:41 UTC (rev 673) +++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/Database.java 2008-12-09 10:14:26 UTC (rev 674) @@ -712,8 +712,8 @@ /** * Sets whether this database supports concatenations between <code>NULL</code> and non-<code>NULL</code> values being * <code>NULL</code>. + * @param nullPlusNonNullIsNull <code>true</code> if so; <code>false</code> otherwise * - * @return <code>true</code> if so; <code>false</code> otherwise */ void setNullPlusNonNullIsNull( Boolean nullPlusNonNullIsNull ); @@ -736,7 +736,7 @@ * <code>DatabaseMetaData.supportsConvert</code> to check common (NOT ALL POSSIBLE) conversions. * * @return list of common (NOT ALL POSSIBLE) conversions. - * @see Types + * @see java.sql.Types */ Set<SqlTypeConversionPair> getSupportedConversions(); @@ -756,6 +756,7 @@ /** * Searches set of SqlTypeConversionPair by SrcType + * @param srcType the source type * * @return set of SqlTypeConversionPair */ @@ -817,7 +818,7 @@ * Sets whether this database supports using a column that is not in the <code>SELECT</code> statement in an * <code>ORDER BY</code> clause. * - * @param <code>true</code> if so; <code>false</code> otherwise + * @param supportsOrderByUnrelated <code>true</code> if so; <code>false</code> otherwise */ void setSupportsOrderByUnrelated( Boolean supportsOrderByUnrelated ); @@ -1257,7 +1258,6 @@ * Retrieves whether a catalog name can be used in an index definition statement. * * @return <code>true</code> if so; <code>false</code> otherwise - * @exception SQLException if a database access error occurs */ Boolean isSupportsCatalogsInIndexDefinitions(); @@ -1265,7 +1265,6 @@ * Sets whether a catalog name can be used in an index definition statement. * * @param supportsCatalogsInIndexDefinitions <code>true</code> if so; <code>false</code> otherwise - * @exception SQLException if a database access error occurs */ void setSupportsCatalogsInIndexDefinitions( Boolean supportsCatalogsInIndexDefinitions ); @@ -1839,7 +1838,7 @@ * <code>java.sql.Connection</code>. * * @return the default isolation level - * @see Connection + * @see java.sql.Connection */ Integer getDefaultTransactionIsolation(); @@ -1848,7 +1847,7 @@ * <code>java.sql.Connection</code>. * * @param defaultTransactionIsolation the default isolation level - * @see Connection + * @see java.sql.Connection */ void setDefaultTransactionIsolation( Integer defaultTransactionIsolation ); @@ -1872,7 +1871,7 @@ * Retrieves list of database supported transaction isolation levels. * * @return list of database supported transaction isolation levels. - * @see Connection + * @see java.sql.Connection */ Set<TransactionIsolationLevelType> getSupportedTransactionIsolationLevels(); @@ -1894,6 +1893,7 @@ * Is supported TransactionIsolationLevelType * * @param transactionIsolationLevelType the Transaction Isolation Level Type + * @return true if supported */ Boolean isSupportedTransactionIsolationLevelType( TransactionIsolationLevelType transactionIsolationLevelType ); @@ -2156,7 +2156,7 @@ * Retrieves database supported result set types. * * @return database supported result set types. - * @see Connection + * @see java.sql.Connection * @since 1.2 (JDBC 2.0) */ Set<ResultSetType> getSupportedResultSetTypes(); @@ -2179,7 +2179,7 @@ * Retrieves database supported concurrencies for the given result set type. * * @return database supported concurrencies for the given result set type. - * @see Connection + * @see java.sql.Connection * @since 1.2 (JDBC 2.0) */ Set<ResultSetConcurrencyType> getSupportedForwardOnlyResultSetConcurrencies(); @@ -2202,7 +2202,7 @@ * Retrieves database supported concurrencies for the given result set type. * * @return database supported concurrencies for the given result set type. - * @see Connection + * @see java.sql.Connection * @since 1.2 (JDBC 2.0) */ Set<ResultSetConcurrencyType> getSupportedScrollInsensitiveResultSetConcurrencies(); @@ -2225,7 +2225,7 @@ * Retrieves database supported concurrencies for the given result set type. * * @return database supported concurrencies for the given result set type. - * @see Connection + * @see java.sql.Connection * @since 1.2 (JDBC 2.0) */ Set<ResultSetConcurrencyType> getSupportedScrollSensitiveResultSetConcurrencies(); @@ -2844,7 +2844,7 @@ * Retrieves whether this database supports the given result set holdability. * * @return <code>true</code> if so; <code>false</code> otherwise - * @see Connection + * @see java.sql.Connection * @since 1.4 (JDBC 3.0) */ Boolean isSupportsResultSetHoldCurrorsOverCommitHoldability(); @@ -2853,7 +2853,7 @@ * Sets whether this database supports the given result set holdability. * * @param supportsResultSetHoldCurrorsOverCommitHoldability <code>true</code> if so; <code>false</code> otherwise - * @see Connection + * @see java.sql.Connection * @since 1.4 (JDBC 3.0) */ void setSupportsResultSetHoldCurrorsOverCommitHoldability( Boolean supportsResultSetHoldCurrorsOverCommitHoldability ); @@ -2862,7 +2862,7 @@ * Retrieves whether this database supports the given result set holdability. * * @return <code>true</code> if so; <code>false</code> otherwise - * @see Connection + * @see java.sql.Connection * @since 1.4 (JDBC 3.0) */ Boolean isSupportsResultSetCloseCurrorsAtCommitHoldability(); @@ -2871,7 +2871,7 @@ * Sets whether this database supports the given result set holdability. * * @param supportsResultSetCloseCurrorsAtCommitHoldability <code>true</code> if so; <code>false</code> otherwise - * @see Connection + * @see java.sql.Connection * @since 1.4 (JDBC 3.0) */ void setSupportsResultSetCloseCurrorsAtCommitHoldability( Boolean supportsResultSetCloseCurrorsAtCommitHoldability ); @@ -2881,7 +2881,6 @@ * * @return the default holdability; either <code>ResultSet.HOLD_CURSORS_OVER_COMMIT</code> or * <code>ResultSet.CLOSE_CURSORS_AT_COMMIT</code> - * @exception SQLException if a database access error occurs * @since 1.4 */ ResultSetHoldabilityType getResultSetHoldabilityType(); @@ -2890,9 +2889,8 @@ * Sets the default holdability of this <code>ResultSet</code> object. * * @param resultSetHoldabilityType the ResultSetHoldabilityType - * @return the default holdability; either <code>ResultSet.HOLD_CURSORS_OVER_COMMIT</code> or + * the default holdability; either <code>ResultSet.HOLD_CURSORS_OVER_COMMIT</code> or * <code>ResultSet.CLOSE_CURSORS_AT_COMMIT</code> - * @exception SQLException if a database access error occurs * @since 1.4 */ void setResultSetHoldabilityType( ResultSetHoldabilityType resultSetHoldabilityType ); Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/DatabaseNamedObject.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/DatabaseNamedObject.java 2008-12-08 20:20:41 UTC (rev 673) +++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/DatabaseNamedObject.java 2008-12-09 10:14:26 UTC (rev 674) @@ -86,7 +86,6 @@ * deletes extra property * * @param key the key - * @param value the value */ void deleteExtraProperty( String key ); } Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/ForeignKey.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/ForeignKey.java 2008-12-08 20:20:41 UTC (rev 673) +++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/ForeignKey.java 2008-12-09 10:14:26 UTC (rev 674) @@ -97,7 +97,7 @@ /** * What happens to a foreign key when the primary key is updated * - * @param keyModifyRuleType what happens to a foreign key when the primary key is updated + * @param updateRule what happens to a foreign key when the primary key is updated */ void setUpdateRule( KeyModifyRuleType updateRule ); @@ -125,12 +125,7 @@ /** * Can the evaluation of foreign key constraints be deferred until commit * - * @param keyDeferrabilityType the evaluation of foreign key constraints be deferred until commit + * @param deferrability the evaluation of foreign key constraints be deferred until commit */ void setDeferrability( KeyDeferrabilityType deferrability ); } - -/* - * $Log$ - * - */ Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/ResultSetConcurrencyType.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/ResultSetConcurrencyType.java 2008-12-08 20:20:41 UTC (rev 673) +++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/ResultSetConcurrencyType.java 2008-12-09 10:14:26 UTC (rev 674) @@ -48,8 +48,3 @@ return name(); } } - -/* - * $Log$ - * - */ Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/SqlTypeConversionPair.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/SqlTypeConversionPair.java 2008-12-08 20:20:41 UTC (rev 673) +++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/SqlTypeConversionPair.java 2008-12-09 10:14:26 UTC (rev 674) @@ -52,7 +52,7 @@ /** * Sets valid destination SQL Type * - * @param toType the destination SQL Type + * @param destType the destination SQL Type */ void setDestType( SqlType destType ); } Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/TableType.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/TableType.java 2008-12-08 20:20:41 UTC (rev 673) +++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/TableType.java 2008-12-09 10:14:26 UTC (rev 674) @@ -142,7 +142,6 @@ /** * Is current table type represents SYNONYM * - * @param tableTypeName the table type string * @return true if current table type represents SYNONYM */ Boolean isSynonym(); Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/UserDefinedType.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/UserDefinedType.java 2008-12-08 20:20:41 UTC (rev 673) +++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/api/UserDefinedType.java 2008-12-09 10:14:26 UTC (rev 674) @@ -74,7 +74,7 @@ * user-generated reference type of the SELF_REFERENCING_COLUMN of a structured type as defined in java.sql.Types (null if * DATA_TYPE is not DISTINCT or not STRUCT with REFERENCE_GENERATION = USER_DEFINED) * - * @param baseSqlType the SQL base type from java.sql.Types. + * @param baseType the SQL base type from java.sql.Types. */ void setBaseType( SqlType baseType ); Modified: trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/spi/DatabaseBean.java =================================================================== --- trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/spi/DatabaseBean.java 2008-12-08 20:20:41 UTC (rev 673) +++ trunk/extensions/dna-common-jdbc/src/main/java/org/jboss/dna/common/jdbc/model/spi/DatabaseBean.java 2008-12-09 10:14:26 UTC (rev 674) @@ -100,7 +100,7 @@ private String procedureTerm; private String catalogTerm; private Boolean catalogAtStart; - private String �atalogSeparator; + private String catalogSeparator; private Boolean supportsSchemasInDataManipulation; private Boolean supportsSchemasInProcedureCalls; private Boolean supportsSchemasInTableDefinitions; @@ -1655,7 +1655,7 @@ * @return the separator string */ public String getCatalogSeparator() { - return �atalogSeparator; + return catalogSeparator; } /** @@ -1664,7 +1664,7 @@ * @param catalogSeparator the separator string */ public void setCatalogSeparator( String catalogSeparator ) { - this.�atalogSeparator = catalogSeparator; + this.catalogSeparator = catalogSeparator; } /**