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

(-)build.xml (-20 / +285 lines)
Lines 2063-2069 Link Here
2063
    </target>
2063
    </target>
2064
2064
2065
    <!-- Build server test ejb jar. -->
2065
    <!-- Build server test ejb jar. -->
2066
    <target name="server-build-ejb-jar" depends="config-trunk, config-flat">
2066
    <target name="server-build-ejb-jar" depends="config-trunk, config-flat, check-model-name">
2067
        <property file="${user.home}/${server.name}.properties"/>
2067
        <property file="${user.home}/${server.name}.properties"/>
2068
        <property file="${eclipselink.jpa.test}/${server.name}.properties"/>
2068
        <property file="${eclipselink.jpa.test}/${server.name}.properties"/>
2069
        <mkdir dir="${eclipselink.jpa.test}/stage/META-INF"/>
2069
        <mkdir dir="${eclipselink.jpa.test}/stage/META-INF"/>
Lines 2270-2285 Link Here
2270
    <target name="create-ejb-jar" depends="create-ejb-jar-without-static-weaving,create-ejb-jar-with-static-weaving"/>
2270
    <target name="create-ejb-jar" depends="create-ejb-jar-without-static-weaving,create-ejb-jar-with-static-weaving"/>
2271
2271
2272
    <target name="create-ejb-jar-without-static-weaving" unless="is.static.server.weaving">
2272
    <target name="create-ejb-jar-without-static-weaving" unless="is.static.server.weaving">
2273
        <antcall target="remove-composite-classes"/>
2273
        <jar destfile="${eclipselink.jpa.test}/${build.dir}/${MODEL_NAME}_ejb.jar" basedir="stage"/>
2274
        <jar destfile="${eclipselink.jpa.test}/${build.dir}/${MODEL_NAME}_ejb.jar" basedir="stage"/>
2274
    </target>
2275
    </target>
2275
2276
2276
    <target name="create-ejb-jar-with-static-weaving" if="is.static.server.weaving">
2277
    <target name="create-ejb-jar-with-static-weaving" if="is.static.server.weaving">
2278
        <antcall target="remove-composite-classes"/>
2277
        <jar destfile="${eclipselink.jpa.test}/${build.dir}/unwoven-${MODEL_NAME}_ejb.jar" basedir="stage"/>
2279
        <jar destfile="${eclipselink.jpa.test}/${build.dir}/unwoven-${MODEL_NAME}_ejb.jar" basedir="stage"/>
2278
        <antcall target="run-weaver-server-test" inheritRefs="true">
2280
        <antcall target="run-weaver-server-test" inheritRefs="true">
2279
            <param name="MODEL_NAME" value="${MODEL_NAME}"/>
2281
            <param name="MODEL_NAME" value="${MODEL_NAME}"/>
2280
        </antcall>
2282
        </antcall>
2281
    </target>
2283
    </target>
2284
    <target name="check-model-name">
2285
        <condition property="run.jpa.composite.advanced">
2286
            <equals arg1="${MODEL_NAME}" arg2="eclipselink-composite-advanced-model" />
2287
        </condition>
2288
        <condition property="run.jpa.composite.advanced.member1">
2289
            <equals arg1="${MODEL_NAME}" arg2="eclipselink-composite-advanced-model-member_1" />
2290
        </condition>
2291
        <condition property="run.jpa.composite.advanced.member2">
2292
            <equals arg1="${MODEL_NAME}" arg2="eclipselink-composite-advanced-model-member_2" />
2293
        </condition>
2294
        <condition property="run.jpa.composite.advanced.member3">
2295
            <equals arg1="${MODEL_NAME}" arg2="eclipselink-composite-advanced-model-member_3" />
2296
        </condition>
2297
        <condition property="run.jpa.xml.extendedornot.composite.advanced">
2298
            <or>
2299
                <equals arg1="${MODEL_NAME}" arg2="eclipselink-xml-composite-advanced-model" />
2300
                <equals arg1="${MODEL_NAME}" arg2="eclipselink-xml-extended-composite-advanced-model" />
2301
            </or>
2302
        </condition>
2303
        <condition property="run.jpa.xml.extendedornot.composite.advanced.member1">
2304
            <or>
2305
                <equals arg1="${MODEL_NAME}" arg2="eclipselink-xml-composite-advanced-model-member_1" />
2306
                <equals arg1="${MODEL_NAME}" arg2="eclipselink-xml-extended-composite-advanced-model-member_1" />
2307
            </or>
2308
        </condition>
2309
        <condition property="run.jpa.xml.extendedornot.composite.advanced.member2">
2310
            <or>
2311
                <equals arg1="${MODEL_NAME}" arg2="eclipselink-xml-composite-advanced-model-member_2" />
2312
                <equals arg1="${MODEL_NAME}" arg2="eclipselink-xml-extended-composite-advanced-model-member_2" />
2313
            </or>
2314
        </condition>
2315
        <condition property="run.jpa.xml.extendedornot.composite.advanced.member3">
2316
            <or>
2317
                <equals arg1="${MODEL_NAME}" arg2="eclipselink-xml-composite-advanced-model-member_3" />
2318
                <equals arg1="${MODEL_NAME}" arg2="eclipselink-xml-extended-composite-advanced-model-member_3" />
2319
            </or>
2320
        </condition>
2321
    </target>
2282
2322
2323
    <target name="remove-composite-classes">
2324
        <antcall target="remove-composite-memeber-classes"/>
2325
        <antcall target="remove-composite-memeber23-classes"/>
2326
        <antcall target="remove-composite-memeber13-classes"/>
2327
        <antcall target="remove-composite-memeber12-classes"/>
2328
        <antcall target="remove-xml-composite-memeber-classes"/>
2329
        <antcall target="remove-xml-composite-memeber23-classes"/>
2330
        <antcall target="remove-xml-composite-memeber13-classes"/>
2331
        <antcall target="remove-xml-composite-memeber12-classes"/>
2332
    </target>
2333
2334
    <target name="remove-composite-advanced-main-classes">
2335
        <delete>
2336
            <fileset dir="stage/org/eclipse/persistence/testing/models/jpa/composite/advanced" includes="Customizer*.class, EmployeePopulator.class"/>
2337
        </delete>
2338
    </target>
