Project

General

Profile

« Previous | Next » 

Revision d60221b5

Added by Andreas Müller almost 4 years ago

rename CdmServerUtils, CdmServerException and CdmEmbeddedServerException

View differences:

eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/httpinvoker/CdmServerTest.java
21 21
import org.junit.Test;
22 22
import org.osgi.framework.Bundle;
23 23

  
24
import eu.etaxonomy.taxeditor.remoting.server.CDMServerUtils;
25
import eu.etaxonomy.taxeditor.webapp.CDMEmbeddedServerException;
26
import eu.etaxonomy.taxeditor.webapp.CDMServer;
24
import eu.etaxonomy.taxeditor.remoting.server.CdmServerUtils;
25
import eu.etaxonomy.taxeditor.webapp.CdmEmbeddedServerException;
26
import eu.etaxonomy.taxeditor.webapp.CdmServer;
27 27
import eu.etaxonomy.taxeditor.webapp.ICDMServerError;
28 28

  
29 29

  
......
40 40
    @Test
41 41
    public void generateConfigFile() throws IOException {
42 42
        String mgdServerConfigFileName = "test.mgd.datasources.xml";
43
        String config = CDMServerUtils.convertEditorToServerConfig();
44
        CDMServerUtils.writeManagedServerConfig(config, mgdServerConfigFileName);
43
        String config = CdmServerUtils.convertEditorToServerConfig();
44
        CdmServerUtils.writeManagedServerConfig(config, mgdServerConfigFileName);
45 45
    }
46 46

  
47 47
    @Test
48 48
    @Ignore
49 49
    //FIXME: remove @ignore and fix test #5632
50
    public void manageCdmServer() throws IOException, URISyntaxException, CDMEmbeddedServerException {
50
    public void manageCdmServer() throws IOException, URISyntaxException, CdmEmbeddedServerException {
51 51
        Bundle bundle = Platform.getBundle("eu.etaxonomy.taxeditor.test");
52 52
        URL mgdDatasourcesConfigURL = bundle.getEntry("src/test/resources/.cdmLibrary/writableResources/mgd.datasources.xml");
53 53
        File mgdDatasourcesConfigFile = new File(FileLocator.resolve(mgdDatasourcesConfigURL).toURI());
54
        CDMServer cdmServer = new CDMServer("cdmTest", mgdDatasourcesConfigFile);
54
        CdmServer cdmServer = new CdmServer("cdmTest", mgdDatasourcesConfigFile);
55 55
        cdmServer.start(new ICDMServerError() {
56 56
            @Override
57 57
            public void handleError(Throwable t) {

Also available in: Unified diff