summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmisinco2011-05-10 19:46:31 (EDT)
committer Ryan D. Brooks2011-05-10 19:46:31 (EDT)
commit98fa1f7061eb05ab8f6c7bfc0b868ec91862503e (patch)
treeceb6b23ffa7194181f928288db44bbdbc50c8543
parent05109de7609095a4c3167c4ef33c9258054e2826 (diff)
downloadorg.eclipse.osee-98fa1f7061eb05ab8f6c7bfc0b868ec91862503e.zip
org.eclipse.osee-98fa1f7061eb05ab8f6c7bfc0b868ec91862503e.tar.gz
org.eclipse.osee-98fa1f7061eb05ab8f6c7bfc0b868ec91862503e.tar.bz2
refactor[bgz_343296]: Replace Options with PropertyStore
-rw-r--r--plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/IBranchExchange.java6
-rw-r--r--plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/BranchExchange.java6
-rw-r--r--plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExchangeDb.java10
-rw-r--r--plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExchangeUtil.java4
-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/ImportController.java6
-rw-r--r--plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/TranslationManager.java4
-rw-r--r--plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/export/AbstractExportItem.java8
-rw-r--r--plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/export/DbTableExportItem.java4
-rw-r--r--plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/BaseDbSaxHandler.java10
-rw-r--r--plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/DbTableSaxHandler.java4
-rw-r--r--plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/resource/ExchangeProvider.java6
-rw-r--r--plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/PropertyStore.java13
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ArtifactFileServlet.java4
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/AtsServlet.java4
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/BranchExchangeServlet.java4
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ResourceManagerServlet.java8
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/ats/AtsResourceProvider.java6
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpBranchExchangeInfo.java8
-rw-r--r--plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpRequestDecoder.java6
-rw-r--r--plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/OptionsTest.java6
-rw-r--r--plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/ResourceManagementTestSuite.java2
-rw-r--r--plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/mocks/MockResourceListener.java6
-rw-r--r--plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/mocks/ResourceProviderAdaptor.java6
-rw-r--r--plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/IResourceListener.java6
-rw-r--r--plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/IResourceManager.java5
-rw-r--r--plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/IResourceProvider.java5
-rw-r--r--plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/Options.java30
-rw-r--r--plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/internal/ResourceManager.java10
-rw-r--r--plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/util/OptionsProcessor.java4
-rw-r--r--plugins/org.eclipse.osee.framework.resource.provider.attribute.test/src/org/eclipse/osee/framework/resource/provider/attribute/test/AttributeProviderTestSuite.java2
-rw-r--r--plugins/org.eclipse.osee.framework.resource.provider.attribute/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.framework.resource.provider.attribute/src/org/eclipse/osee/framework/resource/provider/attribute/AttributeProvider.java6
-rw-r--r--plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/AttributeTaggerProviderManagerImpl.java2
-rw-r--r--plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/tagger/BaseAttributeTaggerProvider.java4
-rw-r--r--plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/BranchManagementCommandProvider.java29
-rw-r--r--plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/app/DataStoreBackupApplication.java6
-rw-r--r--plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/branch/BranchExportOperation.java10
-rw-r--r--plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/branch/BranchImportOperation.java10
-rw-r--r--plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/CompressedContentFix.java4
40 files changed, 131 insertions, 150 deletions
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/IBranchExchange.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/IBranchExchange.java
index 25442ea..2796fab 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/IBranchExchange.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/IBranchExchange.java
@@ -13,17 +13,17 @@ package org.eclipse.osee.framework.branch.management;
import java.util.List;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.operation.OperationLogger;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.resource.management.IResourceLocator;
-import org.eclipse.osee.framework.resource.management.Options;
/**
* @author Roberto E. Escobar
*/
public interface IBranchExchange {
- public IResourceLocator exportBranch(String exportName, Options options, List<Integer> branchIds) throws Exception;
+ public IResourceLocator exportBranch(String exportName, PropertyStore options, List<Integer> branchIds) throws Exception;
- public void importBranch(IResourceLocator fileToImport, Options options, List<Integer> branchIds, OperationLogger logger) throws OseeCoreException;
+ public void importBranch(IResourceLocator fileToImport, PropertyStore options, List<Integer> branchIds, OperationLogger logger) throws OseeCoreException;
public IResourceLocator checkIntegrity(IResourceLocator fileToCheck) throws Exception;
}
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/BranchExchange.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/BranchExchange.java
index 9872694..56f4da1 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/BranchExchange.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/BranchExchange.java
@@ -19,8 +19,8 @@ import org.eclipse.osee.framework.branch.management.exchange.transform.ExchangeD
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.operation.OperationLogger;
import org.eclipse.osee.framework.jdk.core.type.Pair;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.resource.management.IResourceLocator;
-import org.eclipse.osee.framework.resource.management.Options;
/**
* @author Roberto E. Escobar
@@ -34,7 +34,7 @@ public class BranchExchange implements IBranchExchange {
}
@Override
- public IResourceLocator exportBranch(String exportName, Options options, List<Integer> branchIds) throws OseeCoreException {
+ public IResourceLocator exportBranch(String exportName, PropertyStore options, List<Integer> branchIds) throws OseeCoreException {
ExportController controller = new ExportController(oseeServices, exportName, options, branchIds);
controller.handleTxWork();
return oseeServices.getResourceLocatorManager().generateResourceLocator(ExchangeLocatorProvider.PROTOCOL, "",
@@ -42,7 +42,7 @@ public class BranchExchange implements IBranchExchange {
}
@Override
- public void importBranch(IResourceLocator exportDataLocator, Options options, List<Integer> branchIds, OperationLogger logger) throws OseeCoreException {
+ public void importBranch(IResourceLocator exportDataLocator, PropertyStore options, List<Integer> branchIds, OperationLogger logger) throws OseeCoreException {
IOseeExchangeDataProvider exportDataProvider = createExportDataProvider(exportDataLocator);
ImportController importController =
new ImportController(oseeServices, exportDataProvider, options, branchIds, logger);
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExchangeDb.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExchangeDb.java
index 6f70f8d..d361cb8 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExchangeDb.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExchangeDb.java
@@ -26,8 +26,8 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.eclipse.osee.framework.database.core.IOseeSequence;
import org.eclipse.osee.framework.jdk.core.type.Pair;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.resource.management.Options;
/**
* @author Roberto E. Escobar
@@ -174,7 +174,7 @@ public final class ExchangeDb {
return translators;
}
- public static Pair<String, Object[]> getQueryWithOptions(String originalQuery, int queryId, Options options) throws Exception {
+ public static Pair<String, Object[]> getQueryWithOptions(String originalQuery, int queryId, PropertyStore options) throws Exception {
if (originalQuery.contains("%s")) {
if (originalQuery.contains("osee_tx_details") || originalQuery.contains("osee_merge")) {
List<Object> dataArray = new ArrayList<Object>();
@@ -217,15 +217,15 @@ public final class ExchangeDb {
return new Pair<String, Object[]>(originalQuery, new Object[] {queryId});
}
- static Long getMaxTransaction(Options options) {
+ static Long getMaxTransaction(PropertyStore options) {
return getTransactionNumber(options, ExportOptions.MAX_TXS.name());
}
- static Long getMinTransaction(Options options) {
+ static Long getMinTransaction(PropertyStore options) {
return getTransactionNumber(options, ExportOptions.MIN_TXS.name());
}
- private static Long getTransactionNumber(Options options, String exportOption) {
+ private static Long getTransactionNumber(PropertyStore options, String exportOption) {
String transactionNumber = options.get(exportOption);
long toReturn = Long.MIN_VALUE;
if (Strings.isValid(transactionNumber)) {
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExchangeUtil.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExchangeUtil.java
index 94809cc..630546d 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExchangeUtil.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ExchangeUtil.java
@@ -25,12 +25,12 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeExceptions;
import org.eclipse.osee.framework.core.util.Conditions;
import org.eclipse.osee.framework.jdk.core.type.Pair;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.resource.management.IResource;
import org.eclipse.osee.framework.resource.management.IResourceLocator;
import org.eclipse.osee.framework.resource.management.IResourceManager;
-import org.eclipse.osee.framework.resource.management.Options;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.XMLReader;
@@ -57,9 +57,9 @@ public class ExchangeUtil {
public static Pair<Boolean, File> getTempExchangeFile(IResourceLocator locator, IResourceManager resourceManager) throws OseeCoreException {
File importSource = null;
boolean wasZipExtractionRequired = false;
+ IResource resource = resourceManager.acquire(locator, new PropertyStore());
Conditions.checkExpressionFailOnTrue(!resourceManager.exists(locator), "Error locating [%s]",
locator.getLocation());
- IResource resource = resourceManager.acquire(locator, new Options());
File source = new File(resource.getLocation());
if (source.isFile()) {
wasZipExtractionRequired = true;
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 f444925..6ad9615 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
@@ -31,10 +31,10 @@ 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;
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.resource.management.Options;
/**
* @author Roberto E. Escobar
@@ -43,14 +43,14 @@ final class ExportController implements IExchangeTaskListener {
private static final String ZIP_EXTENSION = ".zip";
private String exportName;
- private final Options options;
+ private final PropertyStore options;
private final List<Integer> branchIds;
private ExportImportJoinQuery joinQuery;
private ExecutorService executorService;
private final List<String> errorList = new CopyOnWriteArrayList<String>();
private final OseeServices oseeServices;
- ExportController(OseeServices oseeServices, String exportName, Options options, List<Integer> branchIds) throws OseeCoreException {
+ ExportController(OseeServices oseeServices, String exportName, PropertyStore options, List<Integer> branchIds) throws OseeCoreException {
if (branchIds.isEmpty()) {
throw new OseeArgumentException("No branch selected for export.");
}
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ImportController.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ImportController.java
index 07d94b0..6b92cce 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ImportController.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/ImportController.java
@@ -42,9 +42,9 @@ import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.database.core.DbTransaction;
import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.database.core.OseeConnection;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.resource.management.Options;
/**
* @author Roberto E. Escobar
@@ -63,7 +63,7 @@ public final class ImportController {
private final OseeServices oseeServices;
private final IOseeExchangeDataProvider exportDataProvider;
- private final Options options;
+ private final PropertyStore options;
private final int[] branchesToImport = null;
private final Map<String, SavePoint> savePoints;
private final ExchangeDataProcessor exchangeDataProcessor;
@@ -75,7 +75,7 @@ public final class ImportController {
private MetaDataSaxHandler metadataHandler;
private String currentSavePoint;
- ImportController(OseeServices oseeServices, IOseeExchangeDataProvider exportDataProvider, Options options, List<Integer> branchIds, OperationLogger logger) throws OseeArgumentException {
+ ImportController(OseeServices oseeServices, IOseeExchangeDataProvider exportDataProvider, PropertyStore options, List<Integer> branchIds, OperationLogger logger) throws OseeArgumentException {
this.oseeServices = oseeServices;
this.exportDataProvider = exportDataProvider;
this.options = options;
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/TranslationManager.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/TranslationManager.java
index 145bf57..fbe8686 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/TranslationManager.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/TranslationManager.java
@@ -18,7 +18,7 @@ import org.eclipse.osee.framework.branch.management.ImportOptions;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.eclipse.osee.framework.database.core.OseeConnection;
-import org.eclipse.osee.framework.resource.management.Options;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
public class TranslationManager {
private static final String INSERT_INTO_IMPORT_MAP =
@@ -42,7 +42,7 @@ public class TranslationManager {
}
}
- public void configure(Options options) {
+ public void configure(PropertyStore options) {
if (options != null) {
useOriginalIds = options.getBoolean(ImportOptions.USE_IDS_FROM_IMPORT_FILE.name());
}
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/export/AbstractExportItem.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/export/AbstractExportItem.java
index 8884ac4..2d7c636 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/export/AbstractExportItem.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/export/AbstractExportItem.java
@@ -20,7 +20,7 @@ import org.eclipse.osee.framework.branch.management.IExchangeTaskListener;
import org.eclipse.osee.framework.branch.management.exchange.ExchangeUtil;
import org.eclipse.osee.framework.branch.management.exchange.ExportImportXml;
import org.eclipse.osee.framework.branch.management.exchange.handler.ExportItem;
-import org.eclipse.osee.framework.resource.management.Options;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
/**
* @author Roberto E. Escobar
@@ -31,7 +31,7 @@ public abstract class AbstractExportItem implements Runnable {
private final Set<IExchangeTaskListener> exportListeners;
private File writeLocation;
- private Options options;
+ private PropertyStore options;
private boolean cancel;
public AbstractExportItem(ExportItem id) {
@@ -70,11 +70,11 @@ public abstract class AbstractExportItem implements Runnable {
return writeLocation;
}
- public void setOptions(Options options) {
+ public void setOptions(PropertyStore options) {
this.options = options;
}
- public Options getOptions() {
+ public PropertyStore getOptions() {
return this.options;
}
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/export/DbTableExportItem.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/export/DbTableExportItem.java
index 84789cd..1f2ace0 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/export/DbTableExportItem.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/export/DbTableExportItem.java
@@ -25,12 +25,12 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.model.cache.AbstractOseeCache;
import org.eclipse.osee.framework.database.core.IOseeStatement;
import org.eclipse.osee.framework.jdk.core.type.Pair;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.jdk.core.util.xml.Xml;
import org.eclipse.osee.framework.resource.management.IResource;
import org.eclipse.osee.framework.resource.management.IResourceLocator;
-import org.eclipse.osee.framework.resource.management.Options;
/**
* @author Roberto E. Escobar
@@ -57,7 +57,7 @@ public class DbTableExportItem extends AbstractDbExportItem {
}
IResourceLocator locator = services.getResourceLocatorManager().getResourceLocator(uriTarget);
- IResource resource = services.getResourceManager().acquire(locator, new Options());
+ IResource resource = services.getResourceManager().acquire(locator, new PropertyStore());
File target = new File(tempFolder, locator.getRawPath());
if (target.getParentFile() != null) {
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/BaseDbSaxHandler.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/BaseDbSaxHandler.java
index b381804..f99b097 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/BaseDbSaxHandler.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/BaseDbSaxHandler.java
@@ -22,7 +22,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
import org.eclipse.osee.framework.database.core.OseeConnection;
import org.eclipse.osee.framework.logging.OseeLog;
-import org.eclipse.osee.framework.resource.management.Options;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
/**
* @author Roberto E. Escobar
@@ -36,7 +36,7 @@ public abstract class BaseDbSaxHandler extends BaseExportImportSaxHandler {
private OseeConnection connection;
private MetaData metadata;
private TranslationManager translator;
- private Options options;
+ private PropertyStore options;
private final IOseeDatabaseService service;
protected BaseDbSaxHandler(IOseeDatabaseService service, boolean isCacheAll, int cacheLimit) {
@@ -46,7 +46,7 @@ public abstract class BaseDbSaxHandler extends BaseExportImportSaxHandler {
cacheLimit));
}
this.service = service;
- this.options = new Options();
+ this.options = new PropertyStore();
this.translator = null;
this.metadata = null;
this.connection = null;
@@ -55,13 +55,13 @@ public abstract class BaseDbSaxHandler extends BaseExportImportSaxHandler {
this.data = new ArrayList<Object[]>();
}
- public void setOptions(Options options) {
+ public void setOptions(PropertyStore options) {
if (options != null) {
this.options = options;
}
}
- protected Options getOptions() {
+ protected PropertyStore getOptions() {
return this.options;
}
diff --git a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/DbTableSaxHandler.java b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/DbTableSaxHandler.java
index 7d21ebf..eaab501 100644
--- a/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/DbTableSaxHandler.java
+++ b/plugins/org.eclipse.osee.framework.branch.management/src/org/eclipse/osee/framework/branch/management/exchange/handler/DbTableSaxHandler.java
@@ -26,6 +26,7 @@ import org.eclipse.osee.framework.branch.management.internal.Activator;
import org.eclipse.osee.framework.core.enums.ConflictType;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.core.model.AbstractOseeType;
import org.eclipse.osee.framework.core.model.cache.AbstractOseeCache;
import org.eclipse.osee.framework.core.services.IOseeCachingService;
@@ -35,7 +36,6 @@ import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.resource.management.IResourceLocator;
import org.eclipse.osee.framework.resource.management.IResourceManager;
-import org.eclipse.osee.framework.resource.management.Options;
/**
* @author Roberto E. Escobar
@@ -85,7 +85,7 @@ public class DbTableSaxHandler extends BaseDbSaxHandler {
services.getResourceLocatorManager().generateResourceLocator("attr", gammaId, name);
IResourceLocator locator =
- services.getResourceManager().save(locatorHint, new ZipBinaryResource(entry, locatorHint), new Options());
+ services.getResourceManager().save(locatorHint, new ZipBinaryResource(entry, locatorHint), new PropertyStore());
transferredBinaryContent.add(locator);
return locator.getLocation().toASCIIString();
} else {
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 b694400..bbbf284 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
@@ -23,12 +23,12 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeExceptions;
import org.eclipse.osee.framework.core.exception.OseeStateException;
import org.eclipse.osee.framework.core.server.OseeServerProperties;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.resource.management.IResource;
import org.eclipse.osee.framework.resource.management.IResourceLocator;
import org.eclipse.osee.framework.resource.management.IResourceManager;
import org.eclipse.osee.framework.resource.management.IResourceProvider;
-import org.eclipse.osee.framework.resource.management.Options;
import org.eclipse.osee.framework.resource.management.exception.MalformedLocatorException;
import org.eclipse.osee.framework.resource.management.util.OptionsProcessor;
@@ -68,7 +68,7 @@ public class ExchangeProvider implements IResourceProvider {
}
@Override
- public IResource acquire(IResourceLocator locator, Options options) throws OseeCoreException {
+ public IResource acquire(IResourceLocator locator, PropertyStore options) throws OseeCoreException {
IResource toReturn = null;
OptionsProcessor optionsProcessor = new OptionsProcessor(resolve(locator), locator, null, options);
toReturn = optionsProcessor.getResourceToServer();
@@ -96,7 +96,7 @@ public class ExchangeProvider implements IResourceProvider {
}
@Override
- public IResourceLocator save(IResourceLocator locator, IResource resource, Options options) throws OseeCoreException {
+ public IResourceLocator save(IResourceLocator locator, IResource resource, PropertyStore options) throws OseeCoreException {
IResourceLocator toReturn = null;
OptionsProcessor optionsProcessor = new OptionsProcessor(resolve(locator), locator, resource, options);
OutputStream outputStream = null;
diff --git a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/PropertyStore.java b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/PropertyStore.java
index f618cf5..4f72f7a 100644
--- a/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/PropertyStore.java
+++ b/plugins/org.eclipse.osee.framework.jdk.core/src/org/eclipse/osee/framework/jdk/core/type/PropertyStore.java
@@ -186,22 +186,22 @@ public class PropertyStore implements IPropertyStore, Serializable {
return storeId;
}
- protected void setId(String name) {
+ void setId(String name) {
if (name == null) {
name = EMPTY_STRING;
}
this.storeId = name;
}
- protected Map<String, Object> getItems() {
+ Map<String, Object> getItems() {
return storageData;
}
- protected Map<String, Object> getArrays() {
+ Map<String, Object> getArrays() {
return storageArrays;
}
- protected Map<String, Object> getPropertyStores() {
+ Map<String, Object> getPropertyStores() {
return storageProperties;
}
@@ -345,4 +345,9 @@ public class PropertyStore implements IPropertyStore, Serializable {
return keySet().isEmpty() && innerStoresKeySet().isEmpty() && arrayKeySet().isEmpty();
}
+ public void clear() {
+ storageData.clear();
+ storageArrays.clear();
+ }
+
}
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 2cb73e6..05eb593 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
@@ -20,6 +20,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeExceptions;
import org.eclipse.osee.framework.core.server.UnsecuredOseeHttpServlet;
import org.eclipse.osee.framework.jdk.core.type.Pair;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
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;
@@ -31,7 +32,6 @@ 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.framework.resource.management.Options;
import org.eclipse.osee.framework.resource.management.StandardOptions;
/**
@@ -98,7 +98,7 @@ public class ArtifactFileServlet extends UnsecuredOseeHttpServlet {
boolean wasProcessed = false;
if (Strings.isValid(uri)) {
IResourceLocator locator = locatorManager.getResourceLocator(uri);
- Options options = new Options();
+ PropertyStore options = new PropertyStore();
options.put(StandardOptions.DecompressOnAquire.name(), true);
IResource resource = resourceManager.acquire(locator, options);
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 642ad49..aee92ce 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
@@ -16,6 +16,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.server.UnsecuredOseeHttpServlet;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.manager.servlet.ats.AtsService;
import org.eclipse.osee.framework.manager.servlet.ats.AtsXmlMessages;
import org.eclipse.osee.framework.manager.servlet.ats.AtsXmlSearch;
@@ -25,7 +26,6 @@ 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.framework.resource.management.Options;
/**
* @author Roberto E. Escobar
@@ -84,7 +84,7 @@ public class AtsServlet extends UnsecuredOseeHttpServlet {
@Override
public IResource getResource(String path) throws OseeCoreException {
IResourceLocator locator = locatorManager.getResourceLocator(path);
- return resourceManager.acquire(locator, new Options());
+ return resourceManager.acquire(locator, new PropertyStore());
}
}
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 ebf3883..5411261 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
@@ -20,6 +20,7 @@ import org.eclipse.osee.framework.branch.management.IBranchExchange;
import org.eclipse.osee.framework.core.operation.ConsoleLogger;
import org.eclipse.osee.framework.core.server.ISessionManager;
import org.eclipse.osee.framework.core.server.SecureOseeHttpServlet;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.manager.servlet.data.HttpBranchExchangeInfo;
@@ -28,7 +29,6 @@ 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.framework.resource.management.Options;
/**
* @author Roberto E. Escobar
@@ -101,7 +101,7 @@ public class BranchExchangeServlet extends SecureOseeHttpServlet {
if (exchangeInfo.isSendExportFile()) {
InputStream exportFileStream = null;
try {
- IResource resource = resourceManager.acquire(exchangeLocator, new Options());
+ IResource resource = resourceManager.acquire(exchangeLocator, new PropertyStore());
exportFileStream = resource.getContent();
response.setStatus(HttpServletResponse.SC_OK);
response.setContentLength(exportFileStream.available());
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 8782f96..90bb004 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
@@ -23,6 +23,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.server.ISessionManager;
import org.eclipse.osee.framework.core.server.SecureOseeHttpServlet;
import org.eclipse.osee.framework.jdk.core.type.Pair;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.manager.servlet.data.HttpRequestDecoder;
@@ -31,7 +32,6 @@ 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.framework.resource.management.Options;
import org.eclipse.osee.framework.resource.management.exception.MalformedLocatorException;
/**
@@ -68,7 +68,7 @@ public class ResourceManagerServlet extends SecureOseeHttpServlet {
Pair<String, Boolean> parameters = HttpRequestDecoder.fromGetRequest(request);
String path = parameters.getFirst();
boolean isCheckExistance = parameters.getSecond();
- Options options = HttpRequestDecoder.getOptions(request);
+ PropertyStore options = HttpRequestDecoder.getOptions(request);
IResourceLocator locator = locatorManager.getResourceLocator(path);
@@ -124,7 +124,7 @@ public class ResourceManagerServlet extends SecureOseeHttpServlet {
int result = HttpServletResponse.SC_BAD_REQUEST;
try {
String[] args = HttpRequestDecoder.fromPutRequest(request);
- Options options = HttpRequestDecoder.getOptions(request);
+ PropertyStore options = HttpRequestDecoder.getOptions(request);
IResourceLocator locator = locatorManager.generateResourceLocator(args[0], args[1], args[2]);
IResource tempResource = new ServletResourceBridge(request, locator);
@@ -183,7 +183,7 @@ public class ResourceManagerServlet extends SecureOseeHttpServlet {
Set<IResourceLocator> locators = new HashSet<IResourceLocator>();
for (IResourceLocator locator : locators) {
try {
- Options options = new Options();
+ PropertyStore options = new PropertyStore();
resourceManager.acquire(locator, options);
} catch (OseeCoreException ex) {
}
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 21520ac..ebdded4 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
@@ -17,10 +17,10 @@ import java.util.Arrays;
import java.util.Collection;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.server.OseeServerProperties;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.resource.management.IResource;
import org.eclipse.osee.framework.resource.management.IResourceLocator;
import org.eclipse.osee.framework.resource.management.IResourceProvider;
-import org.eclipse.osee.framework.resource.management.Options;
import org.eclipse.osee.framework.resource.management.exception.MalformedLocatorException;
import org.eclipse.osee.framework.resource.management.util.OptionsProcessor;
@@ -59,7 +59,7 @@ public class AtsResourceProvider implements IResourceProvider {
}
@Override
- public IResource acquire(IResourceLocator locator, Options options) throws OseeCoreException {
+ public IResource acquire(IResourceLocator locator, PropertyStore options) throws OseeCoreException {
IResource toReturn = null;
OptionsProcessor optionsProcessor = new OptionsProcessor(resolve(locator), locator, null, options);
toReturn = optionsProcessor.getResourceToServer();
@@ -77,7 +77,7 @@ public class AtsResourceProvider implements IResourceProvider {
}
@Override
- public IResourceLocator save(IResourceLocator locator, IResource resource, Options options) throws OseeCoreException {
+ public IResourceLocator save(IResourceLocator locator, IResource resource, PropertyStore options) throws OseeCoreException {
throw new UnsupportedOperationException();
}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpBranchExchangeInfo.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpBranchExchangeInfo.java
index 869a2d1..ddec7e8 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpBranchExchangeInfo.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpBranchExchangeInfo.java
@@ -14,7 +14,7 @@ import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
-import org.eclipse.osee.framework.resource.management.Options;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
/**
* @author Roberto E. Escobar
@@ -33,11 +33,11 @@ public class HttpBranchExchangeInfo {
private final List<Integer> selectedBranchIds;
private boolean sendExportFile;
private boolean deleteExportFile;
- private final Options options;
+ private final PropertyStore options;
@SuppressWarnings("unchecked")
public HttpBranchExchangeInfo(HttpServletRequest request) throws Exception {
- this.options = new Options();
+ this.options = new PropertyStore();
this.function = null;
this.selectedBranchIds = new ArrayList<Integer>();
this.sendExportFile = false;
@@ -93,7 +93,7 @@ public class HttpBranchExchangeInfo {
return this.selectedBranchIds;
}
- public Options getOptions() {
+ public PropertyStore getOptions() {
return this.options;
}
diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpRequestDecoder.java b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpRequestDecoder.java
index 330c191..e1661ae 100644
--- a/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpRequestDecoder.java
+++ b/plugins/org.eclipse.osee.framework.manager.servlet/src/org/eclipse/osee/framework/manager/servlet/data/HttpRequestDecoder.java
@@ -14,7 +14,7 @@ import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import org.eclipse.osee.framework.jdk.core.type.Pair;
-import org.eclipse.osee.framework.resource.management.Options;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.resource.management.StandardOptions;
/**
@@ -67,8 +67,8 @@ public class HttpRequestDecoder {
Boolean.valueOf(request.getParameter(CHECK_AVAILABLE)));
}
- public static Options getOptions(HttpServletRequest request) {
- Options options = new Options();
+ public static PropertyStore getOptions(HttpServletRequest request) {
+ PropertyStore options = new PropertyStore();
options.put(StandardOptions.CompressOnSave.name(), request.getParameter(COMPRESS_ON_SAVE));
options.put(StandardOptions.CompressOnAcquire.name(), request.getParameter(COMPRESS_ON_ACQUIRE));
options.put(StandardOptions.DecompressOnAquire.name(), request.getParameter(DECOMPRESS_ON_ACQUIRE));
diff --git a/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/OptionsTest.java b/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/OptionsTest.java
index 9bd8f42..c069111 100644
--- a/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/OptionsTest.java
+++ b/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/OptionsTest.java
@@ -10,13 +10,13 @@
*******************************************************************************/
package org.eclipse.osee.framework.resource.management.test;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.jdk.core.type.PropertyStoreTest;
-import org.eclipse.osee.framework.resource.management.Options;
import org.junit.Assert;
import org.junit.Test;
/**
- * Test Cases for {@link Options}
+ * Test Cases for {@link PropertyStore}
*
* @author Roberto E. Escobar
*/
@@ -24,7 +24,7 @@ public class OptionsTest extends PropertyStoreTest {
@Test
public void testClear() {
- Options options = new Options();
+ PropertyStore options = new PropertyStore();
options.put("a", true);
options.put("b", 0.1);
options.put("c", new String[] {"a", "b", "c"});
diff --git a/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/ResourceManagementTestSuite.java b/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/ResourceManagementTestSuite.java
index 6f7cd74..28c7953 100644
--- a/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/ResourceManagementTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/ResourceManagementTestSuite.java
@@ -24,5 +24,5 @@ import org.junit.runners.Suite;
* @author Roberto E. Escobar
*/
public class ResourceManagementTestSuite {
-
+ // do nothing
}
diff --git a/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/mocks/MockResourceListener.java b/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/mocks/MockResourceListener.java
index c4dfa6d..c898258 100644
--- a/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/mocks/MockResourceListener.java
+++ b/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/mocks/MockResourceListener.java
@@ -10,10 +10,10 @@
*******************************************************************************/
package org.eclipse.osee.framework.resource.management.test.mocks;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.resource.management.IResource;
import org.eclipse.osee.framework.resource.management.IResourceListener;
import org.eclipse.osee.framework.resource.management.IResourceLocator;
-import org.eclipse.osee.framework.resource.management.Options;
/**
* @author Roberto E. Escobar
@@ -62,7 +62,7 @@ public class MockResourceListener implements IResourceListener {
}
@Override
- public void onPostSave(IResourceLocator locator, IResource resource, Options options) {
+ public void onPostSave(IResourceLocator locator, IResource resource, PropertyStore options) {
postSave = true;
this.resource = resource;
}
@@ -74,7 +74,7 @@ public class MockResourceListener implements IResourceListener {
}
@Override
- public void onPreSave(IResourceLocator locator, IResource resource, Options options) {
+ public void onPreSave(IResourceLocator locator, IResource resource, PropertyStore options) {
preSave = true;
this.locator = locator;
}
diff --git a/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/mocks/ResourceProviderAdaptor.java b/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/mocks/ResourceProviderAdaptor.java
index 8dff510..4dbb687 100644
--- a/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/mocks/ResourceProviderAdaptor.java
+++ b/plugins/org.eclipse.osee.framework.resource.management.test/src/org/eclipse/osee/framework/resource/management/test/mocks/ResourceProviderAdaptor.java
@@ -13,10 +13,10 @@ package org.eclipse.osee.framework.resource.management.test.mocks;
import java.util.Collection;
import java.util.Collections;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.resource.management.IResource;
import org.eclipse.osee.framework.resource.management.IResourceLocator;
import org.eclipse.osee.framework.resource.management.IResourceProvider;
-import org.eclipse.osee.framework.resource.management.Options;
/**
* @author Roberto E. Escobar
@@ -24,7 +24,7 @@ import org.eclipse.osee.framework.resource.management.Options;
public class ResourceProviderAdaptor implements IResourceProvider {
@Override
- public IResource acquire(IResourceLocator locator, Options options) throws OseeCoreException {
+ public IResource acquire(IResourceLocator locator, PropertyStore options) throws OseeCoreException {
return null;
}
@@ -44,7 +44,7 @@ public class ResourceProviderAdaptor implements IResourceProvider {
}
@Override
- public IResourceLocator save(IResourceLocator locator, IResource resource, Options options) throws OseeCoreException {
+ public IResourceLocator save(IResourceLocator locator, IResource resource, PropertyStore options) throws OseeCoreException {
return null;
}
diff --git a/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/IResourceListener.java b/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/IResourceListener.java
index 79e65f5..0fefb36 100644
--- a/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/IResourceListener.java
+++ b/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/IResourceListener.java
@@ -10,6 +10,8 @@
*******************************************************************************/
package org.eclipse.osee.framework.resource.management;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
+
/**
* @author Roberto E. Escobar
*/
@@ -28,12 +30,12 @@ public interface IResourceListener {
/**
* Event triggered before a resource is saved
*/
- public void onPreSave(IResourceLocator locator, IResource resource, Options options);
+ public void onPreSave(IResourceLocator locator, IResource resource, PropertyStore options);
/**
* Event triggered after a resource is saved
*/
- public void onPostSave(IResourceLocator locator, IResource resource, Options options);
+ public void onPostSave(IResourceLocator locator, IResource resource, PropertyStore options);
/**
* Event triggered before a resource is acquired
diff --git a/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/IResourceManager.java b/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/IResourceManager.java
index 72aedaa..879b95f 100644
--- a/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/IResourceManager.java
+++ b/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/IResourceManager.java
@@ -11,6 +11,7 @@
package org.eclipse.osee.framework.resource.management;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
/**
* @author Roberto E. Escobar
@@ -52,7 +53,7 @@ public interface IResourceManager {
* @param options operation options
* @return the resource
*/
- public IResource acquire(IResourceLocator locator, Options options) throws OseeCoreException;
+ public IResource acquire(IResourceLocator locator, PropertyStore options) throws OseeCoreException;
/**
* Determines if a resource exists for the given locator.
@@ -68,7 +69,7 @@ public interface IResourceManager {
* @param resource to store
* @param options operation options
*/
- public IResourceLocator save(final IResourceLocator locatorHint, final IResource resource, final Options options) throws OseeCoreException;
+ public IResourceLocator save(final IResourceLocator locatorHint, final IResource resource, final PropertyStore options) throws OseeCoreException;
/**
* Delete resource specified by resource locator
diff --git a/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/IResourceProvider.java b/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/IResourceProvider.java
index ad95aa2..6840716 100644
--- a/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/IResourceProvider.java
+++ b/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/IResourceProvider.java
@@ -12,6 +12,7 @@ package org.eclipse.osee.framework.resource.management;
import java.util.Collection;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
/**
* @author Roberto E. Escobar
@@ -32,7 +33,7 @@ public interface IResourceProvider {
* @param options operation options
* @return the resource
*/
- public IResource acquire(IResourceLocator locator, Options options) throws OseeCoreException;
+ public IResource acquire(IResourceLocator locator, PropertyStore options) throws OseeCoreException;
/**
* Determines if a resource exists for the given locator.
@@ -48,7 +49,7 @@ public interface IResourceProvider {
* @param options operation options
* @param resource the resource to save
*/
- public IResourceLocator save(IResourceLocator locator, IResource resource, Options options) throws OseeCoreException;
+ public IResourceLocator save(IResourceLocator locator, IResource resource, PropertyStore options) throws OseeCoreException;
/**
* Delete resource specified by resource locator
diff --git a/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/Options.java b/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/Options.java
deleted file mode 100644
index 7a4fef6..0000000
--- a/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/Options.java
+++ /dev/null
@@ -1,30 +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.resource.management;
-
-import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
-
-/**
- * @author Roberto E. Escobar
- */
-public class Options extends PropertyStore {
-
- private static final long serialVersionUID = -8556523292740896103L;
-
- public Options() {
- super();
- }
-
- public void clear() {
- getItems().clear();
- getArrays().clear();
- }
-}
diff --git a/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/internal/ResourceManager.java b/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/internal/ResourceManager.java
index ed2c025..3e36571 100644
--- a/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/internal/ResourceManager.java
+++ b/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/internal/ResourceManager.java
@@ -14,12 +14,12 @@ import java.util.Collection;
import java.util.concurrent.CopyOnWriteArraySet;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeNotFoundException;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.resource.management.IResource;
import org.eclipse.osee.framework.resource.management.IResourceListener;
import org.eclipse.osee.framework.resource.management.IResourceLocator;
import org.eclipse.osee.framework.resource.management.IResourceManager;
import org.eclipse.osee.framework.resource.management.IResourceProvider;
-import org.eclipse.osee.framework.resource.management.Options;
/**
* @author Roberto E. Escobar
@@ -56,13 +56,13 @@ public class ResourceManager implements IResourceManager {
}
}
- private void notifyPreOnSave(final IResourceLocator locator, IResource resource, Options options) {
+ private void notifyPreOnSave(final IResourceLocator locator, IResource resource, PropertyStore options) {
for (IResourceListener listener : listeners) {
listener.onPreSave(locator, resource, options);
}
}
- private void notifyPostOnSave(IResourceLocator locator, final IResource resource, Options options) {
+ private void notifyPostOnSave(IResourceLocator locator, final IResource resource, PropertyStore options) {
for (IResourceListener listener : listeners) {
listener.onPostSave(locator, resource, options);
}
@@ -106,7 +106,7 @@ public class ResourceManager implements IResourceManager {
}
@Override
- public IResource acquire(IResourceLocator locator, Options options) throws OseeCoreException {
+ public IResource acquire(IResourceLocator locator, PropertyStore options) throws OseeCoreException {
IResourceProvider provider = getProvider(locator);
notifyPreOnAcquire(locator);
IResource toReturn = provider.acquire(locator, options);
@@ -115,7 +115,7 @@ public class ResourceManager implements IResourceManager {
}
@Override
- public IResourceLocator save(IResourceLocator locator, IResource resource, Options options) throws OseeCoreException {
+ public IResourceLocator save(IResourceLocator locator, IResource resource, PropertyStore options) throws OseeCoreException {
IResourceProvider provider = getProvider(locator);
notifyPreOnSave(locator, resource, options);
IResourceLocator actualLocator = provider.save(locator, resource, options);
diff --git a/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/util/OptionsProcessor.java b/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/util/OptionsProcessor.java
index d0f5396..1f6440d 100644
--- a/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/util/OptionsProcessor.java
+++ b/plugins/org.eclipse.osee.framework.resource.management/src/org/eclipse/osee/framework/resource/management/util/OptionsProcessor.java
@@ -15,11 +15,11 @@ import java.net.URI;
import java.net.URISyntaxException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeStateException;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.framework.resource.management.IResource;
import org.eclipse.osee.framework.resource.management.IResourceLocator;
-import org.eclipse.osee.framework.resource.management.Options;
import org.eclipse.osee.framework.resource.management.StandardOptions;
import org.eclipse.osee.framework.resource.management.exception.MalformedLocatorException;
@@ -38,7 +38,7 @@ public class OptionsProcessor {
private final boolean compressOnAcquire;
private final boolean overwrite;
- public OptionsProcessor(URI uri, IResourceLocator locator, IResource resource, Options options) throws MalformedLocatorException {
+ public OptionsProcessor(URI uri, IResourceLocator locator, IResource resource, PropertyStore options) throws MalformedLocatorException {
this.resource = resource;
decompressOnAcquire = options.getBoolean(StandardOptions.DecompressOnAquire.name());
compressOnAcquire = options.getBoolean(StandardOptions.CompressOnAcquire.name());
diff --git a/plugins/org.eclipse.osee.framework.resource.provider.attribute.test/src/org/eclipse/osee/framework/resource/provider/attribute/test/AttributeProviderTestSuite.java b/plugins/org.eclipse.osee.framework.resource.provider.attribute.test/src/org/eclipse/osee/framework/resource/provider/attribute/test/AttributeProviderTestSuite.java
index b2b6104..8aa20ba 100644
--- a/plugins/org.eclipse.osee.framework.resource.provider.attribute.test/src/org/eclipse/osee/framework/resource/provider/attribute/test/AttributeProviderTestSuite.java
+++ b/plugins/org.eclipse.osee.framework.resource.provider.attribute.test/src/org/eclipse/osee/framework/resource/provider/attribute/test/AttributeProviderTestSuite.java
@@ -19,5 +19,5 @@ import org.junit.runners.Suite;
* @author Roberto E. Escobar
*/
public class AttributeProviderTestSuite {
-
+ // do nothing
}
diff --git a/plugins/org.eclipse.osee.framework.resource.provider.attribute/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.resource.provider.attribute/META-INF/MANIFEST.MF
index 59dec36..9938def 100644
--- a/plugins/org.eclipse.osee.framework.resource.provider.attribute/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.framework.resource.provider.attribute/META-INF/MANIFEST.MF
@@ -10,6 +10,7 @@ Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.core.runtime,
org.eclipse.osee.framework.core.exception,
org.eclipse.osee.framework.core.server,
+ org.eclipse.osee.framework.jdk.core.type,
org.eclipse.osee.framework.jdk.core.util,
org.eclipse.osee.framework.resource.management,
org.eclipse.osee.framework.resource.management.util,
diff --git a/plugins/org.eclipse.osee.framework.resource.provider.attribute/src/org/eclipse/osee/framework/resource/provider/attribute/AttributeProvider.java b/plugins/org.eclipse.osee.framework.resource.provider.attribute/src/org/eclipse/osee/framework/resource/provider/attribute/AttributeProvider.java
index 59b01dc..75df77b 100644
--- a/plugins/org.eclipse.osee.framework.resource.provider.attribute/src/org/eclipse/osee/framework/resource/provider/attribute/AttributeProvider.java
+++ b/plugins/org.eclipse.osee.framework.resource.provider.attribute/src/org/eclipse/osee/framework/resource/provider/attribute/AttributeProvider.java
@@ -22,12 +22,12 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeExceptions;
import org.eclipse.osee.framework.core.exception.OseeStateException;
import org.eclipse.osee.framework.core.server.OseeServerProperties;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.resource.management.IResource;
import org.eclipse.osee.framework.resource.management.IResourceLocator;
import org.eclipse.osee.framework.resource.management.IResourceManager;
import org.eclipse.osee.framework.resource.management.IResourceProvider;
-import org.eclipse.osee.framework.resource.management.Options;
import org.eclipse.osee.framework.resource.management.util.OptionsProcessor;
/**
@@ -68,7 +68,7 @@ public class AttributeProvider implements IResourceProvider {
}
@Override
- public IResource acquire(IResourceLocator locator, Options options) throws OseeCoreException {
+ public IResource acquire(IResourceLocator locator, PropertyStore options) throws OseeCoreException {
IResource toReturn = null;
OptionsProcessor optionsProcessor = new OptionsProcessor(resolve(locator), locator, null, options);
toReturn = optionsProcessor.getResourceToServer();
@@ -76,7 +76,7 @@ public class AttributeProvider implements IResourceProvider {
}
@Override
- public IResourceLocator save(IResourceLocator locator, IResource resource, Options options) throws OseeCoreException {
+ public IResourceLocator save(IResourceLocator locator, IResource resource, PropertyStore options) throws OseeCoreException {
IResourceLocator toReturn = null;
OptionsProcessor optionsProcessor = new OptionsProcessor(resolve(locator), locator, resource, options);
OutputStream outputStream = null;
diff --git a/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/AttributeTaggerProviderManagerImpl.java b/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/AttributeTaggerProviderManagerImpl.java
index 85d0dd2..ab4a2df 100644
--- a/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/AttributeTaggerProviderManagerImpl.java
+++ b/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/internal/AttributeTaggerProviderManagerImpl.java
@@ -14,8 +14,8 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.message.SearchOptions;
import org.eclipse.osee.framework.core.exception.OseeStateException;
+import org.eclipse.osee.framework.core.message.SearchOptions;
import org.eclipse.osee.framework.core.model.cache.AttributeTypeCache;
import org.eclipse.osee.framework.core.model.type.AttributeType;
import org.eclipse.osee.framework.jdk.core.type.MatchLocation;
diff --git a/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/tagger/BaseAttributeTaggerProvider.java b/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/tagger/BaseAttributeTaggerProvider.java
index 04647ab..8a7d41b 100644
--- a/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/tagger/BaseAttributeTaggerProvider.java
+++ b/plugins/org.eclipse.osee.framework.search.engine/src/org/eclipse/osee/framework/search/engine/tagger/BaseAttributeTaggerProvider.java
@@ -17,6 +17,7 @@ import java.io.UnsupportedEncodingException;
import java.util.logging.Level;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeExceptions;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
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;
@@ -24,7 +25,6 @@ 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.framework.resource.management.Options;
import org.eclipse.osee.framework.resource.management.StandardOptions;
import org.eclipse.osee.framework.search.engine.IAttributeTaggerProvider;
import org.eclipse.osee.framework.search.engine.attribute.AttributeData;
@@ -73,7 +73,7 @@ public abstract class BaseAttributeTaggerProvider implements IAttributeTaggerPro
private InputStream getExtendedDataAsStream(AttributeData attributeData) throws OseeCoreException {
InputStream toReturn = null;
if (attributeData.isUriValid()) {
- Options options = new Options();
+ PropertyStore options = new PropertyStore();
options.put(StandardOptions.DecompressOnAquire.name(), true);
IResourceLocator locator = locatorManager.getResourceLocator(attributeData.getUri());
IResource resource = resourceManager.acquire(locator, options);
diff --git a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/BranchManagementCommandProvider.java b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/BranchManagementCommandProvider.java
index ae5fdfb..2603908 100644
--- a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/BranchManagementCommandProvider.java
+++ b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/BranchManagementCommandProvider.java
@@ -34,8 +34,8 @@ import org.eclipse.osee.framework.core.operation.MutexSchedulingRule;
import org.eclipse.osee.framework.core.operation.OperationLogger;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.database.IOseeDatabaseService;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.resource.management.Options;
import org.eclipse.osee.framework.server.admin.branch.BranchExportOperation;
import org.eclipse.osee.framework.server.admin.branch.BranchImportOperation;
import org.eclipse.osee.framework.server.admin.branch.ExchangeIntegrityOperation;
@@ -50,7 +50,7 @@ public class BranchManagementCommandProvider implements CommandProvider {
private final ISchedulingRule branchMutex = new MutexSchedulingRule();
public Job _export_branch(CommandInterpreter ci) {
- Options options = new Options();
+ PropertyStore propertyStore = new PropertyStore();
String arg = null;
int count = 0;
String exportFileName = null;
@@ -60,21 +60,21 @@ public class BranchManagementCommandProvider implements CommandProvider {
arg = ci.nextArgument();
if (Strings.isValid(arg)) {
if (arg.equals("-excludeBaselineTxs")) {
- options.put(ExportOptions.EXCLUDE_BASELINE_TXS.name(), true);
+ propertyStore.put(ExportOptions.EXCLUDE_BASELINE_TXS.name(), true);
} else if (arg.equals("-includeArchivedBranches")) {
includeArchivedBranches = true;
} else if (arg.equals("-compress")) {
- options.put(ExportOptions.COMPRESS.name(), true);
+ propertyStore.put(ExportOptions.COMPRESS.name(), true);
} else if (arg.equals("-minTx")) {
arg = ci.nextArgument();
if (Strings.isValid(arg)) {
- options.put(ExportOptions.MIN_TXS.name(), arg);
+ propertyStore.put(ExportOptions.MIN_TXS.name(), arg);
}
count++;
} else if (arg.equals("-maxTx")) {
arg = ci.nextArgument();
if (Strings.isValid(arg)) {
- options.put(ExportOptions.MAX_TXS.name(), arg);
+ propertyStore.put(ExportOptions.MAX_TXS.name(), arg);
}
count++;
} else {
@@ -89,12 +89,13 @@ public class BranchManagementCommandProvider implements CommandProvider {
} while (Strings.isValid(arg));
OperationLogger logger = new CommandInterpreterLogger(ci);
- IOperation op = new BranchExportOperation(logger, options, exportFileName, includeArchivedBranches, branchIds);
+ IOperation op =
+ new BranchExportOperation(logger, propertyStore, exportFileName, includeArchivedBranches, branchIds);
return Operations.executeAsJob(op, false, branchMutex);
}
public Job _import_branch(CommandInterpreter ci) {
- Options options = new Options();
+ PropertyStore propertyStore = new PropertyStore();
String arg = null;
int count = 0;
@@ -104,21 +105,21 @@ public class BranchManagementCommandProvider implements CommandProvider {
arg = ci.nextArgument();
if (Strings.isValid(arg)) {
if (arg.equals("-excludeBaselineTxs")) {
- options.put(ImportOptions.EXCLUDE_BASELINE_TXS.name(), true);
+ propertyStore.put(ImportOptions.EXCLUDE_BASELINE_TXS.name(), true);
} else if (arg.equals("-clean")) {
- options.put(ImportOptions.CLEAN_BEFORE_IMPORT.name(), true);
+ propertyStore.put(ImportOptions.CLEAN_BEFORE_IMPORT.name(), true);
} else if (arg.equals("-allAsRootBranches")) {
- options.put(ImportOptions.ALL_AS_ROOT_BRANCHES.name(), true);
+ propertyStore.put(ImportOptions.ALL_AS_ROOT_BRANCHES.name(), true);
} else if (arg.equals("-minTx")) {
arg = ci.nextArgument();
if (Strings.isValid(arg)) {
- options.put(ImportOptions.MIN_TXS.name(), arg);
+ propertyStore.put(ImportOptions.MIN_TXS.name(), arg);
}
count++;
} else if (arg.equals("-maxTx")) {
arg = ci.nextArgument();
if (Strings.isValid(arg)) {
- options.put(ImportOptions.MAX_TXS.name(), arg);
+ propertyStore.put(ImportOptions.MAX_TXS.name(), arg);
}
count++;
} else if (count == 0 && !arg.startsWith("-")) {
@@ -131,7 +132,7 @@ public class BranchManagementCommandProvider implements CommandProvider {
} while (Strings.isValid(arg));
OperationLogger logger = new CommandInterpreterLogger(ci);
- IOperation op = new BranchImportOperation(logger, options, importFiles, branchIds);
+ IOperation op = new BranchImportOperation(logger, propertyStore, importFiles, branchIds);
return Operations.executeAsJob(op, false, branchMutex);
}
diff --git a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/app/DataStoreBackupApplication.java b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/app/DataStoreBackupApplication.java
index 84f82b4..0c2e988 100644
--- a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/app/DataStoreBackupApplication.java
+++ b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/app/DataStoreBackupApplication.java
@@ -24,12 +24,12 @@ import org.eclipse.osee.framework.branch.management.ExportOptions;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.database.core.IOseeStatement;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
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.resource.management.IResource;
import org.eclipse.osee.framework.resource.management.IResourceLocator;
-import org.eclipse.osee.framework.resource.management.Options;
import org.eclipse.osee.framework.server.admin.internal.Activator;
/**
@@ -56,7 +56,7 @@ public class DataStoreBackupApplication implements IApplication {
InputStream inputStream = null;
OutputStream outputStream = null;
try {
- IResource resource = Activator.getResourceManager().acquire(locator, new Options());
+ IResource resource = Activator.getResourceManager().acquire(locator, new PropertyStore());
inputStream = resource.getContent();
outputStream = new BufferedOutputStream(new FileOutputStream(new File(backupFolder, resource.getName())));
@@ -81,7 +81,7 @@ public class DataStoreBackupApplication implements IApplication {
try {
String backupName = "osee_" + Lib.getDateTimeString();
- Options options = new Options();
+ PropertyStore options = new PropertyStore();
options.put(ExportOptions.COMPRESS.name(), true);
List<Integer> branchIds = getAllBranches();
diff --git a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/branch/BranchExportOperation.java b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/branch/BranchExportOperation.java
index 438560a..0d3451b 100644
--- a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/branch/BranchExportOperation.java
+++ b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/branch/BranchExportOperation.java
@@ -17,8 +17,8 @@ import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.core.operation.OperationLogger;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.database.core.IOseeStatement;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.resource.management.Options;
import org.eclipse.osee.framework.server.admin.internal.Activator;
/**
@@ -27,14 +27,14 @@ import org.eclipse.osee.framework.server.admin.internal.Activator;
public final class BranchExportOperation extends AbstractOperation {
private static final String SELECT_BRANCHES = "SELECT branch_id FROM osee_branch %s ORDER BY branch_id";
- private final Options options;
+ private final PropertyStore propertyStore;
private final String exportFileName;
private final boolean includeArchivedBranches;
private final List<Integer> branchIds;
- public BranchExportOperation(OperationLogger logger, Options options, String exportFileName, boolean includeArchivedBranches, List<Integer> branchIds) {
+ public BranchExportOperation(OperationLogger logger, PropertyStore propertyStore, String exportFileName, boolean includeArchivedBranches, List<Integer> branchIds) {
super("Branch Export", Activator.PLUGIN_ID, logger);
- this.options = options;
+ this.propertyStore = propertyStore;
this.exportFileName = exportFileName;
this.includeArchivedBranches = includeArchivedBranches;
this.branchIds = branchIds;
@@ -59,6 +59,6 @@ public final class BranchExportOperation extends AbstractOperation {
}
logf("Exporting: [%s] branches\n", branchIds.size());
- Activator.getBranchExchange().exportBranch(exportFileName, options, branchIds);
+ Activator.getBranchExchange().exportBranch(exportFileName, propertyStore, branchIds);
}
} \ No newline at end of file
diff --git a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/branch/BranchImportOperation.java b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/branch/BranchImportOperation.java
index ad261af..3331db8 100644
--- a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/branch/BranchImportOperation.java
+++ b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/branch/BranchImportOperation.java
@@ -18,7 +18,7 @@ import org.eclipse.osee.framework.core.exception.OseeArgumentException;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.operation.AbstractOperation;
import org.eclipse.osee.framework.core.operation.OperationLogger;
-import org.eclipse.osee.framework.resource.management.Options;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.resource.management.util.ResourceLocator;
import org.eclipse.osee.framework.server.admin.internal.Activator;
@@ -27,13 +27,13 @@ import org.eclipse.osee.framework.server.admin.internal.Activator;
*/
public final class BranchImportOperation extends AbstractOperation {
private final List<String> importFiles;
- private final Options options;
+ private final PropertyStore propertyStore;
private final List<Integer> branchIds;
- public BranchImportOperation(OperationLogger logger, Options options, List<String> importFiles, List<Integer> branchIds) {
+ public BranchImportOperation(OperationLogger logger, PropertyStore propertyStore, List<String> importFiles, List<Integer> branchIds) {
super("Branch Import", Activator.PLUGIN_ID, logger);
this.importFiles = importFiles;
- this.options = options;
+ this.propertyStore = propertyStore;
this.branchIds = branchIds;
}
@@ -46,7 +46,7 @@ public final class BranchImportOperation extends AbstractOperation {
for (String fileToImport : importFiles) {
URI uri = new URI("exchange://" + fileToImport);
- Activator.getBranchExchange().importBranch(new ResourceLocator(uri), options, branchIds, getLogger());
+ Activator.getBranchExchange().importBranch(new ResourceLocator(uri), propertyStore, branchIds, getLogger());
}
}
}
diff --git a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/CompressedContentFix.java b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/CompressedContentFix.java
index 39eaabc..984ab13 100644
--- a/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/CompressedContentFix.java
+++ b/plugins/org.eclipse.osee.framework.server.admin/src/org/eclipse/osee/framework/server/admin/conversion/CompressedContentFix.java
@@ -22,13 +22,13 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException;
import org.eclipse.osee.framework.core.exception.OseeExceptions;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
import org.eclipse.osee.framework.database.core.IOseeStatement;
+import org.eclipse.osee.framework.jdk.core.type.PropertyStore;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.logging.OseeLog;
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.framework.resource.management.Options;
import org.eclipse.osee.framework.resource.management.StandardOptions;
import org.eclipse.osee.framework.resource.management.util.Resources;
import org.eclipse.osee.framework.server.admin.internal.Activator;
@@ -129,7 +129,7 @@ public class CompressedContentFix {
boolean resourceExists = isResourceAvailable(uri);
if (resourceExists) {
IResourceLocator locator = locatorManager.getResourceLocator(uri);
- Options options = new Options();
+ PropertyStore options = new PropertyStore();
IResource resource = resourceManager.acquire(locator, options);
ByteArrayOutputStream outputStream = new ByteArrayOutputStream();