();
+ for (String requiredBndl : requiredBundles) {
+ // Extract bundle name which is first item in
+ // semicolon
+ // split list
+ String[] bndlParts = requiredBndl.split("[;]");
+ Bundle reqBndl = bundles.get(bndlParts[0]);
+ if (reqBndl != null) {
+ // Found bundle, process context for bundle
+ OSGIXmlApplicationContext parent = createContext(
+ bundles, contextMap, reqBndl, processing);
+ if (parent != null) {
+ // Context found, add to list
+ parentContexts.add(parent);
}
}
+ }
+ if (parentContexts.size() > 0) {
+ // Context with parent context
+ appCtx = new OSGIXmlApplicationContext(
+ new OSGIGroupApplicationContext(parentContexts),
+ files.toArray(new String[0]), bundle);
+ } else {
+ // No parent context required
+ appCtx = new OSGIXmlApplicationContext(
+ files.toArray(new String[0]), bundle);
}
}
}
- buffer.append("\n}");
- log.debug(buffer);
+ contextMap.put(bundleName, appCtx);
}
+ processing.remove(bundleName);
+ return appCtx;
+ }
- final List taskList = new ArrayList(managedContexts.size());
- final List closedContexts = Collections
- .synchronizedList(new ArrayList());
- final Object[] contextClosingDown = new Object[1];
-
- for (i = 0; i < bundles.length; i++) {
- Long id = new Long(bundles[i].getBundleId());
- final ConfigurableOsgiBundleApplicationContext context = (ConfigurableOsgiBundleApplicationContext) managedContexts
- .get(id);
- if (context != null) {
- closedContexts.add(context);
- // add a new runnable
- taskList.add(new Runnable() {
-
- private final String toString = "Closing runnable for context "
- + context.getDisplayName();
-
- public void run() {
- contextClosingDown[0] = context;
- // eliminate context
- closedContexts.remove(context);
- if (log.isDebugEnabled())
- log.debug("Closing appCtx "
- + context.getDisplayName());
- context.close();
- }
-
- public String toString() {
- return toString;
- }
- });
- }
- }
-
- // tasks
- final Runnable[] tasks = (Runnable[]) taskList
- .toArray(new Runnable[taskList.size()]);
-
- // start the ripper >:)
- for (int j = 0; j < tasks.length; j++) {
- if (RunnableTimedExecution.execute(tasks[j],
- extenderConfiguration.getShutdownWaitTime(),
- shutdownTaskExecutor)) {
- if (debug) {
- log.debug(contextClosingDown[0]
- + " context did not close successfully; forcing shutdown...");
- }
- }
- }
-
- this.managedContexts.clear();
- // clear the namespace registry
- nsManager.destroy();
-
- // release listeners
- if (applicationListeners != null) {
- applicationListeners = null;
- try {
- applicationListenersCleaner.destroy();
- } catch (Exception ex) {
- log.warn(
- "exception thrown while releasing OSGi event listeners",
- ex);
- }
- }
-
- // release multicaster
- if (multicaster != null) {
- multicaster.removeAllListeners();
- multicaster = null;
- }
-
- // before bailing out; wait for the threads that might be left by
- // the task executor
- stopTaskExecutor();
-
- extenderConfiguration.destroy();
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
}
/**
- * Cancel any tasks scheduled for the timer.
- */
- private void stopTimer() {
- if (timer != null) {
- if (log.isDebugEnabled())
- log.debug("Canceling timer tasks");
- timer.cancel();
- }
- timer = null;
- }
-
- /**
- * Do some additional waiting so the service dependency listeners detect the
- * shutdown.
- */
- private void stopTaskExecutor() {
- boolean debug = log.isDebugEnabled();
-
- if (debug)
- log.debug("Waiting for " + contextsStarted
- + " service dependency listener(s) to stop...");
-
- contextsStarted
- .waitForZero(extenderConfiguration.getShutdownWaitTime());
-
- if (!contextsStarted.isZero()) {
- if (debug)
- log.debug(contextsStarted.getValue()
- + " service dependency listener(s) did not responded in time; forcing them to shutdown...");
- extenderConfiguration.setForceThreadShutdown(true);
- }
-
- else
- log.debug("All listeners closed");
- }
-
- /**
- * Utility method that does extender range versioning and approapriate
- * logging.
+ * Returns the shared instance
*
- * @param bundle
+ * @return the shared instance
*/
- private boolean handlerBundleMatchesExtenderVersion(Bundle bundle) {
- if (!ConfigUtils.matchExtenderVersionRange(bundle, extenderVersion)) {
- if (log.isDebugEnabled())
- log.debug("Bundle ["
- + OsgiStringUtils.nullSafeNameAndSymName(bundle)
- + "] expects an extender w/ version["
- + OsgiBundleUtils.getHeaderAsVersion(bundle,
- ConfigUtils.EXTENDER_VERSION)
- + "] which does not match current extender w/ version["
- + extenderVersion
- + "]; skipping bundle from handler detection");
- return false;
- }
- return true;
- }
-
- private void maybeAddNamespaceHandlerFor(Bundle bundle) {
- if (handlerBundleMatchesExtenderVersion(bundle))
- nsManager.maybeAddNamespaceHandlerFor(bundle);
- }
-
- private void maybeRemoveNameSpaceHandlerFor(Bundle bundle) {
- if (handlerBundleMatchesExtenderVersion(bundle))
- nsManager.maybeRemoveNameSpaceHandlerFor(bundle);
- }
-
- /**
- * Context creation is a potentially long-running activity (certainly more
- * than we want to do on the synchronous event callback).
- *
- *
- * Based on our configuration, the context can be started on the same thread
- * or on a different one.
- *
- *
- * Kick off a background activity to create an application context for the
- * given bundle if needed.
- *
- * Note: Make sure to do the fastest filtering first to avoid
- * slowdowns on platforms with a big number of plugins and wiring (i.e.
- * Eclipse platform).
- *
- * @param bundle
- */
- protected void maybeCreateApplicationContextFor(Bundle bundle) {
-
- boolean debug = log.isDebugEnabled();
- String bundleString = "["
- + OsgiStringUtils.nullSafeNameAndSymName(bundle) + "]";
-
- final Long bundleId = new Long(bundle.getBundleId());
-
- if (managedContexts.containsKey(bundleId)) {
- if (debug) {
- log.debug("Bundle " + bundleString
- + " is already managed; ignoring...");
- }
- return;
- }
-
- if (!ConfigUtils.matchExtenderVersionRange(bundle, extenderVersion)) {
- if (debug)
- log.debug("Bundle "
- + bundleString
- + " expects an extender w/ version["
- + OsgiBundleUtils.getHeaderAsVersion(bundle,
- ConfigUtils.EXTENDER_VERSION)
- + "] which does not match current extender w/ version["
- + extenderVersion
- + "]; skipping bundle from context creation");
- return;
- }
-
- BundleContext localBundleContext = OsgiBundleUtils
- .getBundleContext(bundle);
-
- if (debug)
- log.debug("Scanning bundle " + bundleString
- + " for configurations...");
-
- // initialize context
- final DelegatedExecutionOsgiBundleApplicationContext localApplicationContext;
-
- if (debug)
- log.debug("Creating an application context for bundle "
- + bundleString);
-
- try {
- localApplicationContext = contextCreator
- .createApplicationContext(localBundleContext);
- } catch (Exception ex) {
- log.error("Cannot create application context for bundle "
- + bundleString, ex);
- return;
- }
-
- if (localApplicationContext == null) {
- log.debug("No application context created for bundle "
- + bundleString);
- return;
- }
-
- // create a dedicated hook for this application context
- BeanFactoryPostProcessor processingHook = new OsgiBeanFactoryPostProcessorAdapter(
- localBundleContext, postProcessors);
-
- // add in the post processors
- localApplicationContext.addBeanFactoryPostProcessor(processingHook);
-
- // add the context to the tracker
- managedContexts.put(bundleId, localApplicationContext);
-
- localApplicationContext.setDelegatedEventMulticaster(multicaster);
-
- // create refresh runnable
- Runnable contextRefresh = new Runnable() {
-
- public void run() {
- localApplicationContext.refresh();
- }
- };
-
- // executor used for creating the appCtx
- // chosen based on the sync/async configuration
- TaskExecutor executor = null;
-
- ApplicationContextConfiguration config = new ApplicationContextConfiguration(
- bundle);
-
- String creationType;
-
- // synch/asynch context creation
- if (config.isCreateAsynchronously()) {
- // for the async stuff use the executor
- executor = taskExecutor;
- creationType = "Asynchronous";
- } else {
- // for the sync stuff, use this thread
- executor = sameThreadTaskExecutor;
- creationType = "Synchronous";
- }
-
- if (debug) {
- log.debug(creationType + " context creation for bundle "
- + bundleString);
- }
-
- // wait/no wait for dependencies behaviour
- if (config.isWaitForDependencies()) {
- DependencyWaiterApplicationContextExecutor appCtxExecutor = new DependencyWaiterApplicationContextExecutor(
- localApplicationContext, !config.isCreateAsynchronously(),
- extenderConfiguration.getDependencyFactories());
-
- long timeout;
- // check whether a timeout has been defined
-
- if (ConfigUtils.isDirectiveDefined(bundle.getHeaders(),
- ConfigUtils.DIRECTIVE_TIMEOUT)) {
- timeout = config.getTimeout();
- if (debug)
- log.debug("Setting bundle-defined, wait-for-dependencies timeout value="
- + timeout + " ms, for bundle " + bundleString);
-
- } else {
- timeout = extenderConfiguration.getDependencyWaitTime();
- if (debug)
- log.debug("Setting globally defined wait-for-dependencies timeout value="
- + timeout + " ms, for bundle " + bundleString);
- }
-
- appCtxExecutor.setTimeout(config.getTimeout());
-
- appCtxExecutor.setWatchdog(timer);
- appCtxExecutor.setTaskExecutor(executor);
- appCtxExecutor.setMonitoringCounter(contextsStarted);
- // set events publisher
- appCtxExecutor.setDelegatedMulticaster(this.multicaster);
-
- contextsStarted.increment();
- } else {
- // do nothing; by default contexts do not wait for services.
- }
-
- executor.execute(contextRefresh);
- }
-
- /**
- * Closing an application context is a potentially long-running activity,
- * however, we *have* to do it synchronously during the event process as the
- * BundleContext object is not valid once we return from this method.
- *
- * @param bundle
- */
- protected void maybeCloseApplicationContextFor(Bundle bundle) {
- final ConfigurableOsgiBundleApplicationContext context = (ConfigurableOsgiBundleApplicationContext) managedContexts
- .remove(new Long(bundle.getBundleId()));
- if (context == null) {
- return;
- }
-
- RunnableTimedExecution.execute(new Runnable() {
-
- private final String toString = "Closing runnable for context "
- + context.getDisplayName();
-
- public void run() {
- if (context.isActive()) {
- context.close();
- }
- }
-
- public String toString() {
- return toString;
- }
-
- }, extenderConfiguration.getShutdownWaitTime(), shutdownTaskExecutor);
- }
-
- private void initListenerService() {
- multicaster = extenderConfiguration.getEventMulticaster();
-
- createListenersList();
- // register the listener that does the dispatching
- multicaster.addApplicationListener(new ListListenerAdapter(
- applicationListeners));
- multicaster.addApplicationListener(extenderConfiguration
- .getContextEventListener());
-
- if (log.isDebugEnabled())
- log.debug("Initialization of OSGi listeners service completed...");
- }
-
- /**
- * Creates a dynamic OSGi list of OSGi services interested in receiving
- * events for OSGi application contexts.
- */
- private void createListenersList() {
- OsgiServiceCollectionProxyFactoryBean fb = new OsgiServiceCollectionProxyFactoryBean();
- fb.setBundleContext(bundleContext);
- fb.setCardinality(Cardinality.C_0__N);
- fb.setCollectionType(CollectionType.LIST);
- fb.setInterfaces(new Class[] { OsgiBundleApplicationContextListener.class });
- fb.setBeanClassLoader(extenderConfiguration.getClassLoader());
- fb.afterPropertiesSet();
-
- applicationListenersCleaner = fb;
- applicationListeners = (List) fb.getObject();
+ public static Activator getDefault() {
+ return plugin;
}
}
diff --git a/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/CustomOsgiApplicationContextCreator.java b/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/CustomOsgiApplicationContextCreator.java
deleted file mode 100644
index c8a4fa2a35..0000000000
--- a/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/CustomOsgiApplicationContextCreator.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- *
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- *
- * Contractor Name: Raytheon Company
- * Contractor Address: 6825 Pine Street, Suite 340
- * Mail Stop B8
- * Omaha, NE 68106
- * 402.291.0100
- *
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.uf.viz.spring.dm;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.springframework.osgi.context.DelegatedExecutionOsgiBundleApplicationContext;
-import org.springframework.osgi.extender.support.ApplicationContextConfiguration;
-import org.springframework.osgi.extender.support.DefaultOsgiApplicationContextCreator;
-import org.springframework.osgi.extender.support.scanning.ConfigurationScanner;
-import org.springframework.osgi.extender.support.scanning.DefaultConfigurationScanner;
-import org.springframework.osgi.util.OsgiStringUtils;
-import org.springframework.util.ObjectUtils;
-
-/**
- * Custom DefaultOsgiApplicationContextCreator used to turn off xml validation
- *
- *
- *
- *
- * SOFTWARE HISTORY
- *
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Oct 12, 2010 mschenke Initial creation
- *
- *
- *
- * @author mschenke
- * @version 1.0
- */
-
-public class CustomOsgiApplicationContextCreator extends
- DefaultOsgiApplicationContextCreator {
-
- /** logger */
- private static final Log log = LogFactory
- .getLog(CustomOsgiApplicationContextCreator.class);
-
- private ConfigurationScanner configurationScanner = new DefaultConfigurationScanner();
-
- public DelegatedExecutionOsgiBundleApplicationContext createApplicationContext(
- BundleContext bundleContext) throws Exception {
- Bundle bundle = bundleContext.getBundle();
- ApplicationContextConfiguration config = new ApplicationContextConfiguration(
- bundle, configurationScanner);
- if (log.isTraceEnabled())
- log.trace("Created configuration " + config + " for bundle "
- + OsgiStringUtils.nullSafeNameAndSymName(bundle));
-
- // it's not a spring bundle, ignore it
- if (!config.isSpringPoweredBundle()) {
- return null;
- }
-
- log.info("Discovered configurations "
- + ObjectUtils.nullSafeToString(config
- .getConfigurationLocations()) + " in bundle ["
- + OsgiStringUtils.nullSafeNameAndSymName(bundle) + "]");
-
- DelegatedExecutionOsgiBundleApplicationContext sdoac = new CustomOsgiBundleXmlApplicationContext(
- config.getConfigurationLocations());
- sdoac.setBundleContext(bundleContext);
- sdoac.setPublishContextAsService(config.isPublishContextAsService());
-
- return sdoac;
- }
-
-}
diff --git a/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/ExtenderConfiguration.java b/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/ExtenderConfiguration.java
deleted file mode 100644
index b4dba761e4..0000000000
--- a/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/ExtenderConfiguration.java
+++ /dev/null
@@ -1,577 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- *
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- *
- * Contractor Name: Raytheon Company
- * Contractor Address: 6825 Pine Street, Suite 340
- * Mail Stop B8
- * Omaha, NE 68106
- * 402.291.0100
- *
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.uf.viz.spring.dm;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URL;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.context.event.SimpleApplicationEventMulticaster;
-import org.springframework.core.JdkVersion;
-import org.springframework.core.task.SimpleAsyncTaskExecutor;
-import org.springframework.core.task.TaskExecutor;
-import org.springframework.osgi.context.ConfigurableOsgiBundleApplicationContext;
-import org.springframework.osgi.context.event.OsgiBundleApplicationContextEventMulticaster;
-import org.springframework.osgi.context.event.OsgiBundleApplicationContextEventMulticasterAdapter;
-import org.springframework.osgi.context.event.OsgiBundleApplicationContextListener;
-import org.springframework.osgi.extender.OsgiApplicationContextCreator;
-import org.springframework.osgi.extender.OsgiBeanFactoryPostProcessor;
-import org.springframework.osgi.extender.OsgiServiceDependencyFactory;
-import org.springframework.osgi.extender.internal.dependencies.startup.MandatoryImporterDependencyFactory;
-import org.springframework.osgi.extender.internal.support.DefaultOsgiBundleApplicationContextListener;
-import org.springframework.osgi.extender.internal.support.OsgiAnnotationPostProcessor;
-import org.springframework.osgi.extender.support.internal.ConfigUtils;
-import org.springframework.osgi.util.BundleDelegatingClassLoader;
-import org.springframework.scheduling.timer.TimerTaskExecutor;
-import org.springframework.util.Assert;
-import org.springframework.util.ObjectUtils;
-
-/**
- * TODO Add Description
- *
- *
- *
- * Custom version of spring osgi ExtenderConfiguration to turn off xml validation
- *
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Oct 12, 2010 mschenke Initial creation
- *
- *
- *
- * @author mschenke
- * @version 1.0
- */
-
-public class ExtenderConfiguration implements DisposableBean {
-
- /** logger */
- private static final Log log = LogFactory
- .getLog(ExtenderConfiguration.class);
-
- private static final String TASK_EXECUTOR_NAME = "taskExecutor";
-
- private static final String SHUTDOWN_TASK_EXECUTOR_NAME = "shutdownTaskExecutor";
-
- private static final String CONTEXT_CREATOR_NAME = "applicationContextCreator";
-
- private static final String APPLICATION_EVENT_MULTICASTER_BEAN_NAME = "osgiApplicationEventMulticaster";
-
- private static final String CONTEXT_LISTENER_NAME = "osgiApplicationContextListener";
-
- private static final String PROPERTIES_NAME = "extenderProperties";
-
- private static final String SHUTDOWN_WAIT_KEY = "shutdown.wait.time";
-
- private static final String PROCESS_ANNOTATIONS_KEY = "process.annotations";
-
- private static final String WAIT_FOR_DEPS_TIMEOUT_KEY = "dependencies.wait.time";
-
- private static final String EXTENDER_CFG_LOCATION = "META-INF/spring/extender";
-
- private static final String XML_PATTERN = "*.xml";
-
- private static final String ANNOTATION_DEPENDENCY_FACTORY = "org.springframework.osgi.extensions.annotation.ServiceReferenceDependencyBeanFactoryPostProcessor";
-
- /** annotation processing system property (kept for backwards compatibility) */
- private static final String AUTO_ANNOTATION_PROCESSING = "org.springframework.osgi.extender.annotation.auto.processing";
-
- //
- // defaults
- //
-
- // default dependency wait time (in milliseconds)
- private static final long DEFAULT_DEP_WAIT = ConfigUtils.DIRECTIVE_TIMEOUT_DEFAULT * 1000;
-
- private static final long DEFAULT_SHUTDOWN_WAIT = 10 * 1000;
-
- private static final boolean DEFAULT_PROCESS_ANNOTATION = false;
-
- private ConfigurableOsgiBundleApplicationContext extenderConfiguration;
-
- private TaskExecutor taskExecutor, shutdownTaskExecutor;
-
- private boolean isTaskExecutorManagedInternally;
-
- private boolean isShutdownTaskExecutorManagedInternally;
-
- private boolean isMulticasterManagedInternally;
-
- private long shutdownWaitTime, dependencyWaitTime;
-
- private boolean processAnnotation;
-
- private OsgiBundleApplicationContextEventMulticaster eventMulticaster;
-
- private OsgiBundleApplicationContextListener contextEventListener;
-
- private boolean forceThreadShutdown;
-
- private OsgiApplicationContextCreator contextCreator;
-
- /** bundle wrapped class loader */
- private final ClassLoader classLoader;
-
- /** List of context post processors */
- private final List postProcessors = Collections
- .synchronizedList(new ArrayList(0));
-
- /** List of service dependency factories */
- private final List dependencyFactories = Collections
- .synchronizedList(new ArrayList(0));
-
- // fields reading/writing lock
- private Object lock = new Object();
-
- /**
- * Constructs a new ExtenderConfiguration instance. Locates the
- * extender configuration, creates an application context which will
- * returned the extender items.
- *
- * @param bundleContext
- * extender OSGi bundle context
- */
- public ExtenderConfiguration(BundleContext bundleContext) {
- Bundle bundle = bundleContext.getBundle();
- Properties properties = new Properties(createDefaultProperties());
-
- Enumeration enm = bundle.findEntries(EXTENDER_CFG_LOCATION,
- XML_PATTERN, false);
-
- if (enm == null) {
- log.info("No custom extender configuration detected; using defaults...");
-
- synchronized (lock) {
- taskExecutor = createDefaultTaskExecutor();
- shutdownTaskExecutor = createDefaultShutdownTaskExecutor();
- eventMulticaster = createDefaultEventMulticaster();
- contextCreator = createDefaultApplicationContextCreator();
- contextEventListener = createDefaultApplicationContextListener();
-
- }
- classLoader = BundleDelegatingClassLoader
- .createBundleClassLoaderFor(bundle);
- } else {
- String[] configs = copyEnumerationToList(enm);
-
- log.info("Detected extender custom configurations at "
- + ObjectUtils.nullSafeToString(configs));
- // create OSGi specific XML context
- ConfigurableOsgiBundleApplicationContext extenderAppCtx = new CustomOsgiBundleXmlApplicationContext(
- configs);
- extenderAppCtx.setBundleContext(bundleContext);
- extenderAppCtx.refresh();
-
- synchronized (lock) {
- extenderConfiguration = extenderAppCtx;
- // initialize beans
- taskExecutor = extenderConfiguration
- .containsBean(TASK_EXECUTOR_NAME) ? (TaskExecutor) extenderConfiguration
- .getBean(TASK_EXECUTOR_NAME, TaskExecutor.class)
- : createDefaultTaskExecutor();
-
- shutdownTaskExecutor = extenderConfiguration
- .containsBean(SHUTDOWN_TASK_EXECUTOR_NAME) ? (TaskExecutor) extenderConfiguration
- .getBean(SHUTDOWN_TASK_EXECUTOR_NAME,
- TaskExecutor.class)
- : createDefaultShutdownTaskExecutor();
-
- eventMulticaster = extenderConfiguration
- .containsBean(APPLICATION_EVENT_MULTICASTER_BEAN_NAME) ? (OsgiBundleApplicationContextEventMulticaster) extenderConfiguration
- .getBean(
- APPLICATION_EVENT_MULTICASTER_BEAN_NAME,
- OsgiBundleApplicationContextEventMulticaster.class)
- : createDefaultEventMulticaster();
-
- contextCreator = extenderConfiguration
- .containsBean(CONTEXT_CREATOR_NAME) ? (OsgiApplicationContextCreator) extenderConfiguration
- .getBean(CONTEXT_CREATOR_NAME,
- OsgiApplicationContextCreator.class)
- : createDefaultApplicationContextCreator();
-
- contextEventListener = extenderConfiguration
- .containsBean(CONTEXT_LISTENER_NAME) ? (OsgiBundleApplicationContextListener) extenderConfiguration
- .getBean(CONTEXT_LISTENER_NAME,
- OsgiBundleApplicationContextListener.class)
- : createDefaultApplicationContextListener();
- }
-
- // get post processors
- postProcessors.addAll(extenderConfiguration.getBeansOfType(
- OsgiBeanFactoryPostProcessor.class).values());
-
- // get dependency factories
- dependencyFactories.addAll(extenderConfiguration.getBeansOfType(
- OsgiServiceDependencyFactory.class).values());
-
- classLoader = extenderConfiguration.getClassLoader();
- // extender properties using the defaults as backup
- if (extenderConfiguration.containsBean(PROPERTIES_NAME)) {
- Properties customProperties = (Properties) extenderConfiguration
- .getBean(PROPERTIES_NAME, Properties.class);
- Enumeration propertyKey = customProperties.propertyNames();
- while (propertyKey.hasMoreElements()) {
- String property = (String) propertyKey.nextElement();
- properties.setProperty(property,
- customProperties.getProperty(property));
- }
- }
- }
-
- synchronized (lock) {
- shutdownWaitTime = getShutdownWaitTime(properties);
- dependencyWaitTime = getDependencyWaitTime(properties);
- processAnnotation = getProcessAnnotations(properties);
- }
-
- // load default dependency factories
- addDefaultDependencyFactories();
- }
-
- /**
- * {@inheritDoc}
- *
- * Cleanup the configuration items.
- */
- public void destroy() {
-
- synchronized (lock) {
- if (isMulticasterManagedInternally) {
- eventMulticaster.removeAllListeners();
- eventMulticaster = null;
- }
-
- if (extenderConfiguration != null) {
- extenderConfiguration.close();
- extenderConfiguration = null;
- }
-
- // postpone the task executor shutdown
- if (forceThreadShutdown) {
-
- if (isTaskExecutorManagedInternally) {
- log.warn("Forcing the (internally created) taskExecutor to stop...");
- ThreadGroup th = ((SimpleAsyncTaskExecutor) taskExecutor)
- .getThreadGroup();
- if (!th.isDestroyed()) {
- // ask the threads nicely to stop
- th.interrupt();
- }
- }
- taskExecutor = null;
- }
-
- if (isShutdownTaskExecutorManagedInternally) {
- try {
- ((DisposableBean) shutdownTaskExecutor).destroy();
- } catch (Exception ex) {
- log.debug(
- "Received exception while shutting down shutdown task executor",
- ex);
- }
- shutdownTaskExecutor = null;
- }
- }
- }
-
- /**
- * Copies the URLs returned by the given enumeration and returns them as an
- * array of Strings for consumption by the application context.
- *
- * @param enm
- * @return
- */
- private String[] copyEnumerationToList(Enumeration enm) {
- List urls = new ArrayList(4);
- while (enm != null && enm.hasMoreElements()) {
- URL configURL = (URL) enm.nextElement();
- if (configURL != null) {
- String configURLAsString = configURL.toExternalForm();
- try {
- urls.add(URLDecoder.decode(configURLAsString, "UTF8"));
- } catch (UnsupportedEncodingException uee) {
- log.warn("UTF8 encoding not supported, using the platform default");
- urls.add(URLDecoder.decode(configURLAsString));
- }
- }
- }
-
- return (String[]) urls.toArray(new String[urls.size()]);
- }
-
- private Properties createDefaultProperties() {
- Properties properties = new Properties();
- properties.setProperty(SHUTDOWN_WAIT_KEY, "" + DEFAULT_SHUTDOWN_WAIT);
- properties.setProperty(PROCESS_ANNOTATIONS_KEY, ""
- + DEFAULT_PROCESS_ANNOTATION);
- properties
- .setProperty(WAIT_FOR_DEPS_TIMEOUT_KEY, "" + DEFAULT_DEP_WAIT);
-
- return properties;
- }
-
- private void addDefaultDependencyFactories() {
- boolean debug = log.isDebugEnabled();
-
- // default JDK 1.4 processor
- dependencyFactories.add(0, new MandatoryImporterDependencyFactory());
-
- // load through reflection the dependency and injection processors if
- // running on JDK 1.5 and annotation processing is enabled
- if (processAnnotation) {
- if (JdkVersion.isAtLeastJava15()) {
- // dependency processor
- Class annotationProcessor = null;
- try {
- annotationProcessor = Class.forName(
- ANNOTATION_DEPENDENCY_FACTORY, false,
- ExtenderConfiguration.class.getClassLoader());
- } catch (ClassNotFoundException cnfe) {
- log.warn(
- "Spring DM annotation package not found, annotation processing disabled.",
- cnfe);
- return;
- }
- Object processor = BeanUtils
- .instantiateClass(annotationProcessor);
- Assert.isInstanceOf(OsgiServiceDependencyFactory.class,
- processor);
- dependencyFactories.add(1,
- (OsgiServiceDependencyFactory) processor);
-
- if (debug)
- log.debug("Succesfully loaded annotation dependency processor ["
- + ANNOTATION_DEPENDENCY_FACTORY + "]");
-
- // add injection processor (first in line)
- postProcessors.add(0, new OsgiAnnotationPostProcessor());
- log.info("Spring-DM annotation processing enabled");
- } else {
- if (debug)
- log.debug("JDK 5 not available ["
- + ANNOTATION_DEPENDENCY_FACTORY + "] not loaded");
- log.warn("Spring-DM annotation processing enabled but JDK 5 is n/a; disabling annotation processing...");
- }
- } else {
- if (debug) {
- log.debug("Spring-DM annotation processing disabled; ["
- + ANNOTATION_DEPENDENCY_FACTORY + "] not loaded");
- }
- }
-
- }
-
- private TaskExecutor createDefaultTaskExecutor() {
- // create thread-pool for starting contexts
- ThreadGroup threadGroup = new ThreadGroup("spring-osgi-extender["
- + ObjectUtils.getIdentityHexString(this) + "]-threads");
- threadGroup.setDaemon(false);
-
- SimpleAsyncTaskExecutor taskExecutor = new SimpleAsyncTaskExecutor();
- taskExecutor.setThreadGroup(threadGroup);
- taskExecutor.setThreadNamePrefix("SpringOsgiExtenderThread-");
-
- isTaskExecutorManagedInternally = true;
-
- return taskExecutor;
- }
-
- private TaskExecutor createDefaultShutdownTaskExecutor() {
- TimerTaskExecutor taskExecutor = new TimerTaskExecutor();
- taskExecutor.afterPropertiesSet();
- isShutdownTaskExecutorManagedInternally = true;
- return taskExecutor;
- }
-
- private OsgiBundleApplicationContextEventMulticaster createDefaultEventMulticaster() {
- isMulticasterManagedInternally = true;
- return new OsgiBundleApplicationContextEventMulticasterAdapter(
- new SimpleApplicationEventMulticaster());
- }
-
- private OsgiApplicationContextCreator createDefaultApplicationContextCreator() {
- return new CustomOsgiApplicationContextCreator();
- }
-
- private OsgiBundleApplicationContextListener createDefaultApplicationContextListener() {
- return new DefaultOsgiBundleApplicationContextListener();
- }
-
- private long getShutdownWaitTime(Properties properties) {
- return Long.parseLong(properties.getProperty(SHUTDOWN_WAIT_KEY));
- }
-
- private long getDependencyWaitTime(Properties properties) {
- return Long
- .parseLong(properties.getProperty(WAIT_FOR_DEPS_TIMEOUT_KEY));
- }
-
- private boolean getProcessAnnotations(Properties properties) {
- return Boolean.valueOf(properties.getProperty(PROCESS_ANNOTATIONS_KEY))
- .booleanValue()
- || Boolean.getBoolean(AUTO_ANNOTATION_PROCESSING);
- }
-
- /**
- * Returns the taskExecutor.
- *
- * @return Returns the taskExecutor
- */
- public TaskExecutor getTaskExecutor() {
- synchronized (lock) {
- return taskExecutor;
- }
- }
-
- /**
- * Returns the shutdown task executor.
- *
- * @return Returns the shutdown task executor
- */
- public TaskExecutor getShutdownTaskExecutor() {
- synchronized (lock) {
- return shutdownTaskExecutor;
- }
- }
-
- /**
- * Returns the contextEventListener.
- *
- * @return Returns the contextEventListener
- */
- public OsgiBundleApplicationContextListener getContextEventListener() {
- synchronized (lock) {
- return contextEventListener;
- }
- }
-
- /**
- * Returns the shutdownWaitTime.
- *
- * @return Returns the shutdownWaitTime
- */
- public long getShutdownWaitTime() {
- synchronized (lock) {
- return shutdownWaitTime;
- }
- }
-
- /**
- * Indicates if the process annotation is enabled or not.
- *
- * @return Returns true if the annotation should be processed or not
- * otherwise.
- */
- public boolean shouldProcessAnnotation() {
- synchronized (lock) {
- return processAnnotation;
- }
- }
-
- /**
- * Returns the dependencyWaitTime.
- *
- * @return Returns the dependencyWaitTime
- */
- public long getDependencyWaitTime() {
- synchronized (lock) {
- return dependencyWaitTime;
- }
- }
-
- /**
- * Returns the eventMulticaster.
- *
- * @return Returns the eventMulticaster
- */
- public OsgiBundleApplicationContextEventMulticaster getEventMulticaster() {
- synchronized (lock) {
- return eventMulticaster;
- }
- }
-
- /**
- * Sets the flag to force the taskExtender to close up in case of runaway
- * threads - this applies *only* if the taskExecutor has been created
- * internally.
- *
- *
- * The flag will cause a best attempt to shutdown the threads.
- *
- * @param forceThreadShutdown
- * The forceThreadShutdown to set.
- */
- public void setForceThreadShutdown(boolean forceThreadShutdown) {
- synchronized (lock) {
- this.forceThreadShutdown = forceThreadShutdown;
- }
- }
-
- /**
- * Returns the contextCreator.
- *
- * @return Returns the contextCreator
- */
- public OsgiApplicationContextCreator getContextCreator() {
- synchronized (lock) {
- return contextCreator;
- }
- }
-
- /**
- * Returns the postProcessors.
- *
- * @return Returns the postProcessors
- */
- public List getPostProcessors() {
- return postProcessors;
- }
-
- /**
- * Returns the class loader wrapped around the extender bundle.
- *
- * @return extender bundle class loader
- */
- public ClassLoader getClassLoader() {
- return classLoader;
- }
-
- /**
- * Returns the dependencies factories declared by the extender
- * configuration. The list automatically contains the default listeners
- * (such as the annotation one).
- *
- * @return list of dependency factories
- */
- public List getDependencyFactories() {
- return dependencyFactories;
- }
-}
diff --git a/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/ListListenerAdapter.java b/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/ListListenerAdapter.java
deleted file mode 100644
index d51400b57a..0000000000
--- a/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/ListListenerAdapter.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * This software was developed and / or modified by Raytheon Company,
- * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
- *
- * U.S. EXPORT CONTROLLED TECHNICAL DATA
- * This software product contains export-restricted data whose
- * export/transfer/disclosure is restricted by U.S. law. Dissemination
- * to non-U.S. persons whether in the United States or abroad requires
- * an export license or other authorization.
- *
- * Contractor Name: Raytheon Company
- * Contractor Address: 6825 Pine Street, Suite 340
- * Mail Stop B8
- * Omaha, NE 68106
- * 402.291.0100
- *
- * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
- * further licensing information.
- **/
-package com.raytheon.uf.viz.spring.dm;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.springframework.osgi.context.event.OsgiBundleApplicationContextEvent;
-import org.springframework.osgi.context.event.OsgiBundleApplicationContextListener;
-import org.springframework.util.Assert;
-
-/**
- * Direct copy of
- * org.springframework.osgi.extender.internal.activator.ListListenerAdapter.
- * Needed for copy of ContextLoaderListener (Activator) since spring class is
- * package level visibility only
- *
- *
- *
- * SOFTWARE HISTORY
- *
- * Date Ticket# Engineer Description
- * ------------ ---------- ----------- --------------------------
- * Oct 12, 2010 mschenke Initial creation
- *
- *
- *
- * @author mschenke
- * @version 1.0
- */
-
-class ListListenerAdapter implements OsgiBundleApplicationContextListener {
-
- private final List listeners;
-
- /**
- * Constructs a new ListListenerAdapter instance.
- *
- * @param listeners
- */
- public ListListenerAdapter(List listeners) {
- Assert.notNull(listeners);
- this.listeners = listeners;
- }
-
- public void onOsgiApplicationEvent(OsgiBundleApplicationContextEvent event) {
- for (Iterator iterator = listeners.iterator(); iterator.hasNext();) {
- OsgiBundleApplicationContextListener osgiListener = (OsgiBundleApplicationContextListener) iterator
- .next();
- osgiListener.onOsgiApplicationEvent(event);
- }
- }
-}
diff --git a/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/OSGIGroupApplicationContext.java b/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/OSGIGroupApplicationContext.java
new file mode 100644
index 0000000000..0396b29a7c
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/OSGIGroupApplicationContext.java
@@ -0,0 +1,62 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ *
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ *
+ * Contractor Name: Raytheon Company
+ * Contractor Address: 6825 Pine Street, Suite 340
+ * Mail Stop B8
+ * Omaha, NE 68106
+ * 402.291.0100
+ *
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.uf.viz.spring.dm;
+
+import java.util.List;
+
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.context.support.GenericApplicationContext;
+
+/**
+ * OSGI Group application context, constructs an {@link OSGIGroupBeanFactory}
+ * from the context group's factories
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * Nov 1, 2012 mschenke Initial creation
+ *
+ *
+ *
+ * @author mschenke
+ * @version 1.0
+ */
+
+public class OSGIGroupApplicationContext extends GenericApplicationContext {
+
+ public OSGIGroupApplicationContext(
+ List contextGroup) {
+ refresh(); // refresh first to avoid recreating bean definitions
+ DefaultListableBeanFactory factory = getDefaultListableBeanFactory();
+ // Register all bean definitions from other contexts into our factory
+ for (OSGIXmlApplicationContext ctx : contextGroup) {
+ ConfigurableListableBeanFactory ctxFactory = ctx.getBeanFactory();
+ for (String beanName : ctxFactory.getBeanDefinitionNames()) {
+ factory.registerBeanDefinition(beanName,
+ ctxFactory.getBeanDefinition(beanName));
+ }
+ }
+ }
+
+}
diff --git a/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/CustomOsgiBundleXmlApplicationContext.java b/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/OSGIXmlApplicationContext.java
similarity index 56%
rename from cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/CustomOsgiBundleXmlApplicationContext.java
rename to cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/OSGIXmlApplicationContext.java
index 7d944907ca..66abec5c6f 100644
--- a/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/CustomOsgiBundleXmlApplicationContext.java
+++ b/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/OSGIXmlApplicationContext.java
@@ -19,11 +19,13 @@
**/
package com.raytheon.uf.viz.spring.dm;
+import org.osgi.framework.Bundle;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
-import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.AbstractXmlApplicationContext;
/**
- * Custom OsgiBundleXmlApplicationContext used to turn off xml validation
+ * TODO Add Description
*
*
*
@@ -31,7 +33,7 @@ import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
- * Oct 12, 2010 mschenke Initial creation
+ * Oct 30, 2012 mschenke Initial creation
*
*
*
@@ -39,23 +41,32 @@ import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
* @version 1.0
*/
-public class CustomOsgiBundleXmlApplicationContext extends
- OsgiBundleXmlApplicationContext {
+public class OSGIXmlApplicationContext extends AbstractXmlApplicationContext {
- /**
- * @param configs
- */
- public CustomOsgiBundleXmlApplicationContext(String[] configs) {
- super(configs);
+ public OSGIXmlApplicationContext(String[] configLocations, Bundle bundle) {
+ this(null, configLocations, bundle);
}
+ public OSGIXmlApplicationContext(ApplicationContext parent,
+ String[] configLocations, Bundle bundle) {
+ super(parent);
+ setClassLoader(new OSGIXmlClassLoader(bundle, getClassLoader()));
+ setConfigLocations(configLocations);
+ refresh();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.springframework.context.support.AbstractXmlApplicationContext#
+ * initBeanDefinitionReader
+ * (org.springframework.beans.factory.xml.XmlBeanDefinitionReader)
+ */
@Override
protected void initBeanDefinitionReader(
XmlBeanDefinitionReader beanDefinitionReader) {
super.initBeanDefinitionReader(beanDefinitionReader);
- beanDefinitionReader
- .setValidationMode(XmlBeanDefinitionReader.VALIDATION_NONE);
- beanDefinitionReader.setNamespaceAware(true);
+ beanDefinitionReader.setBeanClassLoader(getClassLoader());
}
}
diff --git a/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/OSGIXmlClassLoader.java b/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/OSGIXmlClassLoader.java
new file mode 100644
index 0000000000..a7997b74b8
--- /dev/null
+++ b/cave/com.raytheon.uf.viz.spring.dm/src/com/raytheon/uf/viz/spring/dm/OSGIXmlClassLoader.java
@@ -0,0 +1,68 @@
+/**
+ * This software was developed and / or modified by Raytheon Company,
+ * pursuant to Contract DG133W-05-CQ-1067 with the US Government.
+ *
+ * U.S. EXPORT CONTROLLED TECHNICAL DATA
+ * This software product contains export-restricted data whose
+ * export/transfer/disclosure is restricted by U.S. law. Dissemination
+ * to non-U.S. persons whether in the United States or abroad requires
+ * an export license or other authorization.
+ *
+ * Contractor Name: Raytheon Company
+ * Contractor Address: 6825 Pine Street, Suite 340
+ * Mail Stop B8
+ * Omaha, NE 68106
+ * 402.291.0100
+ *
+ * See the AWIPS II Master Rights File ("Master Rights File.pdf") for
+ * further licensing information.
+ **/
+package com.raytheon.uf.viz.spring.dm;
+
+import org.osgi.framework.Bundle;
+
+/**
+ *
+ * Class loader for spring bundle context
+ *
+ *
+ *
+ * SOFTWARE HISTORY
+ *
+ * Date Ticket# Engineer Description
+ * ------------ ---------- ----------- --------------------------
+ * Nov 6, 2012 mschenke Initial creation
+ *
+ *
+ *
+ * @author mschenke
+ * @version 1.0
+ */
+
+public class OSGIXmlClassLoader extends ClassLoader {
+
+ private Bundle bundle;
+
+ public OSGIXmlClassLoader(Bundle bundle, ClassLoader parent) {
+ super(parent);
+ this.bundle = bundle;
+ }
+
+ @Override
+ protected synchronized Class loadClass(String name, boolean resolve)
+ throws ClassNotFoundException {
+ Class clazz = null;
+ try {
+ clazz = super.loadClass(name, resolve);
+ } catch (ClassNotFoundException e) {
+ // Ignore here
+ }
+
+ if (clazz == null) {
+ clazz = bundle.loadClass(name);
+ }
+
+ return clazz;
+ }
+
+}
diff --git a/cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/MenuUpdater.java b/cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/MenuUpdater.java
index ea7c8f1c22..64aee9f6b1 100644
--- a/cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/MenuUpdater.java
+++ b/cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/MenuUpdater.java
@@ -24,7 +24,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.raytheon.edex.util.Util;
import com.raytheon.uf.common.time.DataTime;
import com.raytheon.uf.viz.core.alerts.AlertMessage;
import com.raytheon.uf.viz.core.rsc.URICatalog;
@@ -47,11 +46,6 @@ import com.raytheon.viz.alerts.IAlertObserver;
*/
public class MenuUpdater implements IAlertObserver {
- public MenuUpdater() {
- // TODO remove following line once Util removes static block
- Util.getCurrentMemory();
- }
-
/*
* (non-Javadoc)
*
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/Activator.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/Activator.java
index 34ab54357c..b90d13076b 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/Activator.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/Activator.java
@@ -22,10 +22,6 @@ package com.raytheon.viz.grid;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
-import com.raytheon.uf.common.dataplugin.convert.ConvertUtil;
-import com.raytheon.uf.common.gridcoverage.GridCoverage;
-import com.raytheon.uf.common.gridcoverage.convert.GridCoverageConverter;
-
/**
* The activator class controls the plug-in life cycle
*/
@@ -53,8 +49,6 @@ public class Activator extends AbstractUIPlugin {
*/
public void start(BundleContext context) throws Exception {
super.start(context);
- ConvertUtil.registerConverter(new GridCoverageConverter(),
- GridCoverage.class);
}
/*
diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridUpdater.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridUpdater.java
index 25b0953da5..227c654343 100644
--- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridUpdater.java
+++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/inv/GridUpdater.java
@@ -27,7 +27,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import com.raytheon.edex.util.Util;
import com.raytheon.uf.common.comm.CommunicationException;
import com.raytheon.uf.common.dataplugin.PluginException;
import com.raytheon.uf.common.dataplugin.grid.GridConstants;
@@ -134,8 +133,6 @@ public class GridUpdater implements IAlertObserver {
private Map> updateMap = new HashMap>();
public GridUpdater(GridInventory inventory) {
- // TODO remove following line once Util removes static block
- Util.getCurrentMemory();
this.inventory = inventory;
}
diff --git a/cave/com.raytheon.viz.product.awips/developer.product b/cave/com.raytheon.viz.product.awips/developer.product
index e444cabd71..760b4375e3 100644
--- a/cave/com.raytheon.viz.product.awips/developer.product
+++ b/cave/com.raytheon.viz.product.awips/developer.product
@@ -47,7 +47,7 @@
-
+
diff --git a/cots/org.springframework.dm/.classpath b/cots/org.springframework.dm/.classpath
deleted file mode 100644
index 89574b8582..0000000000
--- a/cots/org.springframework.dm/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/cots/org.springframework.dm/META-INF/MANIFEST.MF b/cots/org.springframework.dm/META-INF/MANIFEST.MF
deleted file mode 100644
index f204b6691a..0000000000
--- a/cots/org.springframework.dm/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,58 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Spring OSGI
-Bundle-SymbolicName: org.springframework.dm
-Bundle-Version: 1.2.1
-Bundle-ClassPath: org.springframework.osgi.core-1.2.0.jar,
- org.springframework.osgi.extender-1.2.0.jar,
- org.springframework.osgi.io-1.2.0.jar
-Export-Package: org.springframework.osgi,
- org.springframework.osgi.bundle,
- org.springframework.osgi.compendium.cm,
- org.springframework.osgi.compendium.config,
- org.springframework.osgi.compendium.internal.cm,
- org.springframework.osgi.config,
- org.springframework.osgi.config.internal.adapter,
- org.springframework.osgi.config.internal.util,
- org.springframework.osgi.context,
- org.springframework.osgi.context.event,
- org.springframework.osgi.context.internal.classloader,
- org.springframework.osgi.context.support,
- org.springframework.osgi.context.support.internal,
- org.springframework.osgi.extender,
- org.springframework.osgi.extender.event,
- org.springframework.osgi.extender.internal.activator,
- org.springframework.osgi.extender.internal.dependencies.shutdown,
- org.springframework.osgi.extender.internal.dependencies.startup,
- org.springframework.osgi.extender.internal.support,
- org.springframework.osgi.extender.internal.util,
- org.springframework.osgi.extender.internal.util.concurrent,
- org.springframework.osgi.extender.support,
- org.springframework.osgi.extender.support.internal,
- org.springframework.osgi.extender.support.scanning,
- org.springframework.osgi.io,
- org.springframework.osgi.io.internal,
- org.springframework.osgi.io.internal.resolver,
- org.springframework.osgi.service,
- org.springframework.osgi.service.dependency.internal,
- org.springframework.osgi.service.exporter,
- org.springframework.osgi.service.exporter.support,
- org.springframework.osgi.service.exporter.support.internal.controller,
- org.springframework.osgi.service.exporter.support.internal.support,
- org.springframework.osgi.service.importer,
- org.springframework.osgi.service.importer.event,
- org.springframework.osgi.service.importer.support,
- org.springframework.osgi.service.importer.support.internal.aop,
- org.springframework.osgi.service.importer.support.internal.collection,
- org.springframework.osgi.service.importer.support.internal.collection.comparator,
- org.springframework.osgi.service.importer.support.internal.controller,
- org.springframework.osgi.service.importer.support.internal.dependency,
- org.springframework.osgi.service.importer.support.internal.support,
- org.springframework.osgi.service.importer.support.internal.util,
- org.springframework.osgi.service.util.internal.aop,
- org.springframework.osgi.util,
- org.springframework.osgi.util.internal
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: org.apache.commons.logging;bundle-version="1.1.1",
- org.eclipse.osgi;bundle-version="3.6.1",
- org.springframework;bundle-version="2.5.6"
diff --git a/cots/org.springframework.dm/build.properties b/cots/org.springframework.dm/build.properties
deleted file mode 100644
index 2aa1fa3db9..0000000000
--- a/cots/org.springframework.dm/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = META-INF/,\
- org.springframework.osgi.core-1.2.0.jar,\
- org.springframework.osgi.extender-1.2.0.jar,\
- org.springframework.osgi.io-1.2.0.jar
diff --git a/cots/org.springframework.dm/org.springframework.dm.ecl b/cots/org.springframework.dm/org.springframework.dm.ecl
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/cots/org.springframework.dm/org.springframework.osgi.core-1.2.0.jar b/cots/org.springframework.dm/org.springframework.osgi.core-1.2.0.jar
deleted file mode 100644
index ece0eb4f5d..0000000000
Binary files a/cots/org.springframework.dm/org.springframework.osgi.core-1.2.0.jar and /dev/null differ
diff --git a/cots/org.springframework.dm/org.springframework.osgi.core-sources-1.2.0.jar b/cots/org.springframework.dm/org.springframework.osgi.core-sources-1.2.0.jar
deleted file mode 100644
index 437d516644..0000000000
Binary files a/cots/org.springframework.dm/org.springframework.osgi.core-sources-1.2.0.jar and /dev/null differ
diff --git a/cots/org.springframework.dm/org.springframework.osgi.extender-1.2.0.jar b/cots/org.springframework.dm/org.springframework.osgi.extender-1.2.0.jar
deleted file mode 100644
index 31ba0c7b45..0000000000
Binary files a/cots/org.springframework.dm/org.springframework.osgi.extender-1.2.0.jar and /dev/null differ
diff --git a/cots/org.springframework.dm/org.springframework.osgi.extender-sources-1.2.0.jar b/cots/org.springframework.dm/org.springframework.osgi.extender-sources-1.2.0.jar
deleted file mode 100644
index b0f78cd113..0000000000
Binary files a/cots/org.springframework.dm/org.springframework.osgi.extender-sources-1.2.0.jar and /dev/null differ
diff --git a/cots/org.springframework.dm/org.springframework.osgi.io-1.2.0.jar b/cots/org.springframework.dm/org.springframework.osgi.io-1.2.0.jar
deleted file mode 100644
index 420b97467b..0000000000
Binary files a/cots/org.springframework.dm/org.springframework.osgi.io-1.2.0.jar and /dev/null differ
diff --git a/cots/org.springframework.dm/org.springframework.osgi.io-sources-1.2.0.jar b/cots/org.springframework.dm/org.springframework.osgi.io-sources-1.2.0.jar
deleted file mode 100644
index e1a9ccd60c..0000000000
Binary files a/cots/org.springframework.dm/org.springframework.osgi.io-sources-1.2.0.jar and /dev/null differ
diff --git a/edexOsgi/build.edex/esb/conf/spring/edex.xml b/edexOsgi/build.edex/esb/conf/spring/edex.xml
index 20a61c50e9..fe8490990b 100644
--- a/edexOsgi/build.edex/esb/conf/spring/edex.xml
+++ b/edexOsgi/build.edex/esb/conf/spring/edex.xml
@@ -174,16 +174,6 @@