diff options
author | Roberto E. Escobar | 2012-02-22 05:40:14 +0000 |
---|---|---|
committer | Ryan D. Brooks | 2012-02-22 05:40:14 +0000 |
commit | 2e952df7696dd959044c6e015b9eb8d53c6d0f08 (patch) | |
tree | b1edd856191916968d8e0fdde7cdc5b81a437baa /plugins | |
parent | a934b51cb7dfa1596239cfeb8c0fbf5ed442d2a2 (diff) | |
download | org.eclipse.osee-2e952df7696dd959044c6e015b9eb8d53c6d0f08.tar.gz org.eclipse.osee-2e952df7696dd959044c6e015b9eb8d53c6d0f08.tar.xz org.eclipse.osee-2e952df7696dd959044c6e015b9eb8d53c6d0f08.zip |
feature[ats_VVMH0]: Integrate org.eclipse.osee.framework.core.server with X Server
Make services DS based
Add org.eclipse.osee.framework.core.server into X Server Maven build
Diffstat (limited to 'plugins')
69 files changed, 775 insertions, 534 deletions
diff --git a/plugins/org.eclipse.osee.framework.branch.management/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.branch.management/META-INF/MANIFEST.MF index d1abe07c004..8d4c808f32e 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.branch.management/META-INF/MANIFEST.MF @@ -34,6 +34,7 @@ Import-Package: org.eclipse.core.runtime, org.eclipse.osee.framework.resource.management, org.eclipse.osee.framework.resource.management.exception, org.eclipse.osee.framework.resource.management.util, + org.eclipse.osee.logger, org.eclipse.osgi.framework.console, org.osgi.framework, org.osgi.util.tracker diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExportController.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExportController.java index b24c0ca01d5..98abbdb7d1d 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExportController.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExportController.java @@ -26,7 +26,6 @@ import org.eclipse.osee.framework.branch.management.exchange.export.AbstractExpo import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeExceptions; -import org.eclipse.osee.framework.core.server.ServerThreads; import org.eclipse.osee.framework.database.core.ExportImportJoinQuery; import org.eclipse.osee.framework.database.core.JoinUtility; import org.eclipse.osee.framework.jdk.core.type.PropertyStore; @@ -100,9 +99,8 @@ final class ExportController implements IExchangeTaskListener { options.put(ExportOptions.MAX_TXS.name(), Long.toString(maxTx)); } - executorService = - Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors(), - ServerThreads.createNewThreadFactory("branch.export.worker")); + //ServerThreads.createNewThreadFactory("branch.export.worker") + executorService = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors()); } protected void handleTxWork() throws OseeCoreException { diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/resource/ExchangeProvider.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/resource/ExchangeProvider.java index bbbf284384f..d5f2d48af0c 100644 --- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/resource/ExchangeProvider.java +++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/resource/ExchangeProvider.java @@ -36,7 +36,7 @@ import org.eclipse.osee.framework.resource.management.util.OptionsProcessor; * @author Roberto E. Escobar */ public class ExchangeProvider implements IResourceProvider { - private static final String BASE_PATH = OseeServerProperties.getOseeApplicationServerData(); + private static final String BASE_PATH = OseeServerProperties.getOseeApplicationServerData(null); private static final String RESOLVED_PATH = BASE_PATH + File.separator + ExchangeLocatorProvider.PROTOCOL + File.separator; diff --git a/plugins/org.eclipse.osee.framework.core.datastore/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.datastore/META-INF/MANIFEST.MF index 4051b5a078e..493fdcd269b 100644 --- a/plugins/org.eclipse.osee.framework.core.datastore/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.datastore/META-INF/MANIFEST.MF @@ -33,6 +33,7 @@ Import-Package: org.apache.commons.lang, org.eclipse.osee.framework.jdk.core.util.xml, org.eclipse.osee.framework.logging, org.eclipse.osee.framework.resource.management, + org.eclipse.osee.logger, org.osgi.framework, org.osgi.util.tracker Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/DatastoreInitOperation.java b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/DatastoreInitOperation.java index 5b8a8141970..72c52992af4 100644 --- a/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/DatastoreInitOperation.java +++ b/plugins/org.eclipse.osee.framework.core.datastore/src/org/eclipse/osee/framework/core/datastore/DatastoreInitOperation.java @@ -72,7 +72,7 @@ public class DatastoreInitOperation extends AbstractOperation { appServerManager.executeLookupRegistration(); deleteBinaryBackingData(); - String binaryDataPath = OseeServerProperties.getOseeApplicationServerData(); + String binaryDataPath = OseeServerProperties.getOseeApplicationServerData(null); Lib.deleteDir(new File(binaryDataPath + File.separator + "attr")); OseeInfo.putValue(OseeInfo.DB_ID_KEY, GUID.create()); @@ -92,7 +92,7 @@ public class DatastoreInitOperation extends AbstractOperation { } private static void deleteBinaryBackingData() { - String binaryDataPath = OseeServerProperties.getOseeApplicationServerData(); + String binaryDataPath = OseeServerProperties.getOseeApplicationServerData(null); OseeLog.logf(Activator.class, Level.INFO, "Deleting application server binary data [%s]...", binaryDataPath); Lib.deleteDir(new File(binaryDataPath + File.separator + "attr")); } diff --git a/plugins/org.eclipse.osee.framework.core.server.test/pom.xml b/plugins/org.eclipse.osee.framework.core.server.test/pom.xml new file mode 100644 index 00000000000..67a844041ed --- /dev/null +++ b/plugins/org.eclipse.osee.framework.core.server.test/pom.xml @@ -0,0 +1,30 @@ +<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.x.server.parent</artifactId> + <version>0.9.9-SNAPSHOT</version> + <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath> + </parent> + + <artifactId>org.eclipse.osee.framework.core.server.test</artifactId> + <packaging>eclipse-test-plugin</packaging> + <name>OSEE Core Legacy Server Test - (Incubation)</name> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <testSuite>org.eclipse.osee.framework.core.server.test</testSuite> + <testClass>org.eclipse.osee.framework.core.server.test.CoreServerTestSuite</testClass> + </configuration> + </plugin> + </plugins> + </build> +</project>
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/CoreServerTestSuite.java b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/CoreServerTestSuite.java index ef134f7f60e..dbdc5894857 100644 --- a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/CoreServerTestSuite.java +++ b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/CoreServerTestSuite.java @@ -22,5 +22,5 @@ CoreServerInternalTestSuite.class, // * @author Roberto E. Escobar */ public class CoreServerTestSuite { - // + // Test Suite Class } diff --git a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/CoreServerInternalTestSuite.java b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/CoreServerInternalTestSuite.java index 7e99b8af24e..298df377e1b 100644 --- a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/CoreServerInternalTestSuite.java +++ b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/CoreServerInternalTestSuite.java @@ -23,5 +23,5 @@ BuildTypeIdentifierTest.class, // * @author Roberto E. Escobar */ public class CoreServerInternalTestSuite { - // + // Test Suite Class } diff --git a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionFactoryTest.java b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionFactoryTest.java index 1c3ebd5f94e..25aa10a1612 100644 --- a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionFactoryTest.java +++ b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionFactoryTest.java @@ -22,6 +22,7 @@ import org.eclipse.osee.framework.core.server.internal.session.Session; import org.eclipse.osee.framework.core.server.internal.session.SessionCache; import org.eclipse.osee.framework.core.server.internal.session.SessionFactory; import org.eclipse.osee.framework.core.server.test.mocks.MockBuildTypeIdentifier; +import org.eclipse.osee.framework.core.server.test.mocks.MockLog; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -47,7 +48,7 @@ public class SessionFactoryTest { private final Date lastInteractionDate; private final String lastInteractionDetails; private final MockBuildTypeIdentifier typeIdentifier = new MockBuildTypeIdentifier(); - private final SessionFactory factory = new SessionFactory(typeIdentifier); + private final SessionFactory factory = new SessionFactory(new MockLog(), typeIdentifier); public SessionFactoryTest(String guid, String userId, Date creationDate, String managedByServerId, String clientVersion, String clientMachineName, String clientAddress, int clientPort, Date lastInteractionDate, String lastInteractionDetails) { super(); diff --git a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/mocks/MockLog.java b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/mocks/MockLog.java new file mode 100644 index 00000000000..7521956dc86 --- /dev/null +++ b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/mocks/MockLog.java @@ -0,0 +1,105 @@ +/******************************************************************************* + * Copyright (c) 2004, 2007 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.framework.core.server.test.mocks; + +import org.eclipse.osee.logger.Log; + +/** + * @author Andrew M. Finkbeiner + */ +public class MockLog implements Log { + + @Override + public boolean isTraceEnabled() { + return true; + } + + @Override + public void trace(String format, Object... args) { + commonOut(format, args); + } + + @Override + public void trace(Throwable th, String format, Object... args) { + commonOut(format, args); + } + + @Override + public boolean isDebugEnabled() { + return true; + } + + @Override + public void debug(String format, Object... args) { + commonOut(format, args); + } + + @Override + public void debug(Throwable th, String format, Object... args) { + commonOut(th, format, args); + } + + @Override + public boolean isInfoEnabled() { + return true; + } + + @Override + public void info(String format, Object... args) { + commonOut(format, args); + } + + @Override + public void info(Throwable th, String format, Object... args) { + commonOut(th, format, args); + } + + @Override + public boolean isWarnEnabled() { + return true; + } + + @Override + public void warn(String format, Object... args) { + commonOut(format, args); + } + + @Override + public void warn(Throwable th, String format, Object... args) { + commonOut(th, format, args); + } + + @Override + public boolean isErrorEnabled() { + return true; + } + + @Override + public void error(String format, Object... args) { + commonOut(format, args); + } + + @Override + public void error(Throwable th, String format, Object... args) { + commonOut(th, format, args); + } + + private void commonOut(String format, Object... args) { + System.out.printf(format, args); + System.out.println(); + } + + private void commonOut(Throwable th, String format, Object... args) { + commonOut(format, args); + th.printStackTrace(); + } + +} diff --git a/plugins/org.eclipse.osee.framework.core.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.server/META-INF/MANIFEST.MF index 696599db2e8..ccdc847ce87 100644 --- a/plugins/org.eclipse.osee.framework.core.server/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.server/META-INF/MANIFEST.MF @@ -5,11 +5,9 @@ Bundle-SymbolicName: org.eclipse.osee.framework.core.server;singleton:=true Bundle-Version: 0.9.9.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: javax.servlet, - javax.servlet.http, +Import-Package: javax.servlet;version="2.5.0", + javax.servlet.http;version="2.5.0", org.apache.commons.codec.binary;version="1.3.0", - org.eclipse.core.runtime, - org.eclipse.core.runtime.jobs, org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, org.eclipse.osee.framework.core.exception, @@ -23,12 +21,13 @@ Import-Package: javax.servlet, org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.jdk.core.util, org.eclipse.osee.framework.jdk.core.util.time, - org.eclipse.osee.framework.logging, + org.eclipse.osee.logger, org.osgi.framework, org.osgi.service.http, org.osgi.util.tracker -Eclipse-ExtensibleAPI: true Export-Package: org.eclipse.osee.framework.core.server Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/*.xml Bundle-Activator: org.eclipse.osee.framework.core.server.internal.ServerActivator +Require-Bundle: org.eclipse.core.runtime, + javax.servlet;bundle-version="2.5.0" diff --git a/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/application.lookup.server.manager.xml b/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/application.lookup.server.manager.xml index f807fc08936..32312958ddd 100644 --- a/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/application.lookup.server.manager.xml +++ b/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/application.lookup.server.manager.xml @@ -1,7 +1,10 @@ <?xml version="1.0"?> -<component name="application.lookup.server.manager"> +<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" name="org.eclipse.osee.framework.core.server.internal.ApplicationServerLookup"> <implementation class="org.eclipse.osee.framework.core.server.internal.ApplicationServerLookup"/> <service> <provide interface="org.eclipse.osee.framework.core.server.IApplicationServerLookup"/> </service> -</component>
\ No newline at end of file + <reference bind="setLogger" cardinality="1..1" interface="org.eclipse.osee.logger.Log" name="Log" policy="static"/> + <reference bind="setServerManager" cardinality="1..1" interface="org.eclipse.osee.framework.core.server.IApplicationServerManager" name="IApplicationServerManager" policy="static"/> + <reference bind="setDatabaseService" cardinality="1..1" interface="org.eclipse.osee.framework.database.IOseeDatabaseService" name="IOseeDatabaseService" policy="static"/> +</scr:component> diff --git a/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/application.server.manager.xml b/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/application.server.manager.xml new file mode 100644 index 00000000000..38229b1e05d --- /dev/null +++ b/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/application.server.manager.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" name="org.eclipse.osee.framework.core.server.internal.ApplicationServerManager"> + <implementation class="org.eclipse.osee.framework.core.server.internal.ApplicationServerManager"/> + <reference bind="setLogger" cardinality="1..1" interface="org.eclipse.osee.logger.Log" name="Log" policy="static"/> + <reference bind="setDatabaseService" cardinality="1..1" interface="org.eclipse.osee.framework.database.IOseeDatabaseService" name="IOseeDatabaseService" policy="static"/> + <service> + <provide interface="org.eclipse.osee.framework.core.server.IApplicationServerManager"/> + </service> +</scr:component> diff --git a/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/authentication.manager.xml b/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/authentication.manager.xml index 0a885007536..44306ee40bd 100644 --- a/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/authentication.manager.xml +++ b/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/authentication.manager.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<component name="authentication.manager"> +<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="authentication.manager"> <implementation class="org.eclipse.osee.framework.core.server.internal.AuthenticationManager"/> <service> <provide interface="org.eclipse.osee.framework.core.server.IAuthenticationManager"/> @@ -10,4 +10,4 @@ unbind="removeAuthenticationProvider" cardinality="0..n" policy="dynamic"/> -</component>
\ No newline at end of file +</scr:component>
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/authentication.provider.demo.xml b/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/authentication.provider.demo.xml index 55d9ab34492..d089ae75f72 100644 --- a/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/authentication.provider.demo.xml +++ b/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/authentication.provider.demo.xml @@ -1,7 +1,10 @@ <?xml version="1.0"?> -<component name="authentication.provider.demo"> +<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.osee.framework.core.server.internal.authentication.DemoAuthenticationProvider"> <implementation class="org.eclipse.osee.framework.core.server.internal.authentication.DemoAuthenticationProvider"/> <service> <provide interface="org.eclipse.osee.framework.core.server.IAuthenticationProvider"/> - </service> -</component>
\ No newline at end of file + </service> + <reference bind="setLogger" cardinality="1..1" interface="org.eclipse.osee.logger.Log" name="Log" policy="static"/> + <reference bind="setDatabaseService" cardinality="1..1" interface="org.eclipse.osee.framework.database.IOseeDatabaseService" name="IOseeDatabaseService" policy="static"/> + <reference bind="setCachingService" cardinality="1..1" interface="org.eclipse.osee.framework.core.services.IOseeCachingService" name="IOseeCachingService" policy="static"/> +</scr:component> diff --git a/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/authentication.provider.xml b/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/authentication.provider.xml index 9d45716fa62..b2bd2489358 100644 --- a/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/authentication.provider.xml +++ b/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/authentication.provider.xml @@ -1,7 +1,10 @@ <?xml version="1.0"?> -<component name="authentication.provider"> +<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.eclipse.osee.framework.core.server.internal.authentication.TrustAllAuthenticationProvider"> <implementation class="org.eclipse.osee.framework.core.server.internal.authentication.TrustAllAuthenticationProvider"/> <service> <provide interface="org.eclipse.osee.framework.core.server.IAuthenticationProvider"/> </service> -</component>
\ No newline at end of file + <reference bind="setLogger" cardinality="1..1" interface="org.eclipse.osee.logger.Log" name="Log" policy="static"/> + <reference bind="setDatabaseService" cardinality="1..1" interface="org.eclipse.osee.framework.database.IOseeDatabaseService" name="IOseeDatabaseService" policy="static"/> + <reference bind="setCachingService" cardinality="1..1" interface="org.eclipse.osee.framework.core.services.IOseeCachingService" name="IOseeCachingService" policy="static"/> +</scr:component>
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/join.cleanup.task.provider.xml b/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/join.cleanup.task.provider.xml index 48fb5703056..dc37edcba73 100644 --- a/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/join.cleanup.task.provider.xml +++ b/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/join.cleanup.task.provider.xml @@ -1,7 +1,10 @@ <?xml version="1.0"?> -<component name="join.cleanup.task.provider"> +<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="join.cleanup.task.provider"> <implementation class="org.eclipse.osee.framework.core.server.internal.task.CleanJoinTablesServerTask"/> <service> <provide interface="org.eclipse.osee.framework.core.server.IServerTask"/> - </service> -</component>
\ No newline at end of file + </service> + <reference bind="setLogger" cardinality="1..1" interface="org.eclipse.osee.logger.Log" name="Log" policy="static"/> + <reference bind="setDbService" cardinality="1..1" interface="org.eclipse.osee.framework.database.IOseeDatabaseService" name="IOseeDatabaseService" policy="static"/> + <reference bind="setSessionManager" cardinality="1..1" interface="org.eclipse.osee.framework.core.server.ISessionManager" name="ISessionManager" policy="static"/> +</scr:component> diff --git a/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/server.task.scheduler.xml b/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/server.task.scheduler.xml index 8e11d7513ed..c91b8c9ce67 100644 --- a/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/server.task.scheduler.xml +++ b/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/server.task.scheduler.xml @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<component name="server.task.scheduler" immediate="true"> +<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" immediate="true" name="server.task.scheduler"> <implementation class="org.eclipse.osee.framework.core.server.internal.ServerTaskScheduler"/> <service> <provide interface="org.eclipse.osee.framework.core.server.IServerTaskScheduler"/> @@ -10,4 +10,6 @@ unbind="removeServerTask" cardinality="0..n" policy="dynamic"/> -</component>
\ No newline at end of file + <reference bind="setLogger" cardinality="1..1" interface="org.eclipse.osee.logger.Log" name="Log" policy="static"/> + <reference bind="setServerManager" cardinality="1..1" interface="org.eclipse.osee.framework.core.server.IApplicationServerManager" name="IApplicationServerManager" policy="static"/> +</scr:component> diff --git a/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/session.manager.xml b/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/session.manager.xml new file mode 100644 index 00000000000..ecdfcc865db --- /dev/null +++ b/plugins/org.eclipse.osee.framework.core.server/OSGI-INF/session.manager.xml @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" activate="start" deactivate="stop" name="org.eclipse.osee.framework.core.server.internal.session.SessionManagerService"> + <implementation class="org.eclipse.osee.framework.core.server.internal.session.SessionManagerService"/> + <service> + <provide interface="org.eclipse.osee.framework.core.server.ISessionManager"/> + </service> + <reference bind="setDbService" cardinality="1..1" interface="org.eclipse.osee.framework.database.IOseeDatabaseService" name="IOseeDatabaseService" policy="static"/> + <reference bind="setServerManager" cardinality="1..1" interface="org.eclipse.osee.framework.core.server.IApplicationServerManager" name="IApplicationServerManager" policy="static"/> + <reference bind="setAuthenticationManager" cardinality="1..1" interface="org.eclipse.osee.framework.core.server.IAuthenticationManager" name="IAuthenticationManager" policy="static"/> +</scr:component> diff --git a/plugins/org.eclipse.osee.framework.core.server/build.properties b/plugins/org.eclipse.osee.framework.core.server/build.properties index c58ea2178c3..002f1772e61 100644 --- a/plugins/org.eclipse.osee.framework.core.server/build.properties +++ b/plugins/org.eclipse.osee.framework.core.server/build.properties @@ -1,5 +1,9 @@ -source.. = src/ output.. = bin/ bin.includes = META-INF/,\ .,\ - OSGI-INF/ + OSGI-INF/,\ + OSGI-INF/application.server.manager.xml,\ + OSGI-INF/session.manager.xml +source.. = src/ +additional.bundles = org.eclipse.osee.logger,\ + org.eclipse.osee.framework.jdk.core diff --git a/plugins/org.eclipse.osee.framework.core.server/pom.xml b/plugins/org.eclipse.osee.framework.core.server/pom.xml new file mode 100644 index 00000000000..0dd254a04d2 --- /dev/null +++ b/plugins/org.eclipse.osee.framework.core.server/pom.xml @@ -0,0 +1,34 @@ +<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.x.server.parent</artifactId> + <version>0.9.9-SNAPSHOT</version> + <relativePath>../../plugins/org.eclipse.osee.x.server.parent</relativePath> + </parent> + + <artifactId>org.eclipse.osee.framework.core.server</artifactId> + <packaging>eclipse-plugin</packaging> + <name>OSEE Core Legacy Server - (Incubation)</name> + + <build> + <!-- workaround for https://issues.sonatype.org/browse/TYCHO-168 --> + <resources> + <resource> + <directory>src</directory> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + </plugin> + </plugins> + </build> +</project>
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/UserDataStore.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/AbstractAuthenticationProvider.java index 84c44bc3f1c..5962f5804f9 100644 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/UserDataStore.java +++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/AbstractAuthenticationProvider.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. + * Copyright (c) 2012 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 @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.osee.framework.core.server; -import java.util.logging.Level; import org.eclipse.osee.framework.core.data.IUserToken; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; @@ -18,38 +17,60 @@ import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.core.enums.TxChange; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; -import org.eclipse.osee.framework.core.server.internal.ServerActivator; -import org.eclipse.osee.framework.core.server.internal.ServiceProvider; import org.eclipse.osee.framework.core.services.IOseeCachingService; -import org.eclipse.osee.framework.database.core.ConnectionHandler; +import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.jdk.core.util.Lib; -import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.logger.Log; /** * @author Roberto E. Escobar */ -public final class UserDataStore { +public abstract class AbstractAuthenticationProvider implements IAuthenticationProvider { + private static final String LOAD_OSEE_USER = "select att.value as user_id from osee_attribute att, osee_txs txs where att.attr_type_id = ? and txs.branch_id = ? and att.gamma_id = txs.gamma_id and txs.tx_current = ? and att.value = ?"; - private UserDataStore() { - // private constructor + private Log logger; + private IOseeDatabaseService dbService; + private IOseeCachingService cachingService; + + public void setLogger(Log logger) { + this.logger = logger; + } + + protected Log getLogger() { + return logger; } - public static IUserToken getUserTokenFromOseeDb(String userId) { + public void setDatabaseService(IOseeDatabaseService dbService) { + this.dbService = dbService; + } + + protected IOseeDatabaseService getDatabaseService() { + return dbService; + } + + public void setCachingService(IOseeCachingService cachingService) { + this.cachingService = cachingService; + } + + protected IOseeCachingService getCachingService() { + return cachingService; + } + + protected IUserToken getUserTokenFromOseeDb(String userId) { IUserToken toReturn = null; IOseeStatement chStmt = null; - IOseeCachingService cachingService = ServiceProvider.getCachingService(); try { - int attributeTypeId = cachingService.getAttributeTypeCache().getLocalId(CoreAttributeTypes.UserId); - Branch branch = cachingService.getBranchCache().get(CoreBranches.COMMON); + int attributeTypeId = getCachingService().getAttributeTypeCache().getLocalId(CoreAttributeTypes.UserId); + Branch branch = getCachingService().getBranchCache().get(CoreBranches.COMMON); if (branch != null) { int branchId = branch.getId(); - chStmt = ConnectionHandler.getStatement(); + chStmt = getDatabaseService().getStatement(); chStmt.runPreparedQuery(LOAD_OSEE_USER, attributeTypeId, branchId, TxChange.CURRENT.getValue(), userId); if (chStmt.next()) { toReturn = @@ -57,16 +78,15 @@ public final class UserDataStore { } } } catch (OseeCoreException ex) { - OseeLog.logf(ServerActivator.class, Level.SEVERE, ex, "Unable to find userId [%s] in OSEE database.", userId); + getLogger().error(ex, "Unable to find userId [%s] in OSEE database.", userId); } finally { Lib.close(chStmt); } return toReturn; } - public static IUserToken createUserToken(boolean isCreationRequired, String userName, String userId, String userEmail, boolean isActive) { + protected IUserToken createUserToken(boolean isCreationRequired, String userName, String userId, String userEmail, boolean isActive) { return TokenFactory.createUserToken(GUID.create(), userName, userEmail, userId, isActive, false, isCreationRequired); } - -}
\ No newline at end of file +} diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/OseeHttpServiceTracker.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/OseeHttpServiceTracker.java deleted file mode 100644 index 4df2f162944..00000000000 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/OseeHttpServiceTracker.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 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.framework.core.server; - -import org.eclipse.osee.framework.core.server.internal.InternalHttpServiceTracker; -import org.osgi.framework.BundleContext; - -/** - * @author Roberto E. Escobar - */ -public class OseeHttpServiceTracker extends InternalHttpServiceTracker { - - public OseeHttpServiceTracker(BundleContext context, String contextName, OseeHttpServlet servletClass) { - super(context, contextName, servletClass); - } -} diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/OseeHttpServlet.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/OseeHttpServlet.java index 8e94b8a8e76..0eb162e0de6 100644 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/OseeHttpServlet.java +++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/OseeHttpServlet.java @@ -11,6 +11,7 @@ package org.eclipse.osee.framework.core.server; import org.eclipse.osee.framework.core.server.internal.InternalOseeHttpServlet; +import org.eclipse.osee.logger.Log; /** * @author Roberto E. Escobar @@ -18,19 +19,13 @@ import org.eclipse.osee.framework.core.server.internal.InternalOseeHttpServlet; public abstract class OseeHttpServlet extends InternalOseeHttpServlet { private static final long serialVersionUID = -4747761442607851113L; - // - // @Override - // protected void checkAccessControl(HttpServletRequest request) throws OseeCoreException { - // String sessionId = request.getParameter("sessionId"); - // String interaction = - // String.format("%s %s %s", request.getMethod(), request.getRequestURI(), request.getQueryString()); - // ServerActivator.getSessionManager().updateSessionActivity(sessionId, interaction); - // } - // - // public boolean isInitializing(HttpServletRequest request) throws OseeCoreException { - // String sessionId = request.getParameter("sessionId"); - // ISession session = ServerActivator.getSessionManager().getSessionById(sessionId); - // String userId = session.getUserId(); - // return SystemUser.BootStrap.getUserID().equals(userId); - // } + + public OseeHttpServlet(Log logger) { + super(logger); + } + + @Override + protected Log getLogger() { + return super.getLogger(); + } } diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/OseeServerProperties.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/OseeServerProperties.java index 067b410e79d..d82b99d312e 100644 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/OseeServerProperties.java +++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/OseeServerProperties.java @@ -11,11 +11,9 @@ package org.eclipse.osee.framework.core.server; import java.io.File; -import java.util.logging.Level; -import org.eclipse.osee.framework.core.server.internal.ServerActivator; import org.eclipse.osee.framework.jdk.core.util.OseeProperties; import org.eclipse.osee.framework.jdk.core.util.Strings; -import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.logger.Log; /** * @author Roberto E. Escobar @@ -62,15 +60,16 @@ public class OseeServerProperties { * * @return OSEE application server binary data path */ - public static String getOseeApplicationServerData() { + public static String getOseeApplicationServerData(Log logger) { String toReturn = internalGetOseeApplicationServerData(); if (!wasBinaryDataChecked) { File file = new File(toReturn); - if (file.exists()) { - OseeLog.logf(ServerActivator.class, Level.INFO, "Application Server Data: [%s]", toReturn); - } else { - OseeLog.logf(ServerActivator.class, Level.WARNING, - "Application Server Data: [%s] does not exist and will be created", toReturn); + if (logger != null) { + if (file.exists()) { + logger.info("Application Server Data: [%s]", toReturn); + } else { + logger.warn("Application Server Data: [%s] does not exist and will be created", toReturn); + } } wasBinaryDataChecked = true; } diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/SecureOseeHttpServlet.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/SecureOseeHttpServlet.java index e0c712630f0..334ff6f0f5e 100644 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/SecureOseeHttpServlet.java +++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/SecureOseeHttpServlet.java @@ -13,6 +13,7 @@ package org.eclipse.osee.framework.core.server; import javax.servlet.http.HttpServletRequest; import org.eclipse.osee.framework.core.enums.SystemUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.logger.Log; /** * @author Roberto E. Escobar @@ -22,7 +23,8 @@ public class SecureOseeHttpServlet extends OseeHttpServlet { private static final long serialVersionUID = -4034231476048459552L; private final ISessionManager sessionManager; - public SecureOseeHttpServlet(ISessionManager sessionManager) { + public SecureOseeHttpServlet(Log logger, ISessionManager sessionManager) { + super(logger); this.sessionManager = sessionManager; } diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/ServerThreads.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/ServerThreads.java deleted file mode 100644 index 50e9833c151..00000000000 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/ServerThreads.java +++ /dev/null @@ -1,24 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 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.framework.core.server; - -import java.util.concurrent.ThreadFactory; -import org.eclipse.osee.framework.core.server.internal.ServerActivator; - -/** - * @author Roberto E. Escobar - */ -public final class ServerThreads { - - public static ThreadFactory createNewThreadFactory(String name) { - return ServerActivator.getApplicationServerManager().createNewThreadFactory(name, Thread.NORM_PRIORITY); - } -} diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/UnsecuredOseeHttpServlet.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/UnsecuredOseeHttpServlet.java index 7156bb2efa2..35e9f3872ef 100644 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/UnsecuredOseeHttpServlet.java +++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/UnsecuredOseeHttpServlet.java @@ -11,6 +11,7 @@ package org.eclipse.osee.framework.core.server; import javax.servlet.http.HttpServletRequest; +import org.eclipse.osee.logger.Log; /** * @author Roberto E. Escobar @@ -19,12 +20,13 @@ public class UnsecuredOseeHttpServlet extends OseeHttpServlet { private static final long serialVersionUID = 6633402530554659368L; - public UnsecuredOseeHttpServlet() { - super(); + public UnsecuredOseeHttpServlet(Log logger) { + super(logger); } @Override protected final void checkAccessControl(HttpServletRequest request) { + // } } diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerDataStore.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerDataStore.java index b120cd45666..b82b7af367d 100644 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerDataStore.java +++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerDataStore.java @@ -17,15 +17,14 @@ import java.util.Collection; import java.util.HashSet; import java.util.List; import java.util.Set; -import java.util.logging.Level; import org.eclipse.osee.framework.core.data.OseeServerInfo; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; -import org.eclipse.osee.framework.database.core.ConnectionHandler; +import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.database.core.IOseeStatement; import org.eclipse.osee.framework.jdk.core.type.CompositeKeyHashMap; import org.eclipse.osee.framework.jdk.core.util.Strings; -import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.logger.Log; /** * @author Roberto E. Escobar @@ -51,17 +50,33 @@ public class ApplicationServerDataStore { private static final String SELECT_SUPPORTED_VERSIONS_FROM_LOOKUP_TABLE_BY_SERVER_ID = "SELECT version_id FROM osee_server_lookup where server_id = ?"; - static void removeByServerId(Collection<OseeServerInfo> infos) throws OseeCoreException { + private final Log logger; + private final IOseeDatabaseService dbService; + + public ApplicationServerDataStore(Log logger, IOseeDatabaseService dbService) { + this.logger = logger; + this.dbService = dbService; + } + + private Log getLogger() { + return logger; + } + + private IOseeDatabaseService getDbService() { + return dbService; + } + + public void removeByServerId(Collection<OseeServerInfo> infos) throws OseeCoreException { if (!infos.isEmpty()) { List<Object[]> data = new ArrayList<Object[]>(); for (OseeServerInfo info : infos) { data.add(new Object[] {info.getServerId()}); } - ConnectionHandler.runBatchUpdate(DELETE_FROM_LOOKUP_TABLE_BY_ID, data); + getDbService().runBatchUpdate(DELETE_FROM_LOOKUP_TABLE_BY_ID, data); } } - static boolean deregisterWithDb(OseeServerInfo applicationServerInfo) { + public boolean deregisterWithDb(OseeServerInfo applicationServerInfo) { boolean status = false; try { String address = applicationServerInfo.getServerAddress(); @@ -70,15 +85,15 @@ public class ApplicationServerDataStore { for (String version : applicationServerInfo.getVersion()) { data.add(new Object[] {address, port, version}); } - ConnectionHandler.runBatchUpdate(DELETE_FROM_LOOKUP_TABLE, data); + getDbService().runBatchUpdate(DELETE_FROM_LOOKUP_TABLE, data); status = true; } catch (OseeCoreException ex) { - OseeLog.log(ServerActivator.class, Level.INFO, "Server lookup table not initialized"); + getLogger().info("Server lookup table not initialized"); } return status; } - static boolean registerWithDb(OseeServerInfo applicationServerInfo) { + public boolean registerWithDb(OseeServerInfo applicationServerInfo) { boolean status = false; try { String serverId = applicationServerInfo.getServerId(); @@ -90,22 +105,22 @@ public class ApplicationServerDataStore { for (String version : applicationServerInfo.getVersion()) { data.add(new Object[] {serverId, version, address, port, dateStarted, acceptingRequests}); } - ConnectionHandler.runBatchUpdate(INSERT_LOOKUP_TABLE, data); + getDbService().runBatchUpdate(INSERT_LOOKUP_TABLE, data); status = true; } catch (OseeCoreException ex) { - OseeLog.log(ServerActivator.class, Level.INFO, "Server lookup table not initialized"); + getLogger().info("Server lookup table not initialized"); } return status; } @SuppressWarnings("unchecked") - static boolean updateServerState(OseeServerInfo applicationServerInfo, boolean state) throws OseeCoreException { - ConnectionHandler.runPreparedUpdate(UPDATE_LOOKUP_TABLE, state ? 1 : 0, applicationServerInfo.getServerAddress(), + public boolean updateServerState(OseeServerInfo applicationServerInfo, boolean state) throws OseeCoreException { + getDbService().runPreparedUpdate(UPDATE_LOOKUP_TABLE, state ? 1 : 0, applicationServerInfo.getServerAddress(), applicationServerInfo.getPort()); return true; } - static boolean isCompatibleVersion(String serverVersion, String clientVersion) { + public boolean isCompatibleVersion(String serverVersion, String clientVersion) { boolean result = false; if (serverVersion.equals(clientVersion)) { result = true; @@ -118,11 +133,11 @@ public class ApplicationServerDataStore { return result; } - static Collection<OseeServerInfo> getApplicationServerInfos(String clientVersion) throws OseeCoreException { + public Collection<OseeServerInfo> getApplicationServerInfos(String clientVersion) throws OseeCoreException { CompositeKeyHashMap<String, Integer, OseeServerInfo> servers = new CompositeKeyHashMap<String, Integer, OseeServerInfo>(); if (Strings.isValid(clientVersion)) { - IOseeStatement chStmt = ConnectionHandler.getStatement(); + IOseeStatement chStmt = getDbService().getStatement(); try { chStmt.runPreparedQuery(SELECT_FROM_LOOKUP_TABLE); while (chStmt.next()) { @@ -159,9 +174,9 @@ public class ApplicationServerDataStore { return servers.values(); } - static Collection<OseeServerInfo> getAllApplicationServerInfos() throws OseeCoreException { + public Collection<OseeServerInfo> getAllApplicationServerInfos() throws OseeCoreException { Collection<OseeServerInfo> infos = new ArrayList<OseeServerInfo>(); - IOseeStatement chStmt = ConnectionHandler.getStatement(); + IOseeStatement chStmt = getDbService().getStatement(); try { chStmt.runPreparedQuery(SELECT_FROM_LOOKUP_TABLE); while (chStmt.next()) { @@ -179,9 +194,9 @@ public class ApplicationServerDataStore { return infos; } - static Set<String> getOseeVersionsByServerId(String serverId) throws OseeDataStoreException { + public Set<String> getOseeVersionsByServerId(String serverId) throws OseeDataStoreException { Set<String> supportedVersions = new HashSet<String>(); - IOseeStatement chStmt = ConnectionHandler.getStatement(); + IOseeStatement chStmt = getDbService().getStatement(); try { chStmt.runPreparedQuery(SELECT_SUPPORTED_VERSIONS_FROM_LOOKUP_TABLE_BY_SERVER_ID, serverId); while (chStmt.next()) { @@ -191,14 +206,14 @@ public class ApplicationServerDataStore { } } } catch (Exception ex) { - OseeLog.log(ServerActivator.class, Level.INFO, "Server lookup table is not initialized"); + getLogger().info("Server lookup table is not initialized"); } finally { chStmt.close(); } return supportedVersions; } - static int getNumberOfSessions(String serverId) throws OseeCoreException { - return ConnectionHandler.runPreparedQueryFetchInt(0, GET_NUMBER_OF_SESSIONS, serverId); + public int getNumberOfSessions(String serverId) throws OseeCoreException { + return getDbService().runPreparedQueryFetchObject(0, GET_NUMBER_OF_SESSIONS, serverId); } } diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerLookup.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerLookup.java index 093045360f2..8ee965e998f 100644 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerLookup.java +++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerLookup.java @@ -14,14 +14,14 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.concurrent.ThreadFactory; -import java.util.logging.Level; import org.eclipse.osee.framework.core.data.OseeServerInfo; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.core.server.IApplicationServerLookup; -import org.eclipse.osee.framework.core.server.ServerThreads; +import org.eclipse.osee.framework.core.server.IApplicationServerManager; import org.eclipse.osee.framework.core.util.HttpProcessor; -import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.framework.database.IOseeDatabaseService; +import org.eclipse.osee.logger.Log; /** * @author Roberto E. Escobar @@ -30,9 +30,48 @@ public class ApplicationServerLookup implements IApplicationServerLookup { private static ThreadFactory threadFactory = null; + private Log logger; + private IOseeDatabaseService dbService; + + private IApplicationServerManager serverManager; + private ApplicationServerDataStore serverDataStore; + + public void setLogger(Log logger) { + this.logger = logger; + } + + private Log getLogger() { + return logger; + } + + public void setDatabaseService(IOseeDatabaseService dbService) { + this.dbService = dbService; + } + + private IOseeDatabaseService getDatabaseService() { + return dbService; + } + + public void setServerManager(IApplicationServerManager serverManager) { + this.serverManager = serverManager; + } + + public void start() { + serverDataStore = new ApplicationServerDataStore(getLogger(), getDatabaseService()); + } + + public void stop() { + serverDataStore = null; + } + + private ApplicationServerDataStore getDataStore() { + return serverDataStore; + } + @Override public Collection<OseeServerInfo> getAvailableServers() throws OseeCoreException { - return getHealthyServers(ApplicationServerDataStore.getAllApplicationServerInfos()); + Collection<OseeServerInfo> infos = getDataStore().getAllApplicationServerInfos(); + return getHealthyServers(infos); } private Collection<OseeServerInfo> getHealthyServers(Collection<OseeServerInfo> infos) { @@ -53,25 +92,26 @@ public class ApplicationServerLookup implements IApplicationServerLookup { @Override public OseeServerInfo getServerInfoBy(String version) throws OseeCoreException { - Collection<OseeServerInfo> healthyServers = - getHealthyServers(ApplicationServerDataStore.getApplicationServerInfos(version)); + Collection<OseeServerInfo> healthyServers = getHealthyServers(serverDataStore.getApplicationServerInfos(version)); return getBestAvailable(healthyServers); } - private static void cleanUpServers(final Collection<OseeServerInfo> unHealthyServers) { + private synchronized void cleanUpServers(final Collection<OseeServerInfo> unHealthyServers) { if (!unHealthyServers.isEmpty()) { if (threadFactory == null) { - threadFactory = ServerThreads.createNewThreadFactory("Server Status Thread Factory"); + threadFactory = serverManager.createNewThreadFactory("Server Status Thread Factory", Thread.NORM_PRIORITY); } Thread thread = threadFactory.newThread(new Runnable() { @Override public void run() { - try { - ApplicationServerDataStore.removeByServerId(unHealthyServers); - } catch (OseeCoreException ex) { - OseeLog.logf(ServerActivator.class, Level.SEVERE, - ex, "Error removing unhealthy server entries: [%s]", unHealthyServers); + final ApplicationServerDataStore store = serverDataStore; + if (store != null) { + try { + store.removeByServerId(unHealthyServers); + } catch (OseeCoreException ex) { + logger.error(ex, "Error removing unhealthy server entries: [%s]", unHealthyServers); + } } } }); @@ -87,13 +127,13 @@ public class ApplicationServerLookup implements IApplicationServerLookup { int minSessions = Integer.MAX_VALUE; for (OseeServerInfo info : infos) { try { - int numberOfSessions = ApplicationServerDataStore.getNumberOfSessions(info.getServerId()); + int numberOfSessions = serverDataStore.getNumberOfSessions(info.getServerId()); if (minSessions > numberOfSessions) { result = info; minSessions = numberOfSessions; } } catch (OseeDataStoreException ex) { - OseeLog.log(ServerActivator.class, Level.SEVERE, ex); + logger.error(ex, "Error getting number of sessions"); } } } diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerManager.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerManager.java index 041996e0f49..a0a890fc9c3 100644 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerManager.java +++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ApplicationServerManager.java @@ -16,24 +16,23 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Timer; import java.util.TimerTask; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ThreadFactory; -import java.util.logging.Level; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.operation.OperationJob; import org.eclipse.osee.framework.core.server.IApplicationServerManager; import org.eclipse.osee.framework.core.server.OseeHttpServlet; import org.eclipse.osee.framework.core.server.OseeServerProperties; +import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.jdk.core.util.ChecksumUtil; import org.eclipse.osee.framework.jdk.core.util.time.GlobalTime; -import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.logger.Log; /** * @author Roberto E. Escobar @@ -42,14 +41,37 @@ public class ApplicationServerManager implements IApplicationServerManager { private final Map<String, OseeServerThreadFactory> threadFactories; private final Map<String, InternalOseeHttpServlet> oseeHttpServlets; - private final InternalOseeServerInfo applicationServerInfo; - private final Timer timer; + private Log logger; + private IOseeDatabaseService dbService; + + private ApplicationServerDataStore serverDataStore; + private InternalOseeServerInfo applicationServerInfo; + private Timer timer; public ApplicationServerManager() { - this.oseeHttpServlets = Collections.synchronizedMap(new HashMap<String, InternalOseeHttpServlet>()); - this.threadFactories = Collections.synchronizedMap(new HashMap<String, OseeServerThreadFactory>()); - this.applicationServerInfo = createOseeServerInfo(); - applicationServerInfo.setAcceptingRequests(true); + this.oseeHttpServlets = new ConcurrentHashMap<String, InternalOseeHttpServlet>(); + this.threadFactories = new ConcurrentHashMap<String, OseeServerThreadFactory>(); + } + + public void setLogger(Log logger) { + this.logger = logger; + } + + public Log getLogger() { + return logger; + } + + public void setDatabaseService(IOseeDatabaseService dbService) { + this.dbService = dbService; + } + + private IOseeDatabaseService getDatabaseService() { + return dbService; + } + + public void start() throws Exception { + serverDataStore = new ApplicationServerDataStore(getLogger(), getDatabaseService()); + applicationServerInfo = createOseeServerInfo(getLogger(), serverDataStore); timer = new Timer(); timer.schedule(new TimerTask() { @@ -58,19 +80,26 @@ public class ApplicationServerManager implements IApplicationServerManager { try { executeLookupRegistration(); } catch (Exception ex) { - OseeLog.log(ServerActivator.class, Level.SEVERE, ex); + getLogger().error(ex, "Error during lookup registration"); } finally { timer.cancel(); } } }, 5 * 1000); + + applicationServerInfo.setAcceptingRequests(true); + } + + public void stop() throws OseeCoreException { + shutdown(); } - private InternalOseeServerInfo createOseeServerInfo() { + private static InternalOseeServerInfo createOseeServerInfo(Log logger, ApplicationServerDataStore dataStore) { String serverAddress = "127.0.0.1"; try { serverAddress = InetAddress.getLocalHost().getCanonicalHostName(); } catch (UnknownHostException ex) { + // } int port = OseeServerProperties.getOseeApplicationServerPort(); @@ -80,18 +109,18 @@ public class ApplicationServerManager implements IApplicationServerManager { ByteArrayInputStream inputStream = new ByteArrayInputStream(address.getBytes("UTF-8")); checkSum = ChecksumUtil.createChecksumAsString(inputStream, ChecksumUtil.MD5); } catch (Exception ex) { - OseeLog.log(ServerActivator.class, Level.SEVERE, "Error generating application server id", ex); + logger.error(ex, "Error generating application server id"); } - return new InternalOseeServerInfo(checkSum, serverAddress, port, GlobalTime.GreenwichMeanTimestamp(), false); + return new InternalOseeServerInfo(logger, dataStore, checkSum, serverAddress, port, + GlobalTime.GreenwichMeanTimestamp(), false); } @Override public boolean executeLookupRegistration() { boolean isRegistered = getApplicationServerInfo().updateRegistration(); if (isRegistered) { - OseeLog.logf(ServerActivator.class, Level.INFO, - "Application Server: [%s] registered.", getApplicationServerInfo().getServerId()); + getLogger().info("Application Server: [%s] registered.", getApplicationServerInfo().getServerId()); } return isRegistered; } @@ -149,7 +178,7 @@ public class ApplicationServerManager implements IApplicationServerManager { @Override public synchronized void setServletRequestsAllowed(final boolean value) throws OseeCoreException { if (getApplicationServerInfo().isAcceptingRequests() != value) { - boolean wasSuccessful = ApplicationServerDataStore.updateServerState(getApplicationServerInfo(), value); + boolean wasSuccessful = serverDataStore.updateServerState(getApplicationServerInfo(), value); if (wasSuccessful) { getApplicationServerInfo().setAcceptingRequests(value); updateServletRequestsAllowed(value); @@ -159,7 +188,9 @@ public class ApplicationServerManager implements IApplicationServerManager { @Override public void shutdown() throws OseeCoreException { - timer.cancel(); + if (timer != null) { + timer.cancel(); + } setServletRequestsAllowed(false); } diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/InternalHttpServiceTracker.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/InternalHttpServiceTracker.java deleted file mode 100644 index 24dc32ee99c..00000000000 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/InternalHttpServiceTracker.java +++ /dev/null @@ -1,59 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 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.framework.core.server.internal; - -import java.util.logging.Level; -import org.eclipse.osee.framework.core.server.OseeHttpServlet; -import org.eclipse.osee.framework.logging.OseeLog; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.osgi.service.http.HttpService; -import org.osgi.util.tracker.ServiceTracker; - -/** - * @author Roberto E. Escobar - */ -public class InternalHttpServiceTracker extends ServiceTracker { - - private final String contextName; - private final OseeHttpServlet servlet; - - public InternalHttpServiceTracker(BundleContext context, String contextName, OseeHttpServlet servlet) { - super(context, HttpService.class.getName(), null); - this.contextName = !contextName.startsWith("/") ? "/" + contextName : contextName; - this.servlet = servlet; - } - - @Override - public Object addingService(ServiceReference reference) { - HttpService httpService = (HttpService) context.getService(reference); - try { - httpService.registerServlet(contextName, servlet, null, null); - ApplicationServerManager serverManager = - (ApplicationServerManager) ServerActivator.getApplicationServerManager(); - serverManager.register(contextName, servlet); - System.out.println(String.format("Registered servlet '%s'", contextName)); - } catch (Exception ex) { - OseeLog.log(this.getClass(), Level.SEVERE, ex); - } - return httpService; - } - - @Override - public void removedService(ServiceReference reference, Object service) { - HttpService httpService = (HttpService) service; - httpService.unregister(contextName); - ApplicationServerManager serverManager = (ApplicationServerManager) ServerActivator.getApplicationServerManager(); - serverManager.unregister(contextName); - System.out.println(String.format("De-registering servlet '%s'", contextName)); - super.removedService(reference, service); - } -} diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/InternalOseeHttpServlet.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/InternalOseeHttpServlet.java index 545375850b8..887ee4a48ea 100644 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/InternalOseeHttpServlet.java +++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/InternalOseeHttpServlet.java @@ -11,14 +11,13 @@ package org.eclipse.osee.framework.core.server.internal; import java.io.IOException; -import java.util.logging.Level; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Lib; -import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.logger.Log; /** * @author Roberto E. Escobar @@ -29,14 +28,20 @@ public abstract class InternalOseeHttpServlet extends HttpServlet { private boolean areLogsAllowed; private ProcessingStateEnum processingState; private HttpServletRequest request; + private final Log logger; - public InternalOseeHttpServlet() { + public InternalOseeHttpServlet(Log logger) { + this.logger = logger; this.areRequestsAllowed = true; this.areLogsAllowed = false; this.processingState = ProcessingStateEnum.IDLE; this.request = null; } + protected Log getLogger() { + return logger; + } + protected boolean areRequestsAllowed() { return areRequestsAllowed; } @@ -89,8 +94,8 @@ public abstract class InternalOseeHttpServlet extends HttpServlet { } finally { if (areLogsAllowed()) { long elapsed = System.currentTimeMillis() - start; - OseeLog.logf(this.getClass(), Level.INFO, "[%s] [%s - %s] serviced in [%s] ms", - request.getMethod(), request.getContextPath(), request.getQueryString(), elapsed); + getLogger().info("[%s] [%s - %s] serviced in [%s] ms", request.getMethod(), request.getContextPath(), + request.getQueryString(), elapsed); } this.processingState = ProcessingStateEnum.IDLE; this.request = null; diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/InternalOseeServerInfo.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/InternalOseeServerInfo.java index 2219884b424..6903bf558b5 100644 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/InternalOseeServerInfo.java +++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/InternalOseeServerInfo.java @@ -14,7 +14,6 @@ import java.sql.Timestamp; import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import java.util.logging.Level; import org.eclipse.osee.framework.core.data.OseeCodeVersion; import org.eclipse.osee.framework.core.data.OseeServerInfo; import org.eclipse.osee.framework.core.exception.OseeArgumentException; @@ -23,7 +22,7 @@ import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.server.OseeServerProperties; import org.eclipse.osee.framework.jdk.core.type.MutableBoolean; import org.eclipse.osee.framework.jdk.core.util.Strings; -import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.logger.Log; /** * @author Roberto E. Escobar @@ -34,8 +33,13 @@ class InternalOseeServerInfo extends OseeServerInfo { private transient boolean isRegistered; private transient MutableBoolean updateFromStore; - public InternalOseeServerInfo(String serverId, String serverAddress, int port, Timestamp dateStarted, boolean isAcceptingRequests) { + private transient ApplicationServerDataStore dataStore; + private transient Log logger; + + public InternalOseeServerInfo(Log logger, ApplicationServerDataStore dataStore, String serverId, String serverAddress, int port, Timestamp dateStarted, boolean isAcceptingRequests) { super(serverId, serverAddress, port, new String[0], dateStarted, isAcceptingRequests); + this.logger = logger; + this.dataStore = dataStore; this.isRegistered = false; this.defaultVersions = new HashSet<String>(); this.updateFromStore = new MutableBoolean(true); @@ -59,10 +63,11 @@ class InternalOseeServerInfo extends OseeServerInfo { private void updateVersionsFromDataStore() { Set<String> supportedVersions = new HashSet<String>(); + String serverId = getServerId(); try { - supportedVersions.addAll(ApplicationServerDataStore.getOseeVersionsByServerId(getServerId())); + supportedVersions.addAll(dataStore.getOseeVersionsByServerId(serverId)); } catch (OseeCoreException ex) { - OseeLog.log(ServerActivator.class, Level.SEVERE, ex); + logger.error(ex, "Error getting osee version by serverId [%s]", serverId); } if (!supportedVersions.containsAll(defaultVersions)) { supportedVersions.addAll(defaultVersions); @@ -100,10 +105,10 @@ class InternalOseeServerInfo extends OseeServerInfo { if (supportedVersions.contains(version)) { isRegistered = false; updateFromStore.setValue(false); - ApplicationServerDataStore.deregisterWithDb(this); + dataStore.deregisterWithDb(this); supportedVersions.remove(version); backingData.put(VERSION, supportedVersions.toArray(new String[supportedVersions.size()])); - isRegistered = ApplicationServerDataStore.registerWithDb(this); + isRegistered = dataStore.registerWithDb(this); updateFromStore.setValue(true); } else { throw new OseeStateException("Not part of the supported version [%s]", version); @@ -113,8 +118,8 @@ class InternalOseeServerInfo extends OseeServerInfo { private void writeToDataStore() { isRegistered = false; - ApplicationServerDataStore.deregisterWithDb(this); - isRegistered = ApplicationServerDataStore.registerWithDb(this); + dataStore.deregisterWithDb(this); + isRegistered = dataStore.registerWithDb(this); } boolean updateRegistration() { diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ServerActivator.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ServerActivator.java index ad3474c04ec..c00e478c0d6 100644 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ServerActivator.java +++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ServerActivator.java @@ -10,94 +10,37 @@ *******************************************************************************/ package org.eclipse.osee.framework.core.server.internal; -import java.util.ArrayList; -import java.util.List; import org.eclipse.osee.framework.core.server.IApplicationServerManager; -import org.eclipse.osee.framework.core.server.ISessionManager; -import org.eclipse.osee.framework.core.server.internal.session.SessionManagerTrackingHandler; -import org.eclipse.osee.framework.core.util.ServiceDependencyTracker; -import org.eclipse.osee.framework.database.core.IDatabaseInfoProvider; -import org.eclipse.osee.framework.jdk.core.util.Lib; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceRegistration; import org.osgi.util.tracker.ServiceTracker; public class ServerActivator implements BundleActivator { - private ServiceTracker applicationManagerTracker; - private ServiceTracker sessionServiceTracker; + private ServiceTracker<IApplicationServerManager, IApplicationServerManager> applicationManagerTracker; - private static List<ServiceRegistration> services; private static ServerActivator instance; - private ApplicationServerManager serverManager; - - private ServiceDependencyTracker serviceDependencyTracker; @Override public void start(BundleContext context) throws Exception { instance = this; - serviceDependencyTracker = new ServiceDependencyTracker(context, new SessionManagerTrackingHandler()); - serviceDependencyTracker.open(); - - services = new ArrayList<ServiceRegistration>(); - - services.add(context.registerService(IDatabaseInfoProvider.class.getName(), new ServerDatabaseProvider(), null)); - - serverManager = new ApplicationServerManager(); - services.add(context.registerService(IApplicationServerManager.class.getName(), serverManager, null)); - - applicationManagerTracker = new ServiceTracker(context, IApplicationServerManager.class.getName(), null); + applicationManagerTracker = + new ServiceTracker<IApplicationServerManager, IApplicationServerManager>(context, + IApplicationServerManager.class.getName(), null); applicationManagerTracker.open(); - - sessionServiceTracker = new ServiceTracker(context, ISessionManager.class.getName(), null); - sessionServiceTracker.open(); - } @Override public void stop(BundleContext context) throws Exception { - Lib.close(serviceDependencyTracker); - - if (applicationManagerTracker != null) { - IApplicationServerManager manager = getApplicationServerManager(); - if (manager != null) { - manager.setServletRequestsAllowed(false); - } - } - - if (sessionServiceTracker != null) { - sessionServiceTracker.close(); - sessionServiceTracker = null; - } - if (applicationManagerTracker != null) { - getApplicationServerManager().shutdown(); applicationManagerTracker.close(); applicationManagerTracker = null; } - - if (sessionServiceTracker != null) { - sessionServiceTracker.close(); - sessionServiceTracker = null; - } - - for (ServiceRegistration service : services) { - service.unregister(); - } - services.clear(); instance = null; } - public static ISessionManager getSessionManager() { - if (instance != null && instance.sessionServiceTracker != null) { - return (ISessionManager) instance.sessionServiceTracker.getService(); - } - return null; - } - public static IApplicationServerManager getApplicationServerManager() { - return instance != null ? instance.serverManager : null; + return instance.applicationManagerTracker != null ? instance.applicationManagerTracker.getService() : null; } } diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ServerDatabaseProvider.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ServerDatabaseProvider.java deleted file mode 100644 index 1d7c0754700..00000000000 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ServerDatabaseProvider.java +++ /dev/null @@ -1,47 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 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.framework.core.server.internal; - -import java.util.logging.Level; -import org.eclipse.osee.framework.core.data.IDatabaseInfo; -import org.eclipse.osee.framework.core.exception.OseeDataStoreException; -import org.eclipse.osee.framework.database.core.DatabaseInfoManager; -import org.eclipse.osee.framework.database.core.IDatabaseInfoProvider; -import org.eclipse.osee.framework.logging.BaseStatus; -import org.eclipse.osee.framework.logging.OseeLog; - -/** - * @author Roberto E. Escobar - */ -public class ServerDatabaseProvider implements IDatabaseInfoProvider { - - private static final String NAME = "Server Data Source"; - - @Override - public IDatabaseInfo getDatabaseInfo() throws OseeDataStoreException { - IDatabaseInfo databaseInfo = null; - databaseInfo = DatabaseInfoManager.getDefault(); - OseeLog.reportStatus(new BaseStatus(NAME, Level.INFO, "%s [%s as %s]", databaseInfo.getDriver(), - databaseInfo.getDatabaseName(), databaseInfo.getDatabaseLoginName())); - return databaseInfo; - } - - @Override - public int getPriority() { - return Integer.MIN_VALUE; - } - - @Override - public String toString() { - return "Application Server DB Connection Info Provider"; - } - -} diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ServerTaskScheduler.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ServerTaskScheduler.java index b28ca789ad3..47b74de85d6 100644 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ServerTaskScheduler.java +++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/ServerTaskScheduler.java @@ -10,36 +10,54 @@ *******************************************************************************/ package org.eclipse.osee.framework.core.server.internal; -import java.util.Collections; -import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; +import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; -import java.util.logging.Level; +import org.eclipse.osee.framework.core.server.IApplicationServerManager; import org.eclipse.osee.framework.core.server.IServerTask; import org.eclipse.osee.framework.core.server.IServerTaskScheduler; -import org.eclipse.osee.framework.core.server.ServerThreads; -import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.logger.Log; /** * @author Roberto E. Escobar */ public class ServerTaskScheduler implements IServerTaskScheduler { - private final Map<Runnable, ScheduledFuture<?>> futures; - private final ScheduledExecutorService executor; - public ServerTaskScheduler() { - futures = Collections.synchronizedMap(new HashMap<Runnable, ScheduledFuture<?>>()); - executor = - Executors.newSingleThreadScheduledExecutor(ServerThreads.createNewThreadFactory("Osee Task Scheduler")); + private Log logger; + + private final Map<Runnable, ScheduledFuture<?>> futures = new ConcurrentHashMap<Runnable, ScheduledFuture<?>>(); + + private ScheduledExecutorService executor; + private IApplicationServerManager serverManager; + + public void setLogger(Log logger) { + this.logger = logger; + } + + public void setServerManager(IApplicationServerManager serverManager) { + this.serverManager = serverManager; + } + + public void start() { + ThreadFactory factory = serverManager.createNewThreadFactory("Osee Task Scheduler", Thread.NORM_PRIORITY); + executor = Executors.newSingleThreadScheduledExecutor(factory); + } + + public void stop() { + if (executor != null) { + executor.shutdown(); + } + futures.clear(); } @Override public void addServerTask(IServerTask taskProvider) { if (taskProvider != null) { - OseeLog.log(ServerActivator.class, Level.INFO, "Adding task: " + taskProvider.getName()); + logger.info("Adding task: [%s]", taskProvider.getName()); switch (taskProvider.getSchedulingScheme()) { case ONE_SHOT: scheduleOneShot(taskProvider, taskProvider.getInitialDelay(), taskProvider.getTimeUnit()); @@ -61,7 +79,7 @@ public class ServerTaskScheduler implements IServerTaskScheduler { @Override public void removeServerTask(IServerTask taskProvider) { if (taskProvider != null) { - OseeLog.log(ServerActivator.class, Level.INFO, "Removing task: " + taskProvider.getName()); + logger.info("Removing task: [%s]", taskProvider.getName()); ScheduledFuture<?> future = futures.get(taskProvider); if (future != null) { future.cancel(true); diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/authentication/DemoAuthenticationProvider.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/authentication/DemoAuthenticationProvider.java index 87bc0b2c6db..a798e9deb62 100644 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/authentication/DemoAuthenticationProvider.java +++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/authentication/DemoAuthenticationProvider.java @@ -12,21 +12,20 @@ package org.eclipse.osee.framework.core.server.internal.authentication; import org.eclipse.osee.framework.core.data.IUserToken; import org.eclipse.osee.framework.core.data.OseeCredential; -import org.eclipse.osee.framework.core.server.IAuthenticationProvider; -import org.eclipse.osee.framework.core.server.UserDataStore; +import org.eclipse.osee.framework.core.server.AbstractAuthenticationProvider; /** * @author Roberto E. Escobar */ -public class DemoAuthenticationProvider implements IAuthenticationProvider { +public class DemoAuthenticationProvider extends AbstractAuthenticationProvider { private final boolean autoAuthenticate = true; private final String DEMO_USER = "Joe Smith"; @Override public IUserToken asOseeUserId(OseeCredential credential) { - IUserToken userToken = UserDataStore.getUserTokenFromOseeDb(DEMO_USER); - return userToken != null ? userToken : UserDataStore.createUserToken(true, DEMO_USER, DEMO_USER, "", true); + IUserToken userToken = getUserTokenFromOseeDb(DEMO_USER); + return userToken != null ? userToken : createUserToken(true, DEMO_USER, DEMO_USER, "", true); } @Override diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/authentication/TrustAllAuthenticationProvider.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/authentication/TrustAllAuthenticationProvider.java index 906308b7dc3..0bd1b5bd6fb 100644 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/authentication/TrustAllAuthenticationProvider.java +++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/authentication/TrustAllAuthenticationProvider.java @@ -13,14 +13,13 @@ package org.eclipse.osee.framework.core.server.internal.authentication; import org.eclipse.osee.framework.core.data.IUserToken; import org.eclipse.osee.framework.core.data.OseeCredential; import org.eclipse.osee.framework.core.enums.SystemUser; -import org.eclipse.osee.framework.core.server.IAuthenticationProvider; -import org.eclipse.osee.framework.core.server.UserDataStore; +import org.eclipse.osee.framework.core.server.AbstractAuthenticationProvider; import org.eclipse.osee.framework.jdk.core.util.Strings; /** * @author Roberto E. Escobar */ -public class TrustAllAuthenticationProvider implements IAuthenticationProvider { +public class TrustAllAuthenticationProvider extends AbstractAuthenticationProvider { @Override public boolean authenticate(OseeCredential credential) { @@ -37,9 +36,9 @@ public class TrustAllAuthenticationProvider implements IAuthenticationProvider { IUserToken userToken = SystemUser.Guest; String userName = credential.getUserName(); if (Strings.isValid(userName)) { - userToken = UserDataStore.getUserTokenFromOseeDb(userName); + userToken = getUserTokenFromOseeDb(userName); if (userToken == null) { - userToken = UserDataStore.createUserToken(true, userName, userName, "", true); + userToken = createUserToken(true, userName, userName, "", true); } } return userToken; diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionFactory.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionFactory.java index f5b14367782..f5aa087dd80 100644 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionFactory.java +++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionFactory.java @@ -26,15 +26,18 @@ import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.DatabaseInfoManager; import org.eclipse.osee.framework.database.core.OseeSql; import org.eclipse.osee.framework.jdk.core.util.Strings; +import org.eclipse.osee.logger.Log; /** * @author Roberto E. Escobar */ public final class SessionFactory implements IOseeTypeFactory { private final BuildTypeIdentifier typeIdentifier; + private final Log logger; - public SessionFactory(BuildTypeIdentifier typeIdentifier) { + public SessionFactory(Log logger, BuildTypeIdentifier typeIdentifier) { this.typeIdentifier = typeIdentifier; + this.logger = logger; } public Session createOrUpdate(IOseeCache<String, Session> cache, int uniqueId, StorageState storageState, String guid, String userId, Date creationDate, String managedByServerId, String clientVersion, String clientMachineName, String clientAddress, int clientPort, Date lastInteractionDate, String lastInteractionDetails) throws OseeCoreException { @@ -71,7 +74,7 @@ public final class SessionFactory implements IOseeTypeFactory { Properties properties = getSQLProperties(session.getClientVersion()); sessionGrant.setSqlProperties(properties); - sessionGrant.setDataStorePath(OseeServerProperties.getOseeApplicationServerData()); + sessionGrant.setDataStorePath(OseeServerProperties.getOseeApplicationServerData(logger)); sessionGrant.setClientBuildDesination(typeIdentifier.getBuildDesignation(session.getClientVersion())); return sessionGrant; } diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionManagerService.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionManagerService.java new file mode 100644 index 00000000000..6f6f9561124 --- /dev/null +++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionManagerService.java @@ -0,0 +1,133 @@ +/******************************************************************************* + * Copyright (c) 2004, 2007 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.framework.core.server.internal.session; + +import java.util.Collection; +import org.eclipse.osee.framework.core.data.OseeCredential; +import org.eclipse.osee.framework.core.data.OseeSessionGrant; +import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.core.model.cache.IOseeDataAccessor; +import org.eclipse.osee.framework.core.server.IApplicationServerManager; +import org.eclipse.osee.framework.core.server.IAuthenticationManager; +import org.eclipse.osee.framework.core.server.ISession; +import org.eclipse.osee.framework.core.server.ISessionManager; +import org.eclipse.osee.framework.core.server.internal.BuildTypeDataProvider; +import org.eclipse.osee.framework.core.server.internal.BuildTypeIdentifier; +import org.eclipse.osee.framework.database.IOseeDatabaseService; +import org.eclipse.osee.logger.Log; + +/** + * @author Roberto E. Escobar + */ +public final class SessionManagerService implements ISessionManager { + + private Log logger; + private IOseeDatabaseService dbService; + private IApplicationServerManager serverManager; + private IAuthenticationManager authenticationManager; + + private ISessionDataStoreSync dataStoreSync; + private ISessionManager proxiedSessionManager; + + public void setLogger(Log logger) { + this.logger = logger; + } + + public void setDbService(IOseeDatabaseService dbService) { + this.dbService = dbService; + } + + public void setServerManager(IApplicationServerManager serverManager) { + this.serverManager = serverManager; + } + + public void setAuthenticationManager(IAuthenticationManager authenticationManager) { + this.authenticationManager = authenticationManager; + } + + private IOseeDatabaseService getDbService() { + return dbService; + } + + private IApplicationServerManager getServerManager() { + return serverManager; + } + + private IAuthenticationManager getAuthenticationManager() { + return authenticationManager; + } + + public void start() { + String serverId = getServerManager().getId(); + BuildTypeIdentifier identifier = new BuildTypeIdentifier(new BuildTypeDataProvider()); + + SessionFactory sessionFactory = new SessionFactory(logger, identifier); + + ISessionQuery sessionQuery = new DatabaseSessionQuery(serverId, getDbService()); + IOseeDataAccessor<String, Session> accessor = + new DatabaseSessionAccessor(serverId, sessionFactory, sessionQuery, getDbService()); + SessionCache sessionCache = new SessionCache(accessor); + + proxiedSessionManager = + new SessionManagerImpl(serverId, sessionFactory, sessionQuery, sessionCache, getAuthenticationManager()); + + dataStoreSync = new SessionDataStoreSync(sessionCache); + dataStoreSync.start(); + } + + public void stop() { + if (dataStoreSync != null) { + dataStoreSync.stop(); + dataStoreSync = null; + } + } + + @Override + public OseeSessionGrant createSession(OseeCredential credential) throws OseeCoreException { + return proxiedSessionManager.createSession(credential); + } + + @Override + public void releaseSession(String sessionId) throws OseeCoreException { + proxiedSessionManager.releaseSession(sessionId); + } + + @Override + public void updateSessionActivity(String sessionId, String interactionName) throws OseeCoreException { + proxiedSessionManager.updateSessionActivity(sessionId, interactionName); + } + + @Override + public ISession getSessionById(String sessionId) throws OseeCoreException { + return proxiedSessionManager.getSessionById(sessionId); + } + + @Override + public Collection<ISession> getSessionByClientAddress(String clientAddress) throws OseeCoreException { + return proxiedSessionManager.getSessionByClientAddress(clientAddress); + } + + @Override + public Collection<ISession> getSessionsByUserId(String userId, boolean includeNonServerManagedSessions) throws OseeCoreException { + return proxiedSessionManager.getSessionsByUserId(userId, includeNonServerManagedSessions); + } + + @Override + public Collection<ISession> getAllSessions(boolean includeNonServerManagedSessions) throws OseeCoreException { + return proxiedSessionManager.getAllSessions(includeNonServerManagedSessions); + } + + @Override + public void releaseSessionImmediate(String... sessionId) throws OseeCoreException { + proxiedSessionManager.releaseSessionImmediate(sessionId); + } + +}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionManagerTrackingHandler.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionManagerTrackingHandler.java deleted file mode 100644 index f489dee4ebb..00000000000 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/session/SessionManagerTrackingHandler.java +++ /dev/null @@ -1,79 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 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.framework.core.server.internal.session; - -import java.util.Map; -import org.eclipse.osee.framework.core.model.cache.IOseeDataAccessor; -import org.eclipse.osee.framework.core.server.IApplicationServerManager; -import org.eclipse.osee.framework.core.server.IAuthenticationManager; -import org.eclipse.osee.framework.core.server.ISessionManager; -import org.eclipse.osee.framework.core.server.internal.BuildTypeDataProvider; -import org.eclipse.osee.framework.core.server.internal.BuildTypeIdentifier; -import org.eclipse.osee.framework.core.util.AbstractTrackingHandler; -import org.eclipse.osee.framework.database.IOseeDatabaseService; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceRegistration; - -/** - * @author Roberto E. Escobar - */ -public final class SessionManagerTrackingHandler extends AbstractTrackingHandler { - - private static final Class<?>[] SERVICE_DEPENDENCIES = new Class<?>[] { - IOseeDatabaseService.class, - IApplicationServerManager.class, - IAuthenticationManager.class}; - - private ServiceRegistration registration; - - private ISessionDataStoreSync dataStoreSync; - private ISessionManager sessionManager; - - @Override - public Class<?>[] getDependencies() { - return SERVICE_DEPENDENCIES; - } - - @Override - public void onActivate(BundleContext context, Map<Class<?>, Object> services) { - IOseeDatabaseService databaseService = getService(IOseeDatabaseService.class, services); - IApplicationServerManager serverManager = getService(IApplicationServerManager.class, services); - IAuthenticationManager authenticationManager = getService(IAuthenticationManager.class, services); - - String serverId = serverManager.getId(); - BuildTypeIdentifier identifier = new BuildTypeIdentifier(new BuildTypeDataProvider()); - SessionFactory sessionFactory = new SessionFactory(identifier); - - ISessionQuery sessionQuery = new DatabaseSessionQuery(serverId, databaseService); - IOseeDataAccessor<String, Session> accessor = - new DatabaseSessionAccessor(serverId, sessionFactory, sessionQuery, databaseService); - SessionCache sessionCache = new SessionCache(accessor); - - sessionManager = - new SessionManagerImpl(serverId, sessionFactory, sessionQuery, sessionCache, authenticationManager); - - registration = context.registerService(ISessionManager.class.getName(), sessionManager, null); - - dataStoreSync = new SessionDataStoreSync(sessionCache); - dataStoreSync.start(); - } - - @Override - public void onDeActivate() { - if (registration != null) { - if (dataStoreSync != null) { - dataStoreSync.stop(); - } - registration.unregister(); - } - } - -}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/task/CleanJoinTablesServerTask.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/task/CleanJoinTablesServerTask.java index 6b32f6608a4..117b0287b4b 100644 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/task/CleanJoinTablesServerTask.java +++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/task/CleanJoinTablesServerTask.java @@ -14,17 +14,15 @@ import java.sql.Timestamp; import java.util.ArrayList; import java.util.List; import java.util.concurrent.TimeUnit; -import java.util.logging.Level; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.server.IServerTask; import org.eclipse.osee.framework.core.server.ISession; import org.eclipse.osee.framework.core.server.ISessionManager; import org.eclipse.osee.framework.core.server.SchedulingScheme; -import org.eclipse.osee.framework.core.server.SessionUtil; -import org.eclipse.osee.framework.core.server.internal.ServerActivator; +import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.database.core.ConnectionHandler; import org.eclipse.osee.framework.database.core.IOseeStatement; -import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.osee.logger.Log; /** * @author Roberto E. Escobar @@ -48,6 +46,22 @@ public class CleanJoinTablesServerTask implements IServerTask { "osee_tag_gamma_queue", "osee_join_id"}; + private IOseeDatabaseService dbService; + private Log logger; + private ISessionManager sessionManager; + + public void setDbService(IOseeDatabaseService dbService) { + this.dbService = dbService; + } + + public void setLogger(Log logger) { + this.logger = logger; + } + + public void setSessionManager(ISessionManager sessionManager) { + this.sessionManager = sessionManager; + } + @Override public String getName() { return NAME; @@ -62,15 +76,15 @@ public class CleanJoinTablesServerTask implements IServerTask { } deleteFromJoinCleanup(); } catch (OseeCoreException ex) { - OseeLog.log(ServerActivator.class, Level.WARNING, ex); + logger.warn(ex, "Error cleaning up tables"); } } private void deleteFromJoinCleanup() throws OseeCoreException { List<Integer[]> queryIds = new ArrayList<Integer[]>(); - IOseeStatement chStmt = ConnectionHandler.getStatement(); + IOseeStatement chStmt = dbService.getStatement(); boolean isAlive = false; - ISessionManager manager = ServerActivator.getSessionManager(); + ISessionManager manager = sessionManager; try { chStmt.runPreparedQuery(SELECT_SESSION_FROM_JOIN); diff --git a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/SessionUtil.java b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/task/SessionUtil.java index 266aa351ab9..dd45ca8314f 100644 --- a/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/SessionUtil.java +++ b/plugins/org.eclipse.osee.framework.core.server/src/org/eclipse/osee/framework/core/server/internal/task/SessionUtil.java @@ -8,12 +8,13 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.framework.core.server; +package org.eclipse.osee.framework.core.server.internal.task; import java.io.ByteArrayOutputStream; import java.net.URL; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeExceptions; +import org.eclipse.osee.framework.core.server.ISession; import org.eclipse.osee.framework.core.util.HttpProcessor; import org.eclipse.osee.framework.core.util.HttpProcessor.AcquireResult; import org.eclipse.osee.framework.jdk.core.util.Strings; diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.manager.servlet/META-INF/MANIFEST.MF index 051fff28be6..811b94659ac 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.manager.servlet/META-INF/MANIFEST.MF @@ -37,6 +37,7 @@ Import-Package: com.lowagie.text;version="2.1.7", org.eclipse.osee.framework.resource.management.exception, org.eclipse.osee.framework.resource.management.util, org.eclipse.osee.framework.search.engine, + org.eclipse.osee.logger, org.eclipse.osgi.framework.console, org.osgi.framework, org.osgi.service.http, diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/AdminServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/AdminServlet.java index 9faafb51904..260bb13bcf3 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/AdminServlet.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/AdminServlet.java @@ -29,6 +29,7 @@ import org.eclipse.osee.framework.core.server.UnsecuredOseeHttpServlet; import org.eclipse.osee.framework.core.util.OsgiUtil; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.Strings; +import org.eclipse.osee.logger.Log; import org.eclipse.osgi.framework.console.CommandInterpreter; import org.eclipse.osgi.framework.console.CommandProvider; import org.osgi.framework.Bundle; @@ -44,7 +45,8 @@ public class AdminServlet extends UnsecuredOseeHttpServlet { private final BundleContext context; - public AdminServlet(BundleContext context) { + public AdminServlet(Log logger, BundleContext context) { + super(logger); this.context = context; } diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ArtifactFileServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ArtifactFileServlet.java index c07d7a7dc3d..af6f0e6de7f 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ArtifactFileServlet.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ArtifactFileServlet.java @@ -40,6 +40,7 @@ import org.eclipse.osee.framework.resource.management.IResourceLocator; import org.eclipse.osee.framework.resource.management.IResourceLocatorManager; import org.eclipse.osee.framework.resource.management.IResourceManager; import org.eclipse.osee.framework.resource.management.StandardOptions; +import org.eclipse.osee.logger.Log; import org.osgi.framework.FrameworkUtil; /** @@ -55,7 +56,8 @@ public class ArtifactFileServlet extends UnsecuredOseeHttpServlet { private static Map<Integer, String> branchIdToGuidMap; - public ArtifactFileServlet(IResourceLocatorManager locatorManager, IResourceManager resourceManager, IOseeCachingService cachingService) { + public ArtifactFileServlet(Log logger, IResourceLocatorManager locatorManager, IResourceManager resourceManager, IOseeCachingService cachingService) { + super(logger); this.locatorManager = locatorManager; this.resourceManager = resourceManager; this.branchCache = cachingService.getBranchCache(); diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/AtsServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/AtsServlet.java index 6fe5861beac..0ba3ad61297 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/AtsServlet.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/AtsServlet.java @@ -27,6 +27,7 @@ import org.eclipse.osee.framework.resource.management.IResource; import org.eclipse.osee.framework.resource.management.IResourceLocator; import org.eclipse.osee.framework.resource.management.IResourceLocatorManager; import org.eclipse.osee.framework.resource.management.IResourceManager; +import org.eclipse.osee.logger.Log; /** * @author Roberto E. Escobar @@ -40,7 +41,8 @@ public class AtsServlet extends UnsecuredOseeHttpServlet { private final IResourceLocatorManager locatorManager; private final IResourceManager resourceManager; - public AtsServlet(IResourceLocatorManager locatorManager, IResourceManager resourceManager, IOseeCachingService cacheService) { + public AtsServlet(Log logger, IResourceLocatorManager locatorManager, IResourceManager resourceManager, IOseeCachingService cacheService) { + super(logger); this.locatorManager = locatorManager; this.resourceManager = resourceManager; AtsService.IResourceProvider provider = new ResourceProvider(); diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchExchangeServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchExchangeServlet.java index 4cf8574437f..86024cad877 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchExchangeServlet.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchExchangeServlet.java @@ -29,6 +29,7 @@ import org.eclipse.osee.framework.resource.management.IResource; import org.eclipse.osee.framework.resource.management.IResourceLocator; import org.eclipse.osee.framework.resource.management.IResourceLocatorManager; import org.eclipse.osee.framework.resource.management.IResourceManager; +import org.eclipse.osee.logger.Log; /** * @author Roberto E. Escobar @@ -41,8 +42,8 @@ public class BranchExchangeServlet extends SecureOseeHttpServlet { private final IResourceLocatorManager locatorManager; private final IResourceManager resourceManager; - public BranchExchangeServlet(ISessionManager sessionManager, IBranchExchange branchExchangeService, IResourceLocatorManager locatorManager, IResourceManager resourceManager) { - super(sessionManager); + public BranchExchangeServlet(Log logger, ISessionManager sessionManager, IBranchExchange branchExchangeService, IResourceLocatorManager locatorManager, IResourceManager resourceManager) { + super(logger, sessionManager); this.branchExchangeService = branchExchangeService; this.locatorManager = locatorManager; this.resourceManager = resourceManager; diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchManagerServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchManagerServlet.java index 1c32e823507..48194cd7958 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchManagerServlet.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchManagerServlet.java @@ -35,6 +35,7 @@ import org.eclipse.osee.framework.manager.servlet.function.CreateBranchFunction; import org.eclipse.osee.framework.manager.servlet.function.CreateCommitFunction; import org.eclipse.osee.framework.manager.servlet.function.PurgeBranchFunction; import org.eclipse.osee.framework.manager.servlet.internal.Activator; +import org.eclipse.osee.logger.Log; /** * @author Andrew M. Finkbeiner @@ -46,8 +47,8 @@ public class BranchManagerServlet extends SecureOseeHttpServlet { private final IOseeBranchService branchService; private final IDataTranslationService translationService; - public BranchManagerServlet(ISessionManager sessionManager, IOseeBranchService branchService, IDataTranslationService translationService) { - super(sessionManager); + public BranchManagerServlet(Log logger, ISessionManager sessionManager, IOseeBranchService branchService, IDataTranslationService translationService) { + super(logger, sessionManager); this.branchService = branchService; this.translationService = translationService; } @@ -87,8 +88,7 @@ public class BranchManagerServlet extends SecureOseeHttpServlet { } Operations.executeWorkAndCheckStatus(op, new LogProgressMonitor()); } catch (Exception ex) { - OseeLog.logf(Activator.class, Level.SEVERE, - ex, "Branch servlet request error: [%s]", req.toString()); + OseeLog.logf(Activator.class, Level.SEVERE, ex, "Branch servlet request error: [%s]", req.toString()); resp.setStatus(HttpURLConnection.HTTP_INTERNAL_ERROR); resp.setContentType("text/plain"); resp.getWriter().write(Lib.exceptionToString(ex)); diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ConfigurationServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ConfigurationServlet.java index e624cd3e9e7..40f5d61eb97 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ConfigurationServlet.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ConfigurationServlet.java @@ -38,6 +38,7 @@ import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.manager.servlet.internal.Activator; +import org.eclipse.osee.logger.Log; /** * @author Roberto E. Escobar @@ -53,7 +54,8 @@ public class ConfigurationServlet extends UnsecuredOseeHttpServlet { private final IApplicationServerManager appServerService; private final IdentityService identityService; - public ConfigurationServlet(IApplicationServerManager appServerService, IDataTranslationService translationService, IOseeDatabaseService databaseService, IOseeCachingService cachingService, IOseeBranchService branchService, IdentityService identityService) { + public ConfigurationServlet(Log logger, IApplicationServerManager appServerService, IDataTranslationService translationService, IOseeDatabaseService databaseService, IOseeCachingService cachingService, IOseeBranchService branchService, IdentityService identityService) { + super(logger); this.translationService = translationService; this.databaseService = databaseService; this.branchService = branchService; diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/DataServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/DataServlet.java index 8d8c59f0079..22cae5e0666 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/DataServlet.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/DataServlet.java @@ -30,6 +30,7 @@ import org.eclipse.osee.framework.manager.servlet.data.ArtifactUtil; import org.eclipse.osee.framework.manager.servlet.internal.Activator; import org.eclipse.osee.framework.resource.management.IResourceLocatorManager; import org.eclipse.osee.framework.resource.management.IResourceManager; +import org.eclipse.osee.logger.Log; public class DataServlet extends UnsecuredOseeHttpServlet { @@ -39,8 +40,8 @@ public class DataServlet extends UnsecuredOseeHttpServlet { private final IResourceManager resourceManager; private final BranchCache branchCache; - public DataServlet(IResourceLocatorManager locatorManager, IResourceManager resourceManager, IOseeCachingService cacheService) { - super(); + public DataServlet(Log logger, IResourceLocatorManager locatorManager, IResourceManager resourceManager, IOseeCachingService cacheService) { + super(logger); this.locatorManager = locatorManager; this.resourceManager = resourceManager; branchCache = cacheService.getBranchCache(); diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeCacheServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeCacheServlet.java index 8126e78f44f..de9780e7f3c 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeCacheServlet.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeCacheServlet.java @@ -49,6 +49,7 @@ import org.eclipse.osee.framework.jdk.core.type.Pair; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.manager.servlet.internal.Activator; +import org.eclipse.osee.logger.Log; /** * @author Roberto E. Escobar @@ -61,7 +62,8 @@ public class OseeCacheServlet extends UnsecuredOseeHttpServlet { private final IOseeModelFactoryService factoryService; private final ISessionManager sessionManager; - public OseeCacheServlet(ISessionManager sessionManager, IDataTranslationService translationService, IOseeCachingService cachingService, IOseeModelFactoryService factoryService) { + public OseeCacheServlet(Log logger, ISessionManager sessionManager, IDataTranslationService translationService, IOseeCachingService cachingService, IOseeModelFactoryService factoryService) { + super(logger); this.sessionManager = sessionManager; this.translationService = translationService; this.cachingService = cachingService; diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeModelServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeModelServlet.java index f2bff02b07f..3a989476d8c 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeModelServlet.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/OseeModelServlet.java @@ -29,6 +29,7 @@ import org.eclipse.osee.framework.core.translation.IDataTranslationService; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.manager.servlet.internal.Activator; +import org.eclipse.osee.logger.Log; /** * @author Roberto E. Escobar @@ -40,8 +41,8 @@ public class OseeModelServlet extends SecureOseeHttpServlet { private final IOseeModelingService modelingService; private final IDataTranslationService dataTransalatorService; - public OseeModelServlet(ISessionManager sessionManager, IDataTranslationService dataTransalatorService, IOseeModelingService modelingService) { - super(sessionManager); + public OseeModelServlet(Log logger, ISessionManager sessionManager, IDataTranslationService dataTransalatorService, IOseeModelingService modelingService) { + super(logger, sessionManager); this.dataTransalatorService = dataTransalatorService; this.modelingService = modelingService; } diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ResourceManagerServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ResourceManagerServlet.java index 990bc81ffc2..77cdddf698d 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ResourceManagerServlet.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ResourceManagerServlet.java @@ -33,6 +33,7 @@ import org.eclipse.osee.framework.resource.management.IResourceLocator; import org.eclipse.osee.framework.resource.management.IResourceLocatorManager; import org.eclipse.osee.framework.resource.management.IResourceManager; import org.eclipse.osee.framework.resource.management.exception.MalformedLocatorException; +import org.eclipse.osee.logger.Log; /** * This class is responsible for managing server-side resources. The class accepts HTTP requests to perform uploads, @@ -46,8 +47,8 @@ public class ResourceManagerServlet extends SecureOseeHttpServlet { private final IResourceLocatorManager locatorManager; private final IResourceManager resourceManager; - public ResourceManagerServlet(ISessionManager sessionManager, IResourceLocatorManager locatorManager, IResourceManager resourceManager) { - super(sessionManager); + public ResourceManagerServlet(Log logger, ISessionManager sessionManager, IResourceLocatorManager locatorManager, IResourceManager resourceManager) { + super(logger, sessionManager); this.locatorManager = locatorManager; this.resourceManager = resourceManager; } diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SearchEngineServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SearchEngineServlet.java index faf0c0410bf..86b56e0a085 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SearchEngineServlet.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SearchEngineServlet.java @@ -25,6 +25,7 @@ import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.manager.servlet.internal.Activator; import org.eclipse.osee.framework.search.engine.ISearchEngine; +import org.eclipse.osee.logger.Log; /** * @author Roberto E. Escobar @@ -36,8 +37,8 @@ public class SearchEngineServlet extends SecureOseeHttpServlet { private final ISearchEngine searchEngine; private final IDataTranslationService translationService; - public SearchEngineServlet(ISessionManager sessionManager, ISearchEngine searchEngine, IDataTranslationService translationService) { - super(sessionManager); + public SearchEngineServlet(Log logger, ISessionManager sessionManager, ISearchEngine searchEngine, IDataTranslationService translationService) { + super(logger, sessionManager); this.searchEngine = searchEngine; this.translationService = translationService; } @@ -59,8 +60,8 @@ public class SearchEngineServlet extends SecureOseeHttpServlet { Lib.inputStreamToOutputStream(inputStream, response.getOutputStream()); } catch (Exception ex) { - OseeLog.logf(Activator.class, Level.SEVERE, - ex, "Failed to respond to a search engine servlet request [%s]", request.getRequestURL()); + OseeLog.logf(Activator.class, Level.SEVERE, ex, "Failed to respond to a search engine servlet request [%s]", + request.getRequestURL()); response.setStatus(HttpServletResponse.SC_BAD_REQUEST); response.setContentType("text/plain"); response.getWriter().write(Lib.exceptionToString(ex)); diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SearchEngineTaggerServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SearchEngineTaggerServlet.java index e7fb5d14101..10bc3f33cb8 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SearchEngineTaggerServlet.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SearchEngineTaggerServlet.java @@ -22,6 +22,7 @@ import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.manager.servlet.data.TagListener; import org.eclipse.osee.framework.manager.servlet.internal.Activator; import org.eclipse.osee.framework.search.engine.ISearchEngineTagger; +import org.eclipse.osee.logger.Log; /** * @author Roberto E. Escobar @@ -31,8 +32,8 @@ public class SearchEngineTaggerServlet extends SecureOseeHttpServlet { private final ISearchEngineTagger searchTaggerService; - public SearchEngineTaggerServlet(ISessionManager sessionManager, ISearchEngineTagger searchTaggerService) { - super(sessionManager); + public SearchEngineTaggerServlet(Log logger, ISessionManager sessionManager, ISearchEngineTagger searchTaggerService) { + super(logger, sessionManager); this.searchTaggerService = searchTaggerService; } diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ServerLookupServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ServerLookupServlet.java index 70d5f8b7b1f..da9dc151271 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ServerLookupServlet.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ServerLookupServlet.java @@ -24,6 +24,7 @@ import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.manager.servlet.internal.Activator; +import org.eclipse.osee.logger.Log; /** * @author Roberto E. Escobar @@ -35,7 +36,8 @@ public class ServerLookupServlet extends UnsecuredOseeHttpServlet { private final IApplicationServerLookup lookupService; private final IApplicationServerManager applicationServerManager; - public ServerLookupServlet(IApplicationServerLookup lookupService, IApplicationServerManager applicationServerManager) { + public ServerLookupServlet(Log logger, IApplicationServerLookup lookupService, IApplicationServerManager applicationServerManager) { + super(logger); this.lookupService = lookupService; this.applicationServerManager = applicationServerManager; @@ -74,8 +76,8 @@ public class ServerLookupServlet extends UnsecuredOseeHttpServlet { response.getOutputStream().flush(); } } catch (Exception ex) { - OseeLog.logf(Activator.class, Level.SEVERE, - ex, "Failed to process application server lookup request [%s]", request.toString()); + OseeLog.logf(Activator.class, Level.SEVERE, ex, "Failed to process application server lookup request [%s]", + request.toString()); response.getWriter().write(Lib.exceptionToString(ex)); response.getWriter().flush(); response.getWriter().close(); @@ -94,8 +96,8 @@ public class ServerLookupServlet extends UnsecuredOseeHttpServlet { String.format("Registration into server lookup was a [%s]", wasSuccessful ? "success" : "failure")); } } catch (Exception ex) { - OseeLog.logf(Activator.class, Level.SEVERE, - ex, "Failed to process application server lookup request [%s]", request.toString()); + OseeLog.logf(Activator.class, Level.SEVERE, ex, "Failed to process application server lookup request [%s]", + request.toString()); response.getWriter().write(Lib.exceptionToString(ex)); } response.getWriter().flush(); diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SessionClientLoopbackServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SessionClientLoopbackServlet.java index a35048d04f2..e1e9c8b36e2 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SessionClientLoopbackServlet.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SessionClientLoopbackServlet.java @@ -32,6 +32,7 @@ import org.eclipse.osee.framework.core.server.UnsecuredOseeHttpServlet; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.manager.servlet.internal.Activator; +import org.eclipse.osee.logger.Log; /** * @author Roberto E. Escobar @@ -42,8 +43,8 @@ public class SessionClientLoopbackServlet extends UnsecuredOseeHttpServlet { private final ISessionManager sessionManager; - public SessionClientLoopbackServlet(ISessionManager sessionManager) { - super(); + public SessionClientLoopbackServlet(Log logger, ISessionManager sessionManager) { + super(logger); this.sessionManager = sessionManager; } diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SessionManagementServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SessionManagementServlet.java index d9656db9577..a229782e712 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SessionManagementServlet.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SessionManagementServlet.java @@ -25,6 +25,7 @@ import org.eclipse.osee.framework.core.server.UnsecuredOseeHttpServlet; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.manager.servlet.internal.Activator; +import org.eclipse.osee.logger.Log; /** * @author Roberto E. Escobar @@ -53,8 +54,8 @@ public class SessionManagementServlet extends UnsecuredOseeHttpServlet { private final IAuthenticationManager authenticationManager; private final ISessionManager sessionManager; - public SessionManagementServlet(ISessionManager sessionManager, IAuthenticationManager authenticationManager) { - super(); + public SessionManagementServlet(Log logger, ISessionManager sessionManager, IAuthenticationManager authenticationManager) { + super(logger); this.sessionManager = sessionManager; this.authenticationManager = authenticationManager; } diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SystemManagerServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SystemManagerServlet.java index f23f571a512..09447d80d9b 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SystemManagerServlet.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/SystemManagerServlet.java @@ -33,6 +33,7 @@ import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.manager.servlet.data.HttpSystemManagerCreationInfo; import org.eclipse.osee.framework.manager.servlet.internal.Activator; +import org.eclipse.osee.logger.Log; /** * @author Donald G. Dunne @@ -51,7 +52,8 @@ public class SystemManagerServlet extends UnsecuredOseeHttpServlet { private final ISessionManager sessionManager; - public SystemManagerServlet(ISessionManager sessionManager) { + public SystemManagerServlet(Log logger, ISessionManager sessionManager) { + super(logger); this.sessionManager = sessionManager; } @@ -88,8 +90,8 @@ public class SystemManagerServlet extends UnsecuredOseeHttpServlet { response.setCharacterEncoding("UTF-8"); response.getWriter().write(appendable.toString() + AHTML.newline() + "As of: " + new Date()); } catch (Exception ex) { - OseeLog.logf(Activator.class, Level.SEVERE, - ex, "Error processing request for protocols [%s]", request.toString()); + OseeLog.logf(Activator.class, Level.SEVERE, ex, "Error processing request for protocols [%s]", + request.toString()); response.setStatus(HttpServletResponse.SC_BAD_REQUEST); response.setContentType("text/plain"); response.getWriter().write(Lib.exceptionToString(ex)); diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/UnsubscribeServlet.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/UnsubscribeServlet.java index 7d27e863697..5a982958bb7 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/UnsubscribeServlet.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/UnsubscribeServlet.java @@ -25,6 +25,7 @@ import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.manager.servlet.internal.Activator; +import org.eclipse.osee.logger.Log; import org.osgi.framework.BundleContext; /** @@ -38,7 +39,8 @@ public class UnsubscribeServlet extends UnsecuredOseeHttpServlet { private final BundleContext bundleContext; private final IdentityService identityService; - public UnsubscribeServlet(BundleContext bundleContext, IOseeDatabaseService databaseService, IOseeCachingService cacheService, IdentityService identityService) { + public UnsubscribeServlet(Log logger, BundleContext bundleContext, IOseeDatabaseService databaseService, IOseeCachingService cacheService, IdentityService identityService) { + super(logger); this.databaseService = databaseService; this.cacheService = cacheService; this.bundleContext = bundleContext; diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/AtsResourceProvider.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/AtsResourceProvider.java index 949a63b9d58..03d250c0322 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/AtsResourceProvider.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/AtsResourceProvider.java @@ -28,7 +28,7 @@ import org.eclipse.osee.framework.resource.management.util.OptionsProcessor; * @author Roberto E. Escobar */ public class AtsResourceProvider implements IResourceProvider { - private static final String BASE_PATH = OseeServerProperties.getOseeApplicationServerData(); + private static final String BASE_PATH = OseeServerProperties.getOseeApplicationServerData(null); private static final String RESOLVED_PATH = BASE_PATH + File.separator + AtsResourceLocatorProvider.PROTOCOL + File.separator; diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServletRegistrationHandler.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServletRegistrationHandler.java index 0c371475971..1b636577eff 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServletRegistrationHandler.java +++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/internal/ServletRegistrationHandler.java @@ -50,6 +50,7 @@ import org.eclipse.osee.framework.resource.management.IResourceLocatorManager; import org.eclipse.osee.framework.resource.management.IResourceManager; import org.eclipse.osee.framework.search.engine.ISearchEngine; import org.eclipse.osee.framework.search.engine.ISearchEngineTagger; +import org.eclipse.osee.logger.Log; import org.osgi.framework.BundleContext; import org.osgi.service.http.HttpService; @@ -77,6 +78,7 @@ public class ServletRegistrationHandler extends AbstractTrackingHandler { IResourceManager.class, HttpService.class, IdentityService.class, + Log.class }; //@formatter:on @@ -107,35 +109,42 @@ public class ServletRegistrationHandler extends AbstractTrackingHandler { IResourceLocatorManager locatorManager = getService(IResourceLocatorManager.class, services); IResourceManager resourceManager = getService(IResourceManager.class, services); IdentityService identityService = getService(IdentityService.class, services); + Log logger = getService(Log.class, services); httpService = getService(HttpService.class, services); appServerManager = getService(IApplicationServerManager.class, services); - register(new SystemManagerServlet(sessionManager), OseeServerContext.MANAGER_CONTEXT); - register(new ResourceManagerServlet(sessionManager, locatorManager, resourceManager), + register(new SystemManagerServlet(logger, sessionManager), OseeServerContext.MANAGER_CONTEXT); + register(new ResourceManagerServlet(logger, sessionManager, locatorManager, resourceManager), OseeServerContext.RESOURCE_CONTEXT); - register(new ArtifactFileServlet(locatorManager, resourceManager, caching), OseeServerContext.PROCESS_CONTEXT); - register(new ArtifactFileServlet(locatorManager, resourceManager, caching), OseeServerContext.ARTIFACT_CONTEXT); - register(new ArtifactFileServlet(locatorManager, resourceManager, caching), "index"); - register(new BranchExchangeServlet(sessionManager, branchExchangeService, locatorManager, resourceManager), + register(new ArtifactFileServlet(logger, locatorManager, resourceManager, caching), + OseeServerContext.PROCESS_CONTEXT); + register(new ArtifactFileServlet(logger, locatorManager, resourceManager, caching), + OseeServerContext.ARTIFACT_CONTEXT); + register(new ArtifactFileServlet(logger, locatorManager, resourceManager, caching), "index"); + register( + new BranchExchangeServlet(logger, sessionManager, branchExchangeService, locatorManager, resourceManager), OseeServerContext.BRANCH_EXCHANGE_CONTEXT); - register(new BranchManagerServlet(sessionManager, branchService, translationService), + register(new BranchManagerServlet(logger, sessionManager, branchService, translationService), OseeServerContext.BRANCH_CONTEXT); - register(new SearchEngineServlet(sessionManager, search, translationService), OseeServerContext.SEARCH_CONTEXT); - register(new SearchEngineTaggerServlet(sessionManager, tagger), OseeServerContext.SEARCH_TAGGING_CONTEXT); - register(new ServerLookupServlet(serverLookup, appServerManager), OseeServerContext.LOOKUP_CONTEXT); - register(new SessionManagementServlet(sessionManager, authenticationManager), OseeServerContext.SESSION_CONTEXT); - register(new SessionClientLoopbackServlet(sessionManager), OseeServerContext.CLIENT_LOOPBACK_CONTEXT); - register(new OseeCacheServlet(sessionManager, translationService, caching, factoryService), + register(new SearchEngineServlet(logger, sessionManager, search, translationService), + OseeServerContext.SEARCH_CONTEXT); + register(new SearchEngineTaggerServlet(logger, sessionManager, tagger), OseeServerContext.SEARCH_TAGGING_CONTEXT); + register(new ServerLookupServlet(logger, serverLookup, appServerManager), OseeServerContext.LOOKUP_CONTEXT); + register(new SessionManagementServlet(logger, sessionManager, authenticationManager), + OseeServerContext.SESSION_CONTEXT); + register(new SessionClientLoopbackServlet(logger, sessionManager), OseeServerContext.CLIENT_LOOPBACK_CONTEXT); + register(new OseeCacheServlet(logger, sessionManager, translationService, caching, factoryService), OseeServerContext.CACHE_CONTEXT); - register(new OseeModelServlet(sessionManager, translationService, modeling), OseeServerContext.OSEE_MODEL_CONTEXT); - register(new UnsubscribeServlet(context, databaseService, caching, identityService), "osee/unsubscribe"); + register(new OseeModelServlet(logger, sessionManager, translationService, modeling), + OseeServerContext.OSEE_MODEL_CONTEXT); + register(new UnsubscribeServlet(logger, context, databaseService, caching, identityService), "osee/unsubscribe"); - register(new AtsServlet(locatorManager, resourceManager, caching), "osee/ats"); - register(new ConfigurationServlet(appServerManager, translationService, databaseService, caching, branchService, - identityService), OseeServerContext.OSEE_CONFIGURE_CONTEXT); - register(new DataServlet(locatorManager, resourceManager, caching), "osee/data"); - register(new AdminServlet(context), "osee/console"); + register(new AtsServlet(logger, locatorManager, resourceManager, caching), "osee/ats"); + register(new ConfigurationServlet(logger, appServerManager, translationService, databaseService, caching, + branchService, identityService), OseeServerContext.OSEE_CONFIGURE_CONTEXT); + register(new DataServlet(logger, locatorManager, resourceManager, caching), "osee/data"); + register(new AdminServlet(logger, context), "osee/console"); } private void register(OseeHttpServlet servlet, String... contexts) { diff --git a/plugins/org.eclipse.osee.framework.server.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.server.admin/META-INF/MANIFEST.MF index 556397b2216..f016fe8c130 100644 --- a/plugins/org.eclipse.osee.framework.server.admin/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.server.admin/META-INF/MANIFEST.MF @@ -32,6 +32,7 @@ Import-Package: org.eclipse.core.runtime, org.eclipse.osee.framework.resource.management.util, org.eclipse.osee.framework.search.engine, org.eclipse.osee.framework.search.engine.attribute, + org.eclipse.osee.logger, org.eclipse.osgi.framework.console, org.osgi.framework, org.osgi.util.tracker diff --git a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/management/ServerStats.java b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/management/ServerStats.java index fdf5be73c04..156d869e572 100644 --- a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/management/ServerStats.java +++ b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/management/ServerStats.java @@ -52,7 +52,7 @@ public class ServerStats extends AbstractOperation { logf("Code Base Location: [%s]", System.getProperty("user.dir")); logf("Datastore: [%s]", DatabaseInfoManager.getDefault().toString()); - logf("Binary Data Path: [%s]\n", OseeServerProperties.getOseeApplicationServerData()); + logf("Binary Data Path: [%s]\n", OseeServerProperties.getOseeApplicationServerData(null)); logf("Supported Versions: %s", Arrays.deepToString(manager.getSupportedVersions())); logf("Accepting Requests: [%s]", manager.isAcceptingRequests()); diff --git a/plugins/org.eclipse.osee.logback.config/logback-dev.xml b/plugins/org.eclipse.osee.logback.config/logback-dev.xml index 298f487fbd0..7139ecfbbbe 100644 --- a/plugins/org.eclipse.osee.logback.config/logback-dev.xml +++ b/plugins/org.eclipse.osee.logback.config/logback-dev.xml @@ -18,6 +18,7 @@ <logger name="org.eclipse.osee.database" level="TRACE" /> <logger name="org.eclipse.osee.orcs.core" level="TRACE" /> <logger name="org.eclipse.osee" level="WARN" /> + <logger name="org.eclipse.osee.framework.core.server" level="INFO" /> <!-- Vaadin Servlet URL Requests --> <!-- <logger name="org.eclipse.osee.vaadin" level="TRACE" /> --> diff --git a/plugins/org.eclipse.osee.logback.config/logback.xml b/plugins/org.eclipse.osee.logback.config/logback.xml index a27a83648a5..d53ab6cfe7f 100644 --- a/plugins/org.eclipse.osee.logback.config/logback.xml +++ b/plugins/org.eclipse.osee.logback.config/logback.xml @@ -12,7 +12,8 @@ <!-- Configure OSEE log messages --> <logger name="org.eclipse.osee" level="WARN" /> - + <logger name="org.eclipse.osee.framework.core.server" level="INFO" /> + <root level="WARN"> <appender-ref ref="STDOUT" /> </root> diff --git a/plugins/org.eclipse.osee.x.server.parent/pom.xml b/plugins/org.eclipse.osee.x.server.parent/pom.xml index c708874b715..f72e9f253a0 100644 --- a/plugins/org.eclipse.osee.x.server.parent/pom.xml +++ b/plugins/org.eclipse.osee.x.server.parent/pom.xml @@ -10,6 +10,9 @@ <version>0.9.9-SNAPSHOT</version> <modules> + <module>../../plugins/org.eclipse.osee.framework.core.server</module> + <module>../../plugins/org.eclipse.osee.framework.core.server.test</module> + <module>../../plugins/org.eclipse.osee.display.api</module> <module>../../plugins/org.eclipse.osee.display.view.web</module> <module>../../plugins/org.eclipse.osee.display.presenter</module> @@ -22,8 +25,12 @@ <module>../../plugins/org.eclipse.osee.ats.presenter</module> <module>../../plugins/org.eclipse.osee.ats.presenter.test</module> + <module>../../features/org.eclipse.osee.x.server.legacy.feature</module> + <module>../../features/org.eclipse.osee.x.server.feature</module> <module>../../features/org.eclipse.osee.x.server.external.feature</module> + + <module>../../features/org.eclipse.osee.x.server.legacy.feature.source</module> <module>../../features/org.eclipse.osee.x.server.feature.source</module> <module>../../plugins/org.eclipse.osee.x.server.p2</module> |