Project

General

Profile

« Previous | Next » 

Revision 0408c72c

Added by Andreas Müller almost 2 years ago

ref #10072 final adaption log4j12->log4j2 in vaadin

View differences:

src/test/java/eu/etaxonomy/cdm/vaadin/container/CdmSQLContainerTest.java
11 11 
import java.sql.SQLException;
12 12 
import java.util.Collection;
13 13 

  		




  14
  
  
    
import org.apache.log4j.Logger;


  		




  
  14
  
    
import org.apache.logging.log4j.LogManager;


  		




  
  15
  
    
import org.apache.logging.log4j.Logger;


  		




  15
  16
  
    
import org.junit.Assert;


  		




  16
  17
  
    
import org.junit.Test;


  		




  17
  18
  
    
import org.unitils.dbunit.annotation.DataSet;


  		




  ......




  23
  24
  
    
public class CdmSQLContainerTest extends CdmVaadinBaseTest {


  		




  24
  25
  
    

  		




  25
  26
  
    
	@SuppressWarnings("unused")


  		




  26
  
  
    
    private static final Logger logger = Logger.getLogger(CdmSQLContainerTest.class);


  		




  
  27
  
    
    private static final Logger logger = LogManager.getLogger();


  		




  27
  28
  
    

  		




  28
  29
  
    
	@Test


  		




  29
  30
  
    
	@DataSet(loadStrategy=CleanSweepInsertLoadStrategy.class, value="CdmSQLContainerTest.xml")


  		












  

    
      src/test/java/eu/etaxonomy/cdm/vaadin/jscomponent/D3CTree.java
    
  





  8
  8
  
    
 */


  		




  9
  9
  
    
package eu.etaxonomy.cdm.vaadin.jscomponent;


  		




  10
  10
  
    

  		




  11
  
  
    
import org.apache.log4j.Logger;


  		




  
  11
  
    
import org.apache.logging.log4j.LogManager;


  		




  
  12
  
    
import org.apache.logging.log4j.Logger;


  		




  12
  13
  
    
import org.json.JSONArray;


  		




  13
  14
  
    
import org.json.JSONException;


  		




  14
  15
  
    
import org.json.JSONObject;


  		




  ......




  30
  31
  
    
@JavaScript({"extlib/d3.min.js", "lib/d3ctree_connector.js"})


  		




  31
  32
  
    
public class D3CTree extends AbstractJavaScriptComponent {


  		




  32
  33
  
    

  		




  33
  
  
    
    private static final Logger logger = Logger.getLogger(D3CTree.class);


  		




  
  34
  
    
    private static final long serialVersionUID = 910149189854426279L;


  		




  
  35
  
    
    private static final Logger logger = LogManager.getLogger();


  		




  34
  36
  
    

  		