2339
2340
    <target name="remove-xml-composite-advanced-main-classes">
2341
        <delete>
2342
            <fileset dir="stage/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced" includes="ModelExamples.class, EmployeePopulator.class"/>
2343
        </delete>
2344
    </target>
2345
2346
    <target name="remove-composite-memeber-classes" if="run.jpa.composite.advanced">
2347
        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/composite/advanced/member_1"/>
2348
        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/composite/advanced/member_2"/>
2349
        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/composite/advanced/member_3"/>
2350
    </target>
2351
2352
    <target name="remove-composite-memeber23-classes" if="run.jpa.composite.advanced.member1">
2353
        <antcall target="remove-composite-advanced-main-classes"/>
2354
        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/composite/advanced/member_2"/>
2355
        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/composite/advanced/member_3"/>
2356
    </target>
2357
2358
    <target name="remove-composite-memeber13-classes" if="run.jpa.composite.advanced.member2">
2359
        <antcall target="remove-composite-advanced-main-classes"/>
2360
        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/composite/advanced/member_1"/>
2361
        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/composite/advanced/member_3"/>
2362
    </target>
2363
2364
    <target name="remove-composite-memeber12-classes" if="run.jpa.composite.advanced.member3">
2365
        <antcall target="remove-composite-advanced-main-classes"/>
2366
        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/composite/advanced/member_1"/>
2367
        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/composite/advanced/member_2"/>
2368
    </target>
2369
2370
    <target name="remove-xml-composite-memeber-classes" if="run.jpa.xml.extendedornot.composite.advanced">
2371
        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_1"/>
2372
        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_2"/>
2373
        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_3"/>
2374
    </target>
2375
2376
    <target name="remove-xml-composite-memeber23-classes" if="run.jpa.xml.extendedornot.composite.advanced.member1">
2377
        <antcall target="remove-xml-composite-advanced-main-classes"/>
2378
        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_2"/>
2379
        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_3"/>
2380
    </target>
2381
2382
    <target name="remove-xml-composite-memeber13-classes" if="run.jpa.xml.extendedornot.composite.advanced.member2">
2383
        <antcall target="remove-xml-composite-advanced-main-classes"/>
2384
        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_1"/>
2385
        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_3"/>
2386
    </target>
2387
2388
    <target name="remove-xml-composite-memeber12-classes" if="run.jpa.xml.extendedornot.composite.advanced.member3">
2389
        <antcall target="remove-xml-composite-advanced-main-classes"/>
2390
        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_1"/>
2391
        <delete dir="stage/org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_2"/>
2392
    </target>
2393
2283
    <target name="copy-criteria-api-canonical-model" if="is.criteria.server.test">
2394
    <target name="copy-criteria-api-canonical-model" if="is.criteria.server.test">
2284
        <!-- Coping the CriteriaServerTestSuite class -->
2395
        <!-- Coping the CriteriaServerTestSuite class -->
2285
        <antcall target="compile"/>
2396
        <antcall target="compile"/>
Lines 2313-2321 Link Here
2313
    <!-- Build the client jar, ejb jar, and ear. -->
2424
    <!-- Build the client jar, ejb jar, and ear. -->
2314
    <target name="server-build" depends="prepare-non-jta-ds-servertest,prepare-server-sessionbeans,server-build-client-jar,server-build-ejb-jar,server-build-ear"/>
2425
    <target name="server-build" depends="prepare-non-jta-ds-servertest,prepare-server-sessionbeans,server-build-client-jar,server-build-ejb-jar,server-build-ear"/>
2315
2426
2427
    <target name="server-build-composite-advanced" depends="prepare-non-jta-ds-servertest,prepare-server-sessionbeans,server-build-client-jar,server-build-ejb-composite-advanced-jar,server-build-composite-advanced-ear"/>
2428
2429
    <target name="server-build-xml-composite-advanced" depends="prepare-non-jta-ds-servertest,prepare-server-sessionbeans,server-build-client-jar,server-build-ejb-xml-composite-advanced-jar,server-build-xml-composite-advanced-ear"/>
2430
2431
    <target name="server-build-xml-extended-composite-advanced" depends="prepare-non-jta-ds-servertest,prepare-server-sessionbeans,server-build-client-jar,server-build-ejb-xml-extended-composite-advanced-jar,server-build-xml-extended-composite-advanced-ear"/>
2432
2433
    <target name="server-build-ejb-composite-advanced-jar">
2434
        <antcall target="server-build-ejb-jar" inheritRefs="true">
2435
            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/composite/advanced"/>
2436
            <param name="MODEL_NAME" value="eclipselink-composite-advanced-model"/>
2437
        </antcall>
2438
        <antcall target="server-build-ejb-jar" inheritRefs="true">
2439
            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/composite/advanced/member_1"/>
2440
            <param name="MODEL_NAME" value="eclipselink-composite-advanced-model-member_1"/>
2441
        </antcall>
2442
        <antcall target="server-build-ejb-jar" inheritRefs="true">
2443
            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/composite/advanced/member_2"/>
2444
            <param name="MODEL_NAME" value="eclipselink-composite-advanced-model-member_2"/>
2445
        </antcall>
2446
        <antcall target="server-build-ejb-jar" inheritRefs="true">
2447
            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/composite/advanced/member_3"/>
2448
            <param name="MODEL_NAME" value="eclipselink-composite-advanced-model-member_3"/>
2449
        </antcall>
2450
    </target>
2451
2452
    <target name="server-build-composite-advanced-ear">
2453
        <copy overwrite="true" file="./resource/server/application.xml" todir="${build.dir}/META-INF"/>
2454
        <replace dir="${build.dir}/META-INF" token='%%modelname%%' value="eclipselink-composite-advanced-model">
2455
            <include name="*.xml"/>
2456
        </replace>
2457
        <ear destfile="${eclipselink.jpa.test}/${build.dir}/${EAR_NAME}.ear" appxml="${build.dir}/META-INF/application.xml">
2458
            <fileset dir="${eclipselink.jpa.test}/${build.dir}" 
2459
               includes ="eclipselink-composite-advanced-model_ejb.jar,
2460
                   eclipselink-composite-advanced-model-member_1_ejb.jar,
2461
                   eclipselink-composite-advanced-model-member_2_ejb.jar,
