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

Prevent XXE vulnerabilities #258

Merged
merged 7 commits into from
Jun 21, 2022
Merged

Prevent XXE vulnerabilities #258

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
83d1820
moved XML utils for handling config files to impexp-util
clausnagel Jun 10, 2022
d42c1d7
moved query schema writer back to impexp-config
clausnagel Jun 10, 2022
8ab7fb6
prevent XXE vulnerabilities
clausnagel Jun 10, 2022
f72dad9
bumping version to 5.2.1-SNAPSHOT
clausnagel Jun 10, 2022
1ab40b0
updated citygml4j to 2.12.1
clausnagel Jun 14, 2022
a82199a
Disable external DTDs for SAXParserFactory
Jun 20, 2022
124b0bd
updated changelog
Jun 20, 2022
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
5 changes: 4 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {

apply from: 'properties.gradle'

version '5.2.0'
version '5.2.1-SNAPSHOT'

subprojects {
apply plugin: 'java-library'
Expand Down Expand Up @@ -35,6 +35,9 @@ subprojects {
maven {
url 'https://citydb.jfrog.io/artifactory/maven'
}
maven {
url 'https://oss.sonatype.org/content/repositories/snapshots/'
}
mavenCentral()
}

Expand Down
2 changes: 1 addition & 1 deletion impexp-client-cli/src/main/java/org/citydb/cli/ImpExpCli.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
import org.citydb.cli.util.CliConstants;
import org.citydb.cli.util.PidFile;
import org.citydb.config.Config;
import org.citydb.config.ConfigUtil;
import org.citydb.util.config.ConfigUtil;
import org.citydb.config.ProjectConfig;
import org.citydb.config.i18n.Language;
import org.citydb.config.project.global.LanguageType;
Expand Down
7 changes: 4 additions & 3 deletions impexp-client-cli/src/main/java/org/citydb/cli/option/XMLQueryOption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@

package org.citydb.cli.option;

import org.citydb.config.ConfigUtil;
import org.citydb.util.config.ConfigUtil;
import org.citydb.config.project.query.QueryConfig;
import org.citydb.config.util.QueryWrapper;
import org.citydb.config.util.ConfigConstants;
import org.citydb.config.project.query.QueryWrapper;
import org.citygml4j.model.module.Module;
import org.citygml4j.model.module.ModuleContext;
import org.citygml4j.model.module.citygml.CityGMLVersion;
Expand Down Expand Up @@ -86,7 +87,7 @@ public void preprocess(CommandLine commandLine) throws Exception {

private String wrapQuery(String query) {
StringBuilder wrapper = new StringBuilder("<wrapper xmlns=\"")
.append(ConfigUtil.CITYDB_CONFIG_NAMESPACE_URI)
.append(ConfigConstants.CITYDB_CONFIG_NAMESPACE_URI)
.append("\" ");

ModuleContext context = new ModuleContext(CityGMLVersion.v2_0_0);
Expand Down
2 changes: 1 addition & 1 deletion impexp-client-gui/src/main/java/org/citydb/gui/GuiCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import org.citydb.cli.option.StartupProgressListener;
import org.citydb.cli.util.CliConstants;
import org.citydb.config.Config;
import org.citydb.config.ConfigUtil;
import org.citydb.util.config.ConfigUtil;
import org.citydb.config.gui.GuiConfig;
import org.citydb.config.gui.style.Theme;
import org.citydb.core.database.DatabaseController;
Expand Down
2 changes: 1 addition & 1 deletion impexp-client-gui/src/main/java/org/citydb/gui/ImpExpGui.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
import com.formdev.flatlaf.ui.FlatTabbedPaneUI;
import org.citydb.cli.util.CliConstants;
import org.citydb.config.Config;
import org.citydb.config.ConfigUtil;
import org.citydb.util.config.ConfigUtil;
import org.citydb.config.gui.style.Theme;
import org.citydb.config.gui.window.MainWindow;
import org.citydb.config.gui.window.WindowSize;
Expand Down
8 changes: 5 additions & 3 deletions impexp-client-gui/src/main/java/org/citydb/gui/map/geocoder/service/GoogleGeocoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@
import org.citydb.gui.map.geocoder.GeocoderResult;
import org.citydb.gui.map.geocoder.Location;
import org.citydb.gui.map.geocoder.LocationType;
import org.citydb.util.xml.SecureXMLProcessors;
import org.jdesktop.swingx.mapviewer.GeoPosition;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;

import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathFactory;
Expand Down Expand Up @@ -84,9 +84,11 @@ private GeocoderResult geocode(String operation, String requestString) throws Ge
}

try (InputStream stream = new URL(serviceCall).openStream()) {
Document response = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(stream);
XPath xpath = XPathFactory.newInstance().newXPath();
Document response = SecureXMLProcessors.newDocumentBuilderFactory()
.newDocumentBuilder()
.parse(stream);

XPath xpath = XPathFactory.newInstance().newXPath();
GeocoderResult geocodingResult = new GeocoderResult();

// check the response status
Expand Down
2 changes: 1 addition & 1 deletion impexp-client-gui/src/main/java/org/citydb/gui/menu/MenuFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

import com.formdev.flatlaf.extras.FlatSVGIcon;
import org.citydb.config.Config;
import org.citydb.config.ConfigUtil;
import org.citydb.util.config.ConfigUtil;
import org.citydb.config.ProjectConfig;
import org.citydb.config.i18n.Language;
import org.citydb.config.project.global.Logging;
Expand Down
11 changes: 6 additions & 5 deletions impexp-client-gui/src/main/java/org/citydb/gui/operation/common/filter/XMLQueryView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import com.formdev.flatlaf.extras.FlatSVGIcon;
import com.github.vertical_blank.sqlformatter.SqlFormatter;
import com.sun.xml.bind.marshaller.NamespacePrefixMapper;
import org.citydb.config.ConfigUtil;
import org.citydb.util.config.ConfigUtil;
import org.citydb.config.geometry.BoundingBox;
import org.citydb.config.i18n.Language;
import org.citydb.config.project.database.DatabaseSrs;
Expand All @@ -54,7 +54,8 @@
import org.citydb.config.project.query.filter.type.FeatureTypeFilter;
import org.citydb.config.project.query.simple.SimpleAttributeFilter;
import org.citydb.config.project.query.simple.SimpleFeatureVersionFilter;
import org.citydb.config.util.QueryWrapper;
import org.citydb.config.util.ConfigConstants;
import org.citydb.config.project.query.QueryWrapper;
import org.citydb.core.database.DatabaseController;
import org.citydb.core.database.adapter.AbstractSQLAdapter;
import org.citydb.core.database.schema.mapping.FeatureType;
Expand Down Expand Up @@ -197,7 +198,7 @@ private void setEmptyQuery() {

CityGMLNamespaceContext namespaceContext = new CityGMLNamespaceContext();
namespaceContext.setPrefixes(new ModuleContext(CityGMLVersion.v2_0_0));
namespaceContext.setDefaultNamespace(ConfigUtil.CITYDB_CONFIG_NAMESPACE_URI);
namespaceContext.setDefaultNamespace(ConfigConstants.CITYDB_CONFIG_NAMESPACE_URI);

xmlText.setText(marshalQuery(query, namespaceContext));
}
Expand Down Expand Up @@ -324,7 +325,7 @@ private void setSimpleSettings() {

CityGMLNamespaceContext namespaceContext = new CityGMLNamespaceContext();
namespaceContext.setPrefixes(new ModuleContext(version));
namespaceContext.setDefaultNamespace(ConfigUtil.CITYDB_CONFIG_NAMESPACE_URI);
namespaceContext.setDefaultNamespace(ConfigConstants.CITYDB_CONFIG_NAMESPACE_URI);

xmlText.setText(marshalQuery(query, namespaceContext));
}
Expand Down Expand Up @@ -437,7 +438,7 @@ public String getPreferredPrefix(String namespaceUri, String suggestion, boolean

private String wrapQuery(String query) {
StringBuilder wrapper = new StringBuilder("<wrapper xmlns=\"")
.append(ConfigUtil.CITYDB_CONFIG_NAMESPACE_URI).append("\" ");
.append(ConfigConstants.CITYDB_CONFIG_NAMESPACE_URI).append("\" ");

ModuleContext context = new ModuleContext(CityGMLVersion.v2_0_0);
for (Module module : context.getModules()) {
Expand Down
2 changes: 1 addition & 1 deletion impexp-client-gui/src/main/java/org/citydb/gui/operation/database/preferences/SrsPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

import org.citydb.cli.util.CliConstants;
import org.citydb.config.Config;
import org.citydb.config.ConfigUtil;
import org.citydb.util.config.ConfigUtil;
import org.citydb.config.i18n.Language;
import org.citydb.config.project.database.DatabaseSrs;
import org.citydb.config.project.database.DatabaseSrsList;
Expand Down
2 changes: 1 addition & 1 deletion impexp-config/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
dependencies {
api 'org.citygml4j:citygml4j:2.12.0'
api 'org.citygml4j:citygml4j:2.12.1'
}
2 changes: 1 addition & 1 deletion impexp-config/src/main/java/org/citydb/config/ProjectConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ ConfigNamespaceFilter getNamespaceFilter() {
return namespaceFilter;
}

void setNamespaceFilter(ConfigNamespaceFilter namespaceFilter) {
public void setNamespaceFilter(ConfigNamespaceFilter namespaceFilter) {
this.namespaceFilter = namespaceFilter;
}
}
4 changes: 2 additions & 2 deletions impexp-config/src/main/java/org/citydb/config/geometry/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*/

@javax.xml.bind.annotation.XmlAccessorType(javax.xml.bind.annotation.XmlAccessType.FIELD)
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigUtil.CITYDB_CONFIG_NAMESPACE_URI,
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigConstants.CITYDB_CONFIG_NAMESPACE_URI,
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.citydb.config.geometry;

import org.citydb.config.ConfigUtil;
import org.citydb.config.util.ConfigConstants;
4 changes: 2 additions & 2 deletions impexp-config/src/main/java/org/citydb/config/gui/components/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*/

@javax.xml.bind.annotation.XmlAccessorType(javax.xml.bind.annotation.XmlAccessType.FIELD)
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigUtil.CITYDB_CONFIG_NAMESPACE_URI,
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigConstants.CITYDB_CONFIG_NAMESPACE_URI,
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.citydb.config.gui.components;

import org.citydb.config.ConfigUtil;
import org.citydb.config.util.ConfigConstants;
4 changes: 2 additions & 2 deletions impexp-config/src/main/java/org/citydb/config/gui/database/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*/

@javax.xml.bind.annotation.XmlAccessorType(javax.xml.bind.annotation.XmlAccessType.FIELD)
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigUtil.CITYDB_CONFIG_NAMESPACE_URI,
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigConstants.CITYDB_CONFIG_NAMESPACE_URI,
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.citydb.config.gui.database;

import org.citydb.config.ConfigUtil;
import org.citydb.config.util.ConfigConstants;
4 changes: 2 additions & 2 deletions impexp-config/src/main/java/org/citydb/config/gui/exporter/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*/

@javax.xml.bind.annotation.XmlAccessorType(javax.xml.bind.annotation.XmlAccessType.FIELD)
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigUtil.CITYDB_CONFIG_NAMESPACE_URI,
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigConstants.CITYDB_CONFIG_NAMESPACE_URI,
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.citydb.config.gui.exporter;

import org.citydb.config.ConfigUtil;
import org.citydb.config.util.ConfigConstants;
4 changes: 2 additions & 2 deletions impexp-config/src/main/java/org/citydb/config/gui/importer/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*/

@javax.xml.bind.annotation.XmlAccessorType(javax.xml.bind.annotation.XmlAccessType.FIELD)
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigUtil.CITYDB_CONFIG_NAMESPACE_URI,
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigConstants.CITYDB_CONFIG_NAMESPACE_URI,
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.citydb.config.gui.importer;

import org.citydb.config.ConfigUtil;
import org.citydb.config.util.ConfigConstants;
4 changes: 2 additions & 2 deletions impexp-config/src/main/java/org/citydb/config/gui/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*/

@javax.xml.bind.annotation.XmlAccessorType(javax.xml.bind.annotation.XmlAccessType.FIELD)
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigUtil.CITYDB_CONFIG_NAMESPACE_URI,
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigConstants.CITYDB_CONFIG_NAMESPACE_URI,
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.citydb.config.gui;

import org.citydb.config.ConfigUtil;
import org.citydb.config.util.ConfigConstants;
4 changes: 2 additions & 2 deletions impexp-config/src/main/java/org/citydb/config/gui/preferences/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*/

@javax.xml.bind.annotation.XmlAccessorType(javax.xml.bind.annotation.XmlAccessType.FIELD)
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigUtil.CITYDB_CONFIG_NAMESPACE_URI,
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigConstants.CITYDB_CONFIG_NAMESPACE_URI,
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.citydb.config.gui.preferences;

import org.citydb.config.ConfigUtil;
import org.citydb.config.util.ConfigConstants;
4 changes: 2 additions & 2 deletions impexp-config/src/main/java/org/citydb/config/gui/style/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*/

@javax.xml.bind.annotation.XmlAccessorType(javax.xml.bind.annotation.XmlAccessType.FIELD)
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigUtil.CITYDB_CONFIG_NAMESPACE_URI,
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigConstants.CITYDB_CONFIG_NAMESPACE_URI,
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.citydb.config.gui.style;

import org.citydb.config.ConfigUtil;
import org.citydb.config.util.ConfigConstants;
4 changes: 2 additions & 2 deletions impexp-config/src/main/java/org/citydb/config/gui/visExporter/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*/

@javax.xml.bind.annotation.XmlAccessorType(javax.xml.bind.annotation.XmlAccessType.FIELD)
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigUtil.CITYDB_CONFIG_NAMESPACE_URI,
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigConstants.CITYDB_CONFIG_NAMESPACE_URI,
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.citydb.config.gui.visExporter;

import org.citydb.config.ConfigUtil;
import org.citydb.config.util.ConfigConstants;
4 changes: 2 additions & 2 deletions impexp-config/src/main/java/org/citydb/config/gui/window/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*/

@javax.xml.bind.annotation.XmlAccessorType(javax.xml.bind.annotation.XmlAccessType.FIELD)
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigUtil.CITYDB_CONFIG_NAMESPACE_URI,
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigConstants.CITYDB_CONFIG_NAMESPACE_URI,
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.citydb.config.gui.window;

import org.citydb.config.ConfigUtil;
import org.citydb.config.util.ConfigConstants;
5 changes: 3 additions & 2 deletions impexp-config/src/main/java/org/citydb/config/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@
*/

@javax.xml.bind.annotation.XmlAccessorType(javax.xml.bind.annotation.XmlAccessType.FIELD)
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigUtil.CITYDB_CONFIG_NAMESPACE_URI,
xmlns = {@javax.xml.bind.annotation.XmlNs(prefix = "", namespaceURI = ConfigUtil.CITYDB_CONFIG_NAMESPACE_URI)},
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigConstants.CITYDB_CONFIG_NAMESPACE_URI,
xmlns = {@javax.xml.bind.annotation.XmlNs(prefix = "", namespaceURI = ConfigConstants.CITYDB_CONFIG_NAMESPACE_URI)},
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.citydb.config;

import org.citydb.config.util.ConfigConstants;
4 changes: 2 additions & 2 deletions impexp-config/src/main/java/org/citydb/config/project/common/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*/

@javax.xml.bind.annotation.XmlAccessorType(javax.xml.bind.annotation.XmlAccessType.FIELD)
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigUtil.CITYDB_CONFIG_NAMESPACE_URI,
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigConstants.CITYDB_CONFIG_NAMESPACE_URI,
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.citydb.config.project.common;

import org.citydb.config.ConfigUtil;
import org.citydb.config.util.ConfigConstants;
4 changes: 2 additions & 2 deletions impexp-config/src/main/java/org/citydb/config/project/database/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*/

@javax.xml.bind.annotation.XmlAccessorType(javax.xml.bind.annotation.XmlAccessType.FIELD)
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigUtil.CITYDB_CONFIG_NAMESPACE_URI,
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigConstants.CITYDB_CONFIG_NAMESPACE_URI,
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.citydb.config.project.database;

import org.citydb.config.ConfigUtil;
import org.citydb.config.util.ConfigConstants;
4 changes: 2 additions & 2 deletions impexp-config/src/main/java/org/citydb/config/project/deleter/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*/

@javax.xml.bind.annotation.XmlAccessorType(javax.xml.bind.annotation.XmlAccessType.FIELD)
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigUtil.CITYDB_CONFIG_NAMESPACE_URI,
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigConstants.CITYDB_CONFIG_NAMESPACE_URI,
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.citydb.config.project.deleter;

import org.citydb.config.ConfigUtil;
import org.citydb.config.util.ConfigConstants;
4 changes: 2 additions & 2 deletions impexp-config/src/main/java/org/citydb/config/project/exporter/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*/

@javax.xml.bind.annotation.XmlAccessorType(javax.xml.bind.annotation.XmlAccessType.FIELD)
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigUtil.CITYDB_CONFIG_NAMESPACE_URI,
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigConstants.CITYDB_CONFIG_NAMESPACE_URI,
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.citydb.config.project.exporter;

import org.citydb.config.ConfigUtil;
import org.citydb.config.util.ConfigConstants;
4 changes: 2 additions & 2 deletions impexp-config/src/main/java/org/citydb/config/project/global/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*/

@javax.xml.bind.annotation.XmlAccessorType(javax.xml.bind.annotation.XmlAccessType.FIELD)
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigUtil.CITYDB_CONFIG_NAMESPACE_URI,
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigConstants.CITYDB_CONFIG_NAMESPACE_URI,
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.citydb.config.project.global;

import org.citydb.config.ConfigUtil;
import org.citydb.config.util.ConfigConstants;
4 changes: 2 additions & 2 deletions impexp-config/src/main/java/org/citydb/config/project/importer/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
*/

@javax.xml.bind.annotation.XmlAccessorType(javax.xml.bind.annotation.XmlAccessType.FIELD)
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigUtil.CITYDB_CONFIG_NAMESPACE_URI,
@javax.xml.bind.annotation.XmlSchema(namespace = ConfigConstants.CITYDB_CONFIG_NAMESPACE_URI,
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
package org.citydb.config.project.importer;

import org.citydb.config.ConfigUtil;
import org.citydb.config.util.ConfigConstants;
Loading