Skip to content

Commit 50e3d90

Browse files
If project created with Studio then entities are created with incorrect prefix #110
1 parent 93fe222 commit 50e3d90

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/main/kotlin/com/haulmont/cuba/cli/ProjectModel.kt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class ProjectModel(projectStructure: ProjectStructure) {
6464
?: artifactParseError()
6565
}
6666

67-
namespace = parseNamespace(global.persistenceXml)
67+
namespace = parseNamespace(global.metadataXml)
6868

6969
val buildGradle = projectStructure.buildGradle.toFile().readText()
7070

@@ -111,12 +111,12 @@ class ProjectModel(projectStructure: ProjectStructure) {
111111
}
112112
}
113113

114-
private fun parseNamespace(persistenceXml: Path): String {
115-
val document = parse(persistenceXml)
116-
return DomUtil.getChild(document.documentElement, "persistence-unit")
117-
.attributes
118-
.getNamedItem("name")
119-
.nodeValue
114+
private fun parseNamespace(metadataXml: Path): String {
115+
val document = parse(metadataXml)
116+
return DomUtil.getChild(document.documentElement, "metadata-model")
117+
?.attributes
118+
?.getNamedItem("namespace")
119+
?.nodeValue ?: ""
120120
}
121121

122122
private fun parseDatabase(projectStructure: ProjectStructure): Database {

0 commit comments

Comments
 (0)