Skip to content

Commit e86d98f

Browse files
committed
Merge pull request javaee-samples#317 from AndreaGencova/master
change of build directory
2 parents 5669bb3 + 970cade commit e86d98f

File tree

3 files changed

+20
-8
lines changed

3 files changed

+20
-8
lines changed

jpa/schema-gen-scripts-generate/pom.xml

+8
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,12 @@
1313
<version>1.0-SNAPSHOT</version>
1414
<packaging>war</packaging>
1515
<name>Java EE 7 Sample: jpa - schema-gen-scripts-generate</name>
16+
<build>
17+
<resources>
18+
<resource>
19+
<filtering>true</filtering>
20+
<directory>src/main/resources</directory>
21+
</resource>
22+
</resources>
23+
</build>
1624
</project>

jpa/schema-gen-scripts-generate/src/main/resources/META-INF/persistence.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<persistence-unit name="MyPU" transaction-type="JTA">
88
<properties>
99
<property name="javax.persistence.schema-generation.scripts.action" value="drop-and-create"/>
10-
<property name="javax.persistence.schema-generation.scripts.create-target" value="file:/tmp/create.sql"/>
11-
<property name="javax.persistence.schema-generation.scripts.drop-target" value="file:/tmp/drop.sql"/>
10+
<property name="javax.persistence.schema-generation.scripts.create-target" value="${project.build.directory}/create-script.sql"/>
11+
<property name="javax.persistence.schema-generation.scripts.drop-target" value="${project.build.directory}/drop-script.sql"/>
1212
</properties>
1313
</persistence-unit>
1414
</persistence>

jpa/schema-gen-scripts-generate/src/test/java/org/javaee7/jpasamples/schema/gen/scripts/generate/SchemaGenScriptsTest.java

+10-6
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import java.nio.file.Files;
1515
import java.nio.file.Path;
1616
import java.nio.file.Paths;
17+
import org.jboss.arquillian.container.test.api.RunAsClient;
1718

1819
import static org.junit.Assert.assertTrue;
1920

@@ -22,27 +23,30 @@
2223
*/
2324
@RunWith(Arquillian.class)
2425
public class SchemaGenScriptsTest {
26+
2527
@Deployment
2628
public static WebArchive createDeployment() {
2729
WebArchive war = ShrinkWrap.create(WebArchive.class)
28-
.addPackage("org.javaee7.jpasamples.schema.gen.scripts.generate")
29-
.addAsResource("META-INF/persistence.xml");
30+
.addPackage("org.javaee7.jpasamples.schema.gen.scripts.generate")
31+
.addAsResource("META-INF/persistence.xml");
3032
System.out.println(war.toString(true));
3133
return war;
3234
}
3335

3436
@After
3537
public void tearDown() throws Exception {
36-
new File("/tmp/create.sql").delete();
37-
new File("/tmp/drop.sql").delete();
38+
System.out.println(new File("target/create-script.sql").getAbsolutePath());
39+
new File("target/create-script.sql").delete();
40+
new File("target/drop-script.sql").delete();
3841
}
3942

4043
@Test
44+
@RunAsClient
4145
public void testSchemaGenIndex() throws Exception {
42-
Path create = Paths.get("/tmp/create.sql");
46+
Path create = Paths.get("target","create-script.sql");
4347
assertTrue(Files.exists(create));
4448

45-
Path drop = Paths.get("/tmp/drop.sql");
49+
Path drop = Paths.get("target","drop-script.sql");
4650
assertTrue(Files.exists(create));
4751

4852
String line;

0 commit comments

Comments
 (0)