2462
                   eclipselink-composite-advanced-model-member_3_ejb.jar"/>
2463
        </ear>
2464
        <copy file="${eclipselink.jpa.test}/${build.dir}/${EAR_NAME}.ear" todir="."/>
2465
    </target>
2466
2467
    <target name="server-build-ejb-xml-composite-advanced-jar">
2468
        <copyfile src="${eclipselink.jpa.test}/resource/eclipselink-xml-composite-advanced-model-member_1/orm.xml" dest="${eclipselink.jpa.test}/resource/eclipselink-xml-composite-advanced-model-member_1/server/orm.xml" forceoverwrite="true"/>
2469
2470
        <copyfile src="${eclipselink.jpa.test}/resource/eclipselink-xml-composite-advanced-model-member_2/orm.xml" dest="${eclipselink.jpa.test}/resource/eclipselink-xml-composite-advanced-model-member_2/server/orm.xml" forceoverwrite="true"/>
2471
2472
        <copyfile src="${eclipselink.jpa.test}/resource/eclipselink-xml-composite-advanced-model-member_3/orm.xml" dest="${eclipselink.jpa.test}/resource/eclipselink-xml-composite-advanced-model-member_3/server/orm.xml" forceoverwrite="true"/>
2473
2474
        <antcall target="server-build-ejb-jar" inheritRefs="true">
2475
            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/xml/composite/advanced"/>
2476
            <param name="MODEL_NAME" value="eclipselink-xml-composite-advanced-model"/>
2477
        </antcall>
2478
        <antcall target="server-build-ejb-jar" inheritRefs="true">
2479
            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_1"/>
2480
            <param name="MODEL_NAME" value="eclipselink-xml-composite-advanced-model-member_1"/>
2481
        </antcall>
2482
        <antcall target="server-build-ejb-jar" inheritRefs="true">
2483
            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_2"/>
2484
            <param name="MODEL_NAME" value="eclipselink-xml-composite-advanced-model-member_2"/>
2485
        </antcall>
2486
        <antcall target="server-build-ejb-jar" inheritRefs="true">
2487
            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_3"/>
2488
            <param name="MODEL_NAME" value="eclipselink-xml-composite-advanced-model-member_3"/>
2489
        </antcall>
2490
2491
        <delete file="${eclipselink.jpa.test}/resource/eclipselink-xml-composite-advanced-model-member_1/server/orm.xml" failonerror="false"/>
2492
        <delete file="${eclipselink.jpa.test}/resource/eclipselink-xml-composite-advanced-model-member_2/server/orm.xml" failonerror="false"/>
2493
        <delete file="${eclipselink.jpa.test}/resource/eclipselink-xml-composite-advanced-model-member_3/server/orm.xml" failonerror="false"/>
2494
    </target>
2495
2496
    <target name="server-build-xml-composite-advanced-ear">
2497
        <copy overwrite="true" file="./resource/server/application.xml" todir="${build.dir}/META-INF"/>
2498
        <replace dir="${build.dir}/META-INF" token='%%modelname%%' value="eclipselink-xml-composite-advanced-model">
2499
            <include name="*.xml"/>
2500
        </replace>
2501
        <ear destfile="${eclipselink.jpa.test}/${build.dir}/${EAR_NAME}.ear" appxml="${build.dir}/META-INF/application.xml">
2502
            <fileset dir="${eclipselink.jpa.test}/${build.dir}" 
2503
               includes ="eclipselink-xml-composite-advanced-model_ejb.jar,
2504
                   eclipselink-xml-composite-advanced-model-member_1_ejb.jar,
2505
                   eclipselink-xml-composite-advanced-model-member_2_ejb.jar,
2506
                   eclipselink-xml-composite-advanced-model-member_3_ejb.jar"/>
2507
        </ear>
2508
        <copy file="${eclipselink.jpa.test}/${build.dir}/${EAR_NAME}.ear" todir="."/>
2509
    </target>
2510
2511
    <target name="server-build-ejb-xml-extended-composite-advanced-jar">
2512
        <copy todir="${eclipselink.jpa.test}/resource/eclipselink-xml-extended-composite-advanced-model-member_1/server" overwrite="true" failonerror="false">
2513
           <fileset dir="${eclipselink.jpa.test}/resource/eclipselinkorm/eclipselink-xml-extended-composite-advanced-model-member_1/" includes="eclipselink-orm.xml, advanced-extended-entity-mappings_1.xml"/>
2514
        </copy>
2515
        <copy todir="${eclipselink.jpa.test}/resource/eclipselink-xml-extended-composite-advanced-model-member_2/server" overwrite="true" failonerror="false">
2516
            <fileset dir="${eclipselink.jpa.test}/resource/eclipselinkorm/eclipselink-xml-extended-composite-advanced-model-member_2/" includes="eclipselink-orm.xml, advanced-extended-entity-mappings_2.xml"/>
2517
        </copy>
2518
        <copy todir="${eclipselink.jpa.test}/resource/eclipselink-xml-extended-composite-advanced-model-member_3/server" overwrite="true" failonerror="false">
2519
            <fileset dir="${eclipselink.jpa.test}/resource/eclipselinkorm/eclipselink-xml-extended-composite-advanced-model-member_3/" includes="eclipselink-orm.xml, advanced-extended-entity-mappings_3.xml"/>
2520
        </copy>
2521
        <antcall target="server-build-ejb-jar" inheritRefs="true">
2522
            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/xml/composite/advanced"/>
2523
            <param name="MODEL_NAME" value="eclipselink-xml-extended-composite-advanced-model"/>
2524
        </antcall>
2525
        <antcall target="server-build-ejb-jar" inheritRefs="true">
2526
            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_1"/>
2527
            <param name="MODEL_NAME" value="eclipselink-xml-extended-composite-advanced-model-member_1"/>
2528
        </antcall>
2529
        <antcall target="server-build-ejb-jar" inheritRefs="true">
2530
            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_2"/>
2531
            <param name="MODEL_NAME" value="eclipselink-xml-extended-composite-advanced-model-member_2"/>
2532
        </antcall>
2533
        <antcall target="server-build-ejb-jar" inheritRefs="true">
2534
            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/member_3"/>
