diff --git a/vcell-core/src/main/java/cbit/rmi/event/VCellApiRpcBody.java b/vcell-api-types/src/main/java/org/vcell/api/types/rpc/VCellApiRpcBody.java similarity index 96% rename from vcell-core/src/main/java/cbit/rmi/event/VCellApiRpcBody.java rename to vcell-api-types/src/main/java/org/vcell/api/types/rpc/VCellApiRpcBody.java index dc7e20b3ef..e2fbaa3b3d 100644 --- a/vcell-core/src/main/java/cbit/rmi/event/VCellApiRpcBody.java +++ b/vcell-api-types/src/main/java/org/vcell/api/types/rpc/VCellApiRpcBody.java @@ -1,4 +1,4 @@ -package cbit.rmi.event; +package org.vcell.api.types.rpc; import java.io.Serializable; diff --git a/vcell-core/src/main/java/cbit/rmi/event/VCellApiRpcRequest.java b/vcell-api-types/src/main/java/org/vcell/api/types/rpc/VCellApiRpcRequest.java similarity index 94% rename from vcell-core/src/main/java/cbit/rmi/event/VCellApiRpcRequest.java rename to vcell-api-types/src/main/java/org/vcell/api/types/rpc/VCellApiRpcRequest.java index 5681de81e6..c7dd31566a 100644 --- a/vcell-core/src/main/java/cbit/rmi/event/VCellApiRpcRequest.java +++ b/vcell-api-types/src/main/java/org/vcell/api/types/rpc/VCellApiRpcRequest.java @@ -8,7 +8,7 @@ * http://www.opensource.org/licenses/mit-license.php */ -package cbit.rmi.event; +package org.vcell.api.types.rpc; /** diff --git a/vcell-api/src/main/java/org/vcell/rest/rpc/RpcRestlet.java b/vcell-api/src/main/java/org/vcell/rest/rpc/RpcRestlet.java index 64f4f38e28..cc4e72f66b 100644 --- a/vcell-api/src/main/java/org/vcell/rest/rpc/RpcRestlet.java +++ b/vcell-api/src/main/java/org/vcell/rest/rpc/RpcRestlet.java @@ -1,6 +1,6 @@ package org.vcell.rest.rpc; -import cbit.rmi.event.VCellApiRpcBody; +import org.vcell.api.types.rpc.VCellApiRpcBody; import cbit.vcell.clientdb.ServerRejectedSaveException; import cbit.vcell.message.VCRpcRequest; import cbit.vcell.message.VCRpcRequest.RpcServiceType; @@ -17,7 +17,7 @@ import org.restlet.data.Status; import org.restlet.engine.adapter.HttpRequest; import org.restlet.representation.ByteArrayRepresentation; -import cbit.rmi.event.VCellApiRpcRequest; +import org.vcell.api.types.rpc.VCellApiRpcRequest; import org.vcell.rest.VCellApiApplication; import org.vcell.rest.VCellApiApplication.AuthenticationPolicy; import org.vcell.rest.server.RestDatabaseService; diff --git a/vcell-apiclient/src/main/java/org/vcell/api/client/VCellApiClient.java b/vcell-apiclient/src/main/java/org/vcell/api/client/VCellApiClient.java index 58c0d4ba6f..ec4befa919 100644 --- a/vcell-apiclient/src/main/java/org/vcell/api/client/VCellApiClient.java +++ b/vcell-apiclient/src/main/java/org/vcell/api/client/VCellApiClient.java @@ -1,7 +1,7 @@ package org.vcell.api.client; -import cbit.rmi.event.VCellApiRpcBody; -import cbit.rmi.event.VCellApiRpcRequest; +import org.vcell.api.types.rpc.VCellApiRpcBody; +import org.vcell.api.types.rpc.VCellApiRpcRequest; import com.google.gson.Gson; import com.nimbusds.oauth2.sdk.ParseException; import org.vcell.api.types.common.BiomodelRepresentation; diff --git a/vcell-apiclient/src/main/java/org/vcell/api/messaging/RemoteProxyVCellConnectionFactory.java b/vcell-apiclient/src/main/java/org/vcell/api/messaging/RemoteProxyVCellConnectionFactory.java index 4b65adc6f1..89e8b07e08 100644 --- a/vcell-apiclient/src/main/java/org/vcell/api/messaging/RemoteProxyVCellConnectionFactory.java +++ b/vcell-apiclient/src/main/java/org/vcell/api/messaging/RemoteProxyVCellConnectionFactory.java @@ -26,8 +26,8 @@ import org.apache.logging.log4j.Logger; import org.vcell.DependencyConstants; import org.vcell.api.client.VCellApiClient; -import cbit.rmi.event.VCellApiRpcBody; -import cbit.rmi.event.VCellApiRpcRequest; +import org.vcell.api.types.rpc.VCellApiRpcBody; +import org.vcell.api.types.rpc.VCellApiRpcRequest; import org.vcell.api.utils.Auth0ConnectionUtils; import org.vcell.restclient.ApiException; import org.vcell.restclient.model.AccesTokenRepresentationRecord;