Attachment #126349 for bug #265512

View | Details | Raw Unified | Return to bug 265512
Collapse All | Expand All

Lines 119-126 Link Here

(-)foundation/eclipselink.extension.oracle.test/build.xml (-3 / +10 lines)
119	<delete includeEmptyDirs="true" failonerror="false">	119	<delete includeEmptyDirs="true" failonerror="false">
120	<fileset dir="${classes.dir}"/>	120	<fileset dir="${classes.dir}"/>
121	<fileset file="${eclipselink.oracle.depend.test.jar}"/>	121	<fileset file="${eclipselink.oracle.depend.test.jar}"/>
122	<fileset file="eclipselink-struct-converter-model-tests.jar"/>
123	<fileset file="eclipselink-struct-converter-model.jar"/>	122	<fileset file="eclipselink-struct-converter-model.jar"/>
		123	<fileset file="eclipselink-customfeatures-model.jar"/>
		124	<fileset file="eclipselink-jpa-oracle-tests.jar"/>
124	</delete>	125	</delete>
125	</target>	126	</target>
126		127
Lines 154-162 Link Here
154	<fileset dir="${classes.dir}"	155	<fileset dir="${classes.dir}"
155	includes="org/eclipse/persistence/testing/models/jpa/**"/>	156	includes="org/eclipse/persistence/testing/models/jpa/**"/>
156	</jar>	157	</jar>
157	<!-- Package the structconverter JPA tests jar. -->	158	<!-- Package the customfeatures JPA model jar. -->
158	<jar jarfile="eclipselink-struct-converter-model-tests.jar">	159	<jar jarfile="eclipselink-customfeatures-model.jar">
		160	<zipfileset dir="resource/customfeatures" includes="*.xml" prefix="META-INF"/>
159	<fileset dir="${classes.dir}"	161	<fileset dir="${classes.dir}"
		162	includes="org/eclipse/persistence/testing/models/jpa/customfeatures/**"/>
		163	</jar>
		164	<!-- Package the JPA oracle specific tests jar. -->
		165	<jar jarfile="eclipselink-jpa-oracle-tests.jar">
		166	<fileset dir="${classes.dir}"
160	includes="org/eclipse/persistence/testing/tests/jpa/**"/>	167	includes="org/eclipse/persistence/testing/tests/jpa/**"/>
161	</jar>	168	</jar>
162	<!-- Build tests jar. -->	169	<!-- Build tests jar. -->




<persistence 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 persistence_1_0.xsd" version="1.0">
    <persistence-unit name="customfeatures" transaction-type="RESOURCE_LOCAL">
        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
        <class>org.eclipse.persistence.testing.models.jpa.customfeatures.Employee</class>
        <property name="eclipselink.logging.level" value="FINEST"/>
        <property name="eclipselink.descriptor.customizer" value="org.eclipse.persistence.testing.models.jpa.customfeatures.XmlDataCustomizer"/>
        <property name="eclipselink.jdbc.batch-writing" value="Oracle-JDBC"/>
    </persistence-unit>
    
</persistence>






<persistence 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 persistence_1_0.xsd" version="1.0">
    <persistence-unit name="customfeatures" transaction-type="RESOURCE_LOCAL">
        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
        <class>org.eclipse.persistence.testing.models.jpa.customfeatures.Employee</class>
        <property name="eclipselink.logging.level" value="FINEST"/>
        <property name="eclipselink.descriptor.customizer" value="org.eclipse.persistence.testing.models.jpa.customfeatures.XmlDataCustomizer"/>
        <property name="eclipselink.jdbc.batch-writing" value="Oracle-JDBC"/>
    </persistence-unit>
    
</persistence>






/*******************************************************************************
 * Copyright (c) 1998, 2008 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the 
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
 * which accompanies this distribution. 
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at 
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:
 *     Oracle - initial API and implementation from Oracle TopLink
 ******************************************************************************/  
package org.eclipse.persistence.testing.models.jpa.customfeatures;

import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.JoinColumn;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.SequenceGenerator;
import javax.persistence.Transient;
import javax.persistence.Version;

import org.w3c.dom.*;

import oracle.sql.*;
import org.eclipse.persistence.annotations.Convert;
import org.eclipse.persistence.annotations.NamedStoredProcedureQuery;
import org.eclipse.persistence.annotations.NamedStoredProcedureQueries;
import org.eclipse.persistence.annotations.StoredProcedureParameter;
import org.eclipse.persistence.annotations.TypeConverter;
import static org.eclipse.persistence.annotations.Direction.IN;
import static org.eclipse.persistence.annotations.Direction.IN_OUT;
import static org.eclipse.persistence.annotations.Direction.OUT;
import static org.eclipse.persistence.annotations.Direction.OUT_CURSOR;
import org.eclipse.persistence.platform.database.oracle.NString;

@Entity
@Table(name="CUSTOM_FEATURE_EMPLOYEE")
@NamedStoredProcedureQueries({
@NamedStoredProcedureQuery(
    name="ReadEmployeeInOut",
    resultClass=org.eclipse.persistence.testing.models.jpa.customfeatures.Employee.class,
    procedureName="Read_Employee_InOut",
    parameters={
        @StoredProcedureParameter(direction=IN_OUT, name="employee_id_v", queryParameter="ID", type=Integer.class),
        @StoredProcedureParameter(direction=OUT, name="nchar_v", queryParameter="NCHARTYPE", type=Character.class)}
),
@NamedStoredProcedureQuery(
    name="ReadEmployeeCursor",
    resultClass=org.eclipse.persistence.testing.models.jpa.customfeatures.Employee.class,
    procedureName="Read_Employee_Cursor",
    parameters={
        @StoredProcedureParameter(direction=IN, name="employee_id_v", queryParameter="ID", type=Integer.class),
        @StoredProcedureParameter(direction=OUT_CURSOR, queryParameter="RESULT_CURSOR")})
})

public class Employee implements Serializable {

    @SequenceGenerator(
      name="CUSTOMEMP_SEQ",
      sequenceName="EMPLOYEE_SEQUENCE",
      initialValue=50,
      allocationSize=1
    )

    @Id
    @Column(name="ID")
    @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="CUSTOMEMP_SEQ")
    private Integer id;

    @Column(name="NAME")
    private String name;

    @Version
    @Column(name="VERSION")
    private Integer version;
    
    @Column(name="NCHARTYPE")
    @Convert(value="NChar")
    @TypeConverter(name="NChar", dataType=NString.class)
    private Character empNChar;
    
    @Column(name="XMLData")
    private String resume_xml;

    //@Column(name="XMLDom") wait for fix for bug 265468 to use this annotation
    @Transient
    private Document resume_dom;
 
    public Employee() {}

    public Integer getId() {
        return this.id;
    }

    public String getName() {
        return this.name;
    }

    public void setName(String name) {
        this.name = name;
    }

    public Integer getVersion() {
        return version; 
    }

    public void setVersion(Integer version) {
        this.version = version;
    }

    public char getEmpNChar() {
        return this.empNChar;
    }

    public void setEmpNChar(char empNChar) {
        this.empNChar = empNChar;
    }
    
    public String getReume_xml() {
        return this.resume_xml;
    }

    public void setResume_xml(String resume_xml) {
        this.resume_xml = resume_xml;
    }

    public Document getReume_dom() {
        return this.resume_dom;
    }

    public void setResume_dom(Document resume_dom) {
        this.resume_dom = resume_dom;
    }

    
}





/*******************************************************************************
 * Copyright (c) 1998, 2008 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the 
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
 * which accompanies this distribution. 
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at 
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:
 *     Oracle - initial API and implementation from Oracle TopLink
 ******************************************************************************/  
package org.eclipse.persistence.testing.models.jpa.customfeatures;

import org.eclipse.persistence.descriptors.ClassDescriptor;
import org.eclipse.persistence.sessions.factories.DescriptorCustomizer;
import org.eclipse.persistence.mappings.xdb.DirectToXMLTypeMapping;

public class XmlDataCustomizer implements DescriptorCustomizer {

    public void customize(final ClassDescriptor descriptor) throws Exception{
         descriptor.removeMappingForAttributeName("resume_xml");
         DirectToXMLTypeMapping mapping1 = new DirectToXMLTypeMapping();
         mapping1.setAttributeName("resume_xml");
         mapping1.setFieldName("XMLDATA");
         descriptor.addMapping(mapping1);

         descriptor.removeMappingForAttributeName("resume_dom");
         DirectToXMLTypeMapping mapping2 = new DirectToXMLTypeMapping();
         mapping2.setAttributeName("resume_dom");
         mapping2.setFieldName("XMLDom");
         descriptor.addMapping(mapping2);

     }
}





/*******************************************************************************
 * Copyright (c) 1998, 2008 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the 
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
 * which accompanies this distribution. 
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at 
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:
 *     Oracle - initial API and implementation from Oracle TopLink
 ******************************************************************************/  
package org.eclipse.persistence.testing.models.jpa.customfeatures;

import org.eclipse.persistence.tools.schemaframework.*;

public class EmployeeTableCreator extends TableCreator {
    public EmployeeTableCreator() {
        setName("CustomFeatureEmployeeProject");

        addTableDefinition(buildEmployeeTable());
    }
    