2535
            <param name="MODEL_NAME" value="eclipselink-xml-extended-composite-advanced-model-member_3"/>
2536
        </antcall>
2537
        <delete>
2538
            <fileset dir="${eclipselink.jpa.test}/resource/eclipselink-xml-extended-composite-advanced-model-member_1/server/"
2539
                includes="eclipselink-orm.xml, advanced-extended-entity-mappings_1.xml"/>
2540
            <fileset dir="${eclipselink.jpa.test}/resource/eclipselink-xml-extended-composite-advanced-model-member_2/server/"
2541
                includes="eclipselink-orm.xml, advanced-extended-entity-mappings_2.xml"/>
2542
            <fileset dir="${eclipselink.jpa.test}/resource/eclipselink-xml-extended-composite-advanced-model-member_3/server/"
2543
                includes="eclipselink-orm.xml,advanced-extended-entity-mappings_3.xml"/>
2544
        </delete>
2545
    </target>
2546
2547
    <target name="server-build-xml-extended-composite-advanced-ear">
2548
        <copy overwrite="true" file="./resource/server/application.xml" todir="${build.dir}/META-INF"/>
2549
        <replace dir="${build.dir}/META-INF" token='%%modelname%%' value="eclipselink-xml-extended-composite-advanced-model">
2550
            <include name="*.xml"/>
2551
        </replace>
2552
        <ear destfile="${eclipselink.jpa.test}/${build.dir}/${EAR_NAME}.ear" appxml="${build.dir}/META-INF/application.xml">
2553
            <fileset dir="${eclipselink.jpa.test}/${build.dir}" 
2554
               includes ="eclipselink-xml-extended-composite-advanced-model_ejb.jar,
2555
                   eclipselink-xml-extended-composite-advanced-model-member_1_ejb.jar,
2556
                   eclipselink-xml-extended-composite-advanced-model-member_2_ejb.jar,
2557
                   eclipselink-xml-extended-composite-advanced-model-member_3_ejb.jar"/>
2558
        </ear>
2559
        <copy file="${eclipselink.jpa.test}/${build.dir}/${EAR_NAME}.ear" todir="."/>
2560
    </target>
2316
    <!-- Build, deploy and run a test suite on the server. -->
2561
    <!-- Build, deploy and run a test suite on the server. -->
2317
    <target name="server-run-all" depends="detect-os,set-server-properties">
2562
    <target name="server-run-all" depends="detect-os,set-server-properties">
2318
        <antcall target="server-build" inheritRefs="true"/>
2563
        <antcall target="server-build" inheritRefs="true"/>
2564
        <antcall target="server-deploy-runtest-undeploy" inheritRefs="true"/>
2565
    </target>
2566
2567
    <target name="server-run-all-composite-advanced" depends="detect-os,set-server-properties">
2568
        <antcall target="server-build-composite-advanced" inheritRefs="true"/>
2569
        <antcall target="server-deploy-runtest-undeploy" inheritRefs="true"/>
2570
    </target>
2571
2572
    <target name="server-run-all-xml-composite-advanced" depends="detect-os,set-server-properties">
2573
        <antcall target="server-build-xml-composite-advanced" inheritRefs="true"/>
2574
        <antcall target="server-deploy-runtest-undeploy" inheritRefs="true"/>
2575
    </target>
2576
2577
    <target name="server-run-all-xml-extended-composite-advanced" depends="detect-os,set-server-properties">
2578
        <antcall target="server-build-xml-extended-composite-advanced" inheritRefs="true"/>
2579
        <antcall target="server-deploy-runtest-undeploy" inheritRefs="true"/>
2580
    </target>
2581
2582
    <target name="server-deploy-runtest-undeploy" depends="detect-os,set-server-properties">
2319
        <antcall target="recover-server-sessionbeans" inheritRefs="true"/>
2583
        <antcall target="recover-server-sessionbeans" inheritRefs="true"/>
2320
        <antcall target="cleanup-non-jta-ds-servertest" inheritRefs="true"/>
2584
        <antcall target="cleanup-non-jta-ds-servertest" inheritRefs="true"/>
2321
        <antcall target="server-deploy" inheritRefs="true">
2585
        <antcall target="server-deploy" inheritRefs="true">
Lines 2946-2988 Link Here
2946
    </target>
3210
    </target>
2947
3211
2948
    <target name="server-test-composite-advanced">
3212
    <target name="server-test-composite-advanced">
2949
        <antcall target="server-run-all" inheritRefs="true">
3213
        <ant antfile="${eclipselink.jpa.test}/weblogic.xml" target="weblogic-composite-setup" inheritRefs="true"/>
3214
        <antcall target="server-run-all-composite-advanced" inheritRefs="true">
2950
            <param name="PERSISTENCE_UNIT_NAME" value="composite-advanced"/>
3215
            <param name="PERSISTENCE_UNIT_NAME" value="composite-advanced"/>
2951
            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/composite/advanced"/>
2952
            <param name="MODEL_NAME" value="eclipselink-composite-advanced-model"/>
2953
            <param name="TEST_DIR" value="org/eclipse/persistence/testing/tests/jpa/composite/advanced"/>
3216
            <param name="TEST_DIR" value="org/eclipse/persistence/testing/tests/jpa/composite/advanced"/>
2954
            <param name="TEST_NAME" value="eclipselink-composite-advanced-model"/>
3217
            <param name="TEST_NAME" value="eclipselink-composite-advanced-model"/>
2955
            <param name="EAR_NAME" value="eclipselink-composite-advanced-model"/>
3218
            <param name="EAR_NAME" value="eclipselink-composite-advanced-model"/>
2956
            <param name="TEST_SUITE" value="org.eclipse.persistence.testing.tests.jpa.composite.advanced.EntityManagerJUnitTestSuite"/>
3219
            <param name="TEST_SUITE" value="org.eclipse.persistence.testing.tests.jpa.composite.advanced.EntityManagerJUnitTestSuite"/>
2957
            <param name="MODEL_DIR_CONTAINED_1" value="org/eclipse/persistence/testing/models/jpa/composite/advanced/contained_1"/>
2958
            <param name="MODEL_NAME_CONTAINED_1" value="eclipselink-composite-advanced-model-contained_1"/>
