Skip to content

Commit d8204ed

Browse files
jlcsmithrzwiefel
jlcsmith
authored and
rzwiefel
committed
DDF-2644 Updated Catalog UI configurations
 - removed blueprint default configurations - added catalog UI config file with default configurations - updated hidden attribute config to include workspace and query attributes
1 parent 736a149 commit d8204ed

File tree

6 files changed

+87
-46
lines changed

6 files changed

+87
-46
lines changed

‎catalog/ui/catalog-ui-app/pom.xml

+27-19
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
**/
1414
1515
-->
16-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
16+
<project xmlns="http://maven.apache.org/POM/4.0.0"
17+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
18+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1719
<parent>
1820
<groupId>ddf.ui</groupId>
1921
<artifactId>ui</artifactId>
@@ -53,24 +55,7 @@
5355
</execution>
5456
</executions>
5557
</plugin>
56-
<plugin>
57-
<groupId>org.apache.karaf.tooling</groupId>
58-
<artifactId>karaf-maven-plugin</artifactId>
59-
<executions>
60-
<execution>
61-
<id>kar</id>
62-
<goals>
63-
<goal>kar</goal>
64-
</goals>
65-
<configuration>
66-
<!-- Workaround to prevent features.xml file from being included twice in the kar file. -->
67-
<resourcesDir>${project.build.directory}/doesNotExist</resourcesDir>
68-
<featuresFile>${basedir}/target/classes/features.xml</featuresFile>
69-
</configuration>
70-
</execution>
71-
</executions>
72-
</plugin>
73-
<!-- Puts the features XML file for this app into the maven repo. -->
58+
7459
<plugin>
7560
<groupId>org.codehaus.mojo</groupId>
7661
<artifactId>build-helper-maven-plugin</artifactId>
@@ -89,11 +74,34 @@
8974
<type>xml</type>
9075
<classifier>features</classifier>
9176
</artifact>
77+
<artifact>
78+
<file>src/main/resources/etc/org.codice.ddf.catalog.ui.config
79+
</file>
80+
<type>properties</type>
81+
<classifier>catalog-ui-config</classifier>
82+
</artifact>
9283
</artifacts>
9384
</configuration>
9485
</execution>
9586
</executions>
9687
</plugin>
88+
<plugin>
89+
<groupId>org.apache.karaf.tooling</groupId>
90+
<artifactId>karaf-maven-plugin</artifactId>
91+
<executions>
92+
<execution>
93+
<id>kar</id>
94+
<goals>
95+
<goal>kar</goal>
96+
</goals>
97+
<configuration>
98+
<!-- Workaround to prevent features.xml file from being included twice in the kar file. -->
99+
<resourcesDir>${project.build.directory}/resources</resourcesDir>
100+
<featuresFile>${basedir}/target/classes/features.xml</featuresFile>
101+
</configuration>
102+
</execution>
103+
</executions>
104+
</plugin>
97105
</plugins>
98106
</build>
99107
</project>

‎catalog/ui/catalog-ui-app/src/main/resources/etc/org.codice.ddf.catalog.ui.config

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
service.pid="org.codice.ddf.catalog.ui.config"
2+
resultCount=I"250"
3+
4+
imageryProviders="[{\ \"type\":\ \"WMS\",\ \"url\":\ \"http://geoint.nrlssc.navy.mil/nrltileserver/wms\",\ \"layers\":\ [\"bluemarble\"],\ \"alpha\":\ 1\ },\ {\ \"type\":\ \"OSM\",\ \"url\":\ \"http://a.tile.openstreetmap.org\",\ \"fileExtension\":\ \"png\",\ \"alpha\":\ 0.3\ }]"
5+
terrainProvider="{\ \"type\":\ \"CT\",\ \"url\":\ \"http://assets.agi.com/stk-terrain/tilesets/world/tiles\"\ }"
6+
7+
projection="EPSG:3857"
8+
timeout=I"300000"
9+
sourcePollInterval=I"60000"
10+
helpUrl="help.html"
11+
signIn=B"true"
12+
task=B"false"
13+
gazetteer=B"true"
14+
ingest=B"true"
15+
externalAuthentication=B"false"
16+
readOnly=[
17+
"checksum",
18+
"checksum-algorithm",
19+
"id",
20+
"metadata",
21+
"source-id",
22+
"^metacard\\.",
23+
"^version\\.",
24+
"^validation\\."
25+
]
26+
scheduleFrequencyList=L[
27+
"1800",
28+
"3600",
29+
"7200",
30+
"14400",
31+
"28800",
32+
"57600",
33+
"86400",
34+
]
35+
hiddenAttributes=[
36+
"metacard.modified",
37+
"metacard.created",
38+
"metacard-tags",
39+
"metacard.owner",
40+
"validation-errors",
41+
"validation-warnings",
42+
"sortOrder",
43+
"sortField",
44+
"cql",
45+
"enterprise",
46+
"polling",
47+
"security.access-groups",
48+
"security.access-individuals",
49+
"failed-validators-warnings",
50+
"failed-validators-errors",
51+
"sources",
52+
"federation",
53+
"metacard.sharing",
54+
"cached"
55+
]

