Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport release/1.8.x] Add DXF extension #551

Merged
merged 1 commit into from
Oct 16, 2024
Merged

[Backport release/1.8.x] Add DXF extension #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ Only a curated list of the [vast amount](http://geoserver.org/release/stable/) o
- Pregeneralized feature datastore
- vectortiles
- flatgeobuf
- dxf
- cog
- importer
- imagepyramid
Expand Down
8 changes: 8 additions & 0 deletions src/apps/geoserver/webui/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,14 @@
<groupId>org.geoserver.community</groupId>
<artifactId>gs-flatgeobuf</artifactId>
</dependency>
<dependency>
<groupId>org.geoserver.extension</groupId>
<artifactId>gs-dxf-core</artifactId>
</dependency>
<dependency>
<groupId>org.geoserver.extension</groupId>
<artifactId>gs-dxf-wps</artifactId>
</dependency>
<dependency>
<groupId>org.geoserver</groupId>
<artifactId>gs-wms</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion ...erver/webui/src/main/java/org/geoserver/cloud/autoconfigure/web/wfs/WfsConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
locations = { //
"jar:gs-web-wfs-.*!/applicationContext.xml", //
"jar:gs-wfs-.*!/applicationContext.xml",
"jar:gs-flatgeobuf-.*!/applicationContext.xml#name=.*"
"jar:gs-flatgeobuf-.*!/applicationContext.xml#name=.*",
"jar:gs-dxf-core-.*!/applicationContext.xml#name=.*"
} //
)
public class WfsConfiguration {}
4 changes: 3 additions & 1 deletion ...erver/webui/src/main/java/org/geoserver/cloud/autoconfigure/web/wps/WpsConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
// exclude wpsRequestBuilder, DemosAutoConfiguration takes care of it
"jar:gs-web-wps-.*!/applicationContext.xml#name=^(?!wpsRequestBuilder).*$",
"jar:gs-wps-.*!/applicationContext.xml",
"jar:gs-wcs-.*!/applicationContext.xml"
"jar:gs-wcs-.*!/applicationContext.xml",
"jar:gs-dxf-core-.*!/applicationContext.xml#name=.*",
"jar:gs-dxf-wps-.*!/applicationContext.xml#name=.*"
})
public class WpsConfiguration {}
4 changes: 4 additions & 0 deletions src/apps/geoserver/wfs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
<groupId>org.geoserver.community</groupId>
<artifactId>gs-flatgeobuf</artifactId>
</dependency>
<dependency>
<groupId>org.geoserver.extension</groupId>
<artifactId>gs-dxf-core</artifactId>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
Expand Down
3 changes: 2 additions & 1 deletion ...apps/geoserver/wfs/src/main/java/org/geoserver/cloud/wfs/config/WfsAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
reader = FilteringXmlBeanDefinitionReader.class, //
locations = {
"jar:gs-wfs-.*!/applicationContext.xml#name=.*",
"jar:gs-flatgeobuf-.*!/applicationContext.xml#name=.*"
"jar:gs-flatgeobuf-.*!/applicationContext.xml#name=.*",
"jar:gs-dxf-core-.*!/applicationContext.xml#name=.*"
} //
)
public class WfsAutoConfiguration {
Expand Down
8 changes: 8 additions & 0 deletions src/apps/geoserver/wps/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,14 @@
<groupId>org.geoserver.cloud</groupId>
<artifactId>gs-cloud-starter-raster-formats</artifactId>
</dependency>
<dependency>
<groupId>org.geoserver.extension</groupId>
<artifactId>gs-dxf-core</artifactId>
</dependency>
<dependency>
<groupId>org.geoserver.extension</groupId>
<artifactId>gs-dxf-wps</artifactId>
</dependency>
<dependency>
<!-- REVISIT: for some reason, the WPS service won't start up without the web components. A bean creation exception
will be reported: "Error creating bean with name 'wpsInitializer' ... -->
Expand Down
2 changes: 2 additions & 0 deletions ...apps/geoserver/wps/src/main/java/org/geoserver/cloud/wps/WpsApplicationConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
"jar:gs-wcs1_1-.*!/applicationContext.xml", //
"jar:gs-wcs2_0-.*!/applicationContext.xml", //
"jar:gs-wfs-.*!/applicationContext.xml#name=^(?!wfsInsertElementHandler|wfsUpdateElementHandler|wfsDeleteElementHandler|wfsReplaceElementHandler).*$", //
"jar:gs-dxf-core-.*!/applicationContext.xml#name=.*",
"jar:gs-dxf-wps-.*!/applicationContext.xml#name=.*"
})
public class WpsApplicationConfiguration {

Expand Down
10 changes: 10 additions & 0 deletions src/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -588,6 +588,16 @@
<artifactId>gs-flatgeobuf</artifactId>
<version>${gs.version}</version>
</dependency>
<dependency>
<groupId>org.geoserver.extension</groupId>
<artifactId>gs-dxf-core</artifactId>
<version>${gs.version}</version>
</dependency>
<dependency>
<groupId>org.geoserver.extension</groupId>
<artifactId>gs-dxf-wps</artifactId>
<version>${gs.version}</version>
</dependency>
<dependency>
<groupId>org.geoserver.extension</groupId>
<artifactId>gs-web-resource</artifactId>
Expand Down
Loading