2959
            <param name="MODEL_DIR_CONTAINED_2" value="org/eclipse/persistence/testing/models/jpa/composite/advanced/contained_2"/>
2960
            <param name="MODEL_NAME_CONTAINED_2" value="eclipselink-composite-advanced-model-contained_2"/>
2961
            <param name="MODEL_DIR_CONTAINED_3" value="org/eclipse/persistence/testing/models/jpa/composite/advanced/contained_3"/>
2962
            <param name="MODEL_NAME_CONTAINED_3" value="eclipselink-composite-advanced-model-contained_3"/>
2963
            <param name="eclipselink.jpa.test.dir" value="."/>
3220
            <param name="eclipselink.jpa.test.dir" value="."/>
2964
        </antcall>
3221
        </antcall>
3222
        <ant antfile="${eclipselink.jpa.test}/weblogic.xml" target="weblogic-composite-reset" inheritRefs="true"/>
2965
    </target>
3223
    </target>
2966
3224
2967
    <target name="server-test-xml-composite-advanced">
3225
    <target name="server-test-xml-composite-advanced">
2968
        <antcall target="server-run-all" inheritRefs="true">
3226
        <ant antfile="${eclipselink.jpa.test}/weblogic.xml" target="weblogic-composite-setup" inheritRefs="true"/>
3227
        <antcall target="server-run-all-xml-composite-advanced" inheritRefs="true">
2969
            <param name="PERSISTENCE_UNIT_NAME" value="xml-composite-advanced"/>
3228
            <param name="PERSISTENCE_UNIT_NAME" value="xml-composite-advanced"/>
2970
            <param name="MODEL_DIR" value="org/eclipse/persistence/testing/models/jpa/xml/composite"/>
2971
            <param name="MODEL_NAME" value="eclipselink-xml-composite-advanced-model"/>
2972
            <param name="TEST_DIR" value="org/eclipse/persistence/testing/tests/jpa/xml/composite"/>
3229
            <param name="TEST_DIR" value="org/eclipse/persistence/testing/tests/jpa/xml/composite"/>
2973
            <param name="TEST_NAME" value="eclipselink-xml-composite-advanced-model"/>
3230
            <param name="TEST_NAME" value="eclipselink-xml-composite-advanced-model"/>
2974
            <param name="EAR_NAME" value="eclipselink-xml-composite-advanced-model"/>
3231
            <param name="EAR_NAME" value="eclipselink-xml-composite-advanced-model"/>
2975
            <!-- TODO param name="TEST_SUITE" value="org.eclipse.persistence.testing.tests.jpa.composite.compositeJUnitTestSuite"/-->
3232
            <param name="TEST_SUITE" value="org.eclipse.persistence.testing.tests.jpa.xml.composite.advanced.EntityMappingsAdvancedJUnitTestCase"/>
2976
            <param name="MODEL_DIR_CONTAINED_1" value="org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/contained_1"/>
2977
            <param name="MODEL_NAME_CONTAINED_1" value="eclipselink-xml-composite-advanced-model-contained_1"/>
2978
            <param name="MODEL_DIR_CONTAINED_2" value="org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/contained_2"/>
2979
            <param name="MODEL_NAME_CONTAINED_2" value="eclipselink-xml-composite-advanced-model-contained_2"/>
2980
            <param name="MODEL_DIR_CONTAINED_3" value="org/eclipse/persistence/testing/models/jpa/xml/composite/advanced/contained_3"/>
2981
            <param name="MODEL_NAME_CONTAINED_3" value="eclipselink-xml-composite-advanced-model-contained_3"/>
2982
            <param name="eclipselink.jpa.test.dir" value="."/>
3233
            <param name="eclipselink.jpa.test.dir" value="."/>
2983
        </antcall>
3234
        </antcall>
3235
        <ant antfile="${eclipselink.jpa.test}/weblogic.xml" target="weblogic-composite-reset" inheritRefs="true"/>
2984
    </target>
3236
    </target>
2985
3237
3238
    <target name="server-test-xml-extended-composite-advanced">
3239
        <ant antfile="${eclipselink.jpa.test}/weblogic.xml" target="weblogic-composite-setup" inheritRefs="true"/>
3240
        <antcall target="server-run-all-xml-extended-composite-advanced" inheritRefs="true">
3241
            <param name="PERSISTENCE_UNIT_NAME" value="xml-extended-composite-advanced"/>
3242
            <param name="TEST_DIR" value="org/eclipse/persistence/testing/tests/jpa/xml/composite"/>
3243
            <param name="TEST_NAME" value="eclipselink-xml-extended-composite-advanced-model"/>
3244
            <param name="EAR_NAME" value="eclipselink-xml-extended-composite-advanced-model"/>
3245
            <param name="TEST_SUITE" value="org.eclipse.persistence.testing.tests.jpa.xml.composite.advanced.EntityMappingsAdvancedJUnitTestCase"/>
3246
            <param name="eclipselink.jpa.test.dir" value="."/>
3247
        </antcall>
3248
        <ant antfile="${eclipselink.jpa.test}/weblogic.xml" target="weblogic-composite-reset" inheritRefs="true"/>
3249
    </target>
3250
2986
    <target name="server-test-oracle-timestamptz" if="is.oracle">
3251
    <target name="server-test-oracle-timestamptz" if="is.oracle">
2987
        <antcall target="server-run-all" inheritRefs="true">
3252
        <antcall target="server-run-all" inheritRefs="true">
2988
            <param name="PERSISTENCE_UNIT_NAME" value="default"/>
3253
            <param name="PERSISTENCE_UNIT_NAME" value="default"/>
(-)resource/eclipselink-composite-advanced-model/server/persistence.xml (-5 / +5 lines)
Lines 3-13 Link Here
3
        <provider>
3
        <provider>
4
            org.eclipse.persistence.jpa.PersistenceProvider
4
            org.eclipse.persistence.jpa.PersistenceProvider
5
        </provider>
5
        </provider>
6
        <%%datasource-type%%>%%data-source-name%%</%%datasource-type%%>
7
        <jar-file>eclipselink-composite-advanced-model-member_1_ejb.jar</jar-file>
8
        <jar-file>eclipselink-composite-advanced-model-member_2_ejb.jar</jar-file>
