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 5af44184ba..7cf73667fa 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 @@ -38,7 +38,7 @@ public final class RpcRestlet extends Restlet { private static Logger lg = LogManager.getLogger(RpcRestlet.class); RestDatabaseService restDatabaseService; private static final List vcellguestAllowed; - //MUST keep sycnhronized with cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory + //MUST keep sycnhronized with org.vcell.api.messaging.RemoteProxyVCellConnectionFactory static { String[] temp = new String[] { "getVCInfoContainer", diff --git a/vcell-apiclient/src/main/java/org/vcell/api/server/ClientExportController.java b/vcell-apiclient/src/main/java/org/vcell/api/server/ClientExportController.java index c0ac3279de..ba9fa753c0 100644 --- a/vcell-apiclient/src/main/java/org/vcell/api/server/ClientExportController.java +++ b/vcell-apiclient/src/main/java/org/vcell/api/server/ClientExportController.java @@ -9,11 +9,11 @@ */ package org.vcell.api.server; +import cbit.vcell.message.server.bootstrap.client.RemoteProxyException; import org.vcell.util.DataAccessException; import cbit.rmi.event.ExportEvent; import cbit.vcell.export.server.ExportSpecs; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory.RemoteProxyException; import cbit.vcell.server.ExportController; import cbit.vcell.simdata.OutputContext; /** diff --git a/vcell-apiclient/src/main/java/org/vcell/api/server/ClientJobManager.java b/vcell-apiclient/src/main/java/org/vcell/api/server/ClientJobManager.java index 7242487021..f10b2d5eef 100644 --- a/vcell-apiclient/src/main/java/org/vcell/api/server/ClientJobManager.java +++ b/vcell-apiclient/src/main/java/org/vcell/api/server/ClientJobManager.java @@ -14,12 +14,12 @@ import cbit.vcell.client.server.JobManager; import cbit.vcell.client.server.SimStatusEvent; import cbit.vcell.client.server.SimStatusListener; +import cbit.vcell.message.server.bootstrap.client.RemoteProxyException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.vcell.util.DataAccessException; import cbit.vcell.export.server.ExportSpecs; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory.RemoteProxyException; import cbit.vcell.server.ExportJobStatus; import cbit.vcell.server.SimulationStatus; import cbit.vcell.simdata.OutputContext; @@ -124,7 +124,7 @@ public SimulationStatus getServerSimulationStatus(VCSimulationIdentifier vcSimul * Creation date: (1/4/01 1:38:14 PM) * @param remoteProxyException RemoteProxyException */ -private void handleRemoteProxyException(RemoteProxyException remoteProxyException) { +private void handleRemoteProxyException(cbit.vcell.message.server.bootstrap.client.RemoteProxyException remoteProxyException) { lg.error(remoteProxyException); } diff --git a/vcell-apiclient/src/main/java/org/vcell/api/server/ClientServerManager.java b/vcell-apiclient/src/main/java/org/vcell/api/server/ClientServerManager.java index 29750cdde0..f135ea0aca 100644 --- a/vcell-apiclient/src/main/java/org/vcell/api/server/ClientServerManager.java +++ b/vcell-apiclient/src/main/java/org/vcell/api/server/ClientServerManager.java @@ -17,8 +17,8 @@ import cbit.vcell.clientdb.DocumentManager; import cbit.vcell.field.io.FieldDataFileOperationResults; import cbit.vcell.field.io.FieldDataFileOperationSpec; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory.RemoteProxyException; +import cbit.vcell.message.server.bootstrap.client.RemoteProxyException; +import org.vcell.api.messaging.RemoteProxyVCellConnectionFactory; import cbit.vcell.model.common.VCellErrorMessages; import cbit.vcell.resource.ErrorUtils; import cbit.vcell.resource.PropertyLoader; diff --git a/vcell-client/src/main/java/cbit/vcell/client/ClientSimManager.java b/vcell-client/src/main/java/cbit/vcell/client/ClientSimManager.java index 1d87ee37cb..b9ea2f9846 100644 --- a/vcell-client/src/main/java/cbit/vcell/client/ClientSimManager.java +++ b/vcell-client/src/main/java/cbit/vcell/client/ClientSimManager.java @@ -28,7 +28,7 @@ import cbit.vcell.field.FieldDataIdentifierSpec; import cbit.vcell.mapping.SimulationContext; import cbit.vcell.mapping.SimulationContext.NetworkGenerationRequirements; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory.RemoteProxyException; +import cbit.vcell.message.server.bootstrap.client.RemoteProxyException; import cbit.vcell.messaging.server.SimulationTask; import cbit.vcell.parser.ExpressionException; import cbit.vcell.resource.ResourceUtil; diff --git a/vcell-client/src/main/java/cbit/vcell/client/LocalDataSetControllerProvider.java b/vcell-client/src/main/java/cbit/vcell/client/LocalDataSetControllerProvider.java index dc9723bc00..209593cf94 100644 --- a/vcell-client/src/main/java/cbit/vcell/client/LocalDataSetControllerProvider.java +++ b/vcell-client/src/main/java/cbit/vcell/client/LocalDataSetControllerProvider.java @@ -10,6 +10,7 @@ package cbit.vcell.client; +import cbit.vcell.message.server.bootstrap.client.RemoteProxyException; import org.vcell.solver.nfsim.NFSimMolecularConfigurations; import org.vcell.util.DataAccessException; import org.vcell.util.document.TimeSeriesJobResults; @@ -25,7 +26,6 @@ import cbit.vcell.export.server.ExportSpecs; import cbit.vcell.field.io.FieldDataFileOperationResults; import cbit.vcell.field.io.FieldDataFileOperationSpec; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory.RemoteProxyException; import cbit.vcell.server.DataSetController; import cbit.vcell.server.DataSetControllerProvider; import cbit.vcell.simdata.DataIdentifier; diff --git a/vcell-client/src/main/java/cbit/vcell/client/VCellClientMain.java b/vcell-client/src/main/java/cbit/vcell/client/VCellClientMain.java index c8c0e8d72d..2009221c11 100644 --- a/vcell-client/src/main/java/cbit/vcell/client/VCellClientMain.java +++ b/vcell-client/src/main/java/cbit/vcell/client/VCellClientMain.java @@ -15,7 +15,7 @@ import cbit.vcell.client.desktop.NetworkProxyPreferences; import cbit.vcell.client.server.ClientServerInfo; import cbit.vcell.client.server.DynamicClientProperties; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory; +import org.vcell.api.messaging.RemoteProxyVCellConnectionFactory; import cbit.vcell.mongodb.VCMongoMessage; import cbit.vcell.resource.*; import cbit.vcell.xml.XmlHelper; @@ -23,7 +23,6 @@ import com.google.inject.Injector; import org.jdom.Document; import org.vcell.dependency.client.VCellClientModule; -import org.vcell.util.document.UserLoginInfo; import org.vcell.util.document.VCDocument; import org.vcell.util.document.VCellSoftwareVersion; import org.vcell.util.logging.ConsoleCapture; diff --git a/vcell-client/src/main/java/cbit/vcell/client/data/PDEDataViewerPostProcess.java b/vcell-client/src/main/java/cbit/vcell/client/data/PDEDataViewerPostProcess.java index 9026c741fc..e6b0ba248c 100644 --- a/vcell-client/src/main/java/cbit/vcell/client/data/PDEDataViewerPostProcess.java +++ b/vcell-client/src/main/java/cbit/vcell/client/data/PDEDataViewerPostProcess.java @@ -10,6 +10,7 @@ import javax.swing.JLabel; import javax.swing.JPanel; +import cbit.vcell.message.server.bootstrap.client.RemoteProxyException; import org.vcell.solver.nfsim.NFSimMolecularConfigurations; import org.vcell.util.DataAccessException; import org.vcell.util.Extent; @@ -40,10 +41,8 @@ import cbit.vcell.field.io.FieldDataFileOperationSpec; import cbit.vcell.geometry.RegionImage; import cbit.vcell.math.VariableType; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory.RemoteProxyException; import cbit.vcell.server.DataSetController; import cbit.vcell.server.DataSetControllerProvider; -import cbit.vcell.server.SimulationStatus; import cbit.vcell.simdata.ClientPDEDataContext; import cbit.vcell.simdata.DataIdentifier; import cbit.vcell.simdata.DataOperation; diff --git a/vcell-client/src/main/java/cbit/vcell/client/desktop/DocumentWindow.java b/vcell-client/src/main/java/cbit/vcell/client/desktop/DocumentWindow.java index 89a88aa968..d1e114ba0e 100644 --- a/vcell-client/src/main/java/cbit/vcell/client/desktop/DocumentWindow.java +++ b/vcell-client/src/main/java/cbit/vcell/client/desktop/DocumentWindow.java @@ -29,6 +29,7 @@ import com.google.inject.Key; import com.google.inject.name.Names; import org.vcell.DependencyConstants; +import org.vcell.api.messaging.RemoteProxyVCellConnectionFactory; import org.vcell.api.server.ConnectionStatus; import org.vcell.api.server.Reconnector; import org.vcell.client.logicalwindow.LWTopFrame; @@ -1477,6 +1478,10 @@ private void login(boolean asGuest) { Hashtable hash = new Hashtable(); VCellConnectionFactory vcellConnectionFactory = VCellClientMain.injector.getInstance(VCellConnectionFactory.class); + if (!(vcellConnectionFactory instanceof RemoteProxyVCellConnectionFactory)){ + throw new IllegalStateException("VCellConnectionFactory is not a RemoteProxyVCellConnectionFactory"); + } + String host = VCellClientMain.injector.getInstance(Key.get(String.class, Names.named(DependencyConstants.VCELL_API_HOST))); String port; String pathPrefix; @@ -1494,8 +1499,8 @@ private void login(boolean asGuest) { ClientLogin.LoginOptions loginType = asGuest ? ClientLogin.LoginOptions.GUEST_LOGIN : ClientLogin.LoginOptions.STANDARD_LOGIN; AsynchClientTask task1a = ClientLogin.popupLogin(loginType); - AsynchClientTask task1b = ClientLogin.loginWithAuth0(vcellConnectionFactory.getAuth0ConnectionUtils()); - AsynchClientTask task2 = ClientLogin.connectToServer(vcellConnectionFactory.getAuth0ConnectionUtils(), + AsynchClientTask task1b = ClientLogin.loginWithAuth0(((RemoteProxyVCellConnectionFactory)vcellConnectionFactory).getAuth0ConnectionUtils()); + AsynchClientTask task2 = ClientLogin.connectToServer(((RemoteProxyVCellConnectionFactory)vcellConnectionFactory).getAuth0ConnectionUtils(), ClientServerInfo.createRemoteServerInfo(host, Integer.parseInt(port), pathPrefix, null)); AsynchClientTask[] taskArray = new AsynchClientTask[]{task1a, task1b, task2}; diff --git a/vcell-client/src/main/java/cbit/vcell/client/desktop/NetworkProxyPreferences.java b/vcell-client/src/main/java/cbit/vcell/client/desktop/NetworkProxyPreferences.java index b27630e6fd..d2b6af31bc 100644 --- a/vcell-client/src/main/java/cbit/vcell/client/desktop/NetworkProxyPreferences.java +++ b/vcell-client/src/main/java/cbit/vcell/client/desktop/NetworkProxyPreferences.java @@ -7,7 +7,7 @@ import org.vcell.util.UtilCancelException; import org.vcell.util.gui.DialogUtils; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory; +import org.vcell.api.messaging.RemoteProxyVCellConnectionFactory; import cbit.vcell.resource.NetworkProxyUtils; import cbit.vcell.resource.NetworkProxyUtils.RestartWarningProvider; diff --git a/vcell-client/src/main/java/cbit/vcell/client/desktop/ViewJobsPanel.java b/vcell-client/src/main/java/cbit/vcell/client/desktop/ViewJobsPanel.java index ed44be3ac6..ee99dfe4a4 100644 --- a/vcell-client/src/main/java/cbit/vcell/client/desktop/ViewJobsPanel.java +++ b/vcell-client/src/main/java/cbit/vcell/client/desktop/ViewJobsPanel.java @@ -43,6 +43,7 @@ import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; +import cbit.vcell.message.server.bootstrap.client.RemoteProxyException; import org.vcell.util.DataAccessException; import org.vcell.util.ProgressDialogListener; import org.vcell.util.gui.ColorIcon; @@ -59,7 +60,6 @@ import cbit.vcell.client.task.AsynchClientTask; import cbit.vcell.client.task.ClientTaskDispatcher; import cbit.vcell.clientdb.ClientDocumentManager; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory.RemoteProxyException; import cbit.vcell.server.SessionManager; import cbit.vcell.server.SimpleJobStatus; import cbit.vcell.server.SimpleJobStatusQuerySpec; diff --git a/vcell-client/src/main/java/org/vcell/dependency/client/VCellClientModule.java b/vcell-client/src/main/java/org/vcell/dependency/client/VCellClientModule.java index 457d2c526a..aa39ca3136 100644 --- a/vcell-client/src/main/java/org/vcell/dependency/client/VCellClientModule.java +++ b/vcell-client/src/main/java/org/vcell/dependency/client/VCellClientModule.java @@ -1,6 +1,6 @@ package org.vcell.dependency.client; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory; +import org.vcell.api.messaging.RemoteProxyVCellConnectionFactory; import cbit.vcell.server.VCellConnectionFactory; import cbit.vcell.simdata.ExternalDataIdentifierService; import com.google.inject.AbstractModule; diff --git a/vcell-client/src/main/java/org/vcell/util/network/RemoteRegistrationService.java b/vcell-client/src/main/java/org/vcell/util/network/RemoteRegistrationService.java index 9661ed10f8..1842349f2a 100644 --- a/vcell-client/src/main/java/org/vcell/util/network/RemoteRegistrationService.java +++ b/vcell-client/src/main/java/org/vcell/util/network/RemoteRegistrationService.java @@ -1,6 +1,6 @@ package org.vcell.util.network; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory.RemoteProxyException; +import cbit.vcell.message.server.bootstrap.client.RemoteProxyException; import cbit.vcell.resource.PropertyLoader; import org.vcell.api.client.VCellApiClient; import org.vcell.api.utils.DTOOldAPI; diff --git a/vcell-core/src/main/java/cbit/vcell/client/server/ClientServerInterface.java b/vcell-core/src/main/java/cbit/vcell/client/server/ClientServerInterface.java index 54fe25b599..a28f653676 100644 --- a/vcell-core/src/main/java/cbit/vcell/client/server/ClientServerInterface.java +++ b/vcell-core/src/main/java/cbit/vcell/client/server/ClientServerInterface.java @@ -4,7 +4,7 @@ import cbit.vcell.clientdb.DocumentManager; import cbit.vcell.field.io.FieldDataFileOperationResults; import cbit.vcell.field.io.FieldDataFileOperationSpec; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory; +import cbit.vcell.message.server.bootstrap.client.RemoteProxyException; import cbit.vcell.server.DataSetControllerProvider; import cbit.vcell.server.ExportController; import cbit.vcell.server.SessionManager; @@ -19,7 +19,7 @@ public interface ClientServerInterface extends SessionManager, DataSetController void addPropertyChangeListener(java.beans.PropertyChangeListener listener); public void cleanup(); - public MessageEvent[] getMessageEvents() throws RemoteProxyVCellConnectionFactory.RemoteProxyException, IOException; + public MessageEvent[] getMessageEvents() throws RemoteProxyException, IOException; public void connectNewServer(InteractiveClientServerContext requester, ClientServerInfo csi); public void connect(InteractiveClientServerContext requester); diff --git a/vcell-core/src/main/java/cbit/vcell/clientdb/ClientDocumentManager.java b/vcell-core/src/main/java/cbit/vcell/clientdb/ClientDocumentManager.java index a84c82554a..4b1bf1b0a9 100644 --- a/vcell-core/src/main/java/cbit/vcell/clientdb/ClientDocumentManager.java +++ b/vcell-core/src/main/java/cbit/vcell/clientdb/ClientDocumentManager.java @@ -23,6 +23,7 @@ import java.util.Iterator; import java.util.Vector; +import cbit.vcell.message.server.bootstrap.client.RemoteProxyException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jdom.Element; @@ -75,7 +76,6 @@ import cbit.vcell.math.MathDescription; import cbit.vcell.math.MathException; import cbit.vcell.mathmodel.MathModel; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory.RemoteProxyException; import cbit.vcell.model.DBFormalSpecies; import cbit.vcell.model.DBSpecies; import cbit.vcell.model.FormalSpeciesType; @@ -1341,7 +1341,7 @@ public ReactionStepInfo[] getUserReactionStepInfos(KeyValue[] reactionStepKeys) * Creation date: (11/14/00 5:24:29 PM) * @param e RemoteProxyException */ -private void handleRemoteProxyException(RemoteProxyException e) { +private void handleRemoteProxyException(cbit.vcell.message.server.bootstrap.client.RemoteProxyException e) { lg.error("Handling RemoteProxyException", e); } diff --git a/vcell-core/src/main/java/cbit/vcell/message/server/bootstrap/client/RemoteProxyException.java b/vcell-core/src/main/java/cbit/vcell/message/server/bootstrap/client/RemoteProxyException.java new file mode 100644 index 0000000000..4bb1f62e8e --- /dev/null +++ b/vcell-core/src/main/java/cbit/vcell/message/server/bootstrap/client/RemoteProxyException.java @@ -0,0 +1,7 @@ +package cbit.vcell.message.server.bootstrap.client; + +public class RemoteProxyException extends Exception { + public RemoteProxyException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/vcell-core/src/main/java/cbit/vcell/message/server/bootstrap/client/RemoteProxyVCellConnectionFactory.java b/vcell-core/src/main/java/cbit/vcell/message/server/bootstrap/client/RemoteProxyVCellConnectionFactory.java index ac0377f4de..ccad159506 100644 --- a/vcell-core/src/main/java/cbit/vcell/message/server/bootstrap/client/RemoteProxyVCellConnectionFactory.java +++ b/vcell-core/src/main/java/cbit/vcell/message/server/bootstrap/client/RemoteProxyVCellConnectionFactory.java @@ -155,15 +155,6 @@ public MessageEvent[] getMessageEvents() throws IOException { return messageEvents.toArray(new MessageEvent[0]); } } - - @SuppressWarnings("serial") - public static class RemoteProxyException extends Exception { - - public RemoteProxyException(String message, Exception e) { - super(message,e); - } - - } public RemoteProxyVCellConnectionFactory( String apihost, diff --git a/vcell-core/src/main/java/cbit/vcell/server/DataSetController.java b/vcell-core/src/main/java/cbit/vcell/server/DataSetController.java index 36e7c48bf2..047990fdde 100644 --- a/vcell-core/src/main/java/cbit/vcell/server/DataSetController.java +++ b/vcell-core/src/main/java/cbit/vcell/server/DataSetController.java @@ -10,27 +10,20 @@ package cbit.vcell.server; -import org.vcell.solver.nfsim.NFSimMolecularConfigurations; -import org.vcell.util.DataAccessException; -import org.vcell.util.document.VCDataIdentifier; -import org.vcell.vis.io.VtuFileContainer; -import org.vcell.vis.io.VtuVarInfo; - import cbit.plot.PlotData; import cbit.rmi.event.ExportEvent; import cbit.vcell.export.server.ExportSpecs; import cbit.vcell.field.io.FieldDataFileOperationResults; import cbit.vcell.field.io.FieldDataFileOperationSpec; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory.RemoteProxyException; -import cbit.vcell.simdata.DataIdentifier; -import cbit.vcell.simdata.DataOperation; -import cbit.vcell.simdata.DataOperationResults; -import cbit.vcell.simdata.DataSetMetadata; -import cbit.vcell.simdata.DataSetTimeSeries; -import cbit.vcell.simdata.OutputContext; -import cbit.vcell.simdata.SpatialSelection; +import cbit.vcell.message.server.bootstrap.client.RemoteProxyException; +import cbit.vcell.simdata.*; import cbit.vcell.solver.AnnotatedFunction; import cbit.vcell.solvers.CartesianMesh; +import org.vcell.solver.nfsim.NFSimMolecularConfigurations; +import org.vcell.util.DataAccessException; +import org.vcell.util.document.VCDataIdentifier; +import org.vcell.vis.io.VtuFileContainer; +import org.vcell.vis.io.VtuVarInfo; /** * This interface was generated by a SmartGuide. * diff --git a/vcell-core/src/main/java/cbit/vcell/server/ExportController.java b/vcell-core/src/main/java/cbit/vcell/server/ExportController.java index f22d987f47..d6a852c110 100644 --- a/vcell-core/src/main/java/cbit/vcell/server/ExportController.java +++ b/vcell-core/src/main/java/cbit/vcell/server/ExportController.java @@ -11,7 +11,7 @@ package cbit.vcell.server; import cbit.vcell.export.server.ExportSpecs; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory.RemoteProxyException; +import cbit.vcell.message.server.bootstrap.client.RemoteProxyException; import cbit.vcell.simdata.OutputContext; /** * Insert the type's description here. diff --git a/vcell-core/src/main/java/cbit/vcell/server/SimulationController.java b/vcell-core/src/main/java/cbit/vcell/server/SimulationController.java index c7a87bd0af..b53b73dee1 100644 --- a/vcell-core/src/main/java/cbit/vcell/server/SimulationController.java +++ b/vcell-core/src/main/java/cbit/vcell/server/SimulationController.java @@ -9,10 +9,10 @@ */ package cbit.vcell.server; +import cbit.vcell.message.server.bootstrap.client.RemoteProxyException; import org.vcell.util.DataAccessException; import org.vcell.util.document.KeyValue; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory.RemoteProxyException; import cbit.vcell.solver.VCSimulationIdentifier; /** * This interface was generated by a SmartGuide. diff --git a/vcell-core/src/main/java/cbit/vcell/server/UserMetaDbServer.java b/vcell-core/src/main/java/cbit/vcell/server/UserMetaDbServer.java index 9e7c7c09e3..fe535576e8 100644 --- a/vcell-core/src/main/java/cbit/vcell/server/UserMetaDbServer.java +++ b/vcell-core/src/main/java/cbit/vcell/server/UserMetaDbServer.java @@ -11,6 +11,7 @@ package cbit.vcell.server; import java.util.TreeMap; +import cbit.vcell.message.server.bootstrap.client.RemoteProxyException; import org.vcell.util.BigString; import org.vcell.util.DataAccessException; import org.vcell.util.ObjectNotFoundException; @@ -33,11 +34,9 @@ import cbit.vcell.field.FieldDataDBOperationSpec; import cbit.vcell.geometry.GeometryInfo; import cbit.vcell.mathmodel.MathModelMetaData; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory.RemoteProxyException; import cbit.vcell.model.DBFormalSpecies; import cbit.vcell.model.DBSpecies; import cbit.vcell.model.FormalSpeciesType; -import cbit.vcell.model.Model; import cbit.vcell.model.ReactionDescription; import cbit.vcell.model.ReactionQuerySpec; import cbit.vcell.model.ReactionStepInfo; diff --git a/vcell-core/src/main/java/cbit/vcell/server/VCellBootstrap.java b/vcell-core/src/main/java/cbit/vcell/server/VCellBootstrap.java index 78573b9d80..26c22258f0 100644 --- a/vcell-core/src/main/java/cbit/vcell/server/VCellBootstrap.java +++ b/vcell-core/src/main/java/cbit/vcell/server/VCellBootstrap.java @@ -10,13 +10,13 @@ package cbit.vcell.server; +import cbit.vcell.message.server.bootstrap.client.RemoteProxyException; import org.vcell.util.AuthenticationException; import org.vcell.util.DataAccessException; import org.vcell.util.UseridIDExistsException; import org.vcell.util.document.UserInfo; import org.vcell.util.document.UserLoginInfo; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory.RemoteProxyException; /** * This interface was generated by a SmartGuide. * diff --git a/vcell-core/src/main/java/cbit/vcell/server/VCellConnection.java b/vcell-core/src/main/java/cbit/vcell/server/VCellConnection.java index a0f85a410e..f6cf310ebd 100644 --- a/vcell-core/src/main/java/cbit/vcell/server/VCellConnection.java +++ b/vcell-core/src/main/java/cbit/vcell/server/VCellConnection.java @@ -10,15 +10,13 @@ package cbit.vcell.server; -import java.io.IOException; -import java.io.Serializable; - +import cbit.rmi.event.MessageEvent; +import cbit.vcell.message.server.bootstrap.client.RemoteProxyException; import org.vcell.util.DataAccessException; import org.vcell.util.document.UserLoginInfo; -import cbit.rmi.event.MessageEvent; -import cbit.rmi.event.PerformanceMonitorEvent; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory.RemoteProxyException; +import java.io.IOException; +import java.io.Serializable; /** * This interface was generated by a SmartGuide. * diff --git a/vcell-core/src/main/java/cbit/vcell/server/VCellConnectionRegistrationProvider.java b/vcell-core/src/main/java/cbit/vcell/server/VCellConnectionRegistrationProvider.java index 5ab4ef433d..46cba29824 100644 --- a/vcell-core/src/main/java/cbit/vcell/server/VCellConnectionRegistrationProvider.java +++ b/vcell-core/src/main/java/cbit/vcell/server/VCellConnectionRegistrationProvider.java @@ -1,12 +1,12 @@ package cbit.vcell.server; +import cbit.vcell.message.server.bootstrap.client.RemoteProxyException; import org.vcell.service.registration.RegistrationService; import org.vcell.util.DataAccessException; import org.vcell.util.UseridIDExistsException; import org.vcell.util.document.KeyValue; import org.vcell.util.document.UserInfo; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory.RemoteProxyException; public class VCellConnectionRegistrationProvider implements RegistrationService { private VCellConnection vcellConnection; diff --git a/vcell-core/src/main/java/cbit/vcell/simdata/VCDataManager.java b/vcell-core/src/main/java/cbit/vcell/simdata/VCDataManager.java index 9701a15001..d72146daa3 100644 --- a/vcell-core/src/main/java/cbit/vcell/simdata/VCDataManager.java +++ b/vcell-core/src/main/java/cbit/vcell/simdata/VCDataManager.java @@ -10,6 +10,15 @@ package cbit.vcell.simdata; +import cbit.plot.PlotData; +import cbit.vcell.field.io.FieldDataFileOperationResults; +import cbit.vcell.field.io.FieldDataFileOperationSpec; +import cbit.vcell.math.Function; +import cbit.vcell.message.server.bootstrap.client.RemoteProxyException; +import cbit.vcell.server.DataSetController; +import cbit.vcell.server.DataSetControllerProvider; +import cbit.vcell.solver.ode.ODESimData; +import cbit.vcell.solvers.CartesianMesh; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.vcell.solver.nfsim.NFSimMolecularConfigurations; @@ -20,16 +29,6 @@ import org.vcell.util.document.VCDataIdentifier; import org.vcell.vis.io.VtuFileContainer; import org.vcell.vis.io.VtuVarInfo; - -import cbit.plot.PlotData; -import cbit.vcell.field.io.FieldDataFileOperationResults; -import cbit.vcell.field.io.FieldDataFileOperationSpec; -import cbit.vcell.math.Function; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory.RemoteProxyException; -import cbit.vcell.server.DataSetController; -import cbit.vcell.server.DataSetControllerProvider; -import cbit.vcell.solver.ode.ODESimData; -import cbit.vcell.solvers.CartesianMesh; /** * Insert the type's description here. * Creation date: (6/11/2004 5:36:06 AM) @@ -373,7 +372,7 @@ public synchronized TimeSeriesJobResults getTimeSeriesValues(OutputContext outpu } } -private void handleRemoteProxyException(RemoteProxyException remoteProxyException) { +private void handleRemoteProxyException(cbit.vcell.message.server.bootstrap.client.RemoteProxyException remoteProxyException) { lg.error("Handling RemoteProxyException", remoteProxyException); } diff --git a/vcell-core/src/main/java/org/vcell/service/registration/RegistrationService.java b/vcell-core/src/main/java/org/vcell/service/registration/RegistrationService.java index f7ac4b2022..6ad68b99f4 100644 --- a/vcell-core/src/main/java/org/vcell/service/registration/RegistrationService.java +++ b/vcell-core/src/main/java/org/vcell/service/registration/RegistrationService.java @@ -1,12 +1,11 @@ package org.vcell.service.registration; +import cbit.vcell.message.server.bootstrap.client.RemoteProxyException; import org.vcell.util.DataAccessException; import org.vcell.util.UseridIDExistsException; import org.vcell.util.document.KeyValue; import org.vcell.util.document.UserInfo; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory.RemoteProxyException; - public interface RegistrationService { public UserInfo insertUserInfo(UserInfo newUserInfo,boolean bUpdate) throws RemoteProxyException,DataAccessException,UseridIDExistsException; public UserInfo getUserInfo(KeyValue userKey) throws DataAccessException,RemoteProxyException; diff --git a/vcell-server/src/main/java/cbit/vcell/message/server/bootstrap/LocalVCellConnection.java b/vcell-server/src/main/java/cbit/vcell/message/server/bootstrap/LocalVCellConnection.java index accd35962d..11b85d1112 100644 --- a/vcell-server/src/main/java/cbit/vcell/message/server/bootstrap/LocalVCellConnection.java +++ b/vcell-server/src/main/java/cbit/vcell/message/server/bootstrap/LocalVCellConnection.java @@ -29,7 +29,6 @@ import cbit.rmi.event.SimpleMessageCollector; import cbit.rmi.event.SimpleMessageService; import cbit.vcell.export.server.ExportServiceImpl; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory.RemoteProxyException; import cbit.vcell.message.server.dispatcher.SimulationDatabase; import cbit.vcell.modeldb.LocalUserMetaDbServer; import cbit.vcell.resource.ErrorUtils; diff --git a/vcell-server/src/main/java/org/vcell/dependency/server/VCellServerModule.java b/vcell-server/src/main/java/org/vcell/dependency/server/VCellServerModule.java index 92ea446e9c..bf390e9a41 100644 --- a/vcell-server/src/main/java/org/vcell/dependency/server/VCellServerModule.java +++ b/vcell-server/src/main/java/org/vcell/dependency/server/VCellServerModule.java @@ -5,7 +5,6 @@ import cbit.vcell.message.jms.activeMQ.VCMessagingServiceActiveMQ; import cbit.vcell.message.server.bootstrap.LocalVCellConnectionFactory; import cbit.vcell.message.server.bootstrap.LocalVCellConnectionServiceImpl; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory; import cbit.vcell.server.LocalVCellConnectionService; import cbit.vcell.server.VCellConnectionFactory; import cbit.vcell.simdata.ExternalDataIdentifierService; diff --git a/vcell-server/src/main/java/org/vcell/service/registration/localdb/LocaldbRegistrationService.java b/vcell-server/src/main/java/org/vcell/service/registration/localdb/LocaldbRegistrationService.java index 3931285df3..b6832ad2a8 100644 --- a/vcell-server/src/main/java/org/vcell/service/registration/localdb/LocaldbRegistrationService.java +++ b/vcell-server/src/main/java/org/vcell/service/registration/localdb/LocaldbRegistrationService.java @@ -2,6 +2,7 @@ import java.sql.SQLException; +import cbit.vcell.message.server.bootstrap.client.RemoteProxyException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.vcell.db.ConnectionFactory; @@ -13,7 +14,6 @@ import org.vcell.util.document.KeyValue; import org.vcell.util.document.UserInfo; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory.RemoteProxyException; import cbit.vcell.modeldb.LocalAdminDbServer; import cbit.vcell.server.AdminDatabaseServer; @@ -56,7 +56,7 @@ public UserInfo getUserInfo(KeyValue userKey) throws DataAccessException,RemoteP return getAdminDbServer().getUserInfo(userKey); } @Override - public void sendLostPassword(String userid) throws DataAccessException,RemoteProxyException{ + public void sendLostPassword(String userid) throws DataAccessException, RemoteProxyException { getAdminDbServer().sendLostPassword(userid); } } diff --git a/vcell-vmicro/src/main/java/org/vcell/vmicro/op/display/DisplayTimeSeriesOp.java b/vcell-vmicro/src/main/java/org/vcell/vmicro/op/display/DisplayTimeSeriesOp.java index cb69613371..f18dbabf6e 100644 --- a/vcell-vmicro/src/main/java/org/vcell/vmicro/op/display/DisplayTimeSeriesOp.java +++ b/vcell-vmicro/src/main/java/org/vcell/vmicro/op/display/DisplayTimeSeriesOp.java @@ -9,6 +9,7 @@ import javax.swing.JFrame; import javax.swing.SwingUtilities; +import cbit.vcell.message.server.bootstrap.client.RemoteProxyException; import org.vcell.client.logicalwindow.LWTopFrame; import org.vcell.solver.nfsim.NFSimMolecularConfigurations; import org.vcell.util.DataAccessException; @@ -49,7 +50,6 @@ import cbit.vcell.geometry.RegionImage; import cbit.vcell.math.Variable.Domain; import cbit.vcell.math.VariableType; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory.RemoteProxyException; import cbit.vcell.server.DataSetController; import cbit.vcell.server.DataSetControllerProvider; import cbit.vcell.simdata.ClientPDEDataContext; diff --git a/vcell-vmicro/src/main/java/org/vcell/vmicro/workflow/task/DisplayTimeSeries.java b/vcell-vmicro/src/main/java/org/vcell/vmicro/workflow/task/DisplayTimeSeries.java index a154cad440..2828a4ce1e 100644 --- a/vcell-vmicro/src/main/java/org/vcell/vmicro/workflow/task/DisplayTimeSeries.java +++ b/vcell-vmicro/src/main/java/org/vcell/vmicro/workflow/task/DisplayTimeSeries.java @@ -38,7 +38,6 @@ import cbit.vcell.geometry.RegionImage; import cbit.vcell.math.Variable.Domain; import cbit.vcell.math.VariableType; -import cbit.vcell.message.server.bootstrap.client.RemoteProxyVCellConnectionFactory.RemoteProxyException; import cbit.vcell.server.DataSetController; import cbit.vcell.server.DataSetControllerProvider; import cbit.vcell.simdata.ClientPDEDataContext; @@ -57,6 +56,7 @@ import cbit.vcell.solver.AnnotatedFunction; import cbit.vcell.solver.ode.ODESimData; import cbit.vcell.solvers.CartesianMesh; +import cbit.vcell.message.server.bootstrap.client.RemoteProxyException; public class DisplayTimeSeries extends Task {