reorganize source to match api and service abstractions

Author: yasithdev

airavata-api/src/main/java/org/apache/airavata/accountprovisioning/SSHAccountManager.java

@@ -24,9 +24,10 @@
 import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
+import org.apache.airavata.api.client.CredentialStoreClientFactory;
+import org.apache.airavata.api.client.RegistryServiceClientFactory;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.utils.ServerSettings;
-import org.apache.airavata.credential.store.client.CredentialStoreClientFactory;
 import org.apache.airavata.credential.store.cpi.CredentialStoreService;
 import org.apache.airavata.credential.store.exception.CredentialStoreException;
 import org.apache.airavata.model.appcatalog.computeresource.ComputeResourceDescription;
@@ -38,7 +39,6 @@
 import org.apache.airavata.model.credential.store.PasswordCredential;
 import org.apache.airavata.model.credential.store.SSHCredential;
 import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.client.RegistryServiceClientFactory;
 import org.apache.airavata.registry.api.exception.RegistryServiceException;
 import org.apache.thrift.TException;
 import org.slf4j.Logger;

airavata-api/src/main/java/org/apache/airavata/agents/api/AgentUtils.java

@@ -19,13 +19,13 @@
 */
 package org.apache.airavata.agents.api;
 
+import org.apache.airavata.api.client.CredentialStoreClientFactory;
+import org.apache.airavata.api.client.RegistryServiceClientFactory;
 import org.apache.airavata.common.exception.ApplicationSettingsException;
 import org.apache.airavata.common.utils.ServerSettings;
-import org.apache.airavata.credential.store.client.CredentialStoreClientFactory;
 import org.apache.airavata.credential.store.cpi.CredentialStoreService;
 import org.apache.airavata.credential.store.exception.CredentialStoreException;
 import org.apache.airavata.registry.api.RegistryService;