9
        <jar-file>eclipselink-composite-advanced-model-member_3_ejb.jar</jar-file>
6
10
7
        <jar-file>eclipselink-composite-advanced-model-member_1.jar</jar-file>
8
        <jar-file>eclipselink-composite-advanced-model-member_2.jar</jar-file>
9
        <jar-file>eclipselink-composite-advanced-model-member_3.jar</jar-file>
10
11
        <properties>
11
        <properties>
12
            <property name="eclipselink.target-server" value="%%server-platform%%"/>
12
            <property name="eclipselink.target-server" value="%%server-platform%%"/>
13
            <property name="eclipselink.composite-unit" value="true"/>
13
            <property name="eclipselink.composite-unit" value="true"/>
Lines 15-21 Link Here
15
            <property name="eclipselink.persistence-context.reference-mode" value="WEAK"/>
15
            <property name="eclipselink.persistence-context.reference-mode" value="WEAK"/>
16
            <property name="eclipselink.validate-existence" value="true"/>
16
            <property name="eclipselink.validate-existence" value="true"/>
17
			<property name="eclipselink.logging.parameters" value="true"/>
17
			<property name="eclipselink.logging.parameters" value="true"/>
18
			<property name="eclipselink.logging.logger" value="DefaultLogger"/>
18
			<!--property name="eclipselink.logging.logger" value="DefaultLogger"/-->
19
        </properties>
19
        </properties>
20
    </persistence-unit>
20
    </persistence-unit>
21
</persistence>
21
</persistence>
(-)resource/eclipselink-xml-composite-advanced-model/server/persistence.xml (-5 / +5 lines)
Lines 3-18 Link Here
3
        <provider>
3
        <provider>
4
            org.eclipse.persistence.jpa.PersistenceProvider
4
            org.eclipse.persistence.jpa.PersistenceProvider
5
        </provider>
5
        </provider>
6
        <%%datasource-type%%>%%data-source-name%%</%%datasource-type%%>
7
        <jar-file>eclipselink-xml-composite-advanced-model-member_1_ejb.jar</jar-file>
8
        <jar-file>eclipselink-xml-composite-advanced-model-member_2_ejb.jar</jar-file>
9
        <jar-file>eclipselink-xml-composite-advanced-model-member_3_ejb.jar</jar-file>
6
10
7
        <jar-file>eclipselink-xml-composite-advanced-model-member_1.jar</jar-file>
8
        <jar-file>eclipselink-xml-composite-advanced-model-member_2.jar</jar-file>
9
        <jar-file>eclipselink-xml-composite-advanced-model-member_3.jar</jar-file>
10
11
        <properties>
11
        <properties>
12
            <property name="eclipselink.target-server" value="%%server-platform%%"/>
12
            <property name="eclipselink.target-server" value="%%server-platform%%"/>
13
            <property name="eclipselink.composite-unit" value="true"/>
13
            <property name="eclipselink.composite-unit" value="true"/>
14
			<property name="eclipselink.logging.parameters" value="true"/>
14
			<property name="eclipselink.logging.parameters" value="true"/>
15
			<property name="eclipselink.logging.logger" value="DefaultLogger"/>
15
			<!--property name="eclipselink.logging.logger" value="DefaultLogger"/-->
16
        </properties>
16
        </properties>
17
    </persistence-unit>
17
    </persistence-unit>
18
</persistence>
18
</persistence>
(-)resource/eclipselink-xml-extended-composite-advanced-model-member_1/server/persistence.xml (+16 lines)
Line 0 Link Here
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="xml-composite-advanced-member_1" transaction-type="%%transaction-type%%">
3
        <provider>
4
            org.eclipse.persistence.jpa.PersistenceProvider
5
        </provider>
6
        <mapping-file>META-INF/advanced-extended-entity-mappings_1.xml</mapping-file>
7
        <%%datasource-type%%>%%data-source-name%%</%%datasource-type%%>
8
        <exclude-unlisted-classes>false</exclude-unlisted-classes>
9
        <properties>
10
            <property name="eclipselink.target-database" value="%%database-platform%%"/>
11
            <!--property name="eclipselink.composite-unit.member" value="true"/-->
12
			<property name="eclipselink.logging.parameters" value="true"/>
13
			<property name="eclipselink.logging.logger" value="DefaultLogger"/>
14
        </properties>
15
    </persistence-unit>
16
</persistence>
(-)resource/eclipselink-xml-extended-composite-advanced-model-member_2/server/persistence.xml (+14 lines)
Line 0 Link Here
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="xml-composite-advanced-member_2" transaction-type="%%transaction-type%%">
3
        <provider>
4
            org.eclipse.persistence.jpa.PersistenceProvider
5
        </provider>
6
        <mapping-file>META-INF/advanced-extended-entity-mappings_2.xml</mapping-file>
7
        <%%datasource-type%%>%%data-source2-name%%</%%datasource-type%%>
8
        <exclude-unlisted-classes>false</exclude-unlisted-classes>
9
        <properties>
10
            <property name="eclipselink.target-database" value="%%database2-platform%%"/>
11
            <property name="eclipselink.composite-unit.member" value="true"/>
12
        </properties>
13
    </persistence-unit>
14
</persistence>
(-)resource/eclipselink-xml-extended-composite-advanced-model-member_3/server/persistence.xml (+14 lines)
Line 0 Link Here
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="xml-composite-advanced-member_3" transaction-type="%%transaction-type%%">
3
        <provider>
4
            org.eclipse.persistence.jpa.PersistenceProvider
5
        </provider>
6
        <mapping-file>META-INF/advanced-extended-entity-mappings_3.xml</mapping-file>
7
        <%%datasource-type%%>%%data-source3-name%%</%%datasource-type%%>
8
        <exclude-unlisted-classes>false</exclude-unlisted-classes>
9
        <properties>
10
            <property name="eclipselink.target-database" value="%%database3-platform%%"/>
11
            <property name="eclipselink.composite-unit.member" value="true"/>
12
        </properties>
13
    </persistence-unit>
14
</persistence>
(-)resource/eclipselink-xml-extended-composite-advanced-model/server/persistence.xml (+18 lines)
Line 0 Link Here
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="xml-extended-composite-advanced" transaction-type="%%transaction-type%%">
3
        <provider>
