Bryan Kowal 14f81556c3 Merge branch '11-Collaboration' into development ... Conflicts: cave/com.raytheon.viz.alerts/src/com/raytheon/viz/alerts/jobs/AutoUpdater.java edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/DynamicSerializationManager.java Former-commit-id: 9e7907ecd7 [formerly 9361f3eb94] [formerly f528e10391] [formerly 9e7907ecd7 [formerly 9361f3eb94] [formerly f528e10391] [formerly f0e3b957e3 [formerly f528e10391 [formerly 9e117e495d669e310839bc9ff8e1e8207b03491b]]]] Former-commit-id: f0e3b957e3 Former-commit-id: ac72941bf0 [formerly 21e8618852] [formerly a8e6aa8338ee37d89f37110fad7307c33a5ad620 [formerly 1ee59eac71]] Former-commit-id: 48ce0712d4d33976ae0cc1184df65a9ee61a5ba8 [formerly cbc8964e5b] Former-commit-id: a6d1f97dec		2012-06-18 11:16:28 -05:00
..
build.openfire.plugin	Issue #595 - openfire will now supply the httpd-collaboration port when a user successfully logs in. The port will be stored as part of the CAVE configuration. Change-Id: I76c8ce94ef140d8bb8b608dd07b59b89f1607d16	2012-05-24 16:51:35 -05:00
build.wes2bridge.utility	Issue #18 - rename jetty.port to web.port; the default for web.port is now 8080. The wes2bridge utilities are now built from source.	2012-04-09 09:32:45 -05:00
com.raytheon.openfire.plugin.configuration.collaboration	Issue #595 - openfire will now supply the httpd-collaboration port when a user successfully logs in. The port will be stored as part of the CAVE configuration. Change-Id: I76c8ce94ef140d8bb8b608dd07b59b89f1607d16	2012-05-24 16:51:35 -05:00
com.raytheon.wes2bridge.common	Issue #691 - All scripts, directories that used to include wes2bridge in the name have been renamed to edex-environment. The edex wes2bridge rpm has been renamed to the awips2-edex-environment rpm.	2012-06-05 16:55:52 -05:00
com.raytheon.wes2bridge.configuration	Issue #18 - jvm argument names are no longer used when re-configuring setup.env; renamed variables that referenced jettyPort.	2012-04-09 13:15:50 -05:00
com.raytheon.wes2bridge.datalink	Issue #18 - rename jetty.port to web.port; the default for web.port is now 8080. The wes2bridge utilities are now built from source.	2012-04-09 09:32:45 -05:00
com.raytheon.wes2bridge.manager	Issue #691 - All scripts, directories that used to include wes2bridge in the name have been renamed to edex-environment. The edex wes2bridge rpm has been renamed to the awips2-edex-environment rpm.	2012-06-05 16:55:52 -05:00
com.raytheon.wes2bridge.utility.feature	Issue #18 - rename jetty.port to web.port; the default for web.port is now 8080. The wes2bridge utilities are now built from source.	2012-04-09 09:32:45 -05:00
com.raytheon.wes2bridge.utility.product	Issue #18 - rename jetty.port to web.port; the default for web.port is now 8080. The wes2bridge utilities are now built from source.	2012-04-09 09:32:45 -05:00