‎catalog/ui/catalog-ui-app/src/main/resources/features.xml

+4
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@
4444
mvn:ddf.platform.solr/platform-solr-server-standalone/${project.version}/txt/synonyms
4545
</configfile>
4646

47+
<configfile finalname="/etc/org.codice.ddf.catalog.ui.config" override="true">
48+
mvn:ddf.ui/catalog-ui-app/${project.version}/properties/catalog-ui-config
49+
</configfile>
50+
4751
<bundle>mvn:ddf.ui/catalog-ui-search/${project.version}</bundle>
4852
</feature>
4953
<feature name="catalog-ui-app" install="auto" version="${project.version}"

‎catalog/ui/catalog-ui-search/src/main/java/org/codice/ddf/catalog/ui/metacard/enumerations/ExperimentalEnumerationExtractor.java

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515

1616
import static org.apache.commons.lang.StringUtils.isBlank;
1717

18-
import java.io.Serializable;
1918
import java.util.HashMap;
2019
import java.util.List;
2120
import java.util.Map;

‎catalog/ui/catalog-ui-search/src/main/resources/OSGI-INF/blueprint/blueprint.xml

-25
Original file line numberDiff line numberDiff line change
@@ -47,31 +47,6 @@
4747
update-strategy="container-managed"/>
4848
<property name="branding" ref="webBranding"/>
4949
<property name="httpProxy" ref="httpProxyService"/>
50-
<property name="imageryProviders"
51-
value='[{ "type": "WMS", "url": "http://geoint.nrlssc.navy.mil/nrltileserver/wms", "layers": ["bluemarble"], "alpha": 1 }, { "type": "OSM", "url": "http://a.tile.openstreetmap.org", "fileExtension": "png", "alpha": 0.3 }]'/>
52-
<property name="terrainProvider"
53-
value='{"type": "CT", "url": "http://assets.agi.com/stk-terrain/tilesets/world/tiles"}'/>
54-
<property name="scheduleFrequencyList">
55-
<list>
56-
<value>1800</value>
57-
<value>3600</value>
58-
<value>7200</value>
59-
<value>14400</value>
60-
<value>28800</value>
61-
<value>57600</value>
62-
<value>86400</value>
63-
</list>
64-
</property>
65-
<property name="hiddenAttributes">
66-
<list>
67-
<value>metacard.modified</value>
68-
<value>metacard.created</value>
69-
<value>metacard.owner</value>
70-
<value>metacard-tags</value>
71-
<value>validation-errors</value>
72-
<value>validation-warnings</value>
73-
</list>
74-
</property>
7550
</bean>
7651

7752
<service interface="ddf.catalog.data.MetacardType">

‎catalog/ui/catalog-ui-search/src/main/resources/OSGI-INF/metatype/org.codice.ddf.catalog.ui.config.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147
description="List of attributes to be hidden in the UI."
148148
type="String"
149149
cardinality="10000"
150-
default="metacard.modified,metacard.created,metacard-tags,metacard.owner,validation-errors,validation-warnings"
150+
default="metacard.modified,metacard.created,metacard-tags,metacard.owner,validation-errors,validation-warnings,sortOrder,sortField,cql,enterprise,polling,security.access-groups,security.access-individuals,failed-validators-warnings,failed-validators-errors,sources,federation,metacard.sharing,cached"
151151
required="false"/>
152152

153153
<AD id="scheduleFrequencyList"

0 commit comments

Comments
 (0)