    public static TableDefinition buildEmployeeTable() {
        TableDefinition table = new TableDefinition();
        table.setName("CUSTOM_FEATURE_EMPLOYEE");

        FieldDefinition fieldID = new FieldDefinition();
        fieldID.setName("ID");
        fieldID.setTypeName("NUMERIC");
        fieldID.setSize(15);
        fieldID.setSubSize(0);
        fieldID.setIsPrimaryKey(true);
        fieldID.setIsIdentity(true);
        fieldID.setUnique(false);
        fieldID.setShouldAllowNull(false);
        table.addField(fieldID);

        FieldDefinition fieldNAME = new FieldDefinition();
        fieldNAME.setName("NAME");
        fieldNAME.setTypeName("VARCHAR2");
        fieldNAME.setSize(60);
        fieldNAME.setSubSize(0);
        fieldNAME.setIsPrimaryKey(false);
        fieldNAME.setIsIdentity(false);
        fieldNAME.setUnique(false);
        fieldNAME.setShouldAllowNull(true);
        table.addField(fieldNAME);

        FieldDefinition fieldNCH = new FieldDefinition();
        fieldNCH.setName("NCHARTYPE");
        fieldNCH.setTypeName("NCHAR");
        fieldNCH.setSize(1);
        fieldNCH.setSubSize(0);
        fieldNCH.setIsPrimaryKey(false);
        fieldNCH.setIsIdentity(false);
        fieldNCH.setUnique(false);
        fieldNCH.setShouldAllowNull(true);
        table.addField(fieldNCH);
      
        FieldDefinition fieldXMLDATA = new FieldDefinition();
        fieldXMLDATA.setName("XMLData");
        fieldXMLDATA.setTypeName("XMLTYPE");
        fieldXMLDATA.setIsPrimaryKey(false);
        fieldXMLDATA.setIsIdentity(false);
        fieldXMLDATA.setUnique(false);
        fieldXMLDATA.setShouldAllowNull(true);
        table.addField(fieldXMLDATA);

        FieldDefinition fieldXMLDOM = new FieldDefinition();
        fieldXMLDOM.setName("XMLDom");
        fieldXMLDOM.setTypeName("XMLTYPE");
        fieldXMLDOM.setIsPrimaryKey(false);
        fieldXMLDOM.setIsIdentity(false);
        fieldXMLDOM.setUnique(false);
        fieldXMLDOM.setShouldAllowNull(true);
        table.addField(fieldXMLDOM);

        FieldDefinition fieldVERSION = new FieldDefinition();
        fieldVERSION.setName("VERSION");
        fieldVERSION.setTypeName("NUMERIC");
        fieldVERSION.setSize(15);
        fieldVERSION.setShouldAllowNull(true);
        fieldVERSION.setIsPrimaryKey(false);
        fieldVERSION.setUnique(false);
        fieldVERSION.setIsIdentity(false);
        table.addField(fieldVERSION);

        return table;
    }
    
     
}




/*******************************************************************************
 * Copyright (c) 1998, 2008 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the 
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
 * which accompanies this distribution. 
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at 
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:
 *     Oracle - initial API and implementation from Oracle TopLink
 ******************************************************************************/  
package org.eclipse.persistence.testing.models.jpa.customfeatures;

import java.io.Serializable;
import javax.persistence.Column;
import javax.persistence.JoinColumn;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.SequenceGenerator;
import javax.persistence.Transient;
import javax.persistence.Version;

import org.w3c.dom.*;

import oracle.sql.*;
import org.eclipse.persistence.annotations.Convert;
import org.eclipse.persistence.annotations.NamedStoredProcedureQuery;
import org.eclipse.persistence.annotations.NamedStoredProcedureQueries;
import org.eclipse.persistence.annotations.StoredProcedureParameter;
import org.eclipse.persistence.annotations.TypeConverter;
import static org.eclipse.persistence.annotations.Direction.IN;
import static org.eclipse.persistence.annotations.Direction.IN_OUT;
import static org.eclipse.persistence.annotations.Direction.OUT;
import static org.eclipse.persistence.annotations.Direction.OUT_CURSOR;
import org.eclipse.persistence.platform.database.oracle.NString;

@Entity
@Table(name="CUSTOM_FEATURE_EMPLOYEE")
@NamedStoredProcedureQueries({
@NamedStoredProcedureQuery(
    name="ReadEmployeeInOut",
    resultClass=org.eclipse.persistence.testing.models.jpa.customfeatures.Employee.class,
    procedureName="Read_Employee_InOut",
    parameters={
        @StoredProcedureParameter(direction=IN_OUT, name="employee_id_v", queryParameter="ID", type=Integer.class),
        @StoredProcedureParameter(direction=OUT, name="nchar_v", queryParameter="NCHARTYPE", type=Character.class)}
),
@NamedStoredProcedureQuery(
    name="ReadEmployeeCursor",
    resultClass=org.eclipse.persistence.testing.models.jpa.customfeatures.Employee.class,
    procedureName="Read_Employee_Cursor",
    parameters={
        @StoredProcedureParameter(direction=IN, name="employee_id_v", queryParameter="ID", type=Integer.class),
        @StoredProcedureParameter(direction=OUT_CURSOR, queryParameter="RESULT_CURSOR")})
})

public class Employee implements Serializable {

    @SequenceGenerator(
      name="CUSTOMEMP_SEQ",
      sequenceName="EMPLOYEE_SEQUENCE",
      initialValue=50,
      allocationSize=1
    )

    @Id
    @Column(name="ID")
    @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="CUSTOMEMP_SEQ")
    private Integer id;

    @Column(name="NAME")
    private String name;

    @Version
    @Column(name="VERSION")
    private Integer version;
    
    @Column(name="NCHARTYPE")
    @Convert(value="NChar")
    @TypeConverter(name="NChar", dataType=NString.class)
    private Character empNChar;
    
    @Column(name="XMLData")
    private String resume_xml;

    //@Column(name="XMLDom") wait for fix for bug 265468 to use this annotation
    @Transient
    private Document resume_dom;
 
    public Employee() {}

    public Integer getId() {
        return this.id;
    }

    public String getName() {
        return this.name;
    }

    public void setName(String name) {
        this.name = name;
    }

    public Integer getVersion() {
        return version; 
    }

    public void setVersion(Integer version) {
        this.version = version;
    }

    public char getEmpNChar() {
        return this.empNChar;
    }

    public void setEmpNChar(char empNChar) {
        this.empNChar = empNChar;
    }
    
    public String getReume_xml() {
        return this.resume_xml;
    }

    public void setResume_xml(String resume_xml) {
        this.resume_xml = resume_xml;
    }

    public Document getReume_dom() {
        return this.resume_dom;
    }

    public void setResume_dom(Document resume_dom) {
        this.resume_dom = resume_dom;
    }

    
}





/*******************************************************************************
 * Copyright (c) 1998, 2008 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the 
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
 * which accompanies this distribution. 
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at 
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:
 *     Oracle - initial API and implementation from Oracle TopLink
 ******************************************************************************/  
package org.eclipse.persistence.testing.models.jpa.customfeatures;

import org.eclipse.persistence.tools.schemaframework.*;

public class EmployeeTableCreator extends TableCreator {
    public EmployeeTableCreator() {
        setName("CustomFeatureEmployeeProject");

        addTableDefinition(buildEmployeeTable());
    }
    
    public static TableDefinition buildEmployeeTable() {
        TableDefinition table = new TableDefinition();
        table.setName("CUSTOM_FEATURE_EMPLOYEE");

        FieldDefinition fieldID = new FieldDefinition();
        fieldID.setName("ID");
        fieldID.setTypeName("NUMERIC");
        fieldID.setSize(15);
        fieldID.setSubSize(0);
        fieldID.setIsPrimaryKey(true);
        fieldID.setIsIdentity(true);
        fieldID.setUnique(false);
        fieldID.setShouldAllowNull(false);
        table.addField(fieldID);

        FieldDefinition fieldNAME = new FieldDefinition();
        fieldNAME.setName("NAME");
        fieldNAME.setTypeName("VARCHAR2");
        fieldNAME.setSize(60);
        fieldNAME.setSubSize(0);
        fieldNAME.setIsPrimaryKey(false);
        fieldNAME.setIsIdentity(false);
        fieldNAME.setUnique(false);
        fieldNAME.setShouldAllowNull(true);
        table.addField(fieldNAME);

        FieldDefinition fieldNCH = new FieldDefinition();
        fieldNCH.setName("NCHARTYPE");
        fieldNCH.setTypeName("NCHAR");
        fieldNCH.setSize(1);
        fieldNCH.setSubSize(0);
        fieldNCH.setIsPrimaryKey(false);
        fieldNCH.setIsIdentity(false);
        fieldNCH.setUnique(false);
        fieldNCH.setShouldAllowNull(true);
        table.addField(fieldNCH);
      
        FieldDefinition fieldXMLDATA = new FieldDefinition();
        fieldXMLDATA.setName("XMLData");
        fieldXMLDATA.setTypeName("XMLTYPE");
        fieldXMLDATA.setIsPrimaryKey(false);
        fieldXMLDATA.setIsIdentity(false);
        fieldXMLDATA.setUnique(false);
        fieldXMLDATA.setShouldAllowNull(true);
        table.addField(fieldXMLDATA);

        FieldDefinition fieldXMLDOM = new FieldDefinition();
        fieldXMLDOM.setName("XMLDom");
        fieldXMLDOM.setTypeName("XMLTYPE");
        fieldXMLDOM.setIsPrimaryKey(false);
        fieldXMLDOM.setIsIdentity(false);
        fieldXMLDOM.setUnique(false);
        fieldXMLDOM.setShouldAllowNull(true);
        table.addField(fieldXMLDOM);

        FieldDefinition fieldVERSION = new FieldDefinition();
        fieldVERSION.setName("VERSION");
        fieldVERSION.setTypeName("NUMERIC");
        fieldVERSION.setSize(15);
        fieldVERSION.setShouldAllowNull(true);
        fieldVERSION.setIsPrimaryKey(false);
        fieldVERSION.setUnique(false);
        fieldVERSION.setIsIdentity(false);
        table.addField(fieldVERSION);

        return table;
    }
    
     
}




/*******************************************************************************
 * Copyright (c) 1998, 2008 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the 
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
 * which accompanies this distribution. 
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at 
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:
 *     Oracle - initial API and implementation from Oracle TopLink
 ******************************************************************************/  
package org.eclipse.persistence.testing.models.jpa.customfeatures;

import org.eclipse.persistence.descriptors.ClassDescriptor;
import org.eclipse.persistence.sessions.factories.DescriptorCustomizer;
import org.eclipse.persistence.mappings.xdb.DirectToXMLTypeMapping;

public class XmlDataCustomizer implements DescriptorCustomizer {

    public void customize(final ClassDescriptor descriptor) throws Exception{
         descriptor.removeMappingForAttributeName("resume_xml");
         DirectToXMLTypeMapping mapping1 = new DirectToXMLTypeMapping();
         mapping1.setAttributeName("resume_xml");
         mapping1.setFieldName("XMLDATA");
         descriptor.addMapping(mapping1);

         descriptor.removeMappingForAttributeName("resume_dom");
         DirectToXMLTypeMapping mapping2 = new DirectToXMLTypeMapping();
         mapping2.setAttributeName("resume_dom");
         mapping2.setFieldName("XMLDom");
         descriptor.addMapping(mapping2);

     }
}





/*******************************************************************************
 * Copyright (c) 1998, 2008 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the 
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
 * which accompanies this distribution. 
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at 
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:
 *     Oracle - initial API and implementation from Oracle TopLink
 ******************************************************************************/  
