Commit 3218d87a authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Added UsersManagement page for admin, added 'UCD Rebuild' functionality based... 

Added UsersManagement page for admin, added 'UCD Rebuild' functionality based on CDS web services, refactoring, removed ConversationScoped in favour of DeltaSpike WindowScoped, set version number to 1.1.0
parent 563cf1c5

TapSchemaManagerAPI/pom.xml

+3 −3
Original line number Diff line number Diff line
@@ -2,9 +2,10 @@ 
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

    <modelVersion>4.0.0</modelVersion>

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

    <artifactId>TapSchemaManagerAPI</artifactId>

    <version>1.0.4</version>

    <artifactId>tasman-core</artifactId>

    <version>1.1.0</version>

    <packaging>jar</packaging>

    <name>tasman-core</name>

    <properties>

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

        <maven.compiler.source>1.7</maven.compiler.source>
@@ -46,5 +47,4 @@ 
            </plugin>

        </plugins>

    </build>

    <name>TapSchemaManagerAPI</name>

</project>
 
 No newline at end of file

TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/ConsistencyChecks.java

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory; 


/**

 *

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

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

 */

public class ConsistencyChecks implements Serializable {

TapSchemaManagerAPI/src/main/java/it/inaf/ia2/tsm/api/InconsistentValue.java

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ package it.inaf.ia2.tsm.api; 


/**

 *

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

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

 */

public class InconsistentValue {

TapSchemaManagerWebApp/pom.xml

+58 −5
Original line number Diff line number Diff line
@@ -3,17 +3,18 @@ 
    <modelVersion>4.0.0</modelVersion>



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

    <artifactId>TapSchemaManagerWebApp</artifactId>

    <version>1.0.4</version>

    <artifactId>tasman-webapp</artifactId>

    <version>1.1.0</version>

    <packaging>war</packaging>



    <name>TapSchemaManagerWebApp</name>

    <name>tasman-webapp</name>



    <properties>

        <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>

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

        <netbeans.hint.license>inaf-license-netbeans</netbeans.hint.license>

        <jersey.version>2.23.2</jersey.version>

        <deltaspike.version>1.7.2</deltaspike.version>

    </properties>    

        

    <profiles>
@@ -86,8 +87,8 @@ 
    <dependencies>

        <dependency>

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

            <artifactId>TapSchemaManagerAPI</artifactId>

            <version>1.0.4</version>

            <artifactId>tasman-core</artifactId>

            <version>1.1.0</version>

        </dependency>

        <dependency>

            <groupId>ari.ucidy</groupId>
@@ -123,7 +124,59 @@ 
            <version>4.10</version>

            <scope>test</scope>

        </dependency>

        <dependency>

            <groupId>org.apache.deltaspike.modules</groupId>

            <artifactId>deltaspike-jsf-module-impl</artifactId>

            <scope>runtime</scope>

        </dependency>

        <dependency>

            <groupId>org.apache.deltaspike.modules</groupId>

            <artifactId>deltaspike-jsf-module-api</artifactId>

            <scope>runtime</scope>

        </dependency>

        <dependency>

            <groupId>org.apache.deltaspike.core</groupId>

            <artifactId>deltaspike-core-api</artifactId>

            <scope>compile</scope>

        </dependency>

        <dependency>

            <groupId>org.apache.deltaspike.core</groupId>

            <artifactId>deltaspike-core-impl</artifactId>

            <scope>runtime</scope>

        </dependency>

        <dependency>

            <groupId>org.apache.deltaspike.cdictrl</groupId>

            <artifactId>deltaspike-cdictrl-weld</artifactId>

            <scope>runtime</scope>

        </dependency>

        <dependency>

            <groupId>org.apache.deltaspike.cdictrl</groupId>

            <artifactId>deltaspike-cdictrl-api</artifactId>

            <scope>compile</scope>

        </dependency>

        <dependency>

            <groupId>org.apache.deltaspike.modules</groupId>

            <artifactId>deltaspike-servlet-module-impl</artifactId>

            <scope>runtime</scope>

        </dependency>

        <dependency>

            <groupId>org.apache.deltaspike.modules</groupId>

            <artifactId>deltaspike-servlet-module-api</artifactId>

            <scope>compile</scope>

        </dependency>

    </dependencies>



    <dependencyManagement>

        <dependencies>

            <dependency>

                <groupId>org.apache.deltaspike.distribution</groupId>

                <artifactId>distributions-bom</artifactId>

                <version>${deltaspike.version}</version>

                <type>pom</type>

                <scope>import</scope>

            </dependency>

        </dependencies>

    </dependencyManagement>

    

    <build>

        <resources>

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

+15 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import it.inaf.ia2.tsm.webapp.xmlconfig.UserConfiguration; 
import java.io.File;

import java.io.IOException;

import java.io.InputStream;

import java.util.List;

import java.util.Properties;

import javax.annotation.PostConstruct;

import javax.enterprise.context.ApplicationScoped;
@@ -81,6 +82,11 @@ public class ConfigurationData { 
        return configuration;

    }



    public synchronized List<UserConfiguration> cloneUsersConfiguration() {

        // JAXB is exploited for doing deep copy.

        return JAXB.unmarshal(configFile, Configuration.class).getUsers();

    }



    public void updateConfigurationFile() throws IOException {

        JAXB.marshal(configuration, configFile);

    }
@@ -90,8 +96,16 @@ public class ConfigurationData { 
        updateConfigurationFile();

    }



    public synchronized void updateUsersList(List<UserConfiguration> users) throws IOException {

        configuration.getUsers().clear();

        for (UserConfiguration user : users) {

            configuration.getUsers().add(user);

        }

        updateConfigurationFile();

    }



    public String getRestPath() {

        return FacesContext.getCurrentInstance().getExternalContext().getRequestContextPath() + "/rest";

        return FacesContext.getCurrentInstance().getExternalContext().getRequestContextPath() + "/faces/rest";

    }



    public String getVersion() {