  35
  37
  
    
    public D3CTree() {


  		




  36
  38
  
    
        addFunction("select", new JavaScriptFunction() {


  		












  

    
      src/test/java/eu/etaxonomy/cdm/vaadin/presenter/AuthenticationPresenterTest.java
    
  





  10
  10
  
    

  		




  11
  11
  
    
import java.net.URISyntaxException;


  		




  12
  12
  
    

  		




  13
  
  
    
import org.apache.log4j.Logger;


  		




  
  13
  
    
import org.apache.logging.log4j.LogManager;


  		




  
  14
  
    
import org.apache.logging.log4j.Logger;


  		




  14
  15
  
    
import org.junit.Assert;


  		




  15
  16
  
    
import org.junit.BeforeClass;


  		




  16
  17
  
    
import org.junit.Test;


  		




  ......




  30
  31
  
    
public class AuthenticationPresenterTest extends CdmVaadinBaseTest {


  		




  31
  32
  
    

  		




  32
  33
  
    
    @SuppressWarnings("unused")


  		




  33
  
  
    
    private static final Logger logger = Logger.getLogger(AuthenticationPresenterTest.class);


  		




  
  34
  
    
    private static final Logger logger = LogManager.getLogger();


  		




  34
  35
  
    

  		




  35
  36
  
    
    private static AuthenticationPresenter ap;


  		




  36
  37
  
    

  		












  

    
      src/test/java/eu/etaxonomy/cdm/vaadin/presenter/ConceptRelationshipPresenterTest.java
    
  





  10
  10
  
    

  		




  11
  11
  
    
import java.util.UUID;


  		




  12
  12
  
    

  		




  13
  
  
    
import org.apache.log4j.Logger;


  		




  
  13
  
    
import org.apache.logging.log4j.LogManager;


  		




  
  14
  
    
import org.apache.logging.log4j.Logger;


  		




  14
  15
  
    
import org.json.JSONException;


  		




  15
  16
  
    
import org.junit.Assert;


  		




  16
  17
  
    
import org.junit.BeforeClass;


  		




  ......




  41
  42
  
    
})


  		




  42
  43
  
    
public class ConceptRelationshipPresenterTest extends CdmVaadinBaseTest {


  		




  43
  44
  
    

  		




  44
  
  
    
    private static final Logger logger = Logger.getLogger(ConceptRelationshipPresenterTest.class);


  		




  
  45
  
    
    private static final Logger logger = LogManager.getLogger();


  		




  45
  46
  
    

  		




  46
  47
  
    
    private static ConceptRelationshipPresenter crp;


  		




  47
  48
  
    
    private static D3ConceptRelationshipTree crTree;


  		












  

    
      src/test/java/eu/etaxonomy/cdm/vaadin/presenter/EditConceptRelationshipPresenterTest.java
    
  





  14
  14
  
    
import java.util.Map;


  		




  15
  15
  
    
import java.util.UUID;


  		




  16
  16
  
    

  		




  17
  
  
    
import org.apache.log4j.Logger;


  		




  
  17
  
    
import org.apache.logging.log4j.LogManager;


  		




  
  18
  
    
import org.apache.logging.log4j.Logger;


  		




  18
  19
  
    
import org.junit.Assert;


  		




  19
  20
  
    
import org.junit.BeforeClass;


  		




  20
  21
  
    
import org.junit.Test;


  		




  ......




  42
  43
  
    
public class EditConceptRelationshipPresenterTest extends CdmVaadinBaseTest {


  		




  43
  44
  
    

  		




  44
  45
  
    
    @SuppressWarnings("unused")


  		




  45
  
  
    
    private static final Logger logger = Logger.getLogger(EditConceptRelationshipPresenterTest.class);


  		




  
  46
  
    
    private static final Logger logger = LogManager.getLogger();


  		




  46
  47
  
    

  		




  47
  48
  
    
    public static EditConceptRelationshipPresenter conceptRelationshipPresenter;


  		




  48
  49
  
    

  		












  

    
      src/test/java/eu/etaxonomy/cdm/vaadin/presenter/NewTaxonBasePresenterTest.java
    
  





  14
  14
  
    
import java.util.Set;


  		




  15
  15
  
    
import java.util.UUID;


  		




  16
  16
  
    

  		




  17
  
  
    
import org.apache.log4j.Logger;


  		




  
  17
  
    
import org.apache.logging.log4j.LogManager;


  		




  
  18
  
    
import org.apache.logging.log4j.Logger;


  		




  18
  19
  
    
import org.junit.Assert;


  		




  19
  20
  
    
import org.junit.BeforeClass;


  		




  20
  21
  
    
import org.junit.Test;


  		




  ......




  44
  45
  
    
public class NewTaxonBasePresenterTest extends CdmVaadinBaseTest {


  		




  45
  46
  
    

  		




  46
  47
  
    
    @SuppressWarnings("unused")


  		




  47
  
  
    
    private static final Logger logger = Logger.getLogger(NewTaxonBasePresenterTest.class);


  		




  
  48
  
    
    private static final Logger logger = LogManager.getLogger();


  		




  48
  49
  
    

  		




  49
  50
  
    
    private static NewTaxonBasePresenter newTaxonBasePresenter;


  		




  50
  51
  
    

  		












  

    
      src/test/java/eu/etaxonomy/cdm/vaadin/presenter/StatusPresenterTest.java
    
  





  11
  11
  
    
import java.sql.SQLException;


  		




  12
  12
  
    
import java.util.Collection;


  		




  13
  13
  
    

  		




  14
  
  
    
import org.apache.log4j.Logger;


  		




  
  14
  
    
import org.apache.logging.log4j.LogManager;


  		




  
  15
  
    
import org.apache.logging.log4j.Logger;


  		




  15
  16
  
    
import org.junit.Assert;


  		




  16
  17
  
    
import org.junit.BeforeClass;


  		




  17
  18
  
    
import org.junit.Ignore;


  		




  ......




  40
  41
  
    
})


  		




  41
  42
  
    
public class StatusPresenterTest extends CdmVaadinBaseTest {


  		




  42
  43
  
    

  		




  43
  
  
    
    private static final Logger logger = Logger.getLogger(StatusPresenterTest.class);


  		




  
  44
  
    
    private static final Logger logger = LogManager.getLogger();


  		




  44
  45
  
    

  		




  45
  46
  
    
    private static StatusPresenter statusPresenter;


  		




  46
  47
  
    

  		












  

    
      src/test/java/eu/etaxonomy/vaadin/mvp/CdmEditorPresenterTest.java
    
  





  8
  8
  
    
*/


  		




  9
  9
  
    
package eu.etaxonomy.vaadin.mvp;


  		




  10
  10
  
    

  		




  11
  
  
    
import org.apache.log4j.Logger;


  		




  
  11
  
    
import org.apache.logging.log4j.LogManager;


  		




  
  12
  
    
import org.apache.logging.log4j.Logger;


  		




  12
  13
  
    
import org.unitils.dbunit.annotation.DataSet;


  		




  13
  14
  
    
import org.unitils.spring.annotation.SpringBean;


  		




  14
  15
  
    
import org.unitils.spring.annotation.SpringBeanByType;


  		




  ......




  35
  36
  
    
public class CdmEditorPresenterTest {


  		




  36
  37
  
    

  		




  37
  38
  
    
    @SuppressWarnings("unused")


  		




  38
  
  
    
    private static final Logger logger = Logger.getLogger(CdmEditorPresenterTest.class);


  		




  
  39
  
    
    private static final Logger logger = LogManager.getLogger();


  		




  39
  40
  
    

  		




  40
  41
  
    
    @SpringBeanByType


  		




  41
  42
  
    
    protected ViewEventBus viewEventBus;


  		












Also available in:  Unified diff