Skip to content

Commit ddd7e6d

Browse files
authored
Generate conf.jar from the build and move persistence.xml to eclipselink project (#115)
1 parent 46dd56f commit ddd7e6d

File tree

5 files changed

+10
-3
lines changed

5 files changed

+10
-3
lines changed

extension/persistence/eclipselink/build.gradle.kts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,11 @@ dependencies {
3737
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
3838
}
3939

40-
sourceSets { test { resources { srcDir("src/test/data") } } }
40+
tasks.register<Jar>("archiveConf") {
41+
archiveFileName = "conf.jar"
42+
destinationDirectory = layout.buildDirectory.dir("conf")
43+
44+
from("src/test/resources/META-INF/") { include("persistence.xml") }
45+
}
46+
47+
tasks.named("test") { dependsOn("archiveConf") }

polaris-service/src/test/resources/META-INF/persistence.xml renamed to extension/persistence/eclipselink/src/main/resources/META-INF/persistence.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2121
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
2222

23-
<persistence-unit name="polaris-dev" transaction-type="RESOURCE_LOCAL">
23+
<persistence-unit name="polaris" transaction-type="RESOURCE_LOCAL">
2424
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
2525
<class>io.polaris.core.persistence.models.ModelEntity</class>
2626
<class>io.polaris.core.persistence.models.ModelEntityActive</class>
Binary file not shown.

extension/persistence/eclipselink/src/test/java/io/polaris/extension/persistence/impl/eclipselink/PolarisEclipseLinkMetaStoreTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ private static class CreateStoreSessionArgs implements ArgumentsProvider {
8282
public Stream<? extends Arguments> provideArguments(ExtensionContext extensionContext) {
8383
return Stream.of(
8484
Arguments.of("META-INF/persistence.xml", true),
85-
Arguments.of("eclipselink_conf.jar!/persistence.xml", true),
85+
Arguments.of("./build/conf/conf.jar!/persistence.xml", true),
8686
Arguments.of("/dummy_path/conf.jar!/persistence.xml", false));
8787
}
8888
}

0 commit comments

Comments
 (0)