Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2012-02-22 05:40:14 +0000
committerRyan D. Brooks2012-02-22 05:40:14 +0000
commit2e952df7696dd959044c6e015b9eb8d53c6d0f08 (patch)
treeb1edd856191916968d8e0fdde7cdc5b81a437baa /plugins/org.eclipse.osee.framework.branch.management
parenta934b51cb7dfa1596239cfeb8c0fbf5ed442d2a2 (diff)
downloadorg.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/org.eclipse.osee.framework.branch.management')
-rw-r--r--plugins/org.eclipse.osee.framework.branch.management/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExportController.java6
-rw-r--r--plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/resource/ExchangeProvider.java2
3 files changed, 4 insertions, 5 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;

Back to the top