Merge branch 'develop'

Author: TanyaEf

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/domain/DomainMetadataAdapter.java

@@ -25,7 +25,7 @@
 import com.jaspersoft.jasperserver.jaxrs.client.core.SessionStorage;
 import com.jaspersoft.jasperserver.jaxrs.client.core.exceptions.handling.DefaultErrorHandler;
 import com.jaspersoft.jasperserver.jaxrs.client.core.operationresult.OperationResult;
-import com.jaspersoft.jasperserver.jaxrs.client.dto.domain.DomainMetaData;
+import com.jaspersoft.jasperserver.dto.domain.DomainMetaData;
 
 public class DomainMetadataAdapter extends AbstractAdapter {
     private final String domainURI;

src/main/java/com/jaspersoft/jasperserver/jaxrs/client/apiadapters/resources/ResourcesTypeResolverUtil.java

@@ -43,8 +43,8 @@
 import com.jaspersoft.jasperserver.dto.resources.ClientVirtualDataSource;
 import com.jaspersoft.jasperserver.dto.resources.ClientXmlaConnection;
 import com.jaspersoft.jasperserver.dto.resources.ResourceMediaType;
-import com.jaspersoft.jasperserver.jaxrs.client.dto.resources.ClientDashboard;
-import com.jaspersoft.jasperserver.jaxrs.client.dto.resources.ClientDomainTopic;
+import com.jaspersoft.jasperserver.dto.resources.ClientDashboard;
+import com.jaspersoft.jasperserver.dto.resources.ClientDomainTopic;
 import java.util.HashMap;
 import java.util.Map;