Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2015-02-20 11:01:34 -0500
committerAngel Avila2015-02-20 11:01:34 -0500
commitb666c66a62b7d0f5ec00ad878a853f5454ba37a4 (patch)
tree55ca664890b8333c2bac9f38d48aee52619270c1
parente3a78f16bf1e7c19b8efc0e3ed086d0b90874256 (diff)
downloadorg.eclipse.osee-b666c66a62b7d0f5ec00ad878a853f5454ba37a4.tar.gz
org.eclipse.osee-b666c66a62b7d0f5ec00ad878a853f5454ba37a4.tar.xz
org.eclipse.osee-b666c66a62b7d0f5ec00ad878a853f5454ba37a4.zip
feature[ats_ATS138505]: Revert - 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/build.properties5
-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/jaxrs/ActivityConstants.java29
-rw-r--r--plugins/org.eclipse.osee.activity/META-INF/MANIFEST.MF7
-rw-r--r--plugins/org.eclipse.osee.activity/OSGI-INF/activity.jaxrs.application.xml (renamed from plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.jaxrs.application.xml)2
-rw-r--r--plugins/org.eclipse.osee.activity/OSGI-INF/activity.jaxrs.request.filter.xml (renamed from plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.jaxrs.request.filter.xml)2
-rw-r--r--plugins/org.eclipse.osee.activity/OSGI-INF/activity.jaxrs.response.filter.xml (renamed from plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.jaxrs.response.filter.xml)2
-rw-r--r--plugins/org.eclipse.osee.activity/OSGI-INF/activity.schema.resource.xml (renamed from plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.schema.resource.xml)2
-rw-r--r--plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/ActivityConstants.java7
-rw-r--r--plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/ActivitySchemaResource.java (renamed from plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/ActivitySchemaResource.java)2
-rw-r--r--plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogApplication.java (renamed from plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityLogApplication.java)2
-rw-r--r--plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogRequestFilter.java (renamed from plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityLogRequestFilter.java)3
-rw-r--r--plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogResource.java (renamed from plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityLogResource.java)2
-rw-r--r--plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogResponseFilter.java (renamed from plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityLogResponseFilter.java)3
-rw-r--r--plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/schema/ACTIVITY.DS.SCHEMA.xml (renamed from plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/schema/ACTIVITY.DS.SCHEMA.xml)0
-rw-r--r--plugins/org.eclipse.osee.orcs.parent/pom.xml1
21 files changed, 24 insertions, 141 deletions
diff --git a/features/org.eclipse.osee.core.feature/feature.xml b/features/org.eclipse.osee.core.feature/feature.xml
index 92a22e0584..9f2b73c3d2 100644
--- a/features/org.eclipse.osee.core.feature/feature.xml
+++ b/features/org.eclipse.osee.core.feature/feature.xml
@@ -104,19 +104,5 @@
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 267ec5afba..a1c62fa87c 100644
--- a/features/org.eclipse.osee.orcs.feature/feature.xml
+++ b/features/org.eclipse.osee.orcs.feature/feature.xml
@@ -109,13 +109,6 @@
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"
download-size="0"
install-size="0"
diff --git a/plugins/org.eclipse.osee.activity.server/.classpath b/plugins/org.eclipse.osee.activity.server/.classpath
deleted file mode 100644
index ad32c83a78..0000000000
--- a/plugins/org.eclipse.osee.activity.server/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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
deleted file mode 100644
index ab3557b1b8..0000000000
--- a/plugins/org.eclipse.osee.activity.server/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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
deleted file mode 100644
index 6c01b59c3a..0000000000
--- a/plugins/org.eclipse.osee.activity.server/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: OSEE Activity Logging Server - (Incubation)
-Bundle-SymbolicName: org.eclipse.osee.activity.server
-Bundle-Version: 0.21.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.framework.core.exception,
- org.eclipse.osee.framework.jdk.core.type,
- org.eclipse.osee.framework.jdk.core.util,
- org.eclipse.osee.jdbc,
- org.eclipse.osee.logger
-Bundle-Vendor: Eclipse Open System Engineering Environment
diff --git a/plugins/org.eclipse.osee.activity.server/build.properties b/plugins/org.eclipse.osee.activity.server/build.properties
deleted file mode 100644
index c58ea2178c..0000000000
--- a/plugins/org.eclipse.osee.activity.server/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- OSGI-INF/
diff --git a/plugins/org.eclipse.osee.activity.server/pom.xml b/plugins/org.eclipse.osee.activity.server/pom.xml
deleted file mode 100644
index d530911e27..0000000000
--- a/plugins/org.eclipse.osee.activity.server/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<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.21.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.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
deleted file mode 100644
index aee9d84461..0000000000
--- a/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityConstants.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * 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/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.activity/META-INF/MANIFEST.MF
index 3c084d5232..5623d0270d 100644
--- a/plugins/org.eclipse.osee.activity/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.activity/META-INF/MANIFEST.MF
@@ -7,7 +7,12 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: Eclipse Open System Engineering Environment
Service-Component: OSGI-INF/*.xml
Osee-Data: OSEE-INF/*
-Import-Package: org.eclipse.osee.activity.api,
+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.executor.admin,
org.eclipse.osee.framework.core.exception,
org.eclipse.osee.framework.jdk.core.type,
diff --git a/plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.jaxrs.application.xml b/plugins/org.eclipse.osee.activity/OSGI-INF/activity.jaxrs.application.xml
index 054a9a3cb4..ad7b1b5775 100644
--- a/plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.jaxrs.application.xml
+++ b/plugins/org.eclipse.osee.activity/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.server.internal.jaxrs.ActivityLogApplication"/>
+ <implementation class="org.eclipse.osee.activity.internal.jaxrs.ActivityLogApplication"/>
<service>
<provide interface="javax.ws.rs.core.Application"/>
</service>
diff --git a/plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.jaxrs.request.filter.xml b/plugins/org.eclipse.osee.activity/OSGI-INF/activity.jaxrs.request.filter.xml
index ab0e7be474..db62dc0412 100644
--- a/plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.jaxrs.request.filter.xml
+++ b/plugins/org.eclipse.osee.activity/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.server.internal.jaxrs.ActivityLogRequestFilter"/>
+ <implementation class="org.eclipse.osee.activity.internal.jaxrs.ActivityLogRequestFilter"/>
<service>
<provide interface="java.lang.Object"/>
<provide interface="javax.ws.rs.container.ContainerRequestFilter"/>
diff --git a/plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.jaxrs.response.filter.xml b/plugins/org.eclipse.osee.activity/OSGI-INF/activity.jaxrs.response.filter.xml
index 9079ed10e0..89c3e45829 100644
--- a/plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.jaxrs.response.filter.xml
+++ b/plugins/org.eclipse.osee.activity/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.server.internal.jaxrs.ActivityLogResponseFilter"/>
+ <implementation class="org.eclipse.osee.activity.internal.jaxrs.ActivityLogResponseFilter"/>
<service>
<provide interface="java.lang.Object"/>
<provide interface="javax.ws.rs.container.ContainerResponseFilter"/>
diff --git a/plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.schema.resource.xml b/plugins/org.eclipse.osee.activity/OSGI-INF/activity.schema.resource.xml
index 942be09a9a..56a0612a12 100644
--- a/plugins/org.eclipse.osee.activity.server/OSGI-INF/activity.schema.resource.xml
+++ b/plugins/org.eclipse.osee.activity/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.server.internal.ActivitySchemaResource" />
+ <implementation class="org.eclipse.osee.activity.internal.ActivitySchemaResource" />
<service>
<provide interface="org.eclipse.osee.jdbc.JdbcSchemaResource"/>
</service>
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 86b4e28100..7b06d7d0a6 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,4 +37,11 @@ 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.activity.server/src/org/eclipse/osee/activity/server/internal/ActivitySchemaResource.java b/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/ActivitySchemaResource.java
index d4d76a4a19..e5a2543cd9 100644
--- a/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/ActivitySchemaResource.java
+++ b/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/ActivitySchemaResource.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.activity.server.internal;
+package org.eclipse.osee.activity.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/ActivityLogApplication.java b/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogApplication.java
index 14c8e4210c..0e527d14be 100644
--- a/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityLogApplication.java
+++ b/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogApplication.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.activity.server.internal.jaxrs;
+package org.eclipse.osee.activity.internal.jaxrs;
import java.util.HashSet;
import java.util.Set;
diff --git a/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityLogRequestFilter.java b/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogRequestFilter.java
index 27d563214c..d06eb30a76 100644
--- a/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityLogRequestFilter.java
+++ b/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogRequestFilter.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.activity.server.internal.jaxrs;
+package org.eclipse.osee.activity.internal.jaxrs;
import javax.annotation.Priority;
import javax.ws.rs.Priorities;
@@ -16,6 +16,7 @@ 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.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityLogResource.java b/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogResource.java
index 32854e94ea..8320412224 100644
--- a/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityLogResource.java
+++ b/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogResource.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.activity.server.internal.jaxrs;
+package org.eclipse.osee.activity.internal.jaxrs;
import java.util.ArrayList;
import java.util.List;
diff --git a/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityLogResponseFilter.java b/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogResponseFilter.java
index c3398d8743..58dc303bab 100644
--- a/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/jaxrs/ActivityLogResponseFilter.java
+++ b/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/jaxrs/ActivityLogResponseFilter.java
@@ -8,7 +8,7 @@
* Contributors:
* Boeing - initial API and implementation
*******************************************************************************/
-package org.eclipse.osee.activity.server.internal.jaxrs;
+package org.eclipse.osee.activity.internal.jaxrs;
import javax.ws.rs.container.ContainerRequestContext;
import javax.ws.rs.container.ContainerResponseContext;
@@ -16,6 +16,7 @@ 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.server/src/org/eclipse/osee/activity/server/internal/schema/ACTIVITY.DS.SCHEMA.xml b/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/schema/ACTIVITY.DS.SCHEMA.xml
index 04fef64fa2..04fef64fa2 100644
--- a/plugins/org.eclipse.osee.activity.server/src/org/eclipse/osee/activity/server/internal/schema/ACTIVITY.DS.SCHEMA.xml
+++ b/plugins/org.eclipse.osee.activity/src/org/eclipse/osee/activity/internal/schema/ACTIVITY.DS.SCHEMA.xml
diff --git a/plugins/org.eclipse.osee.orcs.parent/pom.xml b/plugins/org.eclipse.osee.orcs.parent/pom.xml
index 004b2600ef..30b4a67e1f 100644
--- a/plugins/org.eclipse.osee.orcs.parent/pom.xml
+++ b/plugins/org.eclipse.osee.orcs.parent/pom.xml
@@ -28,7 +28,6 @@
<module>../../plugins/org.eclipse.osee.framework.resource.management.test</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