-import org.apache.airavata.registry.api.client.RegistryServiceClientFactory;
 import org.apache.airavata.registry.api.exception.RegistryServiceException;
 
 public class AgentUtils {

…/airavata/api/server/util/Constants.java …a/org/apache/airavata/api/Constants.javaairavata-api/src/main/java/org/apache/airavata/api/server/util/Constants.java renamed to airavata-api/src/main/java/org/apache/airavata/api/Constants.java airavata-api/src/main/java/org/apache/airavata/api/server/util/Constants.java renamed to airavata-api/src/main/java/org/apache/airavata/api/Constants.java

@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.api.server.util;
+package org.apache.airavata.api;
 
 public class Constants {
     public static final String API_SERVER_PORT = "apiserver.port";

…g/apache/airavata/server/ServerMain.java …/org/apache/airavata/api/ServerMain.javaairavata-api/src/main/java/org/apache/airavata/server/ServerMain.java renamed to airavata-api/src/main/java/org/apache/airavata/api/ServerMain.java airavata-api/src/main/java/org/apache/airavata/server/ServerMain.java renamed to airavata-api/src/main/java/org/apache/airavata/api/ServerMain.java

@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.server;
+package org.apache.airavata.api;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -32,7 +32,7 @@
 import org.apache.airavata.common.utils.ApplicationSettings.ShutdownStrategy;
 import org.apache.airavata.common.utils.IServer.ServerStatus;
 import org.apache.airavata.common.utils.StringUtil.CommandLineParameters;
-import org.apache.airavata.patform.monitoring.MonitoringServer;
+import org.apache.airavata.monitor.platform.MonitoringServer;
 import org.apache.commons.cli.ParseException;
 import org.apache.zookeeper.server.ServerCnxnFactory;
 import org.slf4j.Logger;

…client/CredentialStoreClientFactory.java …client/CredentialStoreClientFactory.javaairavata-api/src/main/java/org/apache/airavata/credential/store/client/CredentialStoreClientFactory.java renamed to airavata-api/src/main/java/org/apache/airavata/api/client/CredentialStoreClientFactory.java airavata-api/src/main/java/org/apache/airavata/credential/store/client/CredentialStoreClientFactory.java renamed to airavata-api/src/main/java/org/apache/airavata/api/client/CredentialStoreClientFactory.java

@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.credential.store.client;
+package org.apache.airavata.api.client;
 
 import org.apache.airavata.credential.store.cpi.CredentialStoreService;
 import org.apache.airavata.credential.store.exception.CredentialStoreException;

…or/client/OrchestratorClientFactory.java …pi/client/OrchestratorClientFactory.javaairavata-api/src/main/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactory.java renamed to airavata-api/src/main/java/org/apache/airavata/api/client/OrchestratorClientFactory.java airavata-api/src/main/java/org/apache/airavata/orchestrator/client/OrchestratorClientFactory.java renamed to airavata-api/src/main/java/org/apache/airavata/api/client/OrchestratorClientFactory.java

@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.orchestrator.client;
+package org.apache.airavata.api.client;
 
 import org.apache.airavata.model.error.AiravataClientException;
 import org.apache.airavata.orchestrator.cpi.OrchestratorService;

…/client/ProfileServiceClientFactory.java …/client/ProfileServiceClientFactory.javaairavata-api/src/main/java/org/apache/airavata/service/profile/client/ProfileServiceClientFactory.java renamed to airavata-api/src/main/java/org/apache/airavata/api/client/ProfileServiceClientFactory.java airavata-api/src/main/java/org/apache/airavata/service/profile/client/ProfileServiceClientFactory.java renamed to airavata-api/src/main/java/org/apache/airavata/api/client/ProfileServiceClientFactory.java

@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.service.profile.client;
+package org.apache.airavata.api.client;
 
 import org.apache.airavata.service.profile.groupmanager.cpi.GroupManagerService;
 import org.apache.airavata.service.profile.groupmanager.cpi.exception.GroupManagerServiceException;

…client/RegistryServiceClientFactory.java …client/RegistryServiceClientFactory.javaairavata-api/src/main/java/org/apache/airavata/registry/api/client/RegistryServiceClientFactory.java renamed to airavata-api/src/main/java/org/apache/airavata/api/client/RegistryServiceClientFactory.java airavata-api/src/main/java/org/apache/airavata/registry/api/client/RegistryServiceClientFactory.java renamed to airavata-api/src/main/java/org/apache/airavata/api/client/RegistryServiceClientFactory.java

@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.registry.api.client;
+package org.apache.airavata.api.client;
 
 import org.apache.airavata.registry.api.RegistryService;
 import org.apache.airavata.registry.api.exception.RegistryServiceException;

…SharingRegistryServiceClientFactory.java …SharingRegistryServiceClientFactory.javaairavata-api/src/main/java/org/apache/airavata/sharing/registry/client/SharingRegistryServiceClientFactory.java renamed to airavata-api/src/main/java/org/apache/airavata/api/client/SharingRegistryServiceClientFactory.java airavata-api/src/main/java/org/apache/airavata/sharing/registry/client/SharingRegistryServiceClientFactory.java renamed to airavata-api/src/main/java/org/apache/airavata/api/client/SharingRegistryServiceClientFactory.java

@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.sharing.registry.client;
+package org.apache.airavata.api.client;
 
 import org.apache.airavata.sharing.registry.models.SharingRegistryException;
 import org.apache.airavata.sharing.registry.service.cpi.SharingRegistryService;

…erver/handler/AiravataServerHandler.java …a/api/handler/AiravataServerHandler.javaairavata-api/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java renamed to airavata-api/src/main/java/org/apache/airavata/api/handler/AiravataServerHandler.java airavata-api/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java renamed to airavata-api/src/main/java/org/apache/airavata/api/handler/AiravataServerHandler.java

@@ -17,7 +17,7 @@
 * specific language governing permissions and limitations
 * under the License.
 */
-package org.apache.airavata.api.server.handler;
+package org.apache.airavata.api.handler;
 
 import java.util.*;
 import org.apache.airavata.accountprovisioning.ConfigParam;
@@ -74,7 +74,7 @@
 import org.apache.airavata.model.workspace.Gateway;
 import org.apache.airavata.model.workspace.Notification;
 import org.apache.airavata.model.workspace.Project;
-import org.apache.airavata.service.security.interceptor.SecurityCheck;
+import org.apache.airavata.security.interceptor.SecurityCheck;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;