Commit 615b59cf authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Little fixes, set version to 1.3.0, added installer for tasman-embedded

parent 243decdb

TASMAN-core/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
    <modelVersion>4.0.0</modelVersion>

    <groupId>it.inaf.ia2.tap</groupId>

    <artifactId>tasman-core</artifactId>

    <version>1.2.0</version>

    <version>1.3.0</version>

    <packaging>jar</packaging>

    <name>tasman-core</name>

    <properties>

TASMAN-core/src/main/java/it/inaf/ia2/tsm/EntityProperty.java

+0 −11
Original line number Diff line number Diff line
@@ -59,13 +59,6 @@ public class EntityProperty<T> implements Serializable { 
        return value;

    }



    /**

     * Retrieve the current value.

     */

    public <X> X getValue(Class<X> type) {

        return (X) value;

    }



    public T getOriginalValue() {

        return originalValue;

    }
@@ -74,10 +67,6 @@ public class EntityProperty<T> implements Serializable { 
        return defaultValue;

    }



    public <X> X getOriginalValue(Class<X> type) {

        return (X) originalValue;

    }



    public <X> void setValue(X value) {

        this.setValue(value, true);

    }

TASMAN-core/src/main/java/it/inaf/ia2/tsm/TapSchemaEntity.java

+2 −2
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ public abstract class TapSchemaEntity implements Serializable { 
     * Retrieve the current value of the property (the last value set).

     */

    public <T> T getValue(String key, Class<T> type) {

        return (T) properties.get(key).getValue(type);

        return (T) properties.get(key).getValue();

    }



    public void setValue(String key, Object value) {
@@ -145,7 +145,7 @@ public abstract class TapSchemaEntity implements Serializable { 
     * @return

     */

    public <T> T getOriginalValue(String key, Class<T> type) {

        return (T) properties.get(key).getOriginalValue(type);

        return (T) properties.get(key).getOriginalValue();

    }



    /**

TASMAN-core/src/main/java/it/inaf/ia2/tsm/datalayer/pgsql/PostgresDBBroker.java

+11 −2
Original line number Diff line number Diff line
@@ -275,6 +275,9 @@ public class PostgresDBBroker extends DBBrokerTemplate { 


                if (!isArray && (ADQL.VARCHAR.equals(adqlType) || ADQL.CHAR.equals(adqlType))) {

                    size = resultSet.getInt("character_maximum_length");

                    if (size == 0) {

                        size = null;

                    }

                }



                cm.put(Column.DATATYPE_KEY, datatype);
@@ -283,10 +286,16 @@ public class PostgresDBBroker extends DBBrokerTemplate { 
                String arraySize = null;

                if (isArray) {

                    arraySize = formatArraySize(arraydimension);

                } else if (size != null) {

                } else {

                    if (size != null) {

                        arraySize = String.valueOf(size);

                    }



                    // variable length columns must have a "*" symbol on arraysize

                    if (adqlType != null && ADQL.isVariable(adqlType)) {

                        if (arraySize == null) {

                            arraySize = "";

                        }

                        arraySize += "*";

                    }

                }

TASMAN-core/src/main/resources/schema_definition/ivoa-1_1.xml

+1 −1
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 
            <type>VARCHAR</type>

            <updatable>true</updatable>

            <description>Identifier of proposal to which observation belongs</description>

            <standard>false</standard>

            <standard>true</standard>

            <mandatory>true</mandatory>

            <utype>Provenance.Proposal.identifier</utype>

            <ucd>meta.id; obs.proposal</ucd>