4
            org.eclipse.persistence.jpa.PersistenceProvider
5
        </provider>
6
        <%%datasource-type%%>%%data-source-name%%</%%datasource-type%%>
7
        <jar-file>eclipselink-xml-extended-composite-advanced-model-member_1_ejb.jar</jar-file>
8
        <jar-file>eclipselink-xml-extended-composite-advanced-model-member_2_ejb.jar</jar-file>
9
        <jar-file>eclipselink-xml-extended-composite-advanced-model-member_3_ejb.jar</jar-file>
10
11
        <properties>
12
            <property name="eclipselink.target-server" value="%%server-platform%%"/>
13
            <property name="eclipselink.composite-unit" value="true"/>
14
			<property name="eclipselink.logging.parameters" value="true"/>
15
			<property name="eclipselink.logging.logger" value="DefaultLogger"/>
16
        </properties>
17
    </persistence-unit>
18
</persistence>
(-)resource/weblogic/wls_composite_reset.py (+25 lines)
Line 0 Link Here
1
############################################################################  
2
# Generic script applicable on any Operating Environments (Unix, Windows)  
3
# ScriptName    : wls_reset.py  
4
# Properties    : weblogic.properties  
5
# Author        : Kevin Yuan  
6
############################################################################   
7
8
#===========================================================================
9
# Connect to wls server
10
#===========================================================================
11
12
connect('%%WL_USR%%','%%WL_PWD%%','t3://%%WL_HOST%%:%%WL_PORT%%')
13
14
#===========================================================================
15
# Remove Data Sources using wlst on-line commonds for three composite models
16
#===========================================================================
17
18
edit()
19
startEdit()
20
delete('EclipseLinkDS','JDBCSystemResource')
21
delete('EclipseLinkDS2','JDBCSystemResource')
22
delete('EclipseLinkDS3','JDBCSystemResource')
23
save()
24
activate()
25
exit()
(-)resource/weblogic/wls_composite_setup.py (+141 lines)
Line 0 Link Here
1
############################################################################  
2
# Generic script applicable on any Operating Environments (Unix, Windows)  
3
# ScriptName    : wls_setup.py  
4
# Properties    : weblogic.properties test.properties 
5
# Author        : Kevin Yuan  
6
############################################################################   
7
8
#===========================================================================
9
# Connect to wls server
10
#===========================================================================
11
12
connect('%%WL_USR%%','%%WL_PWD%%','t3://%%WL_HOST%%:%%WL_PORT%%')
13
14
#===========================================================================
15
# Create and configure JTA Data Source and target it to the server.
16
#===========================================================================
17
18
edit()
19
startEdit()
20
21
# Create EclipseLinkDS for server-test-lrg
22
23
cd('/')
24
cmo.createJDBCSystemResource('EclipseLinkDS')
25
26
cd('/JDBCSystemResources/EclipseLinkDS/JDBCResource/EclipseLinkDS')
27
cmo.setName('EclipseLinkDS')
28
29
cd('/JDBCSystemResources/EclipseLinkDS/JDBCResource/EclipseLinkDS/JDBCDataSourceParams/EclipseLinkDS')
30
set('JNDINames',jarray.array([String('jdbc/EclipseLinkDS')], String))
31
32
cd('/JDBCSystemResources/EclipseLinkDS/JDBCResource/EclipseLinkDS/JDBCDriverParams/EclipseLinkDS')
33
cmo.setUrl('%%DBURL%%')
34
cmo.setDriverName('%%DBDRV%%')
35
set('PasswordEncrypted','%%DBPWD%%')
36
37
cd('/JDBCSystemResources/EclipseLinkDS/JDBCResource/EclipseLinkDS/JDBCConnectionPoolParams/EclipseLinkDS')
38
cmo.setTestTableName('SQL SELECT 1 FROM DUAL')
39
40
cd('/JDBCSystemResources/EclipseLinkDS/JDBCResource/EclipseLinkDS/JDBCDriverParams/EclipseLinkDS/Properties/EclipseLinkDS')
41
cmo.createProperty('user')
42
43
cd('/JDBCSystemResources/EclipseLinkDS/JDBCResource/EclipseLinkDS/JDBCDriverParams/EclipseLinkDS/Properties/EclipseLinkDS/Properties/user')
44
cmo.setValue('%%DBUSR%%')
45
46
#cd('/JDBCSystemResources/EclipseLinkDS/JDBCResource/EclipseLinkDS/JDBCDataSourceParams/EclipseLinkDS')
47
#cmo.setGlobalTransactionsProtocol('OnePhaseCommit')
48
49
cd('/SystemResources/EclipseLinkDS')
50
set('Targets',jarray.array([ObjectName('com.bea:Name=myserver,Type=Server')], ObjectName))
51
52
# Create EclipseLinkDS2 for server-test-composite-advanced (DB2)
53
54
cd('/')
55
cmo.createJDBCSystemResource('EclipseLinkDS2')
56
57
cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2')
58
cmo.setName('EclipseLinkDS2')
59
60
cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCDataSourceParams/EclipseLinkDS2')
61
set('JNDINames',jarray.array([String('jdbc/EclipseLinkDS2')], String))
62
63
cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCDriverParams/EclipseLinkDS2')
64
cmo.setUrl('%%DB2URL%%')
65
cmo.setDriverName('%%DB2DRV%%')
66
set('PasswordEncrypted','%%DB2PWD%%')
67
68
cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCConnectionPoolParams/EclipseLinkDS2')
69
cmo.setTestTableName('SQL SELECT 1 FROM DUAL')
70
71
cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCDriverParams/EclipseLinkDS2/Properties/EclipseLinkDS2')
72
cmo.createProperty('user')
73
74
cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCDriverParams/EclipseLinkDS2/Properties/EclipseLinkDS2/Properties/user')
75
cmo.setValue('%%DB2USR%%')
76
77
cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCDriverParams/EclipseLinkDS2/Properties/EclipseLinkDS2')
78
cmo.createProperty('portNumber')
79
80
cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCDriverParams/EclipseLinkDS2/Properties/EclipseLinkDS2/Properties/portNumber')
81
cmo.setValue('50000')
82
83
cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCDriverParams/EclipseLinkDS2/Properties/EclipseLinkDS2')
84
cmo.createProperty('databaseName')
85
86
cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCDriverParams/EclipseLinkDS2/Properties/EclipseLinkDS2/Properties/databaseName')
87
cmo.setValue('TOPLINK2')
88
89
cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCDriverParams/EclipseLinkDS2/Properties/EclipseLinkDS2')
90
cmo.createProperty('serverName')
91
92
cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCDriverParams/EclipseLinkDS2/Properties/EclipseLinkDS2/Properties/serverName')
93
cmo.setValue('ottvm046.ca.oracle.com')
94
95
cd('/JDBCSystemResources/EclipseLinkDS2/JDBCResource/EclipseLinkDS2/JDBCDataSourceParams/EclipseLinkDS2')
96
cmo.setGlobalTransactionsProtocol('TwoPhaseCommit')
97
98
cd('/SystemResources/EclipseLinkDS2')
99
set('Targets',jarray.array([ObjectName('com.bea:Name=myserver,Type=Server')], ObjectName))
100
101
# Create EclipseLinkDS3 for server-test-composite-advanced (MySQL)
102
103
cd('/')
104
cmo.createJDBCSystemResource('EclipseLinkDS3')
105
106
cd('/JDBCSystemResources/EclipseLinkDS3/JDBCResource/EclipseLinkDS3')
107
cmo.setName('EclipseLinkDS3')
108
109
cd('/JDBCSystemResources/EclipseLinkDS3/JDBCResource/EclipseLinkDS3/JDBCDataSourceParams/EclipseLinkDS3')
110
set('JNDINames',jarray.array([String('jdbc/EclipseLinkDS3')], String))
111
112
cd('/JDBCSystemResources/EclipseLinkDS3/JDBCResource/EclipseLinkDS3/JDBCDriverParams/EclipseLinkDS3')
113
cmo.setUrl('%%DB3URL%%')
114
cmo.setDriverName('%%DB3DRV%%')
115
set('PasswordEncrypted','%%DB3PWD%%')
116
117
cd('/JDBCSystemResources/EclipseLinkDS3/JDBCResource/EclipseLinkDS3/JDBCConnectionPoolParams/EclipseLinkDS3')
118
cmo.setTestTableName('SQL SELECT 1 FROM DUAL')
119
120
cd('/JDBCSystemResources/EclipseLinkDS3/JDBCResource/EclipseLinkDS3/JDBCDriverParams/EclipseLinkDS3/Properties/EclipseLinkDS3')
121
cmo.createProperty('user')
122
123
cd('/JDBCSystemResources/EclipseLinkDS3/JDBCResource/EclipseLinkDS3/JDBCDriverParams/EclipseLinkDS3/Properties/EclipseLinkDS3/Properties/user')
124
cmo.setValue('%%DB3USR%%')
125
126
cd('/JDBCSystemResources/EclipseLinkDS3/JDBCResource/EclipseLinkDS3/JDBCDataSourceParams/EclipseLinkDS3')
127
cmo.setGlobalTransactionsProtocol('EmulateTwoPhaseCommit')
128
129
cd('/SystemResources/EclipseLinkDS3')
130
set('Targets',jarray.array([ObjectName('com.bea:Name=myserver,Type=Server')], ObjectName))
131
132
save()
133
activate()
134
135
#===========================================================================
136
# Exit WLST.
137
#===========================================================================
138
139
exit()
140
141
(-)weblogic.xml (+32 lines)
Lines 117-122 Link Here
117
            <replacefilter token="%%DBURL%%" value="${db.url}"/>
