Changeset 3451


Ignore:
Timestamp:
08/21/13 08:29:32 (11 years ago)
Author:
George.Georgovassilis@mpi.nl
Message:

#360 Fixes for shha lux16 environment and renaming of DAO interfaces and implementations

Location:
ComponentRegistry/trunk/ComponentRegistry
Files:
2 added
20 edited
12 moved

Legend:

Unmodified
Added
Removed

  • ComponentRegistry/trunk/ComponentRegistry/pom.xml

    r3449 r3451  
    325325                                <serviceRootUrl>http://lux16.mpi.nl/ds/ComponentRegistry</serviceRootUrl>
    326326                                <!-- Will be inserted in context.xml -->
    327                                 <shibLI>http://lux16.mpi.nl/Shibboleth.sso/DS</shibLI>
     327                                <shibLI>http://lux16.mpi.nl/Shibboleth.sso/Login</shibLI>
    328328                                <!-- Shibboleth login URI for SHHAA -->
    329329                                <shibLO>http://lux16.mpi.nl/Shibboleth.sso/Logout</shibLO>

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

    r3449 r3451  
    3232import clarin.cmdi.componentregistry.MDMarshaller;
    3333import clarin.cmdi.componentregistry.impl.database.AdminRegistry;
    34 import clarin.cmdi.componentregistry.impl.database.ComponentDescriptionDao;
    35 import clarin.cmdi.componentregistry.impl.database.IComponentDescriptionDao;
    36 import clarin.cmdi.componentregistry.impl.database.IProfileDescriptionDAO;
    37 import clarin.cmdi.componentregistry.impl.database.ProfileDescriptionDao;
    3834import clarin.cmdi.componentregistry.model.AbstractDescription;
    3935import clarin.cmdi.componentregistry.model.ComponentDescription;
    4036import clarin.cmdi.componentregistry.model.ProfileDescription;
     37import clarin.cmdi.componentregistry.persistence.ComponentDescriptionDao;
     38import clarin.cmdi.componentregistry.persistence.ProfileDescriptionDao;
     39import clarin.cmdi.componentregistry.persistence.impl.ComponentDescriptionDaoImpl;
     40import clarin.cmdi.componentregistry.persistence.impl.ProfileDescriptionDaoImpl;
    4141
    4242@SuppressWarnings("serial")
    … …  
    5151    private ComponentRegistryFactory componentRegistryFactory;
    5252    @SpringBean
    53     private IProfileDescriptionDAO profileDescriptionDao;
     53    private ProfileDescriptionDao profileDescriptionDao;
    5454    @SpringBean
    55     private IComponentDescriptionDao componentDescriptionDao;
     55    private ComponentDescriptionDao componentDescriptionDao;
    5656    @SpringBean
    5757    private MDMarshaller marshaller;

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

    r1778 r3451  
    2626    private FeedbackPanel feedback;
    2727//    @SpringBean
    28 //    private ComponentDescriptionDao componentDescriptionDao;
     28//    private ComponentDescriptionDaoImpl componentDescriptionDao;
    2929//    @SpringBean
    30 //    private ProfileDescriptionDao profileDescriptionDao;
     30//    private ProfileDescriptionDaoImpl profileDescriptionDao;
    3131//    @SpringBean
    32 //    private UserDao userDao;
     32//    private UserDaoImpl userDao;
    3333
    3434    public MassMigratePage(final PageParameters pageParameters) {

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

    r3449 r3451  
    77import clarin.cmdi.componentregistry.ComponentRegistryFactory;
    88import clarin.cmdi.componentregistry.UserCredentials;
    9 import clarin.cmdi.componentregistry.impl.database.IUserDAO;
    109import clarin.cmdi.componentregistry.model.RegistryUser;
     10import clarin.cmdi.componentregistry.persistence.UserDao;
    1111
    1212import java.security.Principal;
    … …  
    3232
    3333    @SpringBean
    34     private IUserDAO userDao;
     34    private UserDao userDao;
    3535    @SpringBean(name = "componentRegistryFactory")
    3636    private ComponentRegistryFactory componentRegistryFactory;

  • ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/ComponentRegistryImplBase.java

    r3088 r3451  
    6969    @Override
    7070    public List<ProfileDescription> getProfileDescriptionsForMetadaEditor() throws ComponentRegistryException {
    71         // TODO: Below can also be done by accepting and passing a parameter in the ProfileDescriptionDao, should have better performance
     71        // TODO: Below can also be done by accepting and passing a parameter in the ProfileDescriptionDaoImpl, should have better performance
    7272
    7373        // Get all profile descriptions

  • ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/AdminRegistry.java

    r3449 r3451  
    2525import clarin.cmdi.componentregistry.model.ComponentDescription;
    2626import clarin.cmdi.componentregistry.model.ProfileDescription;
     27import clarin.cmdi.componentregistry.persistence.ComponentDescriptionDao;
     28import clarin.cmdi.componentregistry.persistence.ProfileDescriptionDao;
    2729
    2830/**
    … …  
    3638            .getLogger(AdminRegistry.class);
    3739    private ComponentRegistryFactory componentRegistryFactory;
    38     private IProfileDescriptionDAO profileDescriptionDao;
    39     private IComponentDescriptionDao componentDescriptionDao;
     40    private ProfileDescriptionDao profileDescriptionDao;
     41    private ComponentDescriptionDao componentDescriptionDao;
    4042    private MDMarshaller marshaller;
    4143
    … …  
    4648
    4749    public void setProfileDescriptionDao(
    48             IProfileDescriptionDAO profileDescriptionDao) {
     50            ProfileDescriptionDao profileDescriptionDao) {
    4951        this.profileDescriptionDao = profileDescriptionDao;
    5052    }
    5153
    5254    public void setComponentDescriptionDao(
    53             IComponentDescriptionDao componentDescriptionDao) {
     55            ComponentDescriptionDao componentDescriptionDao) {
    5456        this.componentDescriptionDao = componentDescriptionDao;
    5557    }

  • ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryDbImpl.java

    r3449 r3451  
    1919import clarin.cmdi.componentregistry.model.ProfileDescription;
    2020import clarin.cmdi.componentregistry.model.RegistryUser;
     21import clarin.cmdi.componentregistry.persistence.AbstractDescriptionDao;
     22import clarin.cmdi.componentregistry.persistence.CommentsDao;
     23import clarin.cmdi.componentregistry.persistence.ComponentDescriptionDao;
     24import clarin.cmdi.componentregistry.persistence.ProfileDescriptionDao;
     25import clarin.cmdi.componentregistry.persistence.UserDao;
     26
    2127import java.io.ByteArrayInputStream;
    2228import java.io.ByteArrayOutputStream;
    … …  
    3238import java.util.Date;
    3339import java.util.List;
     40
    3441import javax.xml.bind.JAXBException;
    3542import javax.xml.transform.TransformerException;
     43
    3644import org.slf4j.Logger;
    3745import org.slf4j.LoggerFactory;
    … …  
    6472    // DAO's
    6573    @Autowired
    66     private IProfileDescriptionDAO profileDescriptionDao;
     74    private ProfileDescriptionDao profileDescriptionDao;
    6775    @Autowired
    68     private IComponentDescriptionDao componentDescriptionDao;
     76    private ComponentDescriptionDao componentDescriptionDao;
    6977    @Autowired
    70     private IUserDAO userDao;
     78    private UserDao userDao;
    7179    @Autowired
    72     private ICommentsDao commentsDao;
     80    private CommentsDao commentsDao;
    7381    @Autowired
    7482    private MDMarshaller marshaller;
    … …  
    477485                checkStillUsed(description.getId());
    478486            }
    479             IAbstractDescriptionDao<?> dao = getDaoForDescription(description);
     487            AbstractDescriptionDao<?> dao = getDaoForDescription(description);
    480488            dao.updateDescription(getIdForDescription(description),
    481489                    description, componentSpecToString(spec));
    … …  
    507515            Principal principal) {
    508516        int result = 0;
    509         IAbstractDescriptionDao<?> dao = getDaoForDescription(desc);
     517        AbstractDescriptionDao<?> dao = getDaoForDescription(desc);
    510518        if (!isPublic()) { // if already in public workspace there is nothing
    511519                           // todo
    … …  
    675683    }
    676684
    677     private IAbstractDescriptionDao<?> getDaoForDescription(
     685    private AbstractDescriptionDao<?> getDaoForDescription(
    678686            AbstractDescription description) {
    679687        return description.isProfile() ? profileDescriptionDao
    … …  
    694702            throws IllegalArgumentException {
    695703        Number dbId = null;
    696         IAbstractDescriptionDao<?> dao = getDaoForDescription(description);
     704        AbstractDescriptionDao<?> dao = getDaoForDescription(description);
    697705        try {
    698706            dbId = dao.getDbId(description.getId());
    … …  
    719727
    720728    private CMDComponentSpec getUncachedMDComponent(String id,
    721             IAbstractDescriptionDao dao) {
     729            AbstractDescriptionDao dao) {
    722730        String xml = dao.getContent(false, id);
    723731        if (xml != null) {
    … …  
    795803    }
    796804
    797     private boolean inWorkspace(IAbstractDescriptionDao<?> dao, String cmdId) {
     805    private boolean inWorkspace(AbstractDescriptionDao<?> dao, String cmdId) {
    798806        if (isPublic()) {
    799807            return dao.isPublic(cmdId);

  • ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/impl/database/ComponentRegistryFactoryDbImpl.java

    r3449 r3451  
    1010import clarin.cmdi.componentregistry.UserUnauthorizedException;
    1111import clarin.cmdi.componentregistry.model.RegistryUser;
     12import clarin.cmdi.componentregistry.persistence.UserDao;
     13
    1214import java.security.Principal;
    1315import java.util.ArrayList;
    1416import java.util.List;
     17
    1518import org.slf4j.Logger;
    1619import org.slf4j.LoggerFactory;
    … …  
    3538    private ComponentRegistryBeanFactory componentRegistryBeanFactory;
    3639    @Autowired
    37     private IUserDAO userDao;
     40    private UserDao userDao;
    3841    private ComponentRegistry publicComponentRegistry = null;
    3942

  • ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/persistence/AbstractDescriptionDao.java

    r3449 r3451  
    1 package clarin.cmdi.componentregistry.impl.database;
     1package clarin.cmdi.componentregistry.persistence;
    22
    33import java.util.List;
    … …  
    1616 * @param <T>
    1717 */
    18 public interface IAbstractDescriptionDao<T extends AbstractDescription> {
     18public interface AbstractDescriptionDao<T extends AbstractDescription> {
    1919
    2020        /**

  • ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/persistence/CommentsDao.java

    r3449 r3451  
    1 package clarin.cmdi.componentregistry.impl.database;
     1package clarin.cmdi.componentregistry.persistence;
    22
    33import java.util.List;
    … …  
    1212 *
    1313 */
    14 public interface ICommentsDao extends IComponentRegistryDao<Comment>{
     14public interface CommentsDao extends ComponentRegistryDao<Comment>{
    1515
    1616        /**

  • ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/persistence/ComponentDescriptionDao.java

    r3449 r3451  
    1 package clarin.cmdi.componentregistry.impl.database;
     1package clarin.cmdi.componentregistry.persistence;
    22
    33import java.util.List;
    … …  
    1010 *
    1111 */
    12 public interface IComponentDescriptionDao extends IAbstractDescriptionDao<ComponentDescription>{
     12public interface ComponentDescriptionDao extends AbstractDescriptionDao<ComponentDescription>{
    1313
    1414        List<ComponentDescription> getPublicComponentDescriptions();

  • ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/persistence/ComponentRegistryDao.java

    r3449 r3451  
    1 package clarin.cmdi.componentregistry.impl.database;
     1package clarin.cmdi.componentregistry.persistence;
    22
    33import javax.sql.DataSource;
    … …  
    1111 * @param <T>
    1212 */
    13 public interface IComponentRegistryDao<T> {
     13public interface ComponentRegistryDao<T> {
    1414
    1515        public final static String TABLE_COMMENTS = "comments";

  • ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/persistence/ProfileDescriptionDao.java

    r3449 r3451  
    1 package clarin.cmdi.componentregistry.impl.database;
     1package clarin.cmdi.componentregistry.persistence;
    22
    33import java.util.List;
    … …  
    1010 *
    1111 */
    12 public interface IProfileDescriptionDAO extends IAbstractDescriptionDao<ProfileDescription>{
     12public interface ProfileDescriptionDao extends AbstractDescriptionDao<ProfileDescription>{
    1313
    1414        List<ProfileDescription> getPublicProfileDescriptions();

  • ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/persistence/UserDao.java

    r3449 r3451  
    1 package clarin.cmdi.componentregistry.impl.database;
     1package clarin.cmdi.componentregistry.persistence;
    22
    33import java.util.List;
    … …  
    1212 *
    1313 */
    14 public interface IUserDAO {
     14public interface UserDao {
    1515
    1616        List<RegistryUser> getAllUsers() throws DataAccessException;

  • ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/persistence/impl/AbstractDescriptionDaoImpl.java

    r3449 r3451  
    1 package clarin.cmdi.componentregistry.impl.database;
     1package clarin.cmdi.componentregistry.persistence.impl;
    22
    33import java.sql.ResultSet;
    … …  
    2121import clarin.cmdi.componentregistry.model.ComponentDescription;
    2222import clarin.cmdi.componentregistry.model.ProfileDescription;
     23import clarin.cmdi.componentregistry.persistence.AbstractDescriptionDao;
    2324
    2425import java.util.Arrays;
    … …  
    3233 * @author George.Georgovassilis@mpi.nl
    3334 */
    34 public abstract class AbstractDescriptionDao<T extends AbstractDescription>
    35         extends ComponentRegistryDao<T> implements IAbstractDescriptionDao<T> {
     35public abstract class AbstractDescriptionDaoImpl<T extends AbstractDescription>
     36        extends ComponentRegistryDaoImpl<T> implements AbstractDescriptionDao<T> {
    3637
    3738    private final static Logger LOG = LoggerFactory
    38             .getLogger(AbstractDescriptionDao.class);
     39            .getLogger(AbstractDescriptionDaoImpl.class);
    3940
    4041    protected abstract String getTableName();
    … …  
    4950    private final Class<T> _class;
    5051
    51     protected AbstractDescriptionDao(Class<T> _class) {
     52    protected AbstractDescriptionDaoImpl(Class<T> _class) {
    5253        this._class = _class;
    5354    }

  • ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/persistence/impl/CommentsDaoImpl.java

    r3449 r3451  
    1 package clarin.cmdi.componentregistry.impl.database;
     1package clarin.cmdi.componentregistry.persistence.impl;
    22
    33import clarin.cmdi.componentregistry.model.Comment;
     4import clarin.cmdi.componentregistry.persistence.CommentsDao;
    45
    56import java.util.Date;
    … …  
    2627 */
    2728@Repository
    28 public class CommentsDao extends ComponentRegistryDao<Comment> implements
    29         ICommentsDao {
     29public class CommentsDaoImpl extends ComponentRegistryDaoImpl<Comment> implements
     30        CommentsDao {
    3031
    3132    private final static Logger LOG = LoggerFactory
    32             .getLogger(CommentsDao.class);
     33            .getLogger(CommentsDaoImpl.class);
    3334    private final static String SELECT_BASE = "SELECT "
    3435            + COLUMN_ID

  • ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/persistence/impl/ComponentDescriptionDaoImpl.java

    r3449 r3451  
    1 package clarin.cmdi.componentregistry.impl.database;
     1package clarin.cmdi.componentregistry.persistence.impl;
    22
    33import clarin.cmdi.componentregistry.model.ComponentDescription;
     4import clarin.cmdi.componentregistry.persistence.ComponentDescriptionDao;
    45
    56import java.util.List;
    … …  
    1314 */
    1415@Repository
    15 public class ComponentDescriptionDao extends
    16         AbstractDescriptionDao<ComponentDescription> implements
    17         IComponentDescriptionDao {
     16public class ComponentDescriptionDaoImpl extends
     17        AbstractDescriptionDaoImpl<ComponentDescription> implements
     18        ComponentDescriptionDao {
    1819
    19     public ComponentDescriptionDao() {
     20    public ComponentDescriptionDaoImpl() {
    2021        super(ComponentDescription.class);
    2122    }

  • ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/persistence/impl/ComponentRegistryDaoImpl.java

    r3449 r3451  
    1 package clarin.cmdi.componentregistry.impl.database;
     1package clarin.cmdi.componentregistry.persistence.impl;
    22
    33import java.util.List;
    … …  
    88import org.springframework.jdbc.core.namedparam.NamedParameterJdbcDaoSupport;
    99import org.springframework.jdbc.core.simple.ParameterizedRowMapper;
     10
     11import clarin.cmdi.componentregistry.persistence.ComponentRegistryDao;
    1012
    1113/**
    … …  
    1820 *            Type the dao maps to
    1921 */
    20 public abstract class ComponentRegistryDao<T> extends
    21         NamedParameterJdbcDaoSupport implements IComponentRegistryDao<T> {
     22public abstract class ComponentRegistryDaoImpl<T> extends
     23        NamedParameterJdbcDaoSupport implements ComponentRegistryDao<T> {
    2224
    23     public ComponentRegistryDao() {
     25    public ComponentRegistryDaoImpl() {
    2426    }
    2527

  • ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/persistence/impl/ProfileDescriptionDaoImpl.java

    r3449 r3451  
    1 package clarin.cmdi.componentregistry.impl.database;
     1package clarin.cmdi.componentregistry.persistence.impl;
    22
    33import clarin.cmdi.componentregistry.model.AbstractDescription;
    44import clarin.cmdi.componentregistry.model.ProfileDescription;
     5import clarin.cmdi.componentregistry.persistence.ProfileDescriptionDao;
    56
    67import java.sql.ResultSet;
    … …  
    1920 */
    2021@Repository
    21 public class ProfileDescriptionDao extends AbstractDescriptionDao<ProfileDescription> implements IProfileDescriptionDAO{
     22public class ProfileDescriptionDaoImpl extends AbstractDescriptionDaoImpl<ProfileDescription> implements ProfileDescriptionDao{
    2223
    23     public ProfileDescriptionDao() {
     24    public ProfileDescriptionDaoImpl() {
    2425        super(ProfileDescription.class);
    2526    }

  • ComponentRegistry/trunk/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/persistence/impl/UserDaoImpl.java

    r3449 r3451  
    1 package clarin.cmdi.componentregistry.impl.database;
     1package clarin.cmdi.componentregistry.persistence.impl;
    22
    33import clarin.cmdi.componentregistry.model.RegistryUser;
     4import clarin.cmdi.componentregistry.persistence.UserDao;
    45
    56import java.sql.ResultSet;
    … …  
    2021 */
    2122@Repository
    22 public class UserDao extends ComponentRegistryDao<RegistryUser> implements IUserDAO{
     23public class UserDaoImpl extends ComponentRegistryDaoImpl<RegistryUser> implements UserDao{
    2324
    2425        private final static String SELECT_BASE = "SELECT " + COLUMN_ID

  • ComponentRegistry/trunk/ComponentRegistry/src/main/webapp/WEB-INF/shhaa.xml

    r2819 r3451  
    99                <username>mace:eduPersonPrincipalName</username>
    1010                <username>eduPersonTargetedID</username>
     11        <username>eduPersonPrincipalName</username>
     12        <username>eppn</username>
     13
    1114                <session>Shib-Session-ID</session>
    1215                <idp>Shib-Identity-Provider</idp>

  • ComponentRegistry/trunk/ComponentRegistry/src/main/webapp/WEB-INF/web-shib.xml

    r1543 r3451  
    1616        <param-value>/WEB-INF/shhaa.xml</param-value>
    1717    </context-param>
     18    <context-param>
     19                <param-name>contextConfigLocation</param-name>
     20                <param-value>classpath:spring-config/applicationContext.xml,classpath:spring-config/container-environment.xml
     21                </param-value>
     22        </context-param>
    1823
    1924    <listener>
    2025        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
    2126    </listener>
     27   
     28   
    2229
    2330    <filter>
    … …  
    6673        <url-pattern>/admin/*</url-pattern>
    6774    </filter-mapping>
    68     <servlet>
    69         <servlet-name>ComponentRegistry Web Application</servlet-name>
    70         <servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
    71         <init-param>
    72             <param-name>com.sun.jersey.config.property.resourceConfigClass</param-name>
    73             <param-value>com.sun.jersey.api.core.ClassNamesResourceConfig</param-value>
    74         </init-param>
    75         <init-param>
    76             <param-name>com.sun.jersey.config.property.classnames</param-name>
    77             <param-value>com.sun.jersey.multipart.impl.FormDataMultiPartDispatchProvider;clarin.cmdi.componentregistry.rest.ComponentRegistryRestService</param-value>
    78         </init-param>
    79         <!--    <init-param>-->
    80         <!--      <param-name>com.sun.jersey.config.property.packages</param-name>-->
    81         <!--      <param-value>clarin.cmdi.componentregistry.rest</param-value>-->
    82         <!--    </init-param>-->
    83         <load-on-startup>1</load-on-startup>
    84     </servlet>
     75        <servlet>
     76                <servlet-name>ComponentRegistry Web Application</servlet-name>
     77                <servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
     78                <init-param> <param-name>com.sun.jersey.config.property.classnames</param-name>
     79                        <param-value>com.sun.jersey.multipart.impl.FormDataMultiPartDispatchProvider</param-value>
     80                </init-param>
     81                <load-on-startup>1</load-on-startup>
     82        </servlet>
    8583    <servlet-mapping>
    8684        <servlet-name>ComponentRegistry Web Application</servlet-name>

  • ComponentRegistry/trunk/ComponentRegistry/src/main/webapp/WEB-INF/web-test.xml

    r3449 r3451  
    5555                <servlet-name>ComponentRegistry Web Application</servlet-name>
    5656                <servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
    57                 <!-- init-param>
    58                         <param-name>com.sun.jersey.config.property.resourceConfigClass
    59                         </param-name>
    60                         <param-value>com.sun.jersey.api.core.ClassNamesResourceConfig
    61                         </param-value>
    62                 </init-param-->
    63                 <!-- <init-param> <param-name>com.sun.jersey.config.property.classnames</param-name>
     57                <init-param> <param-name>com.sun.jersey.config.property.classnames</param-name>
    6458                        <param-value>com.sun.jersey.multipart.impl.FormDataMultiPartDispatchProvider</param-value>
    65                         </init-param> -->
    66                 <init-param>
    67                         <param-name>com.sun.jersey.config.property.packages</param-name>
    68                         <param-value>com.sun.jersey.multipart.impl</param-value>
    6959                </init-param>
    7060                <load-on-startup>1</load-on-startup>

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

    r3449 r3451  
    1313import clarin.cmdi.componentregistry.BaseUnitTest;
    1414import clarin.cmdi.componentregistry.model.AbstractDescription;
     15import clarin.cmdi.componentregistry.persistence.AbstractDescriptionDao;
     16import clarin.cmdi.componentregistry.persistence.UserDao;
    1517
    1618/**
    … …  
    2224
    2325    @Autowired
    24     private IUserDAO userDao;
    25 
    26     protected abstract IAbstractDescriptionDao getDao();
     26    private UserDao userDao;
     27
     28    protected abstract AbstractDescriptionDao getDao();
    2729
    2830    @Test

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

    r3449 r3451  
    2222import clarin.cmdi.componentregistry.model.ComponentDescription;
    2323import clarin.cmdi.componentregistry.model.ProfileDescription;
     24import clarin.cmdi.componentregistry.persistence.ComponentDescriptionDao;
     25import clarin.cmdi.componentregistry.persistence.ProfileDescriptionDao;
    2426import clarin.cmdi.componentregistry.rest.DummyPrincipal;
    2527import clarin.cmdi.componentregistry.rest.RegistryTestHelper;
    … …  
    3335
    3436    @Autowired
    35     private IComponentDescriptionDao componentDescriptionDao;
     37    private ComponentDescriptionDao componentDescriptionDao;
    3638    @Autowired
    37     private IProfileDescriptionDAO profileDescriptionDao;
     39    private ProfileDescriptionDao profileDescriptionDao;
    3840    @Autowired
    3941    private ComponentRegistryFactory componentRegistryFactory;

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

    r3449 r3451  
    33import clarin.cmdi.componentregistry.BaseUnitTest;
    44import clarin.cmdi.componentregistry.model.Comment;
     5import clarin.cmdi.componentregistry.persistence.CommentsDao;
    56
    67import java.util.List;
    … …  
    2627    private JdbcTemplate jdbcTemplate;
    2728    @Autowired
    28     private ICommentsDao commentsDao;
     29    private CommentsDao commentsDao;
    2930
    3031    @Before

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

    r3449 r3451  
    44import clarin.cmdi.componentregistry.model.AbstractDescription;
    55import clarin.cmdi.componentregistry.model.ComponentDescription;
     6import clarin.cmdi.componentregistry.persistence.AbstractDescriptionDao;
     7import clarin.cmdi.componentregistry.persistence.ComponentDescriptionDao;
    68import clarin.cmdi.componentregistry.rest.RegistryTestHelper;
    79
    … …  
    1719
    1820    @Autowired
    19     IComponentDescriptionDao componentDescriptionDao;
     21    ComponentDescriptionDao componentDescriptionDao;
    2022
    2123    @Before
    … …  
    2931
    3032    @Override
    31     protected IAbstractDescriptionDao getDao() {
     33    protected AbstractDescriptionDao getDao() {
    3234        return componentDescriptionDao;
    3335    }

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

    r3449 r3451  
    1515import clarin.cmdi.componentregistry.model.ProfileDescription;
    1616import clarin.cmdi.componentregistry.model.RegistryUser;
     17import clarin.cmdi.componentregistry.persistence.UserDao;
    1718import clarin.cmdi.componentregistry.rest.DummyPrincipal;
    1819import clarin.cmdi.componentregistry.rest.RegistryTestHelper;
     20
    1921import java.io.ByteArrayOutputStream;
    2022import java.io.OutputStream;
    … …  
    2224import java.util.Date;
    2325import java.util.List;
     26
    2427import org.apache.commons.lang.time.DateFormatUtils;
    2528import org.junit.Before;
    … …  
    4952    private ComponentRegistryBeanFactory componentRegistryBeanFactory;
    5053    @Autowired
    51     private IUserDAO userDao;
     54    private UserDao userDao;
    5255    @Autowired
    5356    private JdbcTemplate jdbcTemplate;

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

    r3449 r3451  
    44import clarin.cmdi.componentregistry.model.AbstractDescription;
    55import clarin.cmdi.componentregistry.model.ProfileDescription;
     6import clarin.cmdi.componentregistry.persistence.AbstractDescriptionDao;
     7import clarin.cmdi.componentregistry.persistence.ProfileDescriptionDao;
    68import clarin.cmdi.componentregistry.rest.RegistryTestHelper;
    79
    … …  
    1719
    1820    @Autowired
    19     IProfileDescriptionDAO profileDescriptionDao;
     21    ProfileDescriptionDao profileDescriptionDao;
    2022
    2123    @Before
    … …  
    2931
    3032    @Override
    31     protected IAbstractDescriptionDao getDao() {
     33    protected AbstractDescriptionDao getDao() {
    3234        return profileDescriptionDao;
    3335    }

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

    r3449 r3451  
    1414import clarin.cmdi.componentregistry.BaseUnitTest;
    1515import clarin.cmdi.componentregistry.model.ComponentDescription;
     16import clarin.cmdi.componentregistry.persistence.ComponentDescriptionDao;
    1617
    1718/**
    … …  
    2627    JdbcTemplate jdbcTemplate;
    2728    @Autowired
    28     IComponentDescriptionDao componentDescriptionDao;
     29    ComponentDescriptionDao componentDescriptionDao;
    2930
    3031    @Test

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

    r3449 r3451  
    33import clarin.cmdi.componentregistry.BaseUnitTest;
    44import clarin.cmdi.componentregistry.model.RegistryUser;
     5import clarin.cmdi.componentregistry.persistence.UserDao;
    56
    67import java.util.List;
    … …  
    2627    private JdbcTemplate jdbcTemplate;
    2728    @Autowired
    28     private IUserDAO userDao;
     29    private UserDao userDao;
    2930
    3031    @Before

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

    r3449 r3451  
    55import javax.ws.rs.core.HttpHeaders;
    66
    7 import clarin.cmdi.componentregistry.impl.database.IUserDAO;
    87import clarin.cmdi.componentregistry.model.Comment;
    98import clarin.cmdi.componentregistry.model.ComponentDescription;
    109import clarin.cmdi.componentregistry.model.ProfileDescription;
    1110import clarin.cmdi.componentregistry.model.RegistryUser;
     11import clarin.cmdi.componentregistry.persistence.UserDao;
    1212
    1313import com.sun.jersey.api.client.GenericType;
    … …  
    7979
    8080    @Autowired
    81     private IUserDAO userDao;
     81    private UserDao userDao;
    8282
    8383    protected String getApplicationContextFile() {
    … …  
    129129    }
    130130
    131     protected IUserDAO getUserDao() {
     131    protected UserDao getUserDao() {
    132132        return userDao;
    133133    }
Note: See TracChangeset for help on using the changeset viewer.