package org.eclipse.persistence.testing.tests.jpa.customfeatures;

import java.io.*;
import java.util.Calendar;
import java.util.TimeZone;
import java.util.List;
import java.util.Map;

import org.w3c.dom.*;

import javax.xml.parsers.*;
import javax.persistence.EntityManager;
import javax.persistence.OptimisticLockException;
import javax.persistence.PersistenceException;

import junit.framework.*;
import org.eclipse.persistence.testing.framework.TestCase;
import org.eclipse.persistence.testing.framework.junit.JUnitTestCase;
import org.eclipse.persistence.testing.framework.QuerySQLTracker;
import org.eclipse.persistence.testing.models.jpa.customfeatures.*;
import org.eclipse.persistence.tools.schemaframework.PackageDefinition;
import org.eclipse.persistence.tools.schemaframework.StoredProcedureDefinition;
import org.eclipse.persistence.tools.schemaframework.SchemaManager;
import org.eclipse.persistence.sessions.DatabaseSession;
import org.eclipse.persistence.sessions.Session;
import org.eclipse.persistence.sessions.server.ServerSession;

public class CustomFeaturesJUnitTestSuite extends JUnitTestCase {
    private static int empId;
    protected static int NUM_INSERTS = 200;
        
    public CustomFeaturesJUnitTestSuite() {
        super();
    }
    
    public CustomFeaturesJUnitTestSuite(String name) {
        super(name);
    }
    
    public static Test suite() {
        TestSuite suite = new TestSuite();
        suite.setName("CustomFeaturesJUnitTestSuite");
        suite.addTest(new CustomFeaturesJUnitTestSuite("testSetup"));
        suite.addTest(new CustomFeaturesJUnitTestSuite("testNCharXMLType"));
        suite.addTest(new CustomFeaturesJUnitTestSuite("testBatchInserts"));
        suite.addTest(new CustomFeaturesJUnitTestSuite("testBatchUpdates"));
        suite.addTest(new CustomFeaturesJUnitTestSuite("testNamedStoredProcedureInOutQuery"));
        suite.addTest(new CustomFeaturesJUnitTestSuite("testNamedStoredProcedureCursorQuery"));
        return suite;
    }
    
    public void testSetup() {
        ServerSession session = JUnitTestCase.getServerSession("customfeatures");
        new EmployeeTableCreator().replaceTables(session);
        buildOraclePackage(session);
        buildOracleStoredProcedureReadFromEmployeeInOut(session);
        buildOracleStoredProcedureReadFromEmployeeCursor(session);
    }

    /**
     * Tests a NChar and XML Type with Document.
     */
    public void testNCharXMLType() {
        EntityManager em = createEntityManager("customfeatures");
        beginTransaction(em);
        Employee emp = null;
        try{
            emp = new Employee();
            emp.setResume_xml(resume0());
            char nCh = '\u0410';
            emp.setEmpNChar(nCh);
            emp.setResume_dom(documentFromString(resume0()));
            em.persist(emp);
            empId = emp.getId();
            commitTransaction(em);
        } catch (RuntimeException e) {
            if (isTransactionActive(em)){
                rollbackTransaction(em);
            }
            closeEntityManager(em);
            throw e;
        }

        try{
            Employee readEmp = em.find(Employee.class, empId);
            if (!getServerSession("customfeatures").compareObjects(readEmp, emp)) {
                closeEntityManager(em);
                fail("Object: " + readEmp + " does not match object that was written: " + emp + ". See log (on finest) for what did not match.");
            } 
        } catch (Exception exception ) {
            closeEntityManager(em);
            fail("entityManager.refresh(removedObject) threw a wrong exception: " + exception.getMessage());
        }
       closeEntityManager(em);
    }

    /**
     * Tests a Native Batch Writing as batch inserts.
     */
    public void testBatchInserts() {
        EntityManager em = createEntityManager("customfeatures");
        beginTransaction(em);
        try{
            for (int i = 0; i < NUM_INSERTS; i++) {
                Employee emp = new Employee();
                emp.setResume_xml(resume0());
                char nCh = '\u0410';
                emp.setEmpNChar(nCh);
                em.persist(emp);
            }
            commitTransaction(em);
        } catch (RuntimeException e) {
            if (isTransactionActive(em)){
                rollbackTransaction(em);
            }
            throw e;
        } finally{
            closeEntityManager(em);
        }
    }

    /**
     * Tests a Native Batch Writing as batch updates with OptimisticLockingException.
     */
    public void testBatchUpdates() {
        QuerySQLTracker counter = null;
        EntityManager em = createEntityManager("customfeatures");
        beginTransaction(em);
        counter = new QuerySQLTracker(getServerSession("customfeatures"));
        List emps = em.createQuery("SELECT OBJECT(e) FROM Employee e").getResultList();
        if (isOnServer){
            try {
                for(int i=0; i<emps.size(); i++) {
                    Employee e = (Employee)emps.get(i);
                    String newName = ((Employee)emps.get(i)).getName() + i + "test";
                    e.setName(newName);
                    e.setVersion(e.getVersion()-1);
                }
                commitTransaction(em);
                fail("OptimisticLockingException is not thrown!");
            }  catch (RuntimeException exception ) {
                closeEntityManager(em);
            }
        }else{
            try {
                for(int i=0; i<emps.size(); i++) {
                    Employee e = (Employee)emps.get(i);
                    String newName = ((Employee)emps.get(i)).getName() + i + "test";
                    e.setName(newName);
                    e.setVersion(e.getVersion()-1);
                }
                commitTransaction(em);
                fail("OptimisticLockingException is not thrown!");
            }  catch (Exception exception ) {
                if (exception.getMessage().indexOf("org.eclipse.persistence.exceptions.OptimisticLockException") == -1){
                    closeEntityManager(em);
                    fail("it's not the right exception");
                }
                closeEntityManager(em);
            }
            if (counter.getSqlStatements().size() != 1) {
                fail("it's not just one batch update statement");
            }  
        }
        
    }

    /**
     * Tests a @NamedStoredProcedureQuery with store procedure IN_OUT parameter, and XML Type using String
     */
    public void testNamedStoredProcedureInOutQuery() {
        EntityManager em = createEntityManager("customfeatures");
        beginTransaction(em);
        try {
            Employee emp = new Employee();
            emp.setResume_xml(resume1());
            char nCh = '\u0400';
            emp.setEmpNChar(nCh);
            em.persist(emp);
            commitTransaction(em);
            Employee readEmp = (Employee) em.createNamedQuery("ReadEmployeeInOut").setParameter("ID", emp.getId()).getSingleResult();
            if (!getServerSession("customfeatures").compareObjects(readEmp, emp)) {
                fail("Object: " + readEmp + " does not match object that was written: " + emp + ". See log (on finest) for what did not match.");
            }
        } catch (RuntimeException e) {
            if (isTransactionActive(em)){
                rollbackTransaction(em);
            }
            closeEntityManager(em);
            throw e;
        }
        closeEntityManager(em);
    }

    /**
     * Tests a @NamedStoredProcedureQuery with store procedure ref Cursor, and XML Type using String
     */
    public void testNamedStoredProcedureCursorQuery() {
        EntityManager em = createEntityManager("customfeatures");
        beginTransaction(em);
        try {
            Employee emp = new Employee();
            emp.setResume_xml(resume1());
            char nCh = '\u0400';
            emp.setEmpNChar(nCh);
            emp.setName("Edward Xu");
            em.persist(emp);
            commitTransaction(em);
            System.out.println("=====original emp's resume_xml is " + emp.getReume_xml());
            clearCache("customfeatures");
            EntityManager newEM = createEntityManager("customfeatures");
            Employee readEmp = (Employee) newEM.createNamedQuery("ReadEmployeeCursor").setParameter("ID", emp.getId()).getSingleResult();
            System.out.println("======the readEmp's resume_xml is " + readEmp.getReume_xml());
            System.out.println("======the readEmp's name is " + readEmp.getName());
            if (!getServerSession("customfeatures").compareObjects(readEmp, emp)) {
                fail("Object: " + readEmp + " does not match object that was written: " + emp + ". See log (on finest) for what did not match.");
            }
        } catch (RuntimeException e) {
            if (isTransactionActive(em)){
                rollbackTransaction(em);
            }
            closeEntityManager(em);
            throw e;
        }
        closeEntityManager(em);
    }

    public static String resume0() {
        String resume = "<resume>\n";
        resume += "  <first-name>Bob</first-name>\n";
        resume += "   <last-name>Jones</last-name>\n";
        resume += "   <age>45</age>\n";
        resume += "   <education>\n";
        resume += "     <degree>BCS</degree>\n";
        resume += "     <degree>MBA</degree>\n";
        resume += "   </education>\n";
        resume += "</resume>";
        return resume;
    }

    public static String resume1() {
        String resume = "<resume>\n";
        resume += "  <first-name>Frank</first-name>\n";
        resume += "   <last-name>Cotton</last-name>\n";
        resume += "   <age>27</age>\n";
        resume += "   <education>\n";
        resume += "     <degree>BCS</degree>\n";
        resume += "   </education>\n";
        resume += "</resume>";
        return resume;
    }

    public static Document documentFromString(String xmlString) {
        try {
            ByteArrayInputStream stream = new ByteArrayInputStream(xmlString.getBytes());
            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
            DocumentBuilder builder = factory.newDocumentBuilder();
            Document doc = builder.parse(stream);
            return doc;
        } catch (Exception ex) {
            System.out.println("Unable to create document due to: " + ex.getMessage());
            ex.printStackTrace();
        }
        return null;
    }

    public PackageDefinition buildOraclePackage(Session session) {
        PackageDefinition types = new PackageDefinition();
        types.setName("Cursor_Type");
        types.addStatement("Type Any_Cursor is REF CURSOR");
        if (TestCase.supportsStoredProcedures(session)) {
            SchemaManager schema = new SchemaManager(((DatabaseSession) session));
            schema.replaceObject(types);
        }
        return types;
    }