117
            <replacefilter token="%%DBURL%%" value="${db.url}"/>
118
            <replacefilter token="%%DBUSR%%" value="${db.user}"/>
118
            <replacefilter token="%%DBUSR%%" value="${db.user}"/>
119
            <replacefilter token="%%DBPWD%%" value="${db.pwd}"/>
119
            <replacefilter token="%%DBPWD%%" value="${db.pwd}"/>
120
            <replacefilter token="%%DB2DRV%%" value="${db2.driver}"/>
121
            <replacefilter token="%%DB2URL%%" value="${db2.url}"/>
122
            <replacefilter token="%%DB2USR%%" value="${db2.user}"/>
123
            <replacefilter token="%%DB2PWD%%" value="${db2.pwd}"/>
124
            <replacefilter token="%%DB3DRV%%" value="${db3.driver}"/>
125
            <replacefilter token="%%DB3URL%%" value="${db3.url}"/>
126
            <replacefilter token="%%DB3USR%%" value="${db3.user}"/>
127
            <replacefilter token="%%DB3PWD%%" value="${db3.pwd}"/>
120
        </replace>
128
        </replace>
121
    </target>
129
    </target>
122
130
Lines 199-204 Link Here
199
        </java>
207
        </java>
200
    </target>
208
    </target>
201
209
210
    <!-- Create three datasources aginst Oracle, DB2 and MySQL for running composite test models. -->
211
    <target name="weblogic-composite-setup">
212
        <copy todir="${eclipselink.jpa.test}/${temp.dir}" overwrite="true">
213
            <fileset dir="${eclipselink.jpa.test}/resource/weblogic" includes="wls_composite*.py"/>
214
        </copy>
215
        <antcall target="pass-weblogic-and-database-info" inheritRefs="true"/>
216
        <java classname="weblogic.WLST" fork="yes">
217
            <arg line="${eclipselink.jpa.test}/${temp.dir}/wls_composite_setup.py"/>
218
            <classpath>
219
                <path refid="wls.path"/>
220
            </classpath>
221
        </java>
222
    </target>
223
224
    <!-- Remove three datasources created for running composite test models. -->
225
    <target name="weblogic-composite-reset">
226
        <java classname="weblogic.WLST" fork="yes">
227
            <arg line="${eclipselink.jpa.test}/${temp.dir}/wls_composite_reset.py"/>
228
            <classpath>
229
                <path refid="wls.path"/>
230
            </classpath>
231
        </java>
232
    </target>
233
202
    <!-- Stop the server. -->
234
    <!-- Stop the server. -->
203
    <target name="weblogic-stop">
235
    <target name="weblogic-stop">
204
        <java classname="weblogic.WLST" fork="yes">
236
        <java classname="weblogic.WLST" fork="yes">

Return to bug 346335