xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4698 commits 31 branches 40 tags 3.8 GiB
Commit graph

7 commits

Author SHA1 Message Date
Max Schenkelberg
cd88054e2b Issue #2142 Got log4j out of edex. 
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]
Former-commit-id: 63421a4819
Former-commit-id: 94fa6f0e30
 2013-07-15 14:26:15 -05:00
Dustin Johnson
19c2e301b8 Issue #1302 Restore jdom.jar, delete net.jcip/.project 
Amend:
  Also change the manifest and .classpath for ohd common

Change-Id: I26b4e88d36da6c38da393f2428b79735c881a23b

Former-commit-id: 2b6e98954e [formerly 595c421e47 [formerly 49b999039c470a5df095a202b5a67bf036a5b71c]]
Former-commit-id: 595c421e47
Former-commit-id: db4d728eb7
 2012-11-08 14:47:17 -06:00
Dustin Johnson
acd4cf94d8 Issue #1302 Address peer review comments for 5-Data_Delivery/development merge 
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]
Former-commit-id: 064ef82d1e
Former-commit-id: efd3d3735a
 2012-11-08 09:57:16 -06:00
Dustin Johnson
7d0e4a6e75 Issue #1302 Merge branch '5-Data_Delivery' into development 
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]
Former-commit-id: 98d7beae50
Former-commit-id: 8e69107b5a
 2012-11-01 13:36:06 -05:00
Steve Harris
4767b0e069 12.4.1-4 baseline 
Former-commit-id: 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 67a5a68300
Former-commit-id: 750b7543dd
 2012-04-18 15:18:16 -05:00
Matt Nash
d8da2252c3 Moving 12.1.1 into ss_sync 
Former-commit-id: c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: 66be3bec40
Former-commit-id: 580e2938d7
 2012-01-19 11:53:12 -06:00
root
133dc97f67 Initial revision of AWIPS2 11.9.0-7p5 
Former-commit-id: 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 9f19e3f712
Former-commit-id: a02aeb236c
 2012-01-06 08:55:05 -06:00