    public void buildOracleStoredProcedureReadFromEmployeeInOut(Session session) {
        StoredProcedureDefinition proc = new StoredProcedureDefinition();
        proc.setName("Read_Employee_InOut");
        
        proc.addInOutputArgument("employee_id_v", Integer.class);
        proc.addOutputArgument("nchar_v", Character.class);
                
        String statement = "SELECT NCHARTYPE INTO nchar_v FROM CUSTOM_FEATURE_EMPLOYEE WHERE (ID = employee_id_v)";
        
        proc.addStatement(statement);
        if (TestCase.supportsStoredProcedures(session)) {
            SchemaManager schema = new SchemaManager(((DatabaseSession) session));
            schema.replaceObject(proc);
        }
    }

    public void buildOracleStoredProcedureReadFromEmployeeCursor(Session session) {
        StoredProcedureDefinition proc = new StoredProcedureDefinition();
        proc.setName("Read_Employee_Cursor");
        
        proc.addArgument("employee_id_v", Integer.class);
        proc.addOutputArgument("RESULT_CURSOR", "CURSOR_TYPE.ANY_CURSOR");
		proc.addStatement("OPEN RESULT_CURSOR FOR SELECT * FROM CUSTOM_FEATURE_EMPLOYEE WHERE (ID = employee_id_v)");
 
        if (TestCase.supportsStoredProcedures(session)) {
            SchemaManager schema = new SchemaManager(((DatabaseSession) session));
            schema.replaceObject(proc);
        }
    }

}




/*******************************************************************************
 * Copyright (c) 1998, 2008 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the 
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
 * which accompanies this distribution. 
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at 
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:
 *     Oracle - initial API and implementation from Oracle TopLink
 ******************************************************************************/  
package org.eclipse.persistence.testing.tests.jpa.customfeatures;

import java.io.*;
import java.util.Calendar;
import java.util.TimeZone;
import java.util.List;
import java.util.Map;

import org.w3c.dom.*;

import javax.xml.parsers.*;
import javax.persistence.EntityManager;
import javax.persistence.OptimisticLockException;
import javax.persistence.PersistenceException;

import junit.framework.*;
import org.eclipse.persistence.testing.framework.TestCase;
import org.eclipse.persistence.testing.framework.junit.JUnitTestCase;
import org.eclipse.persistence.testing.framework.QuerySQLTracker;
import org.eclipse.persistence.testing.models.jpa.customfeatures.*;
import org.eclipse.persistence.tools.schemaframework.PackageDefinition;
import org.eclipse.persistence.tools.schemaframework.StoredProcedureDefinition;
import org.eclipse.persistence.tools.schemaframework.SchemaManager;
import org.eclipse.persistence.sessions.DatabaseSession;
import org.eclipse.persistence.sessions.Session;
import org.eclipse.persistence.sessions.server.ServerSession;

public class CustomFeaturesJUnitTestSuite extends JUnitTestCase {
    private static int empId;
    protected static int NUM_INSERTS = 200;
        
    public CustomFeaturesJUnitTestSuite() {
        super();
    }
    
    public CustomFeaturesJUnitTestSuite(String name) {
        super(name);
    }
    
    public static Test suite() {
        TestSuite suite = new TestSuite();
        suite.setName("CustomFeaturesJUnitTestSuite");
        suite.addTest(new CustomFeaturesJUnitTestSuite("testSetup"));
        suite.addTest(new CustomFeaturesJUnitTestSuite("testNCharXMLType"));
        suite.addTest(new CustomFeaturesJUnitTestSuite("testBatchInserts"));
        suite.addTest(new CustomFeaturesJUnitTestSuite("testBatchUpdates"));
        suite.addTest(new CustomFeaturesJUnitTestSuite("testNamedStoredProcedureInOutQuery"));
        suite.addTest(new CustomFeaturesJUnitTestSuite("testNamedStoredProcedureCursorQuery"));
        return suite;
    }
    
    public void testSetup() {
        ServerSession session = JUnitTestCase.getServerSession("customfeatures");
        new EmployeeTableCreator().replaceTables(session);
        buildOraclePackage(session);
        buildOracleStoredProcedureReadFromEmployeeInOut(session);
        buildOracleStoredProcedureReadFromEmployeeCursor(session);
    }

    /**
     * Tests a NChar and XML Type with Document.
     */
    public void testNCharXMLType() {
        EntityManager em = createEntityManager("customfeatures");
        beginTransaction(em);
        Employee emp = null;
        try{
            emp = new Employee();
            emp.setResume_xml(resume0());
            char nCh = '\u0410';
            emp.setEmpNChar(nCh);
            emp.setResume_dom(documentFromString(resume0()));
            em.persist(emp);
            empId = emp.getId();
            commitTransaction(em);
        } catch (RuntimeException e) {
            if (isTransactionActive(em)){
                rollbackTransaction(em);
            }
            closeEntityManager(em);
            throw e;
        }

        try{
            Employee readEmp = em.find(Employee.class, empId);
            if (!getServerSession("customfeatures").compareObjects(readEmp, emp)) {
                closeEntityManager(em);
                fail("Object: " + readEmp + " does not match object that was written: " + emp + ". See log (on finest) for what did not match.");
            } 
        } catch (Exception exception ) {
            closeEntityManager(em);
            fail("entityManager.refresh(removedObject) threw a wrong exception: " + exception.getMessage());
        }
       closeEntityManager(em);
    }

    /**
     * Tests a Native Batch Writing as batch inserts.
     */
    public void testBatchInserts() {
        EntityManager em = createEntityManager("customfeatures");
        beginTransaction(em);
        try{
            for (int i = 0; i < NUM_INSERTS; i++) {
                Employee emp = new Employee();
                emp.setResume_xml(resume0());
                char nCh = '\u0410';
                emp.setEmpNChar(nCh);
                em.persist(emp);
            }
            commitTransaction(em);
        } catch (RuntimeException e) {
            if (isTransactionActive(em)){
                rollbackTransaction(em);
            }
            throw e;
        } finally{
            closeEntityManager(em);
        }
    }

    /**
     * Tests a Native Batch Writing as batch updates with OptimisticLockingException.
     */
    public void testBatchUpdates() {
        QuerySQLTracker counter = null;
        EntityManager em = createEntityManager("customfeatures");
        beginTransaction(em);
        counter = new QuerySQLTracker(getServerSession("customfeatures"));
        List emps = em.createQuery("SELECT OBJECT(e) FROM Employee e").getResultList();
        if (isOnServer){
            try {
                for(int i=0; i<emps.size(); i++) {
                    Employee e = (Employee)emps.get(i);
                    String newName = ((Employee)emps.get(i)).getName() + i + "test";
                    e.setName(newName);
                    e.setVersion(e.getVersion()-1);
                }
                commitTransaction(em);
                fail("OptimisticLockingException is not thrown!");
            }  catch (RuntimeException exception ) {
                closeEntityManager(em);
            }
        }else{
            try {
                for(int i=0; i<emps.size(); i++) {
                    Employee e = (Employee)emps.get(i);
                    String newName = ((Employee)emps.get(i)).getName() + i + "test";
                    e.setName(newName);
                    e.setVersion(e.getVersion()-1);
                }
                commitTransaction(em);
                fail("OptimisticLockingException is not thrown!");
            }  catch (Exception exception ) {
                if (exception.getMessage().indexOf("org.eclipse.persistence.exceptions.OptimisticLockException") == -1){
                    closeEntityManager(em);
                    fail("it's not the right exception");
                }
                closeEntityManager(em);
            }
            if (counter.getSqlStatements().size() != 1) {
                fail("it's not just one batch update statement");
            }  
        }
        
    }

    /**
     * Tests a @NamedStoredProcedureQuery with store procedure IN_OUT parameter, and XML Type using String
     */
    public void testNamedStoredProcedureInOutQuery() {
        EntityManager em = createEntityManager("customfeatures");
        beginTransaction(em);
        try {
            Employee emp = new Employee();
            emp.setResume_xml(resume1());
            char nCh = '\u0400';
            emp.setEmpNChar(nCh);
            em.persist(emp);
            commitTransaction(em);
            Employee readEmp = (Employee) em.createNamedQuery("ReadEmployeeInOut").setParameter("ID", emp.getId()).getSingleResult();
            if (!getServerSession("customfeatures").compareObjects(readEmp, emp)) {
                fail("Object: " + readEmp + " does not match object that was written: " + emp + ". See log (on finest) for what did not match.");
            }
        } catch (RuntimeException e) {
            if (isTransactionActive(em)){
                rollbackTransaction(em);
            }
            closeEntityManager(em);
            throw e;
        }
        closeEntityManager(em);
    }

    /**
     * Tests a @NamedStoredProcedureQuery with store procedure ref Cursor, and XML Type using String
     */
    public void testNamedStoredProcedureCursorQuery() {
        EntityManager em = createEntityManager("customfeatures");
        beginTransaction(em);
        try {
            Employee emp = new Employee();
            emp.setResume_xml(resume1());
            char nCh = '\u0400';
            emp.setEmpNChar(nCh);
            emp.setName("Edward Xu");
            em.persist(emp);
            commitTransaction(em);
            System.out.println("=====original emp's resume_xml is " + emp.getReume_xml());
            clearCache("customfeatures");
            EntityManager newEM = createEntityManager("customfeatures");
            Employee readEmp = (Employee) newEM.createNamedQuery("ReadEmployeeCursor").setParameter("ID", emp.getId()).getSingleResult();
            System.out.println("======the readEmp's resume_xml is " + readEmp.getReume_xml());
            System.out.println("======the readEmp's name is " + readEmp.getName());
            if (!getServerSession("customfeatures").compareObjects(readEmp, emp)) {
                fail("Object: " + readEmp + " does not match object that was written: " + emp + ". See log (on finest) for what did not match.");
            }
        } catch (RuntimeException e) {
            if (isTransactionActive(em)){
                rollbackTransaction(em);
            }
            closeEntityManager(em);
            throw e;
        }
        closeEntityManager(em);
    }

    public static String resume0() {
        String resume = "<resume>\n";
        resume += "  <first-name>Bob</first-name>\n";
        resume += "   <last-name>Jones</last-name>\n";
        resume += "   <age>45</age>\n";
        resume += "   <education>\n";
        resume += "     <degree>BCS</degree>\n";
        resume += "     <degree>MBA</degree>\n";
        resume += "   </education>\n";
        resume += "</resume>";
        return resume;
    }

    public static String resume1() {
        String resume = "<resume>\n";
        resume += "  <first-name>Frank</first-name>\n";
        resume += "   <last-name>Cotton</last-name>\n";
        resume += "   <age>27</age>\n";
        resume += "   <education>\n";
        resume += "     <degree>BCS</degree>\n";
        resume += "   </education>\n";
        resume += "</resume>";
        return resume;
    }

