Skip to content
This repository was archived by the owner on Jan 30, 2019. It is now read-only.

Commit 4c4b10d

Browse files
author
Arun Gupta
committed
making poms consistent
Former-commit-id: eb175fc87ded7f33bc662fa8ac37fe6f2d8f4437
1 parent 2301422 commit 4c4b10d

12 files changed

Lines changed: 51 additions & 77 deletions

File tree

‎samples/jpa/criteria/pom.xml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
34
<parent>
4-
<groupId>org.sample</groupId>
5-
<artifactId>jpa</artifactId>
5+
<groupId>org.javaee7.jpa</groupId>
6+
<artifactId>jpa-samples</artifactId>
67
<version>1.0-SNAPSHOT</version>
78
<relativePath>../pom.xml</relativePath>
89
</parent>
9-
10-
<modelVersion>4.0.0</modelVersion>
1110

12-
<groupId>org.glassfish</groupId>
11+
<groupId>org.javaee7.jpa</groupId>
1312
<artifactId>criteria</artifactId>
1413
<version>1.0-SNAPSHOT</version>
1514
<packaging>war</packaging>
16-
17-
<name>criteria</name>
18-
1915
</project>

‎samples/jpa/entitygraph/pom.xml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
34
<parent>
4-
<groupId>org.sample</groupId>
5-
<artifactId>jpa</artifactId>
5+
<groupId>org.javaee7.jpa</groupId>
6+
<artifactId>jpa-samples</artifactId>
67
<version>1.0-SNAPSHOT</version>
78
<relativePath>../pom.xml</relativePath>
89
</parent>
910

10-
<modelVersion>4.0.0</modelVersion>
11-
12-
<groupId>org.glassfish</groupId>
11+
<groupId>org.javaee7.jpa</groupId>
1312
<artifactId>entitygraph</artifactId>
1413
<version>1.0-SNAPSHOT</version>
1514
<packaging>war</packaging>
16-
17-
<name>entitygraph</name>
18-
1915
</project>

‎samples/jpa/jndi-context/pom.xml‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<artifactId>jpa</artifactId>
6-
<groupId>org.sample</groupId>
5+
<groupId>org.javaee7.jpa</groupId>
6+
<artifactId>jpa-samples</artifactId>
77
<version>1.0-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010

11-
<groupId>org.glassfish.sample</groupId>
11+
<groupId>org.javaee7.jpa</groupId>
1212
<artifactId>jndi-context</artifactId>
1313
<version>1.0-SNAPSHOT</version>
1414
<packaging>war</packaging>
1515

16-
<name>jndi-context</name>
16+
<!--
1717
<repositories>
1818
<repository>
1919
<url>http://download.eclipse.org/rt/eclipselink/maven.repo/</url>
@@ -42,4 +42,5 @@
4242
<scope>provided</scope>
4343
</dependency>
4444
</dependencies>
45+
-->
4546
</project>

‎samples/jpa/listeners/pom.xml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
34
<parent>
4-
<groupId>org.sample</groupId>
5-
<artifactId>jpa</artifactId>
5+
<groupId>org.javaee7.jpa</groupId>
6+
<artifactId>jpa-samples</artifactId>
67
<version>1.0-SNAPSHOT</version>
78
<relativePath>../pom.xml</relativePath>
89
</parent>
9-
<modelVersion>4.0.0</modelVersion>
1010

11-
<groupId>org.glassfish</groupId>
11+
<groupId>org.javaee7.jpa</groupId>
1212
<artifactId>jpa-listeners</artifactId>
1313
<version>1.0-SNAPSHOT</version>
1414
<packaging>war</packaging>
15-
16-
<name>jpa-listeners</name>
1715
</project>

‎samples/jpa/locking-optimistic/pom.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<artifactId>jpa</artifactId>
6-
<groupId>org.sample</groupId>
5+
<groupId>org.javaee7.jpa</groupId>
6+
<artifactId>jpa-samples</artifactId>
77
<version>1.0-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010

11-
<groupId>org.glassfish.samples</groupId>
11+
<groupId>org.javaee7.jpa</groupId>
1212
<artifactId>locking-optimistic</artifactId>
1313
<version>1.0-SNAPSHOT</version>
1414
<packaging>war</packaging>
15-
16-
<name>locking-optimistic</name>
1715
</project>

‎samples/jpa/locking-pessimistic/pom.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
33
<modelVersion>4.0.0</modelVersion>
44
<parent>
5-
<artifactId>jpa</artifactId>
6-
<groupId>org.sample</groupId>
5+
<groupId>org.javaee7.jpa</groupId>
6+
<artifactId>jpa-samples</artifactId>
77
<version>1.0-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010

