Commit graph

9 commits

Author SHA1 Message Date
Max Schenkelberg
6570c3042b Issue #1638 Moved python localization project out of common.base feature to keep it minimal.
Amend: Added to wrong edex feature

Change-Id: Ic1f3bf92a4559ba04eb6a05c39d5773393235330

Former-commit-id: 0bfeed7240 [formerly 0bfeed7240 [formerly ac578db9a9809798c30d2c694bedb1d960395e77]]
Former-commit-id: 424ea84d6e
Former-commit-id: e80b104e15
2013-06-05 17:13:43 -05:00
Steve Harris
9704fd6a82 Issue #1871 - Merge branch 'vlab' into development
Conflicts:
	edexOsgi/com.raytheon.uf.common.base.feature/feature.xml

Former-commit-id: 3745089239 [formerly 3745089239 [formerly 836c0d6a7873dd77dd58226fe389736652fb51a9]]
Former-commit-id: 26bf27c70d
Former-commit-id: 1691fa413c
2013-05-30 14:33:24 -05:00
Richard Peter
969fa704e5 Merge branch 'omaha_13.4.1' (13.4.1-9) into development
Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/legal/FOSS_licenses/werkzeug/LICENSE.txt

Change-Id: Icc296cedd6d190d1743727c228e540036f9b6d8c

Former-commit-id: a33ddbd1a6 [formerly a33ddbd1a6 [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]
Former-commit-id: a9869f07ba
Former-commit-id: c47eb36e43
2013-05-17 10:33:18 -05:00
Nate Jensen
4973acb807 Issue #1989 fix build
Change-Id: Icf0aa054d2f71711f36e937cd48abeee66148a89

Former-commit-id: 5280b54277 [formerly 5280b54277 [formerly 7ea9c266c80a92c14430ed32825c9bd340655d12]]
Former-commit-id: 4e63b88031
Former-commit-id: 1e059ee8d9
2013-05-15 09:22:16 -05:00
Matt Nash
086696f386 Issue #1870 add python localization to base feature
Change-Id: I55149865870bc24995b267574ce2163b3c8f905c

Former-commit-id: 88365319b5 [formerly 88365319b5 [formerly 49b08468c487c8895c7fd59712936a79cf2b1999]]
Former-commit-id: 60d46cded8
Former-commit-id: 183c1a589a
2013-05-13 14:54:50 -05:00
Max Schenkelberg
924e27f51f Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE.
Change-Id: I177804512c34603bae0027edfa420de47d23138e

Former-commit-id: c6db3ce43b [formerly c6db3ce43b [formerly d9cc808839d4a3210381329eec4f73e061be9968]]
Former-commit-id: 26cfcd2af5
Former-commit-id: 2e10fd83f6
2013-03-20 14:10:52 -05:00
Nate Jensen
d8197235fe Issue #1638 fix velocity on windows
Change-Id: Iacac3c6a76c5d05840606c301fa640b607cb741a

Former-commit-id: 863d4cf3df [formerly 863d4cf3df [formerly bfd5c809b8fd40aacd199c4ccb8bbdbea972e13b]]
Former-commit-id: cbf0343d72
Former-commit-id: b00ccd2b77
2013-03-12 16:04:59 -05:00
Bryan Kowal
cb5a2677b9 Issue #1739 - updates for recent CAVE and EDEX feature-refactoring
- resolved EDEX rpm naming conflict
- resolved CAVE junit dependency issue

Change-Id: I8d868188ad8eff5f55ec9894477f1f772fa4d2dc

Former-commit-id: d081a2afcd [formerly d081a2afcd [formerly 7028a07133a943fe15b094bbd439cbd885463b2e]]
Former-commit-id: 4faf8aefbe
Former-commit-id: 497bf33892
2013-02-28 18:09:25 -06:00
Max Schenkelberg
0c8f3d2449 Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance
Change-Id: I3f336969a48764785ac148c9d67799e228e66d62

Former-commit-id: ec40d261e5 [formerly ec40d261e5 [formerly 108a140d0b203680ed00e9c81b9271a5873ce8df]]
Former-commit-id: 547c593dec
Former-commit-id: 13a4056335
2013-02-27 16:19:58 -06:00