Jane Young wrote:
> Hi Tim,
>
> Thanks for the details. The changes look fine. Can you also send the
> diffs for the ant script?
Yes; should have done that before. Here they are.
- Tim
Index: appclient/client/acc-standalone/fixup.xml
===================================================================
--- ../../../appclient/client/acc-standalone/fixup.xml (revision 28881)
+++ ../../../appclient/client/acc-standalone/fixup.xml (working copy)
@@ -20,6 +20,16 @@
[name of copyright owner]
-->
<project name="glassfish v3, app client library fix-up"
default="fixup.library" basedir=".">
+ <property name="mq.dir.path" value="../../mq"/>
+ <property name="mq.lib" value="${mq.dir.path}/lib"/>
+ <property name="jmsra.apps.dir"
value="../lib/install/applications/jmsra"/>
+ <property name="mq.classpath.additions" value="${mq.lib}/imq.jar
${mq.lib}/imqadmin.jar ${mq.lib}/imqutil.jar ${mq.lib}/fscontext.jar
${jmsra.apps.dir}/imqjmsra.jar"/>
+
+ <property name="ds-jdbcra.classpath.additions"
value="../lib/install/applications/__ds_jdbc_ra/__ds_jdbc_ra.jar"/>
+ <property name="cp-jdbcra.classpath.additions"
value="../lib/install/applications/__cp_jdbc_ra/__cp_jdbc_ra.jar"/>
+ <property name="xa-jdbcra.classpath.additions"
value="../lib/install/applications/__xa_jdbc_ra/__xa_jdbc_ra.jar"/>
+ <property name="derby.jar.classpath.additions"
value="../../javadb/lib/derby.jar ../../javadb/lib/derbyclient.jar
../../javadb/lib/derbynet.jar ../../javadb/lib/derbytools.jar
../../javadb/lib/derbyrun.jar"/>
+ <property name="classpath.additions"
value="${mq.classpath.additions} ${ds-jdbcra.classpath.additions}
${cp-jdbcra.classpath.additions} ${xa-jdbcra.classpath.additions}
${derby.jar.classpath.additions}"/>
<target name="fixup.library">
<unzip src="${output.dir}/${output.file}" dest="${stage.dir}">
<patternset>
>
> Jane
>
>
>
> Tim Quinn wrote:
>> Hi.
>>
>> As part of building the ACC's non-OSGi gf-client.jar file we must
>> augment its manifest Class-Path to include JARs that do not reside in
>> the /modules directory.
>>
>>
>> We used to do this by defining properties in the pom and then passing
>> them to an ant script which manipulates the manifest's Class-Path.
>> This change simply moves the property definitions from the pom (which
>> does not itself use them) into the ant script to clean up the pom and
>> minimize changes. I have replaced the relevant property definitions
>> in the pom with a comment explaining where they went and removed the
>> line which used to pass the now-removed classpath.additions pom
>> property to the ant script.
>>
>>
>> Thanks.
>>
>> - Tim
>>
>> Index: appclient/client/acc-standlone/pom.xml
>> ===================================================================
>> --- pom.xml (revision 28881)
>> +++ pom.xml (working copy)
>> @@ -67,15 +67,11 @@
>>
>> <properties>
>>
>> <classpath.file>${project.build.directory}/tmp/classpath.txt</classpath.file>
>>
>> - <mq.dir.path>../../mq</mq.dir.path>
>> - <mq.lib>${mq.dir.path}/lib</mq.lib>
>> -
>> <jmsra.apps.dir>../lib/install/applications/jmsra</jmsra.apps.dir>
>> - <mq.classpath.additions>${mq.lib}/imq.jar
>> ${mq.lib}/imqadmin.jar ${mq.lib}/imqutil.jar ${mq.lib}/fscontext.jar
>> ${mq.lib} ${jmsra.apps.dir}/imqjmsra.jar</mq.classpath.additions>
>> -
>> -
>> <ds-jdbcra.classpath.additions>../lib/install/applications/__ds_jdbc_ra/__ds_jdbc_ra.jar</ds-jdbcra.classpath.additions>
>>
>> -
>> <cp-jdbcra.classpath.additions>../lib/install/applications/__cp_jdbc_ra/__cp_jdbc_ra.jar</cp-jdbcra.classpath.additions>
>>
>> -
>> <xa-jdbcra.classpath.additions>../lib/install/applications/__xa_jdbc_ra/__xa_jdbc_ra.jar</xa-jdbcra.classpath.additions>
>>
>> - <derby.jar.classpath.additions>../../javadb/lib/derby.jar
>> ../../javadb/lib/derbyclient.jar ../../javadb/lib/derbynet.jar
>> ../../javadb/lib/derbytools.jar
>> ../../javadb/lib/derbyrun.jar</derby.jar.classpath.additions>
>> + <!--
>> + Property settings used for adding parts to the
>> Class-Path used to
>> + be defined here. They are now in the fixup.xml file
>> instead so
>> + the pom is less changeable.
>> + -->
>> </properties>
>> <developers>
>> <developer>
>> @@ -169,7 +165,6 @@
>> <property name="output.file"
>> value="${project.build.finalName}.jar"/>
>> <property name="output.dir"
>> value="${project.build.directory}"/>
>> <property name="stage.dir"
>> value="${project.build.directory}/stage"/>
>> - <property name="classpath.additions"
>> value="${mq.classpath.additions} ${ds-jdbcra.classpath.additions}
>> ${cp-jdbcra.classpath.additions} ${xa-jdbcra.classpath.additions}
>> ${derby.jar.classpath.additions}"/>
>> <property name="classpath.file"
>> value="${classpath.file}"/>
>> <ant antfile="${basedir}/fixup.xml"/>
>> </tasks>
>>
>