Commit 6725839c authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Updated ucdvalidator library (Ucidy), changed configuration model in order to... 

Updated ucdvalidator library (Ucidy), changed configuration model in order to support custom UCD values. Set version number to 1.0.4
parent 1991f0df

CHANGELOG.md

0 → 100644
+26 −0
Original line number Diff line number Diff line 
# CHANGELOG



## Version 1.0.4



### Updated ucdvalidator into Ucidy 1.0



Updated ucdvalidator library, renamed into Ucidy.



https://github.com/gmantele/ucidy



### Configuration file changes



In `webapp.properties` file, the property `credentials_config_path` has been renamed into `config_file_path`, because now the config.xml contains other configuration information in addition to the credentials ones.



XML configuration file structure is changed, however the application can update the old existing configuration into the new one without losing previously inserted values.



### Managed custom UCD



It is now possible to configure the web application for using custom UCD values (in addition to the standard ones). These values have to be inserted into the XML configuration file in this way:



    <configuration>

        <custom-ucds>

            <ucd>ia2:custom.test</ucd>

            <ucd>ia2:custom.anothertest</ucd>

        </custom-ucds>

    </configuration>

README.md

+9 −0
Original line number Diff line number Diff line 


# TAP_SCHEMA Manager



See also the [CHANGELOG]().



## Build



### Build the API
@@ -40,3 +42,10 @@ The web app was tested with: 
* Tomcat 8.0.33



The web app relies on specific JSF and EL versions, so it could not work in different application servers without a proper configuration.



## Credits



TAP_SCHEMA Manager web application uses the following VO libraries:



* Ucidy, by Grégory Mantelet (https://github.com/gmantele/ucidy)

* Unity, by Norman Gray (https://bitbucket.org/nxg/unity)
 
 No newline at end of file

TapSchemaManagerAPI/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>TapSchemaManagerAPI</artifactId>

    <version>1.0.3</version>

    <version>1.0.4</version>

    <packaging>jar</packaging>

    <properties>

        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

TapSchemaManagerWebApp/pom.xml

+5 −5
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


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

    <artifactId>TapSchemaManagerWebApp</artifactId>

    <version>1.0.3</version>

    <version>1.0.4</version>

    <packaging>war</packaging>



    <name>TapSchemaManagerWebApp</name>
@@ -87,12 +87,12 @@ 
        <dependency>

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

            <artifactId>TapSchemaManagerAPI</artifactId>

            <version>1.0.3</version>

            <version>1.0.4</version>

        </dependency>

        <dependency>

            <groupId>ari.ucd</groupId>

            <artifactId>ucdvalidator</artifactId>

            <version>1.0beta</version>

            <groupId>ari.ucidy</groupId>

            <artifactId>ucidy</artifactId>

            <version>1.0</version>

        </dependency>

        <dependency>

            <groupId>javax</groupId>

TapSchemaManagerWebApp/src/main/java/it/inaf/ia2/tsm/webapp/Configuration.java

0 → 100644
+55 −0
Original line number Diff line number Diff line 
package it.inaf.ia2.tsm.webapp;



import java.util.ArrayList;

import java.util.List;

import javax.xml.bind.annotation.XmlAttribute;

import javax.xml.bind.annotation.XmlElement;

import javax.xml.bind.annotation.XmlElementWrapper;

import javax.xml.bind.annotation.XmlRootElement;



/**

 * JAXB model for TSM web application configuration.

 *

 * @author Sonia Zorba {@literal <zorba at oats.inaf.it>}

 */

@XmlRootElement(name = "configuration")

public class Configuration {



    private CredentialsConfiguration credentialsConfiguration;

    private List<String> customUCDs;

    private String version;



    public Configuration() {

        version = Version.NUMBER;

        credentialsConfiguration = new CredentialsConfiguration();

        customUCDs = new ArrayList<>();

    }



    @XmlElement(name = "credentials-config")

    public CredentialsConfiguration getCredentialsConfiguration() {

        return credentialsConfiguration;

    }



    public void setCredentialsConfiguration(CredentialsConfiguration credentialsConfiguration) {

        this.credentialsConfiguration = credentialsConfiguration;

    }



    @XmlElementWrapper(name = "custom-ucds")

    @XmlElement(name = "ucd")

    public List<String> getCustomUCDs() {

        return customUCDs;

    }



    public void setCustomUCDs(List<String> customUCDs) {

        this.customUCDs = customUCDs;

    }



    @XmlAttribute(name = "version")

    public String getVersion() {

        return version;

    }



    public void setVersion(String version) {

        this.version = version;

    }

}