    public static Document documentFromString(String xmlString) {
        try {
            ByteArrayInputStream stream = new ByteArrayInputStream(xmlString.getBytes());
            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
            DocumentBuilder builder = factory.newDocumentBuilder();
            Document doc = builder.parse(stream);
            return doc;
        } catch (Exception ex) {
            System.out.println("Unable to create document due to: " + ex.getMessage());
            ex.printStackTrace();
        }
        return null;
    }

    public PackageDefinition buildOraclePackage(Session session) {
        PackageDefinition types = new PackageDefinition();
        types.setName("Cursor_Type");
        types.addStatement("Type Any_Cursor is REF CURSOR");
        if (TestCase.supportsStoredProcedures(session)) {
            SchemaManager schema = new SchemaManager(((DatabaseSession) session));
            schema.replaceObject(types);
        }
        return types;
    }

    public void buildOracleStoredProcedureReadFromEmployeeInOut(Session session) {
        StoredProcedureDefinition proc = new StoredProcedureDefinition();
        proc.setName("Read_Employee_InOut");
        
        proc.addInOutputArgument("employee_id_v", Integer.class);
        proc.addOutputArgument("nchar_v", Character.class);
                
        String statement = "SELECT NCHARTYPE INTO nchar_v FROM CUSTOM_FEATURE_EMPLOYEE WHERE (ID = employee_id_v)";
        
        proc.addStatement(statement);
        if (TestCase.supportsStoredProcedures(session)) {
            SchemaManager schema = new SchemaManager(((DatabaseSession) session));
            schema.replaceObject(proc);
        }
    }

    public void buildOracleStoredProcedureReadFromEmployeeCursor(Session session) {
        StoredProcedureDefinition proc = new StoredProcedureDefinition();
        proc.setName("Read_Employee_Cursor");
        
        proc.addArgument("employee_id_v", Integer.class);
        proc.addOutputArgument("RESULT_CURSOR", "CURSOR_TYPE.ANY_CURSOR");
		proc.addStatement("OPEN RESULT_CURSOR FOR SELECT * FROM CUSTOM_FEATURE_EMPLOYEE WHERE (ID = employee_id_v)");
 
        if (TestCase.supportsStoredProcedures(session)) {
            SchemaManager schema = new SchemaManager(((DatabaseSession) session));
            schema.replaceObject(proc);
        }
    }

}




/*******************************************************************************
 * Copyright (c) 1998, 2008 Oracle. All rights reserved.
 * This program and the accompanying materials are made available under the 
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0 
 * which accompanies this distribution. 
 * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
 * and the Eclipse Distribution License is available at 
 * http://www.eclipse.org/org/documents/edl-v10.php.
 *
 * Contributors:
 *     05/29/2008-1.0M8 Andrei Ilitchev. 
 *       - New file introduced to consolidate Oracle-specific JPA tests.
 ******************************************************************************/  
package org.eclipse.persistence.testing.tests;

import junit.framework.TestSuite;
import junit.framework.Test;

import org.eclipse.persistence.testing.tests.jpa.customfeatures.CustomFeaturesJUnitTestSuite;

public class OracleJPACustomFeaturesTestSuite extends TestSuite{
    
    public static Test suite() {
        TestSuite fullSuite = new TestSuite();
        fullSuite.setName("OracleJPACustomFeaturesTestSuite");

        fullSuite.addTest(CustomFeaturesJUnitTestSuite.suite());
        
        return fullSuite;
    }
}

Lines 46-53 Link Here

(-)jpa/eclipselink.jpa.test/build.properties (+4 lines)
46	jpa.performance=jpa-performance	46	jpa.performance=jpa-performance
47		47
48	eclipselink.struct.converter.model=eclipselink-struct-converter-model	48	eclipselink.struct.converter.model=eclipselink-struct-converter-model
		49	eclipselink.customfeatures.model=eclipselink-customfeatures-model
		50	eclipselink.jpa.oracle=eclipselink-jpa-oracle
49	oracle.extensions.depend.dir=../../../extension.oracle.lib.external	51	oracle.extensions.depend.dir=../../../extension.oracle.lib.external
50	oracle.spatial.lib=sdoapi.jar	52	oracle.spatial.lib=sdoapi.jar
		53	oracle.xdb.lib=xdb.jar
		54	oracle.xmlparserv2.lib=xmlparserv2.jar
51		55
52	eclipselink.tests.jar=eclipselink-tests.jar	56	eclipselink.tests.jar=eclipselink-tests.jar
53		57




        - package : jars JPA persistent units and tests jars
        - test : runs JPA LRG (FullRegressionTestSuite)
        - test-lrg : runs JPA LRG (FullRegressionTestSuite, if database is Oracle, OracleJPATestSuite as well)
        - test-oracle : runs JPA Oracle-specific tests (OracleJPATestSuite and OracleJPACustomfeaturesTestSuite)
        - test-no-weave : runs JPA LRG using no weaving (no agent)
        - test-static-weave : runs JPA LRG using static weaving


        <contains string="${server.name}" substring="jboss"/>
    </condition>

    <!-- This checks if the Apllication Server is WebLogic -->
    <condition property="is.weblogic">
        <contains string="${server.name}" substring="weblogic"/>
    </condition>

    <!-- This checks if the Apllication Server is WebLogic and running against oracle db-->
    <condition property="is.weblogic.and.oracle">
        <and>
            <contains string="${server.name}" substring="weblogic"/>
            <contains string="${db.driver}" substring="oracle"/>
        </and>
    </condition>

    <target name="set-app-name">
        <condition property="APP_NAME" value="">
            <contains string="${server.name}" substring="websphere"/>

            <pathelement path="${eclipselink.extension.oracle.dir}/${classes.dir}"/>
            <pathelement path="${eclipselink.extension.oracle.dir}/eclipselink-extension-oracle.jar"/>
            <pathelement path="${jdbc.driver.jar}"/>
            <pathelement path="${oracle.extensions.depend.dir}/${oracle.xdb.lib}"/>
            <pathelement path="${oracle.extensions.depend.dir}/${oracle.xmlparserv2.lib}"/>
            <pathelement path="${eclipselink.jpa.test}/${eclipselink.tests.jar}"/>
            <pathelement path="${eclipselink.jpa.test}/${eclipselink.annotation.model}.jar"/>
            <pathelement path="${eclipselink.jpa.test}/${eclipselink.ddl.generation.model}.jar"/>

            <!--pathelement path="${eclipselink.jpa.test}/${eclipselink.pu.with.multibyte}.jar"/-->
            <pathelement path="${eclipselink.jpa.test}/${jpa.performance}.jar"/>
            <pathelement path="${eclipselink.extension.oracle.test.dir}/${eclipselink.struct.converter.model}.jar"/>
            <pathelement path="${eclipselink.extension.oracle.test.dir}/${eclipselink.customfeatures.model}.jar"/>
            <pathelement path="${eclipselink.extension.oracle.test.dir}/${eclipselink.jpa.oracle}-tests.jar"/>
            <pathelement path="${oracle.extensions.depend.dir}/${oracle.spatial.lib}"/>
        </path>
        <path id="run.extended.classpath">

            <param name="TEST_WEAVING" value="${test.weaving}"/>
            <param name="ORM_TESTING" value="-Dorm.testing=jpa"/>
            <param name="RUN_PATH" value="run.classpath"/>
            <param name="DB_URL" value="${db.url}"/>
        </antcall>
        <antcall target="generate-report" inheritRefs="true"/>
    </target>

            <param name="TEST_WEAVING" value="${test.weaving}"/>
            <param name="ORM_TESTING" value="-Dorm.testing=jpa"/>
            <param name="RUN_PATH" value="run.classpath"/>
            <param name="DB_URL" value="${db.url}"/>
        </antcall>
        <antcall target="run-test" inheritRefs="true">
            <param name="TEST_CLASS" value="org.eclipse.persistence.testing.tests.jpa.xml.EntityMappingsJUnitTestSuite"/>

            <param name="TEST_WEAVING" value="${test.weaving}"/>
            <param name="ORM_TESTING" value="-Dorm.testing=eclipselink"/>
            <param name="RUN_PATH" value="run.extended.classpath"/>
            <param name="DB_URL" value="${db.url}"/>
        </antcall>
        <antcall target="test-oracle" inheritRefs="true"/>
        <antcall target="generate-report" inheritRefs="true"/>


    <!-- Runs JPA Oracle-specific tests. -->
    <target name="test-oracle" if="is.oracle" depends="config-trunk, config-flat">
        <!--antcall target="run-test" inheritRefs="true">
            <param name="TEST_CLASS" value="org.eclipse.persistence.testing.tests.OracleJPATestSuite"/>
            <param name="TEST_AGENT" value="${test.agent}"/>
            <param name="TEST_WEAVING" value="${test.weaving}"/>
            <param name="ORM_TESTING" value="-Dorm.testing=jpa"/>
            <param name="RUN_PATH" value="run.classpath"/>
            <param name="DB_URL" value="${db.url}"/>
        </antcall-->
        <antcall target="run-test" inheritRefs="true">
            <param name="TEST_CLASS" value="org.eclipse.persistence.testing.tests.OracleJPACustomFeaturesTestSuite"/>
            <param name="TEST_AGENT" value="${test.agent}"/>
            <param name="TEST_WEAVING" value="${test.weaving}"/>
            <param name="ORM_TESTING" value="-Dorm.testing=jpa"/>
            <param name="RUN_PATH" value="run.classpath"/>
            <param name="DB_URL" value="${db.oci.url}"/>
        </antcall>
    </target>


            <param name="TEST_WEAVING" value="${test.weaving}"/>
            <param name="ORM_TESTING" value="-Dorm.testing=jpa"/>
            <param name="RUN_PATH" value="run.classpath"/>
            <param name="DB_URL" value="${db.url}"/>
        </antcall>
        <antcall target="generate-report" inheritRefs="true"/>
    </target>

            <param name="TEST_WEAVING" value="-DTEST_NO_WEAVING=true"/>
            <param name="ORM_TESTING" value="-Dorm.testing=jpa"/>
            <param name="RUN_PATH" value="run.classpath"/>
            <param name="DB_URL" value="${db.url}"/>
        </antcall>
        <antcall target="generate-report" inheritRefs="true"/>
    </target>

            <param name="TEST_WEAVING" value="-Dignore"/>
            <param name="ORM_TESTING" value="-Dorm.testing=jpa"/>
            <param name="RUN_PATH" value="run.classpath.static"/>
            <param name="DB_URL" value="${db.url}"/>
        </antcall>
        <antcall target="run-test" inheritRefs="true">
            <param name="TEST_CLASS" value="org.eclipse.persistence.testing.tests.jpa.xml.EntityMappingsJUnitTestSuite"/>

            <param name="TEST_WEAVING" value="-Dignore"/>
            <param name="ORM_TESTING" value="-Dorm.testing=eclipselink"/>
            <param name="RUN_PATH" value="run.extended.classpath.static"/>
            <param name="DB_URL" value="${db.url}"/>
        </antcall>
        <antcall target="generate-report" inheritRefs="true"/>
    </target>


    <!-- Generic target for running tests. -->
    <target name="run-test" depends="config-trunk, config-flat">
        <echo>Running test on ${DB_URL}</echo>

        <condition property="jvmarg.db.platform" value="-Ddb.platform=${db.platform}">
            <isset property="db.platform"/>

            <jvmarg value="${ORM_TESTING}"/>
            <jvmarg value="-Declipselink.logging.level=${logging.level}"/>
            <jvmarg value="-Ddb.driver=${db.driver}"/>
            <jvmarg value="-Ddb.url=${DB_URL}"/>
            <jvmarg value="-Ddb.user=${db.user}"/>
            <jvmarg value="-Ddb.pwd=${db.pwd}"/>
            <jvmarg value="${jvmarg.db.platform}"/>

            <param name="eclipselink.jpa.test.dir" value="./../../foundation/eclipselink.extension.oracle.test"/>
        </antcall>
    </target>

    <target name="server-test-custom-features" if="is.weblogic.and.oracle">
        <antcall target="server-run-all" inheritRefs="true">
            <param name="PERSISTENCE_UNIT_NAME" value="customfeatures"/>
            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/customfeatures"/>
            <param name="MODEL_NAME" value="eclipselink-customfeatures-model"/>
            <param name="TEST_DIR" value="org/eclipse/persistence/testing/tests/jpa/customfeatures"/>
            <param name="TEST_NAME" value="eclipselink-customfeatures-model"/>
            <param name="EAR_NAME" value="eclipselink-customfeatures-model"/>
            <param name="TEST_SUITE" value="org.eclipse.persistence.testing.tests.jpa.customfeatures.CustomFeaturesJUnitTestSuite"/>
            <param name="eclipselink.jpa.test.dir" value="./../../foundation/eclipselink.extension.oracle.test"/>
        </antcall>
    </target>

    <!-- *********** CacheCoordination Test Targets -->
    <target name="server-start-cachecoordination" depends="detect-os,config-trunk, config-flat">
      <ant antfile="${eclipselink.jpa.test}/cachecoordination_${server.name}.xml" target="${server.name}-start-cachecoordination" inheritRefs="true"/>




