Attachment 154102 Details for Bug 295842 – Patch containing one additional persistence.xml file as suggested by Kevin

[patch] Patch containing one additional persistence.xml file as suggested by Kevin

bugzilla295842_20091209.patch (text/plain), 10.41 KB, created by Adrian Goerler

on 2009-12-09 05:59:24 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Goerler

Created: 2009-12-09 05:59:24 EST

Size: 10.41 KB

patch

obsolete

>Index: jpa/eclipselink.jpa.test/build.xml
>===================================================================
>--- jpa/eclipselink.jpa.test/build.xml	(revision 6010)
>+++ jpa/eclipselink.jpa.test/build.xml	(working copy)
>@@ -1554,6 +1554,12 @@
>         <replace dir="${eclipselink.jpa.test}/stage/META-INF" token='%%data-source-name%%' value="${DS_NAME}">
>             <include name="*.xml"/>
>         </replace>
>+        <replace dir="${eclipselink.jpa.test}/stage/META-INF" token='%%server-weaving%%' value="${server.weaving}">
>+            <include name="*.xml"/>
>+        </replace>
>+        <replace dir="${eclipselink.jpa.test}/stage/META-INF" token='%%database-platform%%' value="${db.platform}">
>+            <include name="*.xml"/>
>+        </replace>
> 
>         
>         <antcall target="copy_criteria_api_canonical_model" inheritRefs="true"/>
>Index: jpa/eclipselink.jpa.test/resource/eclipselink-advanced-field-access-model/server/persistence.xml
>===================================================================
>--- jpa/eclipselink.jpa.test/resource/eclipselink-advanced-field-access-model/server/persistence.xml	(revision 6010)
>+++ jpa/eclipselink.jpa.test/resource/eclipselink-advanced-field-access-model/server/persistence.xml	(working copy)
>@@ -7,9 +7,9 @@
>             
>             <property name="javax.persistence.query.timeout" value="100"/>
>-            
>+            <property name="eclipselink.weaving" value="%%server-weaving%%"/>
>             <property name="eclipselink.target-server" value="%%server-platform%%"/>
>+            <property name="eclipselink.target-database" value="%%database-platform%%"/>
>             <property name="eclipselink.validate-existence" value="true"/>
>             
>         </properties>
>Index: jpa/eclipselink.jpa.test/resource/eclipselink-advanced-model/server/persistence.xml
>===================================================================
>--- jpa/eclipselink.jpa.test/resource/eclipselink-advanced-model/server/persistence.xml	(revision 6010)
>+++ jpa/eclipselink.jpa.test/resource/eclipselink-advanced-model/server/persistence.xml	(working copy)
>@@ -4,10 +4,12 @@
>         <jta-data-source>%%data-source-name%%</jta-data-source>
>         <properties>
>             <property name="eclipselink.target-server" value="%%server-platform%%"/>
>+            <property name="eclipselink.target-database" value="%%database-platform%%"/>
>             <property name="eclipselink.validate-existence" value="true"/>
>             <property name="eclipselink.descriptor.customizer.Employee" value="org.eclipse.persistence.testing.models.jpa.advanced.Customizer"/>
>             <property name="eclipselink.descriptor.customizer.org.eclipse.persistence.testing.models.jpa.advanced.Address" value="org.eclipse.persistence.testing.models.jpa.advanced.Customizer"/>
>             <property name="eclipselink.descriptor.customizer.Project" value="org.eclipse.persistence.testing.models.jpa.advanced.Customizer"/>
>+            <property name="eclipselink.weaving" value="%%server-weaving%%"/>
>             
>         </properties>
>     </persistence-unit>
>Index: jpa/eclipselink.jpa.test/resource/eclipselink-advanced-properties/server/persistence.xml
>===================================================================
>--- jpa/eclipselink.jpa.test/resource/eclipselink-advanced-properties/server/persistence.xml	(revision 6010)
>+++ jpa/eclipselink.jpa.test/resource/eclipselink-advanced-properties/server/persistence.xml	(working copy)
>@@ -6,6 +6,7 @@
>         <exclude-unlisted-classes>false</exclude-unlisted-classes>
>         <properties>
>              <property name="eclipselink.target-server" value="%%server-platform%%"/>
>+             <property name="eclipselink.target-database" value="%%database-platform%%"/>
>              <property name="eclipselink.sessions-xml" value="META-INF/sessions.xml"/>
>              <property name="eclipselink.session-name" value="JPASessionXML"/>
>              <property name="eclipselink.exception-handler" value="org.eclipse.persistence.testing.tests.jpa.jpaadvancedproperties.CustomizedExceptionHandler"/>
>@@ -19,6 +20,7 @@
>              <property name="eclipselink.logging.file" value="JPAAdvancedProperties.log"/>
>              <property name="eclipselink.session.include.descriptor.queries" value="true"/>
>              <property name="eclipselink.profiler" value="NoProfiler"/>
>+             <property name="eclipselink.weaving" value="%%server-weaving%%"/>
> 
>         </properties>
>     </persistence-unit>
>Index: jpa/eclipselink.jpa.test/resource/eclipselink-customfeatures-model/server/persistence.xml
>===================================================================
>--- jpa/eclipselink.jpa.test/resource/eclipselink-customfeatures-model/server/persistence.xml	(revision 6010)
>+++ jpa/eclipselink.jpa.test/resource/eclipselink-customfeatures-model/server/persistence.xml	(working copy)
>@@ -4,8 +4,10 @@
>         <jta-data-source>%%data-source-name%%</jta-data-source>
>         <properties>
>             <property name="eclipselink.target-server" value="%%server-platform%%"/>
>+            <property name="eclipselink.target-database" value="%%database-platform%%"/>
>             
>             <property name="eclipselink.jdbc.batch-writing" value="Oracle-JDBC"/>
>+            <property name="eclipselink.weaving" value="%%server-weaving%%"/>
>         </properties>
>     </persistence-unit>
> </persistence>
>Index: jpa/eclipselink.jpa.test/resource/eclipselink-ddl-generation-model/server/persistence.xml
>===================================================================
>--- jpa/eclipselink.jpa.test/resource/eclipselink-ddl-generation-model/server/persistence.xml	(revision 6010)
>+++ jpa/eclipselink.jpa.test/resource/eclipselink-ddl-generation-model/server/persistence.xml	(working copy)
>@@ -11,7 +11,9 @@
> 
>         <properties>
>             <property name="eclipselink.target-server" value="%%server-platform%%"/>
>+            <property name="eclipselink.target-database" value="%%database-platform%%"/>
>             <property name="eclipselink.ddl-generation" value="drop-and-create-tables"/>
>+            <property name="eclipselink.weaving" value="%%server-weaving%%"/>
>         </properties>
>     </persistence-unit>
> </persistence>
>Index: jpa/eclipselink.jpa.test/resource/eclipselink-ddl-generation-model/server_merge-inherited/persistence.xml
>===================================================================
>--- jpa/eclipselink.jpa.test/resource/eclipselink-ddl-generation-model/server_merge-inherited/persistence.xml	(revision 6010)
>+++ jpa/eclipselink.jpa.test/resource/eclipselink-ddl-generation-model/server_merge-inherited/persistence.xml	(working copy)
>@@ -15,6 +15,8 @@
>         <properties>
>             <property name="eclipselink.target-server" value="%%server-platform%%"/>
>             <property name="eclipselink.ddl-generation" value="drop-and-create-tables"/>
>+            <property name="eclipselink.weaving" value="%%server-weaving%%"/>
>+            <property name="eclipselink.target-database" value="%%database-platform%%"/>
>         </properties>
>     </persistence-unit>
> </persistence>
>Index: jpa/eclipselink.jpa.test/resource/eclipselink-delimited-model/server/persistence.xml
>===================================================================
>--- jpa/eclipselink.jpa.test/resource/eclipselink-delimited-model/server/persistence.xml	(revision 6010)
>+++ jpa/eclipselink.jpa.test/resource/eclipselink-delimited-model/server/persistence.xml	(working copy)
>@@ -5,9 +5,9 @@
>         <exclude-unlisted-classes>false</exclude-unlisted-classes>
>         <properties>
>             <property name="eclipselink.ddl-generation" value="drop-and-create-tables"/>
>-			
>+            <property name="eclipselink.weaving" value="%%server-weaving%%"/>
>             <property name="eclipselink.target-server" value="%%server-platform%%"/>
>+            <property name="eclipselink.target-database" value="%%database-platform%%"/>
>             <property name="eclipselink.validate-existence" value="true"/>
>             
>         </properties>
>Index: jpa/eclipselink.jpa.test/resource/eclipselink-xml-servertest-model/server/persistence.xml
>===================================================================
>--- jpa/eclipselink.jpa.test/resource/eclipselink-xml-servertest-model/server/persistence.xml	(revision 6010)
>+++ jpa/eclipselink.jpa.test/resource/eclipselink-xml-servertest-model/server/persistence.xml	(working copy)
>@@ -14,8 +14,10 @@
>         <exclude-unlisted-classes>false</exclude-unlisted-classes>
>         <properties>
>             <property name="eclipselink.target-server" value="%%server-platform%%"/>
>+            <property name="eclipselink.target-database" value="%%database-platform%%"/>
>             <property name="eclipselink.validate-existence" value="true"/>
>             <property name="eclipselink.orm.validate.schema" value="true"/>
>+            <property name="eclipselink.weaving" value="%%server-weaving%%"/>
>         </properties>
>     </persistence-unit>
> </persistence>
>Index: jpa/eclipselink.jpa.test/resource/server/persistence.xml
>===================================================================
>--- jpa/eclipselink.jpa.test/resource/server/persistence.xml	(revision 6010)
>+++ jpa/eclipselink.jpa.test/resource/server/persistence.xml	(working copy)
>@@ -4,8 +4,10 @@
>         <jta-data-source>%%data-source-name%%</jta-data-source>
>         <properties>
>             <property name="eclipselink.target-server" value="%%server-platform%%"/>
>+            <property name="eclipselink.target-database" value="%%database-platform%%"/>
>             <property name="eclipselink.validate-existence" value="true"/>
>             
>+            <property name="eclipselink.weaving" value="%%server-weaving%%"/>
>         </properties>
>     </persistence-unit>
> </persistence>

Actions: View | Diff

Attachments on bug 295842: 152834 | 154102