Relocate API Types to Separate Module

pom.xml

@@ -55,6 +55,7 @@
 
 	<modules>
 		<module>vcell-admin</module>
+		<module>vcell-api-types</module>
 		<module>vcell-api</module>
 		<module>vcell-apiclient</module>
 		<module>vcell-client</module>

vcell-api-types/pom.xml

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.vcell</groupId>
+        <artifactId>vcell-pom</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>vcell-api-types</artifactId>
+
+    <name>vcell-api-types</name>
+
+    <description>Types used for communication.</description>
+    <version>1.0.0</version>
+    <url>https://maven.apache.org</url>
+    <inceptionYear>2025</inceptionYear>
+    <organization>
+        <name>VCell</name>
+        <url>https://vcell.org</url>
+    </organization>
+    <licenses>
+        <license>
+            <name>MIT</name>
+            <url>https://opensource.org/licenses/MIT</url>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <id>avocadomoon</id>
+            <name>Ezequiel Valencia</name>
+            <roles>
+                <role>founder</role>
+                <role>lead</role>
+                <role>developer</role>
+                <role>debugger</role>
+                <role>reviewer</role>
+                <role>support</role>
+                <role>maintainer</role>
+            </roles>
+        </developer>
+    </developers>
+
+    <mailingLists>
+        <mailingList>
+            <name>VCell Open Discussion Forum</name>
+            <subscribe>https://groups.google.com/group/vcell-discuss</subscribe>
+            <unsubscribe>https://groups.google.com/group/vcell-discuss</unsubscribe>
+            <post>[email protected]</post>
+            <archive>https://groups.google.com/group/vcell-discuss</archive>
+        </mailingList>
+    </mailingLists>
+
+    <scm>
+        <connection>scm:git:git://github.com/virtualcell/vcell</connection>
+        <developerConnection>scm:git:[email protected]:virtualcell/vcell</developerConnection>
+        <tag>HEAD</tag>
+        <url>https://github.com/virtualcell/vcell</url>
+    </scm>
+    <issueManagement>
+        <system>Bugzilla</system>
+        <url>https://github.com/virtualcell/vcell/issues</url>
+    </issueManagement>
+
+    <properties>
+        <license.licenseName>MIT</license.licenseName>
+        <license.copyrightOwners>UConn Health</license.copyrightOwners>
+    </properties>
+
+    <repositories>
+        <repository>
+            <id>maven-restlet</id>
+            <name>Restlet repository</name>
+            <url>https://maven.restlet.talend.com</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.vcell</groupId>
+            <artifactId>vcell-core</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+</project>

vcell-core/src/main/java/cbit/rmi/event/client/common/AccessTokenRepresentation.java → vcell-api-types/src/main/java/org/vcell/api/types/common/AccessTokenRepresentation.java

@@ -1,4 +1,4 @@
-package cbit.rmi.event.client.common;
+package org.vcell.api.types.common;
 
 
 

vcell-core/src/main/java/cbit/rmi/event/client/common/ApplicationRepresentation.java → vcell-api-types/src/main/java/org/vcell/api/types/common/ApplicationRepresentation.java