11-
<groupId>org.glassfish.samples</groupId>
11+
<groupId>org.javaee7.jpa</groupId>
1212
<artifactId>locking-pessimistic</artifactId>
1313
<version>1.0-SNAPSHOT</version>
1414
<packaging>war</packaging>
15-
16-
<name>locking-pessimistic</name>
1715
</project>

‎samples/jpa/multiple-pu/pom.xml‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<parent>
4-
<groupId>org.sample</groupId>
5-
<artifactId>jpa</artifactId>
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>org.javaee7.jpa</groupId>
6+
<artifactId>jpa-samples</artifactId>
67
<version>1.0-SNAPSHOT</version>
78
<relativePath>../pom.xml</relativePath>
89
</parent>
9-
<modelVersion>4.0.0</modelVersion>
1010

11-
<groupId>org.glassfish</groupId>
11+
<groupId>org.javaee7.jpa</groupId>
1212
<artifactId>multiple-pu</artifactId>
1313
<version>1.0-SNAPSHOT</version>
1414
<packaging>war</packaging>
15-
16-
<name>multiple-pu</name>
1715
</project>

‎samples/jpa/pom.xml‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
34
<parent>
4-
<groupId>org.sample</groupId>
5+
<groupId>org.javaee7</groupId>
56
<artifactId>javaee7-samples</artifactId>
67
<version>1.0-SNAPSHOT</version>
78
<relativePath>../pom.xml</relativePath>
89
</parent>
910

10-
<modelVersion>4.0.0</modelVersion>
11-
12-
<groupId>org.sample</groupId>
13-
<artifactId>jpa</artifactId>
11+
<groupId>org.javaee7.jpa</groupId>
12+
<artifactId>jpa-samples</artifactId>
1413
<version>1.0-SNAPSHOT</version>
1514
<packaging>pom</packaging>
16-
<name>jpa</name>
17-
1815
<modules>
1916
<module>criteria</module>
2017
<module>entitygraph</module>
@@ -23,6 +20,8 @@
2320
<module>schema-gen</module>
2421
<module>storedprocedure</module>
2522
<module>jndi-context</module>
26-
</modules>
23+
<module>locking-optimistic</module>
24+
<module>schema-gen2</module>
25+
</modules>
2726

28-
</project>
27+
</project>

‎samples/jpa/schema-gen/pom.xml‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
22
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3-
<parent>
4-
<groupId>org.sample</groupId>
5-
<artifactId>jpa</artifactId>
3+
<modelVersion>4.0.0</modelVersion>
4+
<parent>
5+
<groupId>org.javaee7.jpa</groupId>
6+
<artifactId>jpa-samples</artifactId>
67
<version>1.0-SNAPSHOT</version>
78
<relativePath>../pom.xml</relativePath>
89
</parent>
9-
<modelVersion>4.0.0</modelVersion>
1010

11-
<groupId>org.sample</groupId>
11+
<groupId>org.javaee7.jpa</groupId>
1212
<artifactId>schema-gen</artifactId>
1313
<version>1.0-SNAPSHOT</version>
1414
<packaging>war</packaging>
15-
16-
<name>schema-gen</name>
17-
1815
</project>

‎samples/jpa/schema-gen/src/main/resources/META-INF/persistence.xml‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
33
<persistence-unit name="MyPU" transaction-type="JTA">
4-
<jta-data-source>jdbc/sample</jta-data-source>
54
<properties>
6-
<property name="javax.persistence.schema-generation-action" value="drop-and-create"/>
7-
<property name="javax.persistence.schema-generation-target" value="scripts"/>
8-
<property name="javax.persistence.ddl-create-script-target" value="createfoo.sql"/>
9-
<property name="javax.persistence.ddl-drop-script-target" value="dropfoo.sql"/>
10-
<property name="eclipselink.deploy-on-startup" value="true"/>
11-
<!--<property name="eclipselink.application-location" value="/tmp"/>-->
5+
<property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
6+
<property name="javax.persistence.schema-generation.create-source" value="metadata"/>
7+
<!-- <property name="javax.persistence.schema-generation.create-source" value="createfoo.sql"/>
8+
<property name="javax.persistence.schema-generation.drop-source" value="dropfoo.sql"/> -->
129
</properties>
1310
</persistence-unit>
1411
</persistence>

0 commit comments

Comments
 (0)