<persistence 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 persistence_1_0.xsd" version="1.0">
    <persistence-unit name="%%default%%">
        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
        <jta-data-source>jdbc/EclipseLinkDS_OCI</jta-data-source>
        <properties>
            <property name="eclipselink.target-server" value="%%server-platform%%"/>
            <property name="eclipselink.logging.level" value="FINEST"/>
            <property name="eclipselink.descriptor.customizer" value="org.eclipse.persistence.testing.models.jpa.customfeatures.XmlDataCustomizer"/>
            <property name="eclipselink.jdbc.batch-writing" value="Oracle-JDBC"/>
        </properties>
    </persistence-unit>
</persistence>




<persistence 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 persistence_1_0.xsd" version="1.0">
    <persistence-unit name="%%default%%">
        <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
        <jta-data-source>jdbc/EclipseLinkDS_OCI</jta-data-source>
        <properties>
            <property name="eclipselink.target-server" value="%%server-platform%%"/>
            <property name="eclipselink.logging.level" value="FINEST"/>
            <property name="eclipselink.descriptor.customizer" value="org.eclipse.persistence.testing.models.jpa.customfeatures.XmlDataCustomizer"/>
            <property name="eclipselink.jdbc.batch-writing" value="Oracle-JDBC"/>
        </properties>
    </persistence-unit>
</persistence>




        <copy file="${junit.lib}" todir="${weblogic.domain}/lib"/>
        <copy file="${eclipselink.jar.name}" todir="${weblogic.domain}/lib"/>
        <copy file="${jdbc.driver.jar}" todir="${weblogic.domain}/lib"/>
        <copy file="${oracle.extensions.depend.dir}/${oracle.xdb.lib}" todir="${weblogic.domain}/lib"/>
        <antcall target="weblogic-stop" inheritRefs="true"/>
    </target>


                <set attribute="PoolName" value="ejbPool"/>
                <set attribute="Targets" value="${myserver}"/>
            </create>
            <create type="JDBCConnectionPool" name="ejbPool_oci">
                <set attribute="CapacityIncrement" value="2"/>
                <set attribute="DriverName" value="${db.driver}"/>
                <set attribute="InitialCapacity" value="1"/>
                <set attribute="MaxCapacity" value="50"/>
                <set attribute="Password" value="${db.pwd}"/>
                <set attribute="Properties" value="user=${db.user}"/>
                <set attribute="URL" value="${db.oci.url}"/>
                <set attribute="Targets" value="${myserver}"/>
            </create>
            <create type="JDBCTxDataSource" name="EclipseLinkDS_OCI">
                <set attribute="JNDIName" value="jdbc/EclipseLinkDS_OCI"/>
                <set attribute="PoolName" value="ejbPool_oci"/>
                <set attribute="Targets" value="${myserver}"/>
            </create>
        </wlconfig>
    </target>


Return to bug 265512

Lines 30-36 Link Here

(-)jpa/eclipselink.jpa.test/build.xml (-5 / +51 lines)
30	- package : jars JPA persistent units and tests jars	30	- package : jars JPA persistent units and tests jars
31	- test : runs JPA LRG (FullRegressionTestSuite)	31	- test : runs JPA LRG (FullRegressionTestSuite)
32	- test-lrg : runs JPA LRG (FullRegressionTestSuite, if database is Oracle, OracleJPATestSuite as well)	32	- test-lrg : runs JPA LRG (FullRegressionTestSuite, if database is Oracle, OracleJPATestSuite as well)
33	- test-oracle : runs JPA Oracle-specific tests (OracleJPATestSuite)	33	- test-oracle : runs JPA Oracle-specific tests (OracleJPATestSuite and OracleJPACustomfeaturesTestSuite)
34	- test-no-weave : runs JPA LRG using no weaving (no agent)	34	- test-no-weave : runs JPA LRG using no weaving (no agent)
35	- test-static-weave : runs JPA LRG using static weaving	35	- test-static-weave : runs JPA LRG using static weaving
36		36
Lines 92-97 Link Here
92	<contains string="${server.name}" substring="jboss"/>	92	<contains string="${server.name}" substring="jboss"/>
93	</condition>	93	</condition>
94		94
		95	<!-- This checks if the Apllication Server is WebLogic -->
		96	<condition property="is.weblogic">
		97	<contains string="${server.name}" substring="weblogic"/>
		98	</condition>
		99
		100	<!-- This checks if the Apllication Server is WebLogic and running against oracle db-->
		101	<condition property="is.weblogic.and.oracle">
		102	<and>
		103	<contains string="${server.name}" substring="weblogic"/>
		104	<contains string="${db.driver}" substring="oracle"/>
		105	</and>
		106	</condition>
		107
95	<target name="set-app-name">	108	<target name="set-app-name">
96	<condition property="APP_NAME" value="">	109	<condition property="APP_NAME" value="">
97	<contains string="${server.name}" substring="websphere"/>	110	<contains string="${server.name}" substring="websphere"/>
Lines 408-413 Link Here
408	<pathelement path="${eclipselink.extension.oracle.dir}/${classes.dir}"/>	421	<pathelement path="${eclipselink.extension.oracle.dir}/${classes.dir}"/>
409	<pathelement path="${eclipselink.extension.oracle.dir}/eclipselink-extension-oracle.jar"/>	422	<pathelement path="${eclipselink.extension.oracle.dir}/eclipselink-extension-oracle.jar"/>
410	<pathelement path="${jdbc.driver.jar}"/>	423	<pathelement path="${jdbc.driver.jar}"/>
		424	<pathelement path="${oracle.extensions.depend.dir}/${oracle.xdb.lib}"/>
		425	<pathelement path="${oracle.extensions.depend.dir}/${oracle.xmlparserv2.lib}"/>
411	<pathelement path="${eclipselink.jpa.test}/${eclipselink.tests.jar}"/>	426	<pathelement path="${eclipselink.jpa.test}/${eclipselink.tests.jar}"/>
412	<pathelement path="${eclipselink.jpa.test}/${eclipselink.annotation.model}.jar"/>	427	<pathelement path="${eclipselink.jpa.test}/${eclipselink.annotation.model}.jar"/>
413	<pathelement path="${eclipselink.jpa.test}/${eclipselink.ddl.generation.model}.jar"/>	428	<pathelement path="${eclipselink.jpa.test}/${eclipselink.ddl.generation.model}.jar"/>
Lines 420-426 Link Here
420	<!--pathelement path="${eclipselink.jpa.test}/${eclipselink.pu.with.multibyte}.jar"/-->	435	<!--pathelement path="${eclipselink.jpa.test}/${eclipselink.pu.with.multibyte}.jar"/-->
421	<pathelement path="${eclipselink.jpa.test}/${jpa.performance}.jar"/>	436	<pathelement path="${eclipselink.jpa.test}/${jpa.performance}.jar"/>
422	<pathelement path="${eclipselink.extension.oracle.test.dir}/${eclipselink.struct.converter.model}.jar"/>	437	<pathelement path="${eclipselink.extension.oracle.test.dir}/${eclipselink.struct.converter.model}.jar"/>
423	<pathelement path="${eclipselink.extension.oracle.test.dir}/${eclipselink.struct.converter.model}-tests.jar"/>	438	<pathelement path="${eclipselink.extension.oracle.test.dir}/${eclipselink.customfeatures.model}.jar"/>
		439	<pathelement path="${eclipselink.extension.oracle.test.dir}/${eclipselink.jpa.oracle}-tests.jar"/>