@@ -1,4 +1,4 @@
-package cbit.rmi.event.client.common;
+package org.vcell.api.types.common;
 
 
 public class ApplicationRepresentation {

vcell-core/src/main/java/cbit/rmi/event/client/common/BioModelLink.java → vcell-api-types/src/main/java/org/vcell/api/types/common/BioModelLink.java

@@ -1,4 +1,4 @@
-package cbit.rmi.event.client.common;
+package org.vcell.api.types.common;
 
 public class BioModelLink {
 	public final static String bmid = "bioModelKey";

vcell-core/src/main/java/cbit/rmi/event/client/common/BiomodelRepresentation.java → vcell-api-types/src/main/java/org/vcell/api/types/common/BiomodelRepresentation.java

@@ -1,4 +1,4 @@
-package cbit.rmi.event.client.common;
+package org.vcell.api.types.common;
 
 
 public class BiomodelRepresentation {

vcell-core/src/main/java/cbit/rmi/event/client/common/MathModelLink.java → vcell-api-types/src/main/java/org/vcell/api/types/common/MathModelLink.java

@@ -1,4 +1,4 @@
-package cbit.rmi.event.client.common;
+package org.vcell.api.types.common;
 
 
 public class MathModelLink {

vcell-core/src/main/java/cbit/rmi/event/client/common/SimDataRepresentation.java → vcell-api-types/src/main/java/org/vcell/api/types/common/SimDataRepresentation.java

@@ -1,4 +1,4 @@
-package cbit.rmi.event.client.common;
+package org.vcell.api.types.common;
 
 
 

vcell-core/src/main/java/cbit/rmi/event/client/common/SimDataValuesRepresentation.java → vcell-api-types/src/main/java/org/vcell/api/types/common/SimDataValuesRepresentation.java

@@ -1,4 +1,4 @@
-package cbit.rmi.event.client.common;
+package org.vcell.api.types.common;
 
 
 

vcell-core/src/main/java/cbit/rmi/event/client/common/SimDataVariableRepresentation.java → vcell-api-types/src/main/java/org/vcell/api/types/common/SimDataVariableRepresentation.java

@@ -1,4 +1,4 @@
-package cbit.rmi.event.client.common;
+package org.vcell.api.types.common;
 
 
 

vcell-core/src/main/java/cbit/rmi/event/client/common/SimDataVariableValuesRepresentation.java → vcell-api-types/src/main/java/org/vcell/api/types/common/SimDataVariableValuesRepresentation.java

@@ -1,4 +1,4 @@
-package cbit.rmi.event.client.common;
+package org.vcell.api.types.common;
 
 
 

vcell-core/src/main/java/cbit/rmi/event/client/common/SimpleJobStatusRepresentation.java → vcell-api-types/src/main/java/org/vcell/api/types/common/SimpleJobStatusRepresentation.java

@@ -1,4 +1,4 @@
-package cbit.rmi.event.client.common;
+package org.vcell.api.types.common;
 
 import java.util.Date;
 

vcell-core/src/main/java/cbit/rmi/event/client/common/SimulationRepresentation.java → vcell-api-types/src/main/java/org/vcell/api/types/common/SimulationRepresentation.java

@@ -1,4 +1,4 @@
-package cbit.rmi.event.client.common;
+package org.vcell.api.types.common;
 
 
 

vcell-core/src/main/java/cbit/rmi/event/client/common/SimulationTaskRepresentation.java → vcell-api-types/src/main/java/org/vcell/api/types/common/SimulationTaskRepresentation.java

@@ -1,4 +1,4 @@
-package cbit.rmi.event.client.common;
+package org.vcell.api.types.common;
 
 
 public class SimulationTaskRepresentation {

vcell-core/src/main/java/cbit/rmi/event/client/common/UserInfo.java → vcell-api-types/src/main/java/org/vcell/api/types/common/UserInfo.java

@@ -8,7 +8,7 @@
  *  http://www.opensource.org/licenses/mit-license.php
  */
 
-package cbit.rmi.event.client.common;
+package org.vcell.api.types.common;
 
 import java.util.Date;
 

vcell-core/src/main/java/cbit/rmi/event/client/events/BroadcastEventRepresentation.java → vcell-api-types/src/main/java/org/vcell/api/types/events/BroadcastEventRepresentation.java

@@ -1,4 +1,4 @@
-package cbit.rmi.event.client.events;
+package org.vcell.api.types.events;
 
 public class BroadcastEventRepresentation {
 

vcell-core/src/main/java/cbit/rmi/event/client/events/DataJobEventRepresentation.java → vcell-api-types/src/main/java/org/vcell/api/types/events/DataJobEventRepresentation.java

@@ -1,4 +1,4 @@
-package cbit.rmi.event.client.events;
+package org.vcell.api.types.events;
 
 public class DataJobEventRepresentation {
 

vcell-core/src/main/java/cbit/rmi/event/client/events/EventWrapper.java → vcell-api-types/src/main/java/org/vcell/api/types/events/EventWrapper.java

@@ -1,4 +1,4 @@
-package cbit.rmi.event.client.events;
+package org.vcell.api.types.events;
 
 public class EventWrapper {
 

vcell-core/src/main/java/cbit/rmi/event/client/events/ExportEventRepresentation.java → vcell-api-types/src/main/java/org/vcell/api/types/events/ExportEventRepresentation.java

@@ -1,4 +1,4 @@
-package cbit.rmi.event.client.events;
+package org.vcell.api.types.events;
 
 public class ExportEventRepresentation {
 

vcell-core/src/main/java/cbit/rmi/event/client/events/ExportHumanReadableDataSpec.java → vcell-api-types/src/main/java/org/vcell/api/types/events/ExportHumanReadableDataSpec.java

@@ -1,4 +1,4 @@
-package cbit.rmi.event.client.events;
+package org.vcell.api.types.events;
 
 import java.util.ArrayList;
 import java.util.HashMap;

vcell-core/src/main/java/cbit/rmi/event/client/events/ExportTimeSpecs.java → vcell-api-types/src/main/java/org/vcell/api/types/events/ExportTimeSpecs.java

@@ -1,4 +1,4 @@
-package cbit.rmi.event.client.events;
+package org.vcell.api.types.events;
 
 public class ExportTimeSpecs {
 	public final int beginTimeIndex;

vcell-core/src/main/java/cbit/rmi/event/client/events/ExportVariableSpecs.java → vcell-api-types/src/main/java/org/vcell/api/types/events/ExportVariableSpecs.java

@@ -1,4 +1,4 @@
-package cbit.rmi.event.client.events;
+package org.vcell.api.types.events;
 
 public class ExportVariableSpecs {
 	public final String[] variableNames;

vcell-core/src/main/java/cbit/rmi/event/client/events/SimulationJobStatusEventRepresentation.java → vcell-api-types/src/main/java/org/vcell/api/types/events/SimulationJobStatusEventRepresentation.java

@@ -1,4 +1,4 @@
-package cbit.rmi.event.client.events;
+package org.vcell.api.types.events;
 
 public class SimulationJobStatusEventRepresentation {
 

vcell-core/src/main/java/cbit/rmi/event/client/events/SimulationJobStatusRepresentation.java → vcell-api-types/src/main/java/org/vcell/api/types/events/SimulationJobStatusRepresentation.java

@@ -1,4 +1,4 @@
-package cbit.rmi.event.client.events;
+package org.vcell.api.types.events;
 
 import java.util.Date;
 

vcell-core/src/main/java/cbit/rmi/event/client/DTOOldAPI.java → vcell-api-types/src/main/java/org/vcell/api/types/utils/DTOOldAPI.java

@@ -1,10 +1,8 @@
-package cbit.rmi.event.client;
+package org.vcell.api.types.utils;
 
 import cbit.rmi.event.DataJobEvent;
 import cbit.rmi.event.ExportEvent;
 import cbit.rmi.event.SimulationJobStatusEvent;
-import cbit.rmi.event.client.common.SimpleJobStatusRepresentation;
-import cbit.rmi.event.client.events.*;
 import cbit.vcell.export.server.HumanReadableExportData;
 import cbit.vcell.export.server.TimeSpecs;
 import cbit.vcell.export.server.VariableSpecs;
@@ -15,6 +13,9 @@
 import cbit.vcell.solver.Simulation;
 import cbit.vcell.solver.VCSimulationIdentifier;
 import cbit.vcell.solver.server.SimulationMessage;
+import org.vcell.api.types.common.SimpleJobStatusRepresentation;
+import org.vcell.api.types.common.UserInfo;
+import org.vcell.api.types.events.*;
 import org.vcell.util.document.*;
 
 import java.io.BufferedInputStream;
@@ -252,17 +253,17 @@ public static SimulationJobStatusEventRepresentation simulationJobStatusEventToJ
         return eventRep;
     }
 
-    public static cbit.rmi.event.client.common.UserInfo getApiUserInfo(UserInfo userInfo){
-        cbit.rmi.event.client.common.UserInfo apiUserInfo = new cbit.rmi.event.client.common.UserInfo(
+    public static UserInfo getApiUserInfo(org.vcell.util.document.UserInfo userInfo){
+        UserInfo apiUserInfo = new UserInfo(
                 (userInfo.id!=null) ? userInfo.id.toString() : null,
                 userInfo.userid, userInfo.digestedPassword0.getString(), userInfo.email, userInfo.wholeName,
                 userInfo.title, userInfo.company, userInfo.country, userInfo.notify, userInfo.insertDate);
         return apiUserInfo;
     }
 
 
-    public static UserInfo fromApiUserInfo(cbit.rmi.event.client.common.UserInfo apiUserInfo) {
-        UserInfo userInfo = new UserInfo();
+    public static org.vcell.util.document.UserInfo fromApiUserInfo(UserInfo apiUserInfo) {
+        org.vcell.util.document.UserInfo userInfo = new org.vcell.util.document.UserInfo();
         userInfo.id = new KeyValue(apiUserInfo.id);
         userInfo.userid = apiUserInfo.userid;
         userInfo.digestedPassword0 = UserLoginInfo.DigestedPassword.createAlreadyDigested(apiUserInfo.digestedPassword0);

vcell-api/pom.xml

@@ -162,5 +162,10 @@
 			<artifactId>joda-time</artifactId>
 			<version>${joda-time.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.vcell</groupId>
+			<artifactId>vcell-api-types</artifactId>
+			<version>1.0.0</version>
+		</dependency>
 	</dependencies>
 </project>

vcell-api/src/main/java/org/vcell/rest/VCellApiApplication.java

@@ -118,7 +118,7 @@ public enum AuthenticationPolicy {
 	public static final String SIMDATA = "simdata";
 	public static final String SIMDATAID = "simdataid";
 
-	public static final String EVENTS = "events";
+	public static final String EVENTS = "org/vcell/api/types";
 	public static final String EVENTS_BEGINTIMESTAMP = "beginTimestamp";
 
 	public static final String N5DATA = "n5data";

vcell-api/src/main/java/org/vcell/rest/admin/AdminJobsRestlet.java

@@ -1,5 +1,6 @@
 package org.vcell.rest.admin;
 
+import org.vcell.api.types.common.SimpleJobStatusRepresentation;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.restlet.Context;
@@ -12,14 +13,13 @@
 import org.restlet.data.Status;
 import org.restlet.engine.adapter.HttpRequest;
 import org.restlet.ext.json.JsonRepresentation;
-import cbit.rmi.event.client.common.SimpleJobStatusRepresentation;
-import cbit.rmi.event.client.DTOOldAPI;
 import org.vcell.rest.VCellApiApplication;
 
 import com.google.gson.Gson;
 
 import cbit.vcell.server.SimpleJobStatusQuerySpec;
 import cbit.vcell.server.SimulationJobStatus;
+import org.vcell.api.types.utils.DTOOldAPI;
 
 public final class AdminJobsRestlet extends Restlet {
 	private final static Logger lg = LogManager.getLogger(AdminJobsRestlet.class);

vcell-api/src/main/java/org/vcell/rest/events/EventsRestlet.java

@@ -1,5 +1,6 @@
 package org.vcell.rest.events;
 
+import org.vcell.api.types.events.EventWrapper;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.restlet.Context;
@@ -12,7 +13,6 @@
 import org.restlet.data.Status;
 import org.restlet.engine.adapter.HttpRequest;
 import org.restlet.ext.json.JsonRepresentation;
-import cbit.rmi.event.client.events.EventWrapper;
 import org.vcell.rest.VCellApiApplication;
 import org.vcell.rest.VCellApiApplication.AuthenticationPolicy;
 import org.vcell.util.document.User;