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

Use addResource for mp config files #628

Closed
wants to merge 1 commit into from
+8 −7
Closed

Use addResource for mp config files #628

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
2 changes: 1 addition & 1 deletion tck/src/main/java/org/eclipse/microprofile/openapi/tck/FilterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public static WebArchive createDeployment() {
.addPackages(true, "org.eclipse.microprofile.openapi.apps.airlines")
.addPackages(true, "org.eclipse.microprofile.openapi.filter")
.addAsManifestResource("openapi.yaml", "openapi.yaml")
.addAsManifestResource("microprofile-config-filter.properties", "microprofile-config.properties");
.addAsResource("microprofile-config-filter.properties", "META-INF/microprofile-config.properties");
}

@Test(dataProvider = "formatProvider")
Expand Down
2 changes: 1 addition & 1 deletion tck/src/main/java/org/eclipse/microprofile/openapi/tck/ModelReaderAppTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public static WebArchive createDeployment() {
return ShrinkWrap.create(WebArchive.class, "airlinesReader.war")
.addPackages(true, "org.eclipse.microprofile.openapi.apps.airlines")
.addPackages(true, "org.eclipse.microprofile.openapi.reader")
.addAsManifestResource("microprofile-reader.properties", "microprofile-config.properties");
.addAsResource("microprofile-reader.properties", "META-INF/microprofile-config.properties");
}

@Test(dataProvider = "formatProvider")
Expand Down
3 changes: 2 additions & 1 deletion tck/src/main/java/org/eclipse/microprofile/openapi/tck/OASConfigScanDisableTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ public class OASConfigScanDisableTest extends AppTestBase {
public static WebArchive createDeployment() {
return ShrinkWrap.create(WebArchive.class, "airlines.war")
.addPackages(true, "org.eclipse.microprofile.openapi.apps.airlines")
.addAsManifestResource("scan-disable-microprofile-config.properties", "microprofile-config.properties");
.addAsResource("scan-disable-microprofile-config.properties",
"META-INF/microprofile-config.properties");
}

@Test(dataProvider = "formatProvider")
Expand Down
2 changes: 1 addition & 1 deletion tck/src/main/java/org/eclipse/microprofile/openapi/tck/OASConfigServersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class OASConfigServersTest extends AppTestBase {
public static WebArchive createDeployment() {
return ShrinkWrap.create(WebArchive.class, "airlines.war")
.addPackages(true, "org.eclipse.microprofile.openapi.apps.airlines")
.addAsManifestResource("server-microprofile-config.properties", "microprofile-config.properties");
.addAsResource("server-microprofile-config.properties", "META-INF/microprofile-config.properties");
}

@Test(dataProvider = "formatProvider")
Expand Down
2 changes: 1 addition & 1 deletion tck/src/main/java/org/eclipse/microprofile/openapi/tck/OASScanConfigTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ public void testPartialPackage(String type) {
private static WebArchive scanConfigApp(String name, ConfigAsset config) {
return ShrinkWrap.create(WebArchive.class, name)
.addPackages(true, ScanConfigApplication.class.getPackage())
.addAsManifestResource(config, "microprofile-config.properties");
.addAsResource(config, "META-INF/microprofile-config.properties");
}

private static void assertPaths(ValidatableResponse vr, String... paths) {
Expand Down
2 changes: 1 addition & 1 deletion .../java/org/eclipse/microprofile/openapi/tck/beanvalidation/BeanValidationDisabledTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static WebArchive buildApp() {

return ShrinkWrap.create(WebArchive.class, "beanValidation.war")
.addPackage(BeanValidationApp.class.getPackage())
.addAsManifestResource(config, "microprofile-config.properties");
.addAsResource(config, "META-INF/microprofile-config.properties");
}

@Test(dataProvider = "formatProvider", groups = BEAN_VALIDATION)
Expand Down
2 changes: 1 addition & 1 deletion tck/src/main/java/org/eclipse/microprofile/openapi/tck/utils/ConfigAsset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
* .put(OASConfig.SCAN_EXCLUDE_CLASSES, "com.example.myPackage.MyClass");
* WebArchive war = ShrinkWrap.create(WebArchive.class, "test.war")
* .addPackages(true, "com.example.myPackage")
* .addAsManifestResource(config, "microprofile-config.properties");
* .addAsResource(config, "META-INF/microprofile-config.properties");
* </code>
* </pre>
*/
Expand Down
Loading