Skip to content

Commit be7deaf

Browse files
clockardpklinef
clockard
authored and
pklinef
committed
DDF-2017 Move registry-app under spatial and rename packages/modules appropriately (#762)
1 parent caf66b1 commit be7deaf

File tree

131 files changed

+237
-200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+237
-200
lines changed

‎catalog/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,6 @@
490490
<module>transformer</module>
491491
<module>plugin</module>
492492
<module>opensearch</module>
493-
<module>registry</module>
494493
<module>rest</module>
495494
<module>security</module>
496495
<module>admin</module>

‎catalog/spatial/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@
173173
<module>wfs</module>
174174
<module>wcs</module>
175175
<module>csw</module>
176+
<module>registry</module>
176177
<module>geocoding</module>
177178
<module>geowebcache</module>
178179
<module>spatial-commands</module>

‎catalog/registry/pom.xml renamed to ‎catalog/spatial/registry/pom.xml

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -17,63 +17,63 @@
1717
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1818
<modelVersion>4.0.0</modelVersion>
1919
<parent>
20-
<groupId>ddf.catalog</groupId>
21-
<artifactId>catalog</artifactId>
20+
<groupId>org.codice.ddf.spatial</groupId>
21+
<artifactId>spatial</artifactId>
2222
<version>2.10.0-SNAPSHOT</version>
2323
</parent>
24-
<groupId>ddf.catalog.registry</groupId>
24+
<groupId>org.codice.ddf.registry</groupId>
2525
<artifactId>registry</artifactId>
2626
<packaging>pom</packaging>
27-
<name>DDF :: Catalog :: Registry</name>
27+
<name>DDF :: Registry</name>
2828
<properties>
2929
<jaxb2.version>0.9.4</jaxb2.version>
3030
<spatial4j.version>0.4.1</spatial4j.version>
3131
</properties>
3232
<dependencyManagement>
3333
<dependencies>
3434
<dependency>
35-
<groupId>ddf.catalog.registry</groupId>
36-
<artifactId>catalog-registry-api</artifactId>
35+
<groupId>org.codice.ddf.registry</groupId>
36+
<artifactId>registry-api</artifactId>
3737
<version>${project.version}</version>
3838
</dependency>
3939
<dependency>
40-
<groupId>ddf.catalog.registry</groupId>
41-
<artifactId>catalog-registry-api-impl</artifactId>
40+
<groupId>org.codice.ddf.registry</groupId>
41+
<artifactId>registry-api-impl</artifactId>
4242
<version>${project.version}</version>
4343
</dependency>
4444
<dependency>
45-
<groupId>ddf.catalog.registry</groupId>
46-
<artifactId>catalog-registry-common</artifactId>
45+
<groupId>org.codice.ddf.registry</groupId>
46+
<artifactId>registry-common</artifactId>
4747
<version>${project.version}</version>
4848
</dependency>
4949
<dependency>
50-
<groupId>ddf.catalog.registry</groupId>
51-
<artifactId>catalog-registry-cswinputtransformer</artifactId>
50+
<groupId>org.codice.ddf.registry</groupId>
51+
<artifactId>registry-ebrim-transformer</artifactId>
5252
<version>${project.version}</version>
5353
</dependency>
5454
<dependency>
55-
<groupId>ddf.catalog.registry</groupId>
56-
<artifactId>catalog-registry-federationadminservice</artifactId>
55+
<groupId>org.codice.ddf.registry</groupId>
56+
<artifactId>registry-federation-admin-service</artifactId>
5757
<version>${project.version}</version>
5858
</dependency>
5959
<dependency>
60-
<groupId>ddf.catalog.registry</groupId>
61-
<artifactId>catalog-registry-federationadminserviceimpl</artifactId>
60+
<groupId>org.codice.ddf.registry</groupId>
61+
<artifactId>registry-federation-admin-service-impl</artifactId>
6262
<version>${project.version}</version>
6363
</dependency>
6464
<dependency>
65-
<groupId>ddf.catalog.registry</groupId>
66-
<artifactId>catalog-registry-identificationplugin</artifactId>
65+
<groupId>org.codice.ddf.registry</groupId>
66+
<artifactId>registry-identification-plugin</artifactId>
6767
<version>${project.version}</version>
6868
</dependency>
6969
<dependency>
70-
<groupId>ddf.catalog.registry</groupId>
71-
<artifactId>catalog-registry-policyplugin</artifactId>
70+
<groupId>org.codice.ddf.registry</groupId>
71+
<artifactId>registry-policy-plugin</artifactId>
7272
<version>${project.version}</version>
7373
</dependency>
7474
<dependency>
75-
<groupId>ddf.catalog.registry</groupId>
76-
<artifactId>catalog-registry-schema-bindings</artifactId>
75+
<groupId>org.codice.ddf.registry</groupId>
76+
<artifactId>registry-schema-bindings</artifactId>
7777
<version>${project.version}</version>
7878
</dependency>
7979
<dependency>
@@ -124,15 +124,17 @@
124124
</dependencies>
125125
</dependencyManagement>
126126
<modules>
127-
<module>catalog-registry-policyplugin</module>
128-
<module>catalog-registry-cswinputtransformer</module>
129-
<module>catalog-registry-common</module>
130-
<module>catalog-registry-schema-bindings</module>
131-
<module>catalog-registry-identificationplugin</module>
132-
<module>catalog-registry-api</module>
133-
<module>catalog-registry-api-impl</module>
134-
<module>catalog-registry-federationadminservice</module>
135-
<module>catalog-registry-federationadminserviceimpl</module>
127+
<module>registry-policy-plugin</module>
128+
<module>registry-ebrim-transformer</module>
129+
<module>registry-common</module>
130+
<module>registry-schema-bindings</module>
131+
<module>registry-identification-plugin</module>
132+
<module>registry-api</module>
133+
<module>registry-api-impl</module>
134+
<module>registry-federation-admin-service</module>
135+
<module>registry-federation-admin-service-impl</module>
136136
<module>registry-app</module>
137+
<module>registry-admin-modules</module>
138+
137139
</modules>
138140
</project>

‎catalog/spatial/registry/registry-admin-modules/pom.xml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright (c) Codice Foundation
5+
*
6+
* This is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either
7+
* version 3 of the License, or any later version.
8+
*
9+
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
10+
* See the GNU Lesser General Public License for more details. A copy of the GNU Lesser General Public License is distributed along with this program and can be found at
11+
* <http://www.gnu.org/licenses/lgpl.html>.
12+
*
13+
**/
14+
-->
15+
<project xmlns="http://maven.apache.org/POM/4.0.0"
16+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
17+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
18+
<parent>
19+
<artifactId>registry</artifactId>
20+
<groupId>org.codice.ddf.registry</groupId>
21+
<version>2.10.0-SNAPSHOT</version>
22+
</parent>
23+
<modelVersion>4.0.0</modelVersion>
24+
25+
<artifactId>registry-admin-modules</artifactId>
26+
<packaging>pom</packaging>
27+
<name>DDF :: Registry :: Admin :: Modules</name>
28+
29+
</project>

‎catalog/registry/catalog-registry-api-impl/pom.xml renamed to ‎catalog/spatial/registry/registry-api-impl/pom.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,31 @@
1717
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1818
<parent>
1919
<artifactId>registry</artifactId>
20-
<groupId>ddf.catalog.registry</groupId>
20+
<groupId>org.codice.ddf.registry</groupId>
2121
<version>2.10.0-SNAPSHOT</version>
2222
</parent>
2323
<modelVersion>4.0.0</modelVersion>
2424

2525

26-
<artifactId>catalog-registry-api-impl</artifactId>
27-
<name>DDF :: Catalog :: Registry :: API :: Impl</name>
26+
<artifactId>registry-api-impl</artifactId>
27+
<name>DDF :: Registry :: API :: Impl</name>
2828

2929
<packaging>bundle</packaging>
3030

3131
<dependencies>
3232
<dependency>
33-
<groupId>ddf.catalog.registry</groupId>
34-
<artifactId>catalog-registry-api</artifactId>
33+
<groupId>org.codice.ddf.registry</groupId>
34+
<artifactId>registry-api</artifactId>
3535
<version>${project.version}</version>
3636
</dependency>
3737
<dependency>
38-
<groupId>ddf.catalog.registry</groupId>
39-
<artifactId>catalog-registry-common</artifactId>
38+
<groupId>org.codice.ddf.registry</groupId>
39+
<artifactId>registry-common</artifactId>
4040
<version>${project.version}</version>
4141
</dependency>
4242
<dependency>
43-
<groupId>ddf.catalog.registry</groupId>
44-
<artifactId>catalog-registry-schema-bindings</artifactId>
43+
<groupId>org.codice.ddf.registry</groupId>
44+
<artifactId>registry-schema-bindings</artifactId>
4545
<version>${project.version}</version>
4646
</dependency>
4747
<dependency>
@@ -197,14 +197,14 @@
197197
!org.codice.ddf.platform.util.http,
198198
!org.codice.ddf.platform.util,
199199
ddf.security.permission,
200-
ddf.catalog.registry.api,
200+
org.codice.ddf.registry.api,
201201
net.opengis.gml.v_3_1_1,
202202
*
203203
</Import-Package>
204204
<!-- Don't Export Anything -->
205205
<Export-Package/>
206206
<Embed-Dependency>
207-
catalog-registry-common,
207+
registry-common,
208208
spatial-csw-source-common,
209209
spatial-csw-common,
210210
spatial-ogc-common,
@@ -267,4 +267,4 @@
267267
</plugin>
268268
</plugins>
269269
</build>
270-
</project>
270+
</project>

‎catalog/registry/catalog-registry-api-impl/src/main/java/ddf/catalog/registry/api/impl/RegistryStoreImpl.java renamed to ‎catalog/spatial/registry/registry-api-impl/src/main/java/org/codice/ddf/registry/api/impl/RegistryStoreImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* is distributed along with this program and can be found at
1212
* <http://www.gnu.org/licenses/lgpl.html>.
1313
*/
14-
package ddf.catalog.registry.api.impl;
14+
package org.codice.ddf.registry.api.impl;
1515

1616
import java.io.ByteArrayInputStream;
1717
import java.io.ByteArrayOutputStream;
@@ -31,6 +31,9 @@
3131
import org.codice.ddf.parser.Parser;
3232
import org.codice.ddf.parser.ParserConfigurator;
3333
import org.codice.ddf.parser.ParserException;
34+
import org.codice.ddf.registry.api.RegistryStore;
35+
import org.codice.ddf.registry.common.RegistryConstants;
36+
import org.codice.ddf.registry.common.metacard.RegistryObjectMetacardType;
3437
import org.codice.ddf.spatial.ogc.csw.catalog.common.CswSourceConfiguration;
3538
import org.codice.ddf.spatial.ogc.csw.catalog.common.source.AbstractCswStore;
3639
import org.osgi.framework.BundleContext;
@@ -49,9 +52,6 @@
4952
import ddf.catalog.operation.UpdateRequest;
5053
import ddf.catalog.operation.UpdateResponse;
5154
import ddf.catalog.operation.impl.SourceResponseImpl;
52-
import ddf.catalog.registry.api.RegistryStore;
53-
import ddf.catalog.registry.common.RegistryConstants;
54-
import ddf.catalog.registry.common.metacard.RegistryObjectMetacardType;
5555
import ddf.catalog.source.IngestException;
5656
import ddf.catalog.source.UnsupportedQueryException;
5757
import oasis.names.tc.ebxml_regrep.xsd.rim._3.ExternalIdentifierType;

‎catalog/registry/catalog-registry-api-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml renamed to ‎catalog/spatial/registry/registry-api-impl/src/main/resources/OSGI-INF/blueprint/blueprint.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@
5959
id="ddf.catalog.registry.api.impl.RegistryStoreImpl.id"
6060
factory-pid="Csw_Registry_Store">
6161
<interfaces>
62-
<value>ddf.catalog.registry.api.RegistryStore</value>
62+
<value>org.codice.ddf.registry.api.RegistryStore</value>
6363
<value>ddf.catalog.source.CatalogStore</value>
6464
<value>ddf.catalog.source.FederatedSource</value>
6565
</interfaces>
66-
<cm:managed-component class="ddf.catalog.registry.api.impl.RegistryStoreImpl"
66+
<cm:managed-component class="org.codice.ddf.registry.api.impl.RegistryStoreImpl"
6767
init-method="init" destroy-method="destroy">
6868
<property name="context" ref="blueprintBundleContext"/>
6969
<property name="filterBuilder" ref="filterBuilder"/>
@@ -105,4 +105,4 @@
105105
update-method="refresh"/>
106106
</cm:managed-component>
107107
</cm:managed-service-factory>
108-
</blueprint>
108+
</blueprint>

‎catalog/registry/catalog-registry-api-impl/src/main/resources/OSGI-INF/metatype/metatype.xml renamed to ‎catalog/spatial/registry/registry-api-impl/src/main/resources/OSGI-INF/metatype/metatype.xml

File renamed without changes.

‎catalog/registry/catalog-registry-api-impl/src/main/resources/describable.properties renamed to ‎catalog/spatial/registry/registry-api-impl/src/main/resources/describable.properties

File renamed without changes.

‎catalog/registry/catalog-registry-api-impl/src/test/java/ddf/catalog/registry/api/TestRegistryStore.java renamed to ‎catalog/spatial/registry/registry-api-impl/src/test/java/org/codice/ddf/registry/api/TestRegistryStore.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* is distributed along with this program and can be found at
1212
* <http://www.gnu.org/licenses/lgpl.html>.
1313
*/
14-
package ddf.catalog.registry.api;
14+
package org.codice.ddf.registry.api;
1515

1616
import static org.hamcrest.MatcherAssert.assertThat;
1717
import static org.hamcrest.core.Is.is;
@@ -31,6 +31,9 @@
3131
import org.codice.ddf.cxf.SecureCxfClientFactory;
3232
import org.codice.ddf.parser.Parser;
3333
import org.codice.ddf.parser.xml.XmlParser;
34+
import org.codice.ddf.registry.api.impl.RegistryStoreImpl;
35+
import org.codice.ddf.registry.common.RegistryConstants;
36+
import org.codice.ddf.registry.common.metacard.RegistryObjectMetacardType;
3437
import org.codice.ddf.spatial.ogc.csw.catalog.common.Csw;
3538
import org.codice.ddf.spatial.ogc.csw.catalog.common.CswSourceConfiguration;
3639
import org.codice.ddf.spatial.ogc.csw.catalog.common.transformer.TransformerManager;
@@ -51,9 +54,6 @@
5154
import ddf.catalog.operation.impl.OperationTransactionImpl;
5255
import ddf.catalog.operation.impl.SourceResponseImpl;
5356
import ddf.catalog.operation.impl.UpdateRequestImpl;
54-
import ddf.catalog.registry.api.impl.RegistryStoreImpl;
55-
import ddf.catalog.registry.common.RegistryConstants;
56-
import ddf.catalog.registry.common.metacard.RegistryObjectMetacardType;
5757
import ddf.catalog.source.UnsupportedQueryException;
5858
import net.opengis.cat.csw.v_2_0_2.TransactionResponseType;
5959
import net.opengis.cat.csw.v_2_0_2.TransactionSummaryType;

‎catalog/registry/catalog-registry-api-impl/src/test/resources/csw-full-registry-package.xml renamed to ‎catalog/spatial/registry/registry-api-impl/src/test/resources/csw-full-registry-package.xml

File renamed without changes.

‎catalog/registry/catalog-registry-api/pom.xml renamed to ‎catalog/spatial/registry/registry-api/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1818
<parent>
1919
<artifactId>registry</artifactId>
20-
<groupId>ddf.catalog.registry</groupId>
20+
<groupId>org.codice.ddf.registry</groupId>
2121
<version>2.10.0-SNAPSHOT</version>
2222
</parent>
2323
<modelVersion>4.0.0</modelVersion>
2424

2525

26-
<artifactId>catalog-registry-api</artifactId>
27-
<name>DDF :: Catalog :: Registry :: API</name>
26+
<artifactId>registry-api</artifactId>
27+
<name>DDF :: Registry :: API</name>
2828

2929
<packaging>bundle</packaging>
3030

@@ -45,7 +45,7 @@
4545
<instructions>
4646
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
4747
<Export-Package>
48-
ddf.catalog.registry.api
48+
org.codice.ddf.registry.api
4949
</Export-Package>
5050
<Import-Package>
5151
!org.codice.ddf.platform.util,

‎catalog/registry/catalog-registry-api/src/main/java/ddf/catalog/registry/api/RegistryStore.java renamed to ‎catalog/spatial/registry/registry-api/src/main/java/org/codice/ddf/registry/api/RegistryStore.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* is distributed along with this program and can be found at
1212
* <http://www.gnu.org/licenses/lgpl.html>.
1313
**/
14-
package ddf.catalog.registry.api;
14+
package org.codice.ddf.registry.api;
1515

1616
import ddf.catalog.service.ConfiguredService;
1717
import ddf.catalog.source.CatalogStore;

0 commit comments

Comments
 (0)