Changeset 1419


Ignore:
Timestamp:
06/14/11 09:28:53 (13 years ago)
Author:
patdui
Message:
  • deleted add fileSystem related implementation/configuration code. We can only use a database now.
  • also removed the old registryFiller script/tool, old and no longer usable.
Location:
ComponentRegistry/trunk/ComponentRegistry
Files:
11 deleted
16 edited

Legend:

Unmodified
Added
Removed

  • ComponentRegistry/trunk/ComponentRegistry/pom.xml

    r1382 r1419  
    324324                </executions>
    325325            </plugin>
    326       <!--
    327         Assembly helper to create the RegistryFiller tool a command line tool which can help fill in a registry with
    328         existing components/profiles. Build the tool with: mvn -Dpackaging=jar -Dmaven.test.skip=true assembly:assembly
    329         This creates a in "target" a ComponentRegistry-1.0-SNAPSHOT-RegistryFiller directory with a bin and share
    330         directory. You can start the tool from the bin dir.
    331       -->
    332             <plugin>
    333                 <groupId>org.apache.maven.plugins</groupId>
    334                 <artifactId>maven-assembly-plugin</artifactId>
    335                 <configuration>
    336                     <attach>false</attach>
    337                     <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
    338                     <descriptors>
    339                         <descriptor>src/main/assembly/registryFiller.xml</descriptor>
    340                     </descriptors>
    341                 </configuration>
    342             </plugin>
    343326        </plugins>
    344327    </build>

  • ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/MassMigratePage.java

    r1364 r1419  
    22
    33import java.io.Serializable;
    4 import java.util.ArrayList;
    5 import java.util.List;
    64
    75import org.apache.wicket.Component;
    … …  
    1816import org.slf4j.LoggerFactory;
    1917
    20 import clarin.cmdi.componentregistry.ComponentRegistry;
    21 import clarin.cmdi.componentregistry.ComponentRegistryException;
    22 import clarin.cmdi.componentregistry.MDMarshaller;
    23 import clarin.cmdi.componentregistry.components.CMDComponentSpec;
    24 import clarin.cmdi.componentregistry.impl.database.AbstractDescriptionDao;
    2518import clarin.cmdi.componentregistry.impl.database.ComponentDescriptionDao;
    2619import clarin.cmdi.componentregistry.impl.database.ProfileDescriptionDao;
    2720import clarin.cmdi.componentregistry.impl.database.UserDao;
    28 import clarin.cmdi.componentregistry.impl.filesystem.ComponentRegistryFactoryImpl;
    29 import clarin.cmdi.componentregistry.model.AbstractDescription;
    30 import clarin.cmdi.componentregistry.model.UserMapping;
    31 import clarin.cmdi.componentregistry.model.UserMapping.User;
    3221
    3322/**
    … …  
    4130    private final static Logger LOG = LoggerFactory.getLogger(MassMigratePage.class);
    4231    private FeedbackPanel feedback;
    43     @SpringBean(name = "fileRegistryFactory")
    44     private ComponentRegistryFactoryImpl fileRegistryFactory;
    45     @SpringBean
    46     private ComponentDescriptionDao componentDescriptionDao;
    47     @SpringBean
    48     private ProfileDescriptionDao profileDescriptionDao;
    49     @SpringBean
    50     private UserDao userDao;
    51     private transient UserMapping userMap;
     32//    @SpringBean
     33//    private ComponentDescriptionDao componentDescriptionDao;
     34//    @SpringBean
     35//    private ProfileDescriptionDao profileDescriptionDao;
     36//    @SpringBean
     37//    private UserDao userDao;
    5238
    5339    public MassMigratePage(final PageParameters pageParameters) {
    5440        super(pageParameters);
    55         userMap = fileRegistryFactory.getUserMap();
    5641        addLinks();
    5742        feedback = new FeedbackPanel("feedback") {
    … …  
    8166
    8267    private void addMigrationOptions() {
    83         add(new Label("migrate1Label", "Click here to start the migration of the file storage into the database."));
     68        add(new Label("migrate1Label", "No migration implemented at the moment..."));
    8469        add(new IndicatingAjaxLink("migrate1") {
    8570
    … …  
    9479
    9580    private void startMigration() {
    96         info("Start Migration users...");
    97         List<User> users = userMap.getUsers();
    98         for (User user : users) {
    99             userDao.insertUser(user);
    100         }
    101         info("Start Migration descriptions and content...");
    102         List<ComponentRegistry> registries = new ArrayList<ComponentRegistry>();
    103         registries.add(fileRegistryFactory.getPublicRegistry());
    104         registries.addAll(fileRegistryFactory.getAllUserRegistries());
    105         for (ComponentRegistry registry : registries) {
    106             try {
    107                 migrateDescriptions(registry.getComponentDescriptions(), registry, componentDescriptionDao);
    108                 migrateDescriptions(registry.getProfileDescriptions(), registry, profileDescriptionDao);
    109             } catch (ComponentRegistryException e) {
    110                 LOG.error("Error in migration, check the logs!", e);
    111                 info("Error cannot retrieve descriptions from registry " + registry.getName());
    112             }
    113         }
    114         info("End Migration.");
     81        info("Nothing to migrate...");
    11582    }
    11683
    117     private void migrateDescriptions(List<? extends AbstractDescription> descs, ComponentRegistry registry, AbstractDescriptionDao descDao) {
    118         int migrateCount = 0;
    119         for (AbstractDescription description : descs) {
    120             try {
    121                 User user = userDao.getByPrincipalName(userMap.findUser(description.getUserId()).getPrincipalName());
    122                 descDao.insertDescription(description, getContent(description, registry), registry.isPublic(), user.getId());
    123             } catch (Exception e) {
    124                 LOG.error("Error in migration:", e);
    125                 info("Error cannot migrate, check the logs!" + description.getId());
    126             }
    127             migrateCount++;
    128         }
    129         LOG.info(registry.getName() + " migrated: " + migrateCount + " out of " + descs.size() + " descs");
    130     }
    131 
    132     private String getContent(AbstractDescription description, ComponentRegistry registry) throws ComponentRegistryException {
    133         CMDComponentSpec spec = null;
    134         if (description.isProfile()) {
    135             spec = registry.getMDProfile(description.getId());
    136         } else {
    137             spec = registry.getMDComponent(description.getId());
    138         }
    139         return MDMarshaller.marshalToString(spec);
    140     }
    14184}

  • ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/SecureAdminWebPage.java

    r1292 r1419  
    11package clarin.cmdi.componentregistry.frontend;
    22
    3 import clarin.cmdi.componentregistry.Configuration;
    43import java.security.Principal;
    54
    … …  
    87import org.apache.wicket.markup.html.basic.MultiLineLabel;
    98
    10 import clarin.cmdi.componentregistry.impl.filesystem.FileSystemConfiguration;
     9import clarin.cmdi.componentregistry.Configuration;
    1110
    1211public abstract class SecureAdminWebPage extends WebPage {
    … …  
    1817            setResponsePage(new AccessDeniedPage());
    1918        }
    20         add(new MultiLineLabel("message", "Component Registry Admin Page.\nYou are logged in as: " + userPrincipal.getName()
    21                 + ".\nRegistry is located in: " + FileSystemConfiguration.getInstance().getRegistryRoot()));
     19        add(new MultiLineLabel("message", "Component Registry Admin Page.\nYou are logged in as: " + userPrincipal.getName() + ".\n"));
    2220    }
    2321
    2422    protected Principal getUserPrincipal() {
    25         return getWebRequestCycle().getWebRequest().getHttpServletRequest().getUserPrincipal();
     23        return getWebRequestCycle().getWebRequest().getHttpServletRequest().getUserPrincipal();
    2624    }
    2725

  • ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/frontend/StatisticsPage.java

    r1359 r1419  
    11package clarin.cmdi.componentregistry.frontend;
    22
    3 import clarin.cmdi.componentregistry.ComponentRegistry;
    4 import clarin.cmdi.componentregistry.ComponentRegistryException;
    5 import clarin.cmdi.componentregistry.impl.filesystem.ComponentRegistryFactoryImpl;
    6 import clarin.cmdi.componentregistry.components.CMDComponentSpec;
    7 import clarin.cmdi.componentregistry.components.CMDComponentType;
    8 import clarin.cmdi.componentregistry.model.ComponentDescription;
    9 import clarin.cmdi.componentregistry.model.ProfileDescription;
    10 import clarin.cmdi.componentregistry.impl.filesystem.CMDComponentSpecExpanderImpl;
    11 import clarin.cmdi.componentregistry.impl.filesystem.ComponentRegistryImpl;
    12 import clarin.cmdi.componentregistry.components.CMDElementType;
    133import java.io.IOException;
    144import java.util.List;
     5
    156import org.apache.wicket.PageParameters;
    167import org.apache.wicket.markup.html.WebMarkupContainer;
    … …  
    189import org.apache.wicket.markup.html.link.Link;
    1910import org.apache.wicket.markup.repeater.RepeatingView;
     11import org.apache.wicket.spring.injection.annot.SpringBean;
     12
     13import clarin.cmdi.componentregistry.ComponentRegistry;
     14import clarin.cmdi.componentregistry.ComponentRegistryException;
     15import clarin.cmdi.componentregistry.ComponentRegistryFactory;
     16import clarin.cmdi.componentregistry.components.CMDComponentSpec;
     17import clarin.cmdi.componentregistry.components.CMDComponentType;
     18import clarin.cmdi.componentregistry.components.CMDElementType;
     19import clarin.cmdi.componentregistry.impl.database.CMDComponentSpecExpanderDbImpl;
     20import clarin.cmdi.componentregistry.impl.database.ComponentRegistryDbImpl;
     21import clarin.cmdi.componentregistry.model.ComponentDescription;
     22import clarin.cmdi.componentregistry.model.ProfileDescription;
    2023
    2124/**
    … …  
    2629
    2730    private static final long serialVersionUID = 1L;
    28     private transient ComponentRegistry registry = ComponentRegistryFactoryImpl.getInstance().getPublicRegistry();
     31    @SpringBean(name = "componentRegistryFactory")
     32    private ComponentRegistryFactory componentRegistryFactory;
    2933
    3034    private static class Statistics {
    … …  
    3640    public StatisticsPage(final PageParameters pageParameters) throws IOException, ComponentRegistryException {
    3741        super(pageParameters);
     42        ComponentRegistry registry = componentRegistryFactory.getPublicRegistry();
    3843        addLinks();
    39         DisplayStatistics();
     44        displayStatistics(registry);
    4045    }
    4146
    42     private void DisplayStatistics() throws ComponentRegistryException {
     47    private void displayStatistics(ComponentRegistry registry) throws ComponentRegistryException {
    4348        List<ProfileDescription> profileList = registry.getProfileDescriptions();
    4449        RepeatingView repeating = new RepeatingView("repeating");
    … …  
    4651        add(new Label("profilenumbermessage", "Current number of profiles in the component registry: " + profileList.size()));
    4752        for (ProfileDescription pd : profileList) {
    48             displayProfileStatistics(pd, repeating);
     53            displayProfileStatistics(pd, repeating, registry);
    4954        }
    5055        List<ComponentDescription> componentList = registry.getComponentDescriptions();
    … …  
    5358        add(new Label("componentnumbermessage", "Current number of components in the component registry: " + componentList.size()));
    5459        for (ComponentDescription cd : componentList) {
    55             displayComponentStatistics(cd, repeatingcomp);
     60            displayComponentStatistics(cd, repeatingcomp, registry);
    5661        }
    5762    }
    5863
    59     private void displayProfileStatistics(ProfileDescription pd, RepeatingView repeatingview) throws ComponentRegistryException {
     64    private void displayProfileStatistics(ProfileDescription pd, RepeatingView repeatingview, ComponentRegistry registry) throws ComponentRegistryException {
    6065        WebMarkupContainer item = new WebMarkupContainer(repeatingview.newChildId());
    6166        repeatingview.add(item);
    6267        item.add(new Label("ID", pd.getId()));
    6368        item.add(new Label("profname", pd.getName()));
    64         CMDComponentSpec profile = CMDComponentSpecExpanderImpl.expandProfile(pd.getId(), (ComponentRegistryImpl) registry);
     69        CMDComponentSpec profile = CMDComponentSpecExpanderDbImpl.expandProfile(pd.getId(), (ComponentRegistryDbImpl) registry);
    6570        Statistics stats = new Statistics();
    6671        componentCounter(profile.getCMDComponent(), stats);
    … …  
    7075    }
    7176
    72     private void displayComponentStatistics(ComponentDescription cd, RepeatingView repeatingview) throws ComponentRegistryException {
     77    private void displayComponentStatistics(ComponentDescription cd, RepeatingView repeatingview,  ComponentRegistry registry) throws ComponentRegistryException {
    7378        WebMarkupContainer item = new WebMarkupContainer(repeatingview.newChildId());
    7479        repeatingview.add(item);
    7580        item.add(new Label("ID", cd.getId()));
    7681        item.add(new Label("compname", cd.getName()));
    77         CMDComponentSpec compspec = CMDComponentSpecExpanderImpl.expandComponent(cd.getId(), (ComponentRegistryImpl) registry);
     82        CMDComponentSpec compspec = CMDComponentSpecExpanderDbImpl.expandComponent(cd.getId(), (ComponentRegistryDbImpl) registry);
    7883        Statistics stats = new Statistics();
    7984        componentCounter(compspec.getCMDComponent(), stats);

  • ComponentRegistry/trunk/ComponentRegistry/src/main/webresources/WEB-INF/applicationContext.xml

    r1342 r1419  
    99
    1010    <import resource="spring-config/component-registry.xml"/>
    11 <!--    <import resource="spring-config/filesystem-impl.xml"/>-->
    1211    <import resource="spring-config/database-impl.xml"/>
    1312   
    14     <!--  For migration -->
    15     <bean id="fileSystemConfiguration" class="clarin.cmdi.componentregistry.impl.filesystem.FileSystemConfiguration" init-method="init" factory-method="getInstance">
    16         <property name="registryRoot" value="${registryRoot}" />
    17     </bean>
    18     <bean id="fileRegistryFactory" class="clarin.cmdi.componentregistry.impl.filesystem.ComponentRegistryFactoryImpl" init-method="init" factory-method="getInstance">
    19         <property name="configuration" ref="configuration"/>
    20         <property name="fileSystemConfiguration" ref="fileSystemConfiguration"/>
    21     </bean>
    22     <!--  For migration end -->
    2313
    2414</beans>

  • ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/AbstractDescriptionDaoTest.java

    r1378 r1419  
    2222 */
    2323@RunWith(SpringJUnit4ClassRunner.class)
    24 @ContextConfiguration(locations = { "/applicationContext-database-impl.xml" })
     24@ContextConfiguration(locations = { "/applicationContext.xml" })
    2525public abstract class AbstractDescriptionDaoTest {
    2626

  • ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/AdminRegistryTest.java

    r1373 r1419  
    11package clarin.cmdi.componentregistry.impl.database;
    22
    3 import static clarin.cmdi.componentregistry.impl.database.ComponentRegistryDatabase.createTableComponentDescription;
    4 import static clarin.cmdi.componentregistry.impl.database.ComponentRegistryDatabase.createTableProfileDescription;
    5 import static clarin.cmdi.componentregistry.impl.database.ComponentRegistryDatabase.createTableRegistryUser;
    6 import static clarin.cmdi.componentregistry.impl.database.ComponentRegistryDatabase.createTableXmlContent;
    7 import static clarin.cmdi.componentregistry.impl.database.ComponentRegistryDatabase.resetDatabase;
    83import static org.junit.Assert.assertEquals;
    94import static org.junit.Assert.assertTrue;
    … …  
    2621import clarin.cmdi.componentregistry.frontend.DisplayDataNode;
    2722import clarin.cmdi.componentregistry.frontend.SubmitFailedException;
    28 import clarin.cmdi.componentregistry.impl.database.ComponentDescriptionDao;
    29 import clarin.cmdi.componentregistry.impl.database.ProfileDescriptionDao;
    3023import clarin.cmdi.componentregistry.model.ComponentDescription;
    3124import clarin.cmdi.componentregistry.model.ProfileDescription;
    … …  
    3427
    3528@RunWith(SpringJUnit4ClassRunner.class)
    36 @ContextConfiguration(locations = {"/applicationContext-database-impl.xml"})
     29@ContextConfiguration(locations = {"/applicationContext.xml"})
    3730public class AdminRegistryTest  {
    3831   
    … …  
    5043    @Before
    5144    public void init() {
    52         resetDatabase(jdbcTemplate);
    53         createTableComponentDescription(jdbcTemplate);
    54         createTableProfileDescription(jdbcTemplate);
    55         createTableXmlContent(jdbcTemplate);
    56         createTableRegistryUser(jdbcTemplate);
     45        ComponentRegistryDatabase.resetAndCreateAllTables(jdbcTemplate);
    5746    }
    5847

  • ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDatabase.java

    r1369 r1419  
    6161                + " principal_name character varying);");
    6262    }
     63
     64    public static void resetAndCreateAllTables(JdbcTemplate jdbcTemplate) {
     65        resetDatabase(jdbcTemplate);
     66        createTableComponentDescription(jdbcTemplate);
     67        createTableProfileDescription(jdbcTemplate);
     68        createTableXmlContent(jdbcTemplate);
     69        createTableRegistryUser(jdbcTemplate);
     70    }
    6371}

  • ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImplTest.java

    r1386 r1419  
    3737
    3838@RunWith(SpringJUnit4ClassRunner.class)
    39 @ContextConfiguration(locations = {"/applicationContext-database-impl.xml"})
     39@ContextConfiguration(locations = {"/applicationContext.xml"})
    4040public class ComponentRegistryDbImplTest {
    4141
    … …  
    5151    @Before
    5252    public void init() {
    53         resetDatabase(jdbcTemplate);
    54         createTableComponentDescription(jdbcTemplate);
    55         createTableProfileDescription(jdbcTemplate);
    56         createTableXmlContent(jdbcTemplate);
    57         createTableRegistryUser(jdbcTemplate);
     53        ComponentRegistryDatabase.resetAndCreateAllTables(jdbcTemplate);
    5854    }
    5955

  • ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryFactoryDbImplTest.java

    r1359 r1419  
    2323 */
    2424@RunWith(SpringJUnit4ClassRunner.class)
    25 @ContextConfiguration(locations = {"/applicationContext-database-impl.xml"})
     25@ContextConfiguration(locations = {"/applicationContext.xml"})
    2626public class ComponentRegistryFactoryDbImplTest {
    2727

  • ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/impl/database/UserDaoTest.java

    r1324 r1419  
    2020 */
    2121@RunWith(SpringJUnit4ClassRunner.class)
    22 @ContextConfiguration(locations = {"/applicationContext-database-impl.xml"})
     22@ContextConfiguration(locations = {"/applicationContext.xml"})
    2323public class UserDaoTest {
    2424

  • ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestServiceTestCase.java

    r1345 r1419  
    66
    77
     8import clarin.cmdi.componentregistry.impl.database.UserDao;
    89import clarin.cmdi.componentregistry.model.ComponentDescription;
    910import clarin.cmdi.componentregistry.model.ProfileDescription;
     11import clarin.cmdi.componentregistry.model.UserMapping.User;
    1012
    1113import com.sun.jersey.api.client.GenericType;
    … …  
    2022import com.sun.jersey.test.framework.JerseyTest;
    2123import com.sun.jersey.test.framework.WebAppDescriptor;
     24
     25import org.springframework.beans.factory.annotation.Autowired;
    2226import org.springframework.web.context.ContextLoaderListener;
    2327import org.springframework.web.context.request.RequestContextListener;
    … …  
    3135    };
    3236
     37    @Autowired
     38    private UserDao userDao;
     39
     40   
    3341    protected abstract String getApplicationContextFile();
    3442
    … …  
    5967                + new String(Base64.encode(DummyPrincipal.DUMMY_PRINCIPAL.getName() + ":dummy")));
    6068    }
     69   
     70    protected void createUserRecord() {
     71        User user = new User();
     72        user.setName("Database test user");
     73        user.setPrincipalName(DummyPrincipal.DUMMY_PRINCIPAL.getName());
     74        userDao.insertUser(user);
     75    }
     76   
     77    protected UserDao getUserDao() {
     78        return userDao;
     79    }
    6180
    6281}

  • ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/DbImplComponentRegistryRestServiceTest.java

    r1348 r1419  
    11package clarin.cmdi.componentregistry.rest;
    22
    3 import clarin.cmdi.componentregistry.ComponentRegistry;
    4 import clarin.cmdi.componentregistry.ComponentRegistryFactory;
    5 import clarin.cmdi.componentregistry.impl.database.ComponentRegistryBeanFactory;
    6 import clarin.cmdi.componentregistry.impl.database.ComponentRegistryDatabase;
    7 import clarin.cmdi.componentregistry.impl.database.UserDao;
    8 import clarin.cmdi.componentregistry.model.UserMapping.User;
    93import org.junit.Before;
    104import org.junit.runner.RunWith;
    … …  
    148import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
    159
     10import clarin.cmdi.componentregistry.ComponentRegistry;
     11import clarin.cmdi.componentregistry.ComponentRegistryFactory;
     12import clarin.cmdi.componentregistry.impl.database.ComponentRegistryBeanFactory;
     13import clarin.cmdi.componentregistry.impl.database.ComponentRegistryDatabase;
     14
    1615
    1716@RunWith(SpringJUnit4ClassRunner.class)
    18 @ContextConfiguration(locations = {"/applicationContext-database-impl.xml"})
     17@ContextConfiguration(locations = {"/applicationContext.xml"})
    1918public class DbImplComponentRegistryRestServiceTest extends ComponentRegistryRestServiceTest {
    2019    @Autowired
    … …  
    2423    @Autowired
    2524    private JdbcTemplate jdbcTemplate;
    26     @Autowired
    27     private UserDao userDao;
     25
    2826    private ComponentRegistry testRegistry;
    2927
    … …  
    3129    @Before
    3230    public void init() {
    33         ComponentRegistryDatabase.resetDatabase(jdbcTemplate);
    34         ComponentRegistryDatabase.createTableRegistryUser(jdbcTemplate);
    35         ComponentRegistryDatabase.createTableXmlContent(jdbcTemplate);
    36         ComponentRegistryDatabase.createTableProfileDescription(jdbcTemplate);
    37         ComponentRegistryDatabase.createTableComponentDescription(jdbcTemplate);
     31        ComponentRegistryDatabase.resetAndCreateAllTables(jdbcTemplate);
    3832        createUserRecord();
    3933        setUpTestRegistry();
    40     }
    41 
    42     private void createUserRecord(){
    43         User user = new User();
    44         user.setName("Database test user");
    45         user.setPrincipalName(DummyPrincipal.DUMMY_PRINCIPAL.getName());
    46         userDao.insertUser(user);
    4734    }
    4835
    … …  
    5441    @Override
    5542    protected String getApplicationContextFile() {
    56         return "classpath:applicationContext-database-impl.xml";
     43        return "classpath:applicationContext.xml";
    5744    }
    5845
    … …  
    6451    @Override
    6552    protected String expectedUserId(String principal) {
    66         return userDao.getByPrincipalName(principal).getId().toString();
     53        return getUserDao().getByPrincipalName(principal).getId().toString();
    6754    }
    6855

  • ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/DbImplConcurrentRestServiceTest.java

    r1359 r1419  
    11package clarin.cmdi.componentregistry.rest;
    22
    3 import clarin.cmdi.componentregistry.impl.database.ComponentRegistryDatabase;
    4 import clarin.cmdi.componentregistry.impl.database.UserDao;
    5 import clarin.cmdi.componentregistry.model.UserMapping.User;
    63import org.junit.Before;
    74import org.junit.runner.RunWith;
    … …  
    118import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
    129
     10import clarin.cmdi.componentregistry.impl.database.ComponentRegistryDatabase;
     11
    1312@RunWith(SpringJUnit4ClassRunner.class)
    14 @ContextConfiguration(locations = {"/applicationContext-database-impl.xml"})
     13@ContextConfiguration(locations = { "/applicationContext.xml" })
    1514public class DbImplConcurrentRestServiceTest extends ConcurrentRestServiceTest {
    1615
    1716    @Autowired
    1817    private JdbcTemplate jdbcTemplate;
    19     @Autowired
    20     private UserDao userDao;
    21 //    private ComponentRegistry testRegistry;
    2218
    2319    @Before
    2420    public void init() {
    25         ComponentRegistryDatabase.resetDatabase(jdbcTemplate);
    26         ComponentRegistryDatabase.createTableRegistryUser(jdbcTemplate);
    27         ComponentRegistryDatabase.createTableXmlContent(jdbcTemplate);
    28         ComponentRegistryDatabase.createTableProfileDescription(jdbcTemplate);
    29         ComponentRegistryDatabase.createTableComponentDescription(jdbcTemplate);
     21        ComponentRegistryDatabase.resetAndCreateAllTables(jdbcTemplate);
    3022        createUserRecord();
    31 //      setUpTestRegistry();
    3223    }
    33 
    34     private void createUserRecord() {
    35         User user = new User();
    36         user.setName("Database test user");
    37         user.setPrincipalName(DummyPrincipal.DUMMY_PRINCIPAL.getName());
    38         userDao.insertUser(user);
    39     }
    40 //
    41 //    private void setUpTestRegistry() {
    42 //      // Get public component registry
    43 //      testRegistry = componentRegistryBeanFactory.getNewComponentRegistry();
    44 //    }
    4524
    4625    @Override
    4726    protected String getApplicationContextFile() {
    48 
    49         return "classpath:applicationContext-database-impl.xml";
     27        return "classpath:applicationContext.xml";
    5028    }
    5129}

  • ComponentRegistry/trunk/ComponentRegistry/src/test/java/clarin/cmdi/componentregistry/rest/MDValidatorTest.java

    r1286 r1419  
    66
    77import java.io.ByteArrayInputStream;
    8 import java.io.File;
    98import java.io.InputStream;
    10 import java.text.ParseException;
    119
    12 import javax.xml.bind.JAXBException;
    13 
    14 import org.junit.After;
    1510import org.junit.Before;
    1611import org.junit.Test;
     12import org.junit.runner.RunWith;
     13import org.springframework.beans.factory.annotation.Autowired;
     14import org.springframework.jdbc.core.JdbcTemplate;
     15import org.springframework.test.context.ContextConfiguration;
     16import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
    1717
    1818import clarin.cmdi.componentregistry.ComponentRegistry;
    1919import clarin.cmdi.componentregistry.ComponentRegistryFactory;
    20 import clarin.cmdi.componentregistry.impl.filesystem.ComponentRegistryTestCase;
     20import clarin.cmdi.componentregistry.impl.database.ComponentRegistryDatabase;
    2121import clarin.cmdi.componentregistry.model.ComponentDescription;
    2222import clarin.cmdi.componentregistry.model.ProfileDescription;
    23 import org.junit.runner.RunWith;
    24 import org.springframework.beans.factory.annotation.Autowired;
    25 import org.springframework.test.context.ContextConfiguration;
    26 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
    2723
    2824@RunWith(SpringJUnit4ClassRunner.class)
    2925@ContextConfiguration(locations={"/applicationContext.xml"})
     26public class MDValidatorTest {
     27   
     28    @Autowired
     29    private ComponentRegistryFactory componentRegistryFactory;
     30    @Autowired
     31    private JdbcTemplate jdbcTemplate;
    3032
    31 public class MDValidatorTest {
    32     @Autowired
    33     protected ComponentRegistryFactory componentRegistryFactory;
    34 
    35     private static File registryDir;
    36     private static ComponentRegistry testRegistry;
    37     private static ComponentRegistry publicRegistry;
     33    private ComponentRegistry publicRegistry;
    3834
    3935    @Before
    40     public void setUpTestRegistry() throws ParseException, JAXBException {
    41         registryDir = ComponentRegistryTestCase.createTempRegistryDir();
    42         testRegistry = ComponentRegistryTestCase.getTestRegistry(registryDir);
    43         publicRegistry = testRegistry;
    44     }
    45 
    46     @After
    47     public void deleteRegistry() {
    48         ComponentRegistryTestCase.cleanUpRegistryDir(registryDir);
     36    public void init() {
     37        ComponentRegistryDatabase.resetAndCreateAllTables(jdbcTemplate);
     38        publicRegistry = componentRegistryFactory.getPublicRegistry();
    4939    }
    5040
    … …  
    6757
    6858        ProfileDescription desc = ProfileDescription.createNewDescription();
    69         MDValidator validator = new MDValidator(input, desc, testRegistry, null, publicRegistry);
     59        MDValidator validator = new MDValidator(input, desc, publicRegistry, null, publicRegistry);
    7060        assertTrue(validator.validate());
    7161    }
    … …  
    8373
    8474        ProfileDescription desc = ProfileDescription.createNewDescription();
    85         MDValidator validator = new MDValidator(input, desc, testRegistry, null, publicRegistry);
     75        MDValidator validator = new MDValidator(input, desc, publicRegistry, null, publicRegistry);
    8676        assertFalse(validator.validate());
    8777        assertTrue(validator.getErrorMessages().get(0).startsWith(MDValidator.COMPONENT_NOT_PUBLICLY_REGISTERED_ERROR));
    … …  
    10393
    10494        ProfileDescription desc = ProfileDescription.createNewDescription();
    105         MDValidator validator = new MDValidator(new ByteArrayInputStream(profileContent.getBytes()), desc, testRegistry, null, publicRegistry);
     95        MDValidator validator = new MDValidator(new ByteArrayInputStream(profileContent.getBytes()), desc, publicRegistry, null, publicRegistry);
    10696        assertFalse(validator.validate());
    10797        assertEquals(2, validator.getErrorMessages().size());
    … …  
    10999        assertTrue(validator.getErrorMessages().get(1).startsWith(MDValidator.COMPONENT_NOT_PUBLICLY_REGISTERED_ERROR));
    110100
    111         RegistryTestHelper.addComponent(testRegistry, id1);
    112         validator = new MDValidator(new ByteArrayInputStream(profileContent.getBytes()), desc, testRegistry, null, publicRegistry);
     101        RegistryTestHelper.addComponent(publicRegistry, id1);
     102        validator = new MDValidator(new ByteArrayInputStream(profileContent.getBytes()), desc, publicRegistry, null, publicRegistry);
    113103        assertFalse(validator.validate());
    114104        assertEquals(1, validator.getErrorMessages().size());
    115105        assertTrue(validator.getErrorMessages().get(0).startsWith(MDValidator.COMPONENT_NOT_PUBLICLY_REGISTERED_ERROR));
    116106
    117         RegistryTestHelper.addComponent(testRegistry, id2);
    118         validator = new MDValidator(new ByteArrayInputStream(profileContent.getBytes()), desc, testRegistry, null, publicRegistry);
     107        RegistryTestHelper.addComponent(publicRegistry, id2);
     108        validator = new MDValidator(new ByteArrayInputStream(profileContent.getBytes()), desc, publicRegistry, null, publicRegistry);
    119109        assertTrue("component is registered should be valid now", validator.validate());
    120110        assertEquals(0, validator.getErrorMessages().size());
    … …  
    144134
    145135        RegistryTestHelper.addComponent(userRegistry, id1);
    146         RegistryTestHelper.addComponent(testRegistry, id2);
    147         validator = new MDValidator(new ByteArrayInputStream(profileContent.getBytes()), desc, testRegistry, null, publicRegistry);
     136        RegistryTestHelper.addComponent(publicRegistry, id2);
     137        validator = new MDValidator(new ByteArrayInputStream(profileContent.getBytes()), desc, publicRegistry, null, publicRegistry);
    148138        assertFalse(validator.validate());
    149139        assertEquals(1, validator.getErrorMessages().size());
    … …  
    171161
    172162        ComponentDescription desc = ComponentDescription.createNewDescription();
    173         MDValidator validator = new MDValidator(new ByteArrayInputStream(content.getBytes()), desc, testRegistry, null, publicRegistry);
     163        MDValidator validator = new MDValidator(new ByteArrayInputStream(content.getBytes()), desc, publicRegistry, null, publicRegistry);
    174164        assertFalse(validator.validate());
    175165        assertEquals(1, validator.getErrorMessages().size());
    176166        assertTrue(validator.getErrorMessages().get(0).startsWith(MDValidator.COMPONENT_NOT_PUBLICLY_REGISTERED_ERROR));
    177167
    178         RegistryTestHelper.addComponent(testRegistry, id1);
    179         validator = new MDValidator(new ByteArrayInputStream(content.getBytes()), desc, testRegistry, null, publicRegistry);
     168        RegistryTestHelper.addComponent(publicRegistry, id1);
     169        validator = new MDValidator(new ByteArrayInputStream(content.getBytes()), desc, publicRegistry, null, publicRegistry);
    180170        assertTrue(validator.validate());
    181171        assertEquals(0, validator.getErrorMessages().size());

  • ComponentRegistry/trunk/ComponentRegistry/src/test/resources/applicationContext.xml

    r1345 r1419  
    99
    1010    <import resource="spring-config/component-registry.xml"/>
    11     <import resource="spring-config/filesystem-impl.xml"/>
     11    <import resource="spring-config/database-impl.xml"/>
     12   
    1213
    1314</beans>
Note: See TracChangeset for help on using the changeset viewer.