Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2014-11-12 11:24:26 -0500
committerAngel Avila2014-11-12 11:24:26 -0500
commit6a37a534a3a8576b85d6c15b436acfd6db9d9696 (patch)
tree822b74d4a060085e693217518a1b78494f5b195d
parent1e090a60012343df6c589fe8cc3a69489a25e805 (diff)
downloadorg.eclipse.osee-6a37a534a3a8576b85d6c15b436acfd6db9d9696.tar.gz
org.eclipse.osee-6a37a534a3a8576b85d6c15b436acfd6db9d9696.tar.xz
org.eclipse.osee-6a37a534a3a8576b85d6c15b436acfd6db9d9696.zip
feature[ats_ATS138505]: Add activity logging to client
-rw-r--r--features/org.eclipse.osee.core.feature/feature.xml14
-rw-r--r--features/org.eclipse.osee.orcs.feature/feature.xml7
-rw-r--r--plugins/org.eclipse.osee.activity.server/.classpath7
-rw-r--r--plugins/org.eclipse.osee.activity.server/.project33
-rw-r--r--plugins/org.eclipse.osee.activity.server/META-INF/MANIFEST.MF19
-rw-r--r--plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.jaxrs.application.xml (renamed from plugins/org.eclipse.osee.activity/OSGI-INF/activity.jaxrs.application.xml)2
-rw-r--r--plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.jaxrs.request.filter.xml (renamed from plugins/org.eclipse.osee.activity/OSGI-INF/activity.jaxrs.request.filter.xml)2
-rw-r--r--plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.jaxrs.response.filter.xml (renamed from plugins/org.eclipse.osee.activity/OSGI-INF/activity.jaxrs.response.filter.xml)2
-rw-r--r--plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.schema.resource.xml (renamed from plugins/org.eclipse.osee.activity/OSGI-INF/activity.schema.resource.xml)2
-rw-r--r--plugins/org.eclipse.osee.activity.server/build.properties4
-rw-r--r--plugins/org.eclipse.osee.activity.server/pom.xml16
-rw-r--r--plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/ActivitySchemaResource.java (renamed from plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/ActivitySchemaResource.java)2
-rw-r--r--plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityConstants.java29
-rw-r--r--plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityLogApplication.java (renamed from plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogApplication.java)2
-rw-r--r--plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityLogRequestFilter.java (renamed from plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogRequestFilter.java)3
-rw-r--r--plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityLogResource.java (renamed from plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogResource.java)2
-rw-r--r--plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityLogResponseFilter.java (renamed from plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogResponseFilter.java)3
-rw-r--r--plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/schema/ACTIVITY.DS.SCHEMA.xml (renamed from plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/schema/ACTIVITY.DS.SCHEMA.xml)0
-rw-r--r--plugins/org.eclipse.osee.activity/META-INF/MANIFEST.MF8
-rw-r--r--plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/ActivityConstants.java7
-rw-r--r--plugins/org.eclipse.osee.orcs.parent/pom.xml1
21 files changed, 140 insertions, 25 deletions
diff --git a/features/org.eclipse.osee.core.feature/feature.xml b/features/org.eclipse.osee.core.feature/feature.xml
index 62f23d61c0..645d0dcc4e 100644
--- a/features/org.eclipse.osee.core.feature/feature.xml
+++ b/features/org.eclipse.osee.core.feature/feature.xml
@@ -104,5 +104,19 @@
install-size="0"
version="0.0.0"
unpack="false"/>
+
+ <plugin
+ id="org.eclipse.osee.activity.api"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.osee.activity"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
</feature>
diff --git a/features/org.eclipse.osee.orcs.feature/feature.xml b/features/org.eclipse.osee.orcs.feature/feature.xml
index 431b059622..4b2d40dbe7 100644
--- a/features/org.eclipse.osee.orcs.feature/feature.xml
+++ b/features/org.eclipse.osee.orcs.feature/feature.xml
@@ -128,6 +128,13 @@
install-size="0"
version="0.0.0"
unpack="false"/>
+
+ <plugin
+ id="org.eclipse.osee.activity.server"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
<plugin
id="org.eclipse.osee.orcs.script.dsl"
diff --git a/plugins/org.eclipse.osee.activity.server/.classpath b/plugins/org.eclipse.osee.activity.server/.classpath
new file mode 100644
index 0000000000..ad32c83a78
--- /dev/null
+++ b/plugins/org.eclipse.osee.activity.server/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/org.eclipse.osee.activity.server/.project b/plugins/org.eclipse.osee.activity.server/.project
new file mode 100644
index 0000000000..ab3557b1b8
--- /dev/null
+++ b/plugins/org.eclipse.osee.activity.server/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.osee.activity.server</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ds.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/plugins/org.eclipse.osee.activity.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.activity.server/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..fd5e1fd970
--- /dev/null
+++ b/plugins/org.eclipse.osee.activity.server/META-INF/MANIFEST.MF
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: OSEE Activity Logging Server - (Incubation)
+Bundle-SymbolicName: org.eclipse.osee.activity.server
+Bundle-Version: 0.20.0.qualifier
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Service-Component: OSGI-INF/*.xml
+Import-Package: javax.annotation;version="1.2.0",
+ javax.ws.rs;version="2.0.0",
+ javax.ws.rs.container;version="2.0.0",
+ javax.ws.rs.core;version="2.0.0",
+ javax.ws.rs.ext;version="2.0.0",
+ org.eclipse.osee.activity.api,
+ org.eclipse.osee.database.schema,
+ org.eclipse.osee.framework.core.exception,
+ org.eclipse.osee.framework.jdk.core.type,
+ org.eclipse.osee.framework.jdk.core.util,
+ org.eclipse.osee.logger
+Bundle-Vendor: Eclipse Open System Engineering Environment
diff --git a/plugins/org.eclipse.osee.activity/OSGI-INF/activity.jaxrs.application.xml b/plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.jaxrs.application.xml
index ad7b1b5775..054a9a3cb4 100644
--- a/plugins/org.eclipse.osee.activity/OSGI-INF/activity.jaxrs.application.xml
+++ b/plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.jaxrs.application.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop">
- <implementation class="org.eclipse.osee.activity.internal.jaxrs.ActivityLogApplication"/>
+ <implementation class="org.eclipse.osee.activity.server.internal.jaxrs.ActivityLogApplication"/>
<service>
<provide interface="javax.ws.rs.core.Application"/>
</service>
diff --git a/plugins/org.eclipse.osee.activity/OSGI-INF/activity.jaxrs.request.filter.xml b/plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.jaxrs.request.filter.xml
index db62dc0412..ab0e7be474 100644
--- a/plugins/org.eclipse.osee.activity/OSGI-INF/activity.jaxrs.request.filter.xml
+++ b/plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.jaxrs.request.filter.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
- <implementation class="org.eclipse.osee.activity.internal.jaxrs.ActivityLogRequestFilter"/>
+ <implementation class="org.eclipse.osee.activity.server.internal.jaxrs.ActivityLogRequestFilter"/>
<service>
<provide interface="java.lang.Object"/>
<provide interface="javax.ws.rs.container.ContainerRequestFilter"/>
diff --git a/plugins/org.eclipse.osee.activity/OSGI-INF/activity.jaxrs.response.filter.xml b/plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.jaxrs.response.filter.xml
index 89c3e45829..9079ed10e0 100644
--- a/plugins/org.eclipse.osee.activity/OSGI-INF/activity.jaxrs.response.filter.xml
+++ b/plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.jaxrs.response.filter.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0">
- <implementation class="org.eclipse.osee.activity.internal.jaxrs.ActivityLogResponseFilter"/>
+ <implementation class="org.eclipse.osee.activity.server.internal.jaxrs.ActivityLogResponseFilter"/>
<service>
<provide interface="java.lang.Object"/>
<provide interface="javax.ws.rs.container.ContainerResponseFilter"/>
diff --git a/plugins/org.eclipse.osee.activity/OSGI-INF/activity.schema.resource.xml b/plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.schema.resource.xml
index 8127bd945c..ad1a83eb8a 100644
--- a/plugins/org.eclipse.osee.activity/OSGI-INF/activity.schema.resource.xml
+++ b/plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.schema.resource.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" >
- <implementation class="org.eclipse.osee.activity.internal.ActivitySchemaResource" />
+ <implementation class="org.eclipse.osee.activity.server.internal.ActivitySchemaResource" />
<service>
<provide interface="org.eclipse.osee.database.schema.SchemaResource"/>
</service>
diff --git a/plugins/org.eclipse.osee.activity.server/build.properties b/plugins/org.eclipse.osee.activity.server/build.properties
new file mode 100644
index 0000000000..34d2e4d2da
--- /dev/null
+++ b/plugins/org.eclipse.osee.activity.server/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
diff --git a/plugins/org.eclipse.osee.activity.server/pom.xml b/plugins/org.eclipse.osee.activity.server/pom.xml
new file mode 100644
index 0000000000..49e355b030
--- /dev/null
+++ b/plugins/org.eclipse.osee.activity.server/pom.xml
@@ -0,0 +1,16 @@
+<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/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.osee</groupId>
+ <artifactId>org.eclipse.osee.orcs.parent</artifactId>
+ <version>0.20.0-SNAPSHOT</version>
+ <relativePath>../../plugins/org.eclipse.osee.orcs.parent</relativePath>
+ </parent>
+
+ <artifactId>org.eclipse.osee.activity.server</artifactId>
+ <packaging>eclipse-plugin</packaging>
+ <name>OSEE Activity Logging Server - (Incubation)</name>
+</project>
diff --git a/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/ActivitySchemaResource.java b/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/ActivitySchemaResource.java
index 4c8cf7631b..3f5b476c7c 100644
--- a/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/ActivitySchemaResource.java
+++ b/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/ActivitySchemaResource.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.activity.internal;
+package org.eclipse.osee.activity.server.internal;
import java.io.BufferedInputStream;
import java.io.InputStream;
diff --git a/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityConstants.java b/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityConstants.java
new file mode 100644
index 0000000000..aee9d84461
--- /dev/null
+++ b/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityConstants.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2014 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.activity.server.internal.jaxrs;
+
+/**
+ * @author Ryan D. Brooks
+ */
+public final class ActivityConstants {
+
+ private ActivityConstants() {
+ // Utility class
+ }
+
+ public static final String HTTP_HEADER__ACTIVITY_ENTRY_ID = "X-osee-activity-log-entryId";
+ public static final String ERROR_MSG__MISSING_ACTIVITY_HEADER =
+ "Error [" + ActivityConstants.HTTP_HEADER__ACTIVITY_ENTRY_ID + "] was missing from request http header";
+
+ public static final Long DEFAULT_ACCOUNT_ID = 1896L; // Guest Account Id
+ public static final Long DEFAULT_SERVER_ID = 777L;
+ public static final Long DEFAULT_CLIENT_ID = 111L;
+} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogApplication.java b/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityLogApplication.java
index 0e527d14be..14c8e4210c 100644
--- a/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogApplication.java
+++ b/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityLogApplication.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.activity.internal.jaxrs;
+package org.eclipse.osee.activity.server.internal.jaxrs;
import java.util.HashSet;
import java.util.Set;
diff --git a/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogRequestFilter.java b/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityLogRequestFilter.java
index d06eb30a76..27d563214c 100644
--- a/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogRequestFilter.java
+++ b/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityLogRequestFilter.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.activity.internal.jaxrs;
+package org.eclipse.osee.activity.server.internal.jaxrs;
import javax.annotation.Priority;
import javax.ws.rs.Priorities;
@@ -16,7 +16,6 @@ import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerRequestFilter;
import javax.ws.rs.container.PreMatching;
import javax.ws.rs.ext.Provider;
-import org.eclipse.osee.activity.ActivityConstants;
import org.eclipse.osee.activity.api.Activity;
import org.eclipse.osee.activity.api.ActivityLog;
import org.eclipse.osee.logger.Log;
diff --git a/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogResource.java b/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityLogResource.java
index 8320412224..32854e94ea 100644
--- a/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogResource.java
+++ b/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityLogResource.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.activity.internal.jaxrs;
+package org.eclipse.osee.activity.server.internal.jaxrs;
import java.util.ArrayList;
import java.util.List;
diff --git a/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogResponseFilter.java b/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityLogResponseFilter.java
index 58dc303bab..c3398d8743 100644
--- a/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogResponseFilter.java
+++ b/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityLogResponseFilter.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.activity.internal.jaxrs;
+package org.eclipse.osee.activity.server.internal.jaxrs;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerResponseContext;
@@ -16,7 +16,6 @@ import javax.ws.rs.container.ContainerResponseFilter;
import javax.ws.rs.core.Response.Status;
import javax.ws.rs.core.Response.StatusType;
import javax.ws.rs.ext.Provider;
-import org.eclipse.osee.activity.ActivityConstants;
import org.eclipse.osee.activity.api.Activity;
import org.eclipse.osee.activity.api.ActivityLog;
import org.eclipse.osee.logger.Log;
diff --git a/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/schema/ACTIVITY.DS.SCHEMA.xml b/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/schema/ACTIVITY.DS.SCHEMA.xml
index 04fef64fa2..04fef64fa2 100644
--- a/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/schema/ACTIVITY.DS.SCHEMA.xml
+++ b/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/schema/ACTIVITY.DS.SCHEMA.xml
diff --git a/plugins/org.eclipse.osee.activity/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.activity/META-INF/MANIFEST.MF
index d1f68bc4f4..7eb269e104 100644
--- a/plugins/org.eclipse.osee.activity/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.activity/META-INF/MANIFEST.MF
@@ -7,13 +7,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: Eclipse Open System Engineering Environment
Service-Component: OSGI-INF/*.xml
Osee-Data: OSEE-INF/*
-Import-Package: javax.annotation;version="1.2.0",
- javax.ws.rs;version="2.0.0",
- javax.ws.rs.container;version="2.0.0",
- javax.ws.rs.core;version="2.0.0",
- javax.ws.rs.ext;version="2.0.0",
- org.eclipse.osee.activity.api,
- org.eclipse.osee.database.schema,
+Import-Package: org.eclipse.osee.activity.api,
org.eclipse.osee.executor.admin,
org.eclipse.osee.framework.core.exception,
org.eclipse.osee.framework.database,
diff --git a/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/ActivityConstants.java b/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/ActivityConstants.java
index 7b06d7d0a6..86b4e28100 100644
--- a/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/ActivityConstants.java
+++ b/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/ActivityConstants.java
@@ -37,11 +37,4 @@ public final class ActivityConstants {
public static int DEFAULT_ACTIVITY_LOGGER__EXECUTOR_POOL_SIZE = 1;
public static boolean DEFAULT_ACTIVITY_LOGGER__ENABLED = false;
- public static final String HTTP_HEADER__ACTIVITY_ENTRY_ID = "X-osee-activity-log-entryId";
- public static final String ERROR_MSG__MISSING_ACTIVITY_HEADER =
- "Error [" + ActivityConstants.HTTP_HEADER__ACTIVITY_ENTRY_ID + "] was missing from request http header";
-
- public static final Long DEFAULT_ACCOUNT_ID = 1896L; // Guest Account Id
- public static final Long DEFAULT_SERVER_ID = 777L;
- public static final Long DEFAULT_CLIENT_ID = 111L;
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.orcs.parent/pom.xml b/plugins/org.eclipse.osee.orcs.parent/pom.xml
index 97d8c2183f..f6656bd4ba 100644
--- a/plugins/org.eclipse.osee.orcs.parent/pom.xml
+++ b/plugins/org.eclipse.osee.orcs.parent/pom.xml
@@ -31,6 +31,7 @@
<module>../../plugins/org.eclipse.osee.database.schema</module>
<module>../../plugins/org.eclipse.osee.activity</module>
+ <module>../../plugins/org.eclipse.osee.activity.server</module>
<module>../../plugins/org.eclipse.osee.orcs.script.dsl</module>
<module>../../plugins/org.eclipse.osee.orcs.script.dsl.tests</module>

Back to the top