424	<pathelement path="${oracle.extensions.depend.dir}/${oracle.spatial.lib}"/>	440	<pathelement path="${oracle.extensions.depend.dir}/${oracle.spatial.lib}"/>
425	</path>	441	</path>
426	<path id="run.extended.classpath">	442	<path id="run.extended.classpath">
Lines 448-453 Link Here
448	<param name="TEST_WEAVING" value="${test.weaving}"/>	464	<param name="TEST_WEAVING" value="${test.weaving}"/>
449	<param name="ORM_TESTING" value="-Dorm.testing=jpa"/>	465	<param name="ORM_TESTING" value="-Dorm.testing=jpa"/>
450	<param name="RUN_PATH" value="run.classpath"/>	466	<param name="RUN_PATH" value="run.classpath"/>
		467	<param name="DB_URL" value="${db.url}"/>
451	</antcall>	468	</antcall>
452	<antcall target="generate-report" inheritRefs="true"/>	469	<antcall target="generate-report" inheritRefs="true"/>
453	</target>	470	</target>
Lines 460-465 Link Here
460	<param name="TEST_WEAVING" value="${test.weaving}"/>	477	<param name="TEST_WEAVING" value="${test.weaving}"/>
461	<param name="ORM_TESTING" value="-Dorm.testing=jpa"/>	478	<param name="ORM_TESTING" value="-Dorm.testing=jpa"/>
462	<param name="RUN_PATH" value="run.classpath"/>	479	<param name="RUN_PATH" value="run.classpath"/>
		480	<param name="DB_URL" value="${db.url}"/>
463	</antcall>	481	</antcall>
464	<antcall target="run-test" inheritRefs="true">	482	<antcall target="run-test" inheritRefs="true">
465	<param name="TEST_CLASS" value="org.eclipse.persistence.testing.tests.jpa.xml.EntityMappingsJUnitTestSuite"/>	483	<param name="TEST_CLASS" value="org.eclipse.persistence.testing.tests.jpa.xml.EntityMappingsJUnitTestSuite"/>
Lines 467-472 Link Here
467	<param name="TEST_WEAVING" value="${test.weaving}"/>	485	<param name="TEST_WEAVING" value="${test.weaving}"/>
468	<param name="ORM_TESTING" value="-Dorm.testing=eclipselink"/>	486	<param name="ORM_TESTING" value="-Dorm.testing=eclipselink"/>
469	<param name="RUN_PATH" value="run.extended.classpath"/>	487	<param name="RUN_PATH" value="run.extended.classpath"/>
		488	<param name="DB_URL" value="${db.url}"/>
470	</antcall>	489	</antcall>
471	<antcall target="test-oracle" inheritRefs="true"/>	490	<antcall target="test-oracle" inheritRefs="true"/>
472	<antcall target="generate-report" inheritRefs="true"/>	491	<antcall target="generate-report" inheritRefs="true"/>
Lines 474-485 Link Here
474		493
475	<!-- Runs JPA Oracle-specific tests. -->	494	<!-- Runs JPA Oracle-specific tests. -->
476	<target name="test-oracle" if="is.oracle" depends="config-trunk, config-flat">	495	<target name="test-oracle" if="is.oracle" depends="config-trunk, config-flat">
477	<antcall target="run-test" inheritRefs="true">	496	<!--antcall target="run-test" inheritRefs="true">
478	<param name="TEST_CLASS" value="org.eclipse.persistence.testing.tests.OracleJPATestSuite"/>	497	<param name="TEST_CLASS" value="org.eclipse.persistence.testing.tests.OracleJPATestSuite"/>
479	<param name="TEST_AGENT" value="${test.agent}"/>	498	<param name="TEST_AGENT" value="${test.agent}"/>
480	<param name="TEST_WEAVING" value="${test.weaving}"/>	499	<param name="TEST_WEAVING" value="${test.weaving}"/>
481	<param name="ORM_TESTING" value="-Dorm.testing=jpa"/>	500	<param name="ORM_TESTING" value="-Dorm.testing=jpa"/>
482	<param name="RUN_PATH" value="run.classpath"/>	501	<param name="RUN_PATH" value="run.classpath"/>
		502	<param name="DB_URL" value="${db.url}"/>
		503	</antcall-->
		504	<antcall target="run-test" inheritRefs="true">
		505	<param name="TEST_CLASS" value="org.eclipse.persistence.testing.tests.OracleJPACustomFeaturesTestSuite"/>
		506	<param name="TEST_AGENT" value="${test.agent}"/>
		507	<param name="TEST_WEAVING" value="${test.weaving}"/>
		508	<param name="ORM_TESTING" value="-Dorm.testing=jpa"/>
		509	<param name="RUN_PATH" value="run.classpath"/>
		510	<param name="DB_URL" value="${db.oci.url}"/>
483	</antcall>	511	</antcall>
484	</target>	512	</target>
485		513
Lines 491-496 Link Here
491	<param name="TEST_WEAVING" value="${test.weaving}"/>	519	<param name="TEST_WEAVING" value="${test.weaving}"/>
492	<param name="ORM_TESTING" value="-Dorm.testing=jpa"/>	520	<param name="ORM_TESTING" value="-Dorm.testing=jpa"/>
493	<param name="RUN_PATH" value="run.classpath"/>	521	<param name="RUN_PATH" value="run.classpath"/>
		522	<param name="DB_URL" value="${db.url}"/>
494	</antcall>	523	</antcall>
495	<antcall target="generate-report" inheritRefs="true"/>	524	<antcall target="generate-report" inheritRefs="true"/>
496	</target>	525	</target>
Lines 503-508 Link Here
503	<param name="TEST_WEAVING" value="-DTEST_NO_WEAVING=true"/>	532	<param name="TEST_WEAVING" value="-DTEST_NO_WEAVING=true"/>
504	<param name="ORM_TESTING" value="-Dorm.testing=jpa"/>	533	<param name="ORM_TESTING" value="-Dorm.testing=jpa"/>
505	<param name="RUN_PATH" value="run.classpath"/>	534	<param name="RUN_PATH" value="run.classpath"/>
		535	<param name="DB_URL" value="${db.url}"/>
506	</antcall>	536	</antcall>
507	<antcall target="generate-report" inheritRefs="true"/>	537	<antcall target="generate-report" inheritRefs="true"/>
508	</target>	538	</target>
Lines 538-543 Link Here
538	<param name="TEST_WEAVING" value="-Dignore"/>	568	<param name="TEST_WEAVING" value="-Dignore"/>
539	<param name="ORM_TESTING" value="-Dorm.testing=jpa"/>	569	<param name="ORM_TESTING" value="-Dorm.testing=jpa"/>
540	<param name="RUN_PATH" value="run.classpath.static"/>	570	<param name="RUN_PATH" value="run.classpath.static"/>
		571	<param name="DB_URL" value="${db.url}"/>
541	</antcall>	572	</antcall>
542	<antcall target="run-test" inheritRefs="true">	573	<antcall target="run-test" inheritRefs="true">
543	<param name="TEST_CLASS" value="org.eclipse.persistence.testing.tests.jpa.xml.EntityMappingsJUnitTestSuite"/>	574	<param name="TEST_CLASS" value="org.eclipse.persistence.testing.tests.jpa.xml.EntityMappingsJUnitTestSuite"/>
Lines 545-550 Link Here
545	<param name="TEST_WEAVING" value="-Dignore"/>	576	<param name="TEST_WEAVING" value="-Dignore"/>
546	<param name="ORM_TESTING" value="-Dorm.testing=eclipselink"/>	577	<param name="ORM_TESTING" value="-Dorm.testing=eclipselink"/>
547	<param name="RUN_PATH" value="run.extended.classpath.static"/>	578	<param name="RUN_PATH" value="run.extended.classpath.static"/>
		579	<param name="DB_URL" value="${db.url}"/>
548	</antcall>	580	</antcall>
549	<antcall target="generate-report" inheritRefs="true"/>	581	<antcall target="generate-report" inheritRefs="true"/>
550	</target>	582	</target>
Lines 665-671 Link Here
665		697
666	<!-- Generic target for running tests. -->	698	<!-- Generic target for running tests. -->
667	<target name="run-test" depends="config-trunk, config-flat">	699	<target name="run-test" depends="config-trunk, config-flat">
668	<echo>Running test on ${db.url}</echo>	700	<echo>Running test on ${DB_URL}</echo>
669		701
670	<condition property="jvmarg.db.platform" value="-Ddb.platform=${db.platform}">	702	<condition property="jvmarg.db.platform" value="-Ddb.platform=${db.platform}">
671	<isset property="db.platform"/>	703	<isset property="db.platform"/>
Lines 682-688 Link Here
682	<jvmarg value="${ORM_TESTING}"/>	714	<jvmarg value="${ORM_TESTING}"/>
683	<jvmarg value="-Declipselink.logging.level=${logging.level}"/>	715	<jvmarg value="-Declipselink.logging.level=${logging.level}"/>
684	<jvmarg value="-Ddb.driver=${db.driver}"/>	716	<jvmarg value="-Ddb.driver=${db.driver}"/>
685	<jvmarg value="-Ddb.url=${db.url}"/>	717	<jvmarg value="-Ddb.url=${DB_URL}"/>
686	<jvmarg value="-Ddb.user=${db.user}"/>	718	<jvmarg value="-Ddb.user=${db.user}"/>
687	<jvmarg value="-Ddb.pwd=${db.pwd}"/>	719	<jvmarg value="-Ddb.pwd=${db.pwd}"/>
688	<jvmarg value="${jvmarg.db.platform}"/>	720	<jvmarg value="${jvmarg.db.platform}"/>
Lines 1411-1416 Link Here
1411	<param name="eclipselink.jpa.test.dir" value="./../../foundation/eclipselink.extension.oracle.test"/>	1443	<param name="eclipselink.jpa.test.dir" value="./../../foundation/eclipselink.extension.oracle.test"/>
1412	</antcall>	1444	</antcall>
1413	</target>	1445	</target>
		1446
		1447	<target name="server-test-custom-features" if="is.weblogic.and.oracle">
		1448	<antcall target="server-run-all" inheritRefs="true">
		1449	<param name="PERSISTENCE_UNIT_NAME" value="customfeatures"/>
		1450	<param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/customfeatures"/>
		1451	<param name="MODEL_NAME" value="eclipselink-customfeatures-model"/>
		1452	<param name="TEST_DIR" value="org/eclipse/persistence/testing/tests/jpa/customfeatures"/>
		1453	<param name="TEST_NAME" value="eclipselink-customfeatures-model"/>
		1454	<param name="EAR_NAME" value="eclipselink-customfeatures-model"/>
		1455	<param name="TEST_SUITE" value="org.eclipse.persistence.testing.tests.jpa.customfeatures.CustomFeaturesJUnitTestSuite"/>
		1456	<param name="eclipselink.jpa.test.dir" value="./../../foundation/eclipselink.extension.oracle.test"/>
		1457	</antcall>
		1458	</target>
		1459
1414	<!-- *********** CacheCoordination Test Targets -->	1460	<!-- *********** CacheCoordination Test Targets -->
1415	<target name="server-start-cachecoordination" depends="detect-os,config-trunk, config-flat">	1461	<target name="server-start-cachecoordination" depends="detect-os,config-trunk, config-flat">
1416	<ant antfile="${eclipselink.jpa.test}/cachecoordination_${server.name}.xml" target="${server.name}-start-cachecoordination" inheritRefs="true"/>	1462	<ant antfile="${eclipselink.jpa.test}/cachecoordination_${server.name}.xml" target="${server.name}-start-cachecoordination" inheritRefs="true"/>

Line 0 Link Here

(-)foundation/eclipselink.extension.oracle.test/resource/customfeatures/persistence.xml (+12 lines)
	1	<persistence 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 persistence_1_0.xsd" version="1.0">
	2	<persistence-unit name="customfeatures" transaction-type="RESOURCE_LOCAL">
	3	<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
	4	<class>org.eclipse.persistence.testing.models.jpa.customfeatures.Employee</class>
	5	<property name="eclipselink.logging.level" value="FINEST"/>
	6	<property name="eclipselink.descriptor.customizer" value="org.eclipse.persistence.testing.models.jpa.customfeatures.XmlDataCustomizer"/>
	7	<property name="eclipselink.jdbc.batch-writing" value="Oracle-JDBC"/>
	8	</persistence-unit>
	9
	10	</persistence>
	11
	12

Line 0 Link Here

(-)foundation/eclipselink.extension.oracle.test/src/org/eclipse/persistence/testing/models/jpa/customfeatures/Employee.java (+142 lines)
		1	/*******************************************************************************
		2	* Copyright (c) 1998, 2008 Oracle. All rights reserved.
		3	* This program and the accompanying materials are made available under the
		4	* terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
		5	* which accompanies this distribution.
		6	* The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
		7	* and the Eclipse Distribution License is available at
		8	* http://www.eclipse.org/org/documents/edl-v10.php.
		9	*
		10	* Contributors:
		11	* Oracle - initial API and implementation from Oracle TopLink
		12	******************************************************************************/
		13	package org.eclipse.persistence.testing.models.jpa.customfeatures;
		14
		15	import java.io.Serializable;
		16	import javax.persistence.Column;
		17	import javax.persistence.JoinColumn;
		18	import javax.persistence.Entity;
		19	import javax.persistence.GeneratedValue;
		20	import javax.persistence.GenerationType;
		21	import javax.persistence.Id;
		22	import javax.persistence.Table;
		23	import javax.persistence.SequenceGenerator;
		24	import javax.persistence.Transient;
		25	import javax.persistence.Version;
		26
		27	import org.w3c.dom.*;
		28
		29	import oracle.sql.*;
		30	import org.eclipse.persistence.annotations.Convert;
		31	import org.eclipse.persistence.annotations.NamedStoredProcedureQuery;
		32	import org.eclipse.persistence.annotations.NamedStoredProcedureQueries;
		33	import org.eclipse.persistence.annotations.StoredProcedureParameter;
		34	import org.eclipse.persistence.annotations.TypeConverter;
		35	import static org.eclipse.persistence.annotations.Direction.IN;
		36	import static org.eclipse.persistence.annotations.Direction.IN_OUT;
		37	import static org.eclipse.persistence.annotations.Direction.OUT;
		38	import static org.eclipse.persistence.annotations.Direction.OUT_CURSOR;
		39	import org.eclipse.persistence.platform.database.oracle.NString;
		40
		41	@Entity
		42	@Table(name="CUSTOM_FEATURE_EMPLOYEE")
		43	@NamedStoredProcedureQueries({
		44	@NamedStoredProcedureQuery(
		45	name="ReadEmployeeInOut",
		46	resultClass=org.eclipse.persistence.testing.models.jpa.customfeatures.Employee.class,
		47	procedureName="Read_Employee_InOut",
		48	parameters={
		49	@StoredProcedureParameter(direction=IN_OUT, name="employee_id_v", queryParameter="ID", type=Integer.class),
		50	@StoredProcedureParameter(direction=OUT, name="nchar_v", queryParameter="NCHARTYPE", type=Character.class)}
		51	),
		52	@NamedStoredProcedureQuery(
		53	name="ReadEmployeeCursor",
		54	resultClass=org.eclipse.persistence.testing.models.jpa.customfeatures.Employee.class,
		55	procedureName="Read_Employee_Cursor",
		56	parameters={
		57	@StoredProcedureParameter(direction=IN, name="employee_id_v", queryParameter="ID", type=Integer.class),
		58	@StoredProcedureParameter(direction=OUT_CURSOR, queryParameter="RESULT_CURSOR")})
		59	})
		60
		61	public class Employee implements Serializable {
		62
		63	@SequenceGenerator(
		64	name="CUSTOMEMP_SEQ",
65	sequenceName="EMPLOYEE_SEQUENCE",
66	initialValue=50,
67	allocationSize=1
68	)
69
70	@Id
71	@Column(name="ID")
72	@GeneratedValue(strategy=GenerationType.SEQUENCE, generator="CUSTOMEMP_SEQ")
73	private Integer id;
74
75	@Column(name="NAME")
76	private String name;
77
78	@Version
79	@Column(name="VERSION")
80	private Integer version;
81
82	@Column(name="NCHARTYPE")
83	@Convert(value="NChar")
84	@TypeConverter(name="NChar", dataType=NString.class)
85	private Character empNChar;
86
87	@Column(name="XMLData")
88	private String resume_xml;
89
90	//@Column(name="XMLDom") wait for fix for bug 265468 to use this annotation
91	@Transient
92	private Document resume_dom;
93
94	public Employee() {}
95
96	public Integer getId() {
97	return this.id;
98	}
99
100	public String getName() {
101	return this.name;
102	}
103
104	public void setName(String name) {
105	this.name = name;
106	}
107
108	public Integer getVersion() {
109	return version;
110	}
111
112	public void setVersion(Integer version) {
113	this.version = version;
114	}
115
116	public char getEmpNChar() {
117	return this.empNChar;
118	}
119
120	public void setEmpNChar(char empNChar) {
121	this.empNChar = empNChar;
122	}
123
124	public String getReume_xml() {
125	return this.resume_xml;
126	}
127
128	public void setResume_xml(String resume_xml) {
129	this.resume_xml = resume_xml;
130	}
131
132	public Document getReume_dom() {
133	return this.resume_dom;
134	}
135
136	public void setResume_dom(Document resume_dom) {
137	this.resume_dom = resume_dom;
138	}
139
140
141	}
142

Line 0 Link Here

(-)jpa/eclipselink.jpa.test/resource/eclipselink-customfeatures-model/server/persistence.xml (+12 lines)
	1	<persistence 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 persistence_1_0.xsd" version="1.0">
	2	<persistence-unit name="%%default%%">
	3	<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
	4	<jta-data-source>jdbc/EclipseLinkDS_OCI</jta-data-source>
	5	<properties>
	6	<property name="eclipselink.target-server" value="%%server-platform%%"/>
	7	<property name="eclipselink.logging.level" value="FINEST"/>
	8	<property name="eclipselink.descriptor.customizer" value="org.eclipse.persistence.testing.models.jpa.customfeatures.XmlDataCustomizer"/>
	9	<property name="eclipselink.jdbc.batch-writing" value="Oracle-JDBC"/>
	10	</properties>
	11	</persistence-unit>
	12	</persistence>

Lines 75-80 Link Here

(-)jpa/eclipselink.jpa.test/weblogic.xml (+16 lines)
75	<copy file="${junit.lib}" todir="${weblogic.domain}/lib"/>	75	<copy file="${junit.lib}" todir="${weblogic.domain}/lib"/>
76	<copy file="${eclipselink.jar.name}" todir="${weblogic.domain}/lib"/>	76	<copy file="${eclipselink.jar.name}" todir="${weblogic.domain}/lib"/>
77	<copy file="${jdbc.driver.jar}" todir="${weblogic.domain}/lib"/>	77	<copy file="${jdbc.driver.jar}" todir="${weblogic.domain}/lib"/>
		78	<copy file="${oracle.extensions.depend.dir}/${oracle.xdb.lib}" todir="${weblogic.domain}/lib"/>
78	<antcall target="weblogic-stop" inheritRefs="true"/>	79	<antcall target="weblogic-stop" inheritRefs="true"/>
79	</target>	80	</target>
80		81
Lines 125-130 Link Here
125	<set attribute="PoolName" value="ejbPool"/>	126	<set attribute="PoolName" value="ejbPool"/>
126	<set attribute="Targets" value="${myserver}"/>	127	<set attribute="Targets" value="${myserver}"/>
127	</create>	128	</create>
		129	<create type="JDBCConnectionPool" name="ejbPool_oci">
		130	<set attribute="CapacityIncrement" value="2"/>
		131	<set attribute="DriverName" value="${db.driver}"/>
		132	<set attribute="InitialCapacity" value="1"/>
		133	<set attribute="MaxCapacity" value="50"/>
		134	<set attribute="Password" value="${db.pwd}"/>
		135	<set attribute="Properties" value="user=${db.user}"/>
		136	<set attribute="URL" value="${db.oci.url}"/>
		137	<set attribute="Targets" value="${myserver}"/>
		138	</create>
		139	<create type="JDBCTxDataSource" name="EclipseLinkDS_OCI">
		140	<set attribute="JNDIName" value="jdbc/EclipseLinkDS_OCI"/>
		141	<set attribute="PoolName" value="ejbPool_oci"/>
		142	<set attribute="Targets" value="${myserver}"/>
		143	</create>
128	</wlconfig>	144	</wlconfig>
129	</target>	145	</target>
130		146