Attachment #104899 for bug #152724

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

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





            <target name="-do-compile-deps">
                <xsl:attribute name="depends">init,deps-jar,pre-pre-compile,pre-compile</xsl:attribute>
                <xsl:attribute name="unless">directory.deployment.supported</xsl:attribute>

                <xsl:for-each select="/p:project/p:configuration/ear2:data/ear2:web-module-additional-libraries/ear2:library[ear2:path-in-war]">
                    <xsl:variable name="copyto" select=" ear2:path-in-war"/>

                </condition>
                <ant target="{$subtarget}" inheritall="false" antfile="${{project.{$subproj}}}/{$script}">                   
                    <property name="dist.ear.dir" location="${{build.dir}}"/>
                    <property name="directory.deployment.supported" value="${{directory.deployment.supported}}"/>
                    <xsl:choose>
                        <xsl:when test="$subtarget = 'jar'">
                            <property name="deploy.on.save" value="false"/>

                    <not><isset property="build.deploy.on.save"/></not>
                </condition>
                <ant target="{$subtarget}" inheritall="false" antfile="{$script}">
                    <property name="directory.deployment.supported" value="${{directory.deployment.supported}}"/>
                    <property name="dist.ear.dir" location="${{build.dir}}"/>
                    <xsl:for-each select="projdeps2:properties/projdeps2:property">
                        <property name="{@name}" value="{.}"/>




                    </and>
                </condition>
                <condition property="no.dist.ear.dir">
                    <or>
                    <not>
                        <isset property="dist.ear.dir"/>
                    </not>
                        <and>
                            <isset property="dist.ear.dir"/>
                            <istrue value="${{directory.deployment.supported}}"/>
                        </and>
                    </or>
                </condition>
                <condition property="is.directory.deployment.supported">
                    <istrue value="${{directory.deployment.supported}}"/>
                </condition>
                <property name="source.encoding" value="${{file.encoding}}"/>
                <condition property="javadoc.encoding.used" value="${{javadoc.encoding}}">

            
            <target name="-do-ear-dist">
                <xsl:attribute name="depends">init,compile,-pre-dist,library-inclusion-in-manifest</xsl:attribute>
                <xsl:attribute name="unless">is.directory.deployment.supported</xsl:attribute>
                <dirname property="dist.jar.dir" file="${{dist.ear.jar}}"/>
                <mkdir dir="${{dist.jar.dir}}"/>
                <jar jarfile="${{dist.ear.jar}}" compress="${{jar.compress}}" manifest="${{build.ear.classes.dir}}/META-INF/MANIFEST.MF">




                    </and>
                </condition>
                <condition property="no.dist.ear.dir">
                    <or>
                    <not>
                        <isset property="dist.ear.dir"/>
                    </not>
                        <and>
                            <isset property="dist.ear.dir"/>
                            <istrue value="${{directory.deployment.supported}}"/>
                        </and>
                    </or>
                </condition>
                <condition property="is.directory.deployment.supported">
                    <istrue value="${{directory.deployment.supported}}"/>
                </condition>
                <property name="build.web.excludes" value="${{build.classes.excludes}}"/>
                <condition property="do.compile.jsps">

                        </or>
                    </and>
                </condition>
                <condition property="do.tmp.war.package">
                    <or>
                        <isfalse value="${{directory.deployment.supported}}"/>
                        <isset property="dist.ear.dir"/>
                    </or>
                </condition>
                
                <property value="${{build.web.dir}}/META-INF" name="build.meta.inf.dir"/>
                


            <target name="do-ear-dist">
                <xsl:attribute name="depends">init,-clean-webinf-lib,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest</xsl:attribute>
                <xsl:attribute name="unless">is.directory.deployment.supported</xsl:attribute>
                <dirname property="dist.jar.dir" file="${{dist.ear.war}}"/>
                <mkdir dir="${{dist.jar.dir}}"/>
                <jar jarfile="${{dist.ear.war}}" compress="${{jar.compress}}" manifest="${{build.web.dir}}/META-INF/MANIFEST.MF">

Return to bug 152724

Lines 362-367 Link Here

(-)a/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/resources/build-impl.xsl (+3 lines)
362		362
363	<target name="-do-compile-deps">	363	<target name="-do-compile-deps">
364	<xsl:attribute name="depends">init,deps-jar,pre-pre-compile,pre-compile</xsl:attribute>	364	<xsl:attribute name="depends">init,deps-jar,pre-pre-compile,pre-compile</xsl:attribute>
		365	<xsl:attribute name="unless">directory.deployment.supported</xsl:attribute>
365		366
366	<xsl:for-each select="/p:project/p:configuration/ear2:data/ear2:web-module-additional-libraries/ear2:library[ear2:path-in-war]">	367	<xsl:for-each select="/p:project/p:configuration/ear2:data/ear2:web-module-additional-libraries/ear2:library[ear2:path-in-war]">
367	<xsl:variable name="copyto" select=" ear2:path-in-war"/>	368	<xsl:variable name="copyto" select=" ear2:path-in-war"/>
Lines 993-998 Link Here
993	</condition>	994	</condition>
994	<ant target="{$subtarget}" inheritall="false" antfile="${{project.{$subproj}}}/{$script}">	995	<ant target="{$subtarget}" inheritall="false" antfile="${{project.{$subproj}}}/{$script}">
995	<property name="dist.ear.dir" location="${{build.dir}}"/>	996	<property name="dist.ear.dir" location="${{build.dir}}"/>
		997	<property name="directory.deployment.supported" value="${{directory.deployment.supported}}"/>
996	<xsl:choose>	998	<xsl:choose>
997	<xsl:when test="$subtarget = 'jar'">	999	<xsl:when test="$subtarget = 'jar'">
998	<property name="deploy.on.save" value="false"/>	1000	<property name="deploy.on.save" value="false"/>
Lines 1026-1031 Link Here
1026	<not><isset property="build.deploy.on.save"/></not>	1028	<not><isset property="build.deploy.on.save"/></not>
1027	</condition>	1029	</condition>
1028	<ant target="{$subtarget}" inheritall="false" antfile="{$script}">	1030	<ant target="{$subtarget}" inheritall="false" antfile="{$script}">
		1031	<property name="directory.deployment.supported" value="${{directory.deployment.supported}}"/>
1029	<property name="dist.ear.dir" location="${{build.dir}}"/>	1032	<property name="dist.ear.dir" location="${{build.dir}}"/>
1030	<xsl:for-each select="projdeps2:properties/projdeps2:property">	1033	<xsl:for-each select="projdeps2:properties/projdeps2:property">
1031	<property name="{@name}" value="{.}"/>	1034	<property name="{@name}" value="{.}"/>

Lines 252-260 Link Here

(-)a/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/resources/build-impl.xsl (+10 lines)
252	</and>	252	</and>
253	</condition>	253	</condition>
254	<condition property="no.dist.ear.dir">	254	<condition property="no.dist.ear.dir">
		255	<or>
255	<not>	256	<not>
256	<isset property="dist.ear.dir"/>	257	<isset property="dist.ear.dir"/>
257	</not>	258	</not>
		259	<and>
		260	<isset property="dist.ear.dir"/>
		261	<istrue value="${{directory.deployment.supported}}"/>
		262	</and>
		263	</or>
		264	</condition>
		265	<condition property="is.directory.deployment.supported">
		266	<istrue value="${{directory.deployment.supported}}"/>
258	</condition>	267	</condition>
259	<property name="source.encoding" value="${{file.encoding}}"/>	268	<property name="source.encoding" value="${{file.encoding}}"/>
260	<condition property="javadoc.encoding.used" value="${{javadoc.encoding}}">	269	<condition property="javadoc.encoding.used" value="${{javadoc.encoding}}">
Lines 1245-1250 Link Here
1245		1254
1246	<target name="-do-ear-dist">	1255	<target name="-do-ear-dist">
1247	<xsl:attribute name="depends">init,compile,-pre-dist,library-inclusion-in-manifest</xsl:attribute>	1256	<xsl:attribute name="depends">init,compile,-pre-dist,library-inclusion-in-manifest</xsl:attribute>
		1257	<xsl:attribute name="unless">is.directory.deployment.supported</xsl:attribute>
1248	<dirname property="dist.jar.dir" file="${{dist.ear.jar}}"/>	1258	<dirname property="dist.jar.dir" file="${{dist.ear.jar}}"/>
1249	<mkdir dir="${{dist.jar.dir}}"/>	1259	<mkdir dir="${{dist.jar.dir}}"/>
1250	<jar jarfile="${{dist.ear.jar}}" compress="${{jar.compress}}" manifest="${{build.ear.classes.dir}}/META-INF/MANIFEST.MF">	1260	<jar jarfile="${{dist.ear.jar}}" compress="${{jar.compress}}" manifest="${{build.ear.classes.dir}}/META-INF/MANIFEST.MF">

Lines 232-240 Link Here

(-)a/web.project/src/org/netbeans/modules/web/project/resources/build-impl.xsl (-7 / +10 lines)
232	</and>	232	</and>
233	</condition>	233	</condition>
234	<condition property="no.dist.ear.dir">	234	<condition property="no.dist.ear.dir">
		235	<or>
235	<not>	236	<not>
236	<isset property="dist.ear.dir"/>	237	<isset property="dist.ear.dir"/>
237	</not>	238	</not>
		239	<and>
		240	<isset property="dist.ear.dir"/>
		241	<istrue value="${{directory.deployment.supported}}"/>
		242	</and>
		243	</or>
		244	</condition>
		245	<condition property="is.directory.deployment.supported">
		246	<istrue value="${{directory.deployment.supported}}"/>
238	</condition>	247	</condition>
239	<property name="build.web.excludes" value="${{build.classes.excludes}}"/>	248	<property name="build.web.excludes" value="${{build.classes.excludes}}"/>
240	<condition property="do.compile.jsps">	249	<condition property="do.compile.jsps">
Lines 297-308 Link Here
297	</or>	306	</or>
298	</and>	307	</and>
299	</condition>	308	</condition>
300	<condition property="do.tmp.war.package">
301	<or>
302	<isfalse value="${{directory.deployment.supported}}"/>
303	<isset property="dist.ear.dir"/>
304	</or>
305	</condition>
306		309
307	<property value="${{build.web.dir}}/META-INF" name="build.meta.inf.dir"/>	310	<property value="${{build.web.dir}}/META-INF" name="build.meta.inf.dir"/>
308		311
Lines 1406-1412 Link Here
1406		1409
1407	<target name="do-ear-dist">	1410	<target name="do-ear-dist">
1408	<xsl:attribute name="depends">init,-clean-webinf-lib,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest</xsl:attribute>	1411	<xsl:attribute name="depends">init,-clean-webinf-lib,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest</xsl:attribute>
1409	<xsl:attribute name="if">do.tmp.war.package</xsl:attribute>	1412	<xsl:attribute name="unless">is.directory.deployment.supported</xsl:attribute>
1410	<dirname property="dist.jar.dir" file="${{dist.ear.war}}"/>	1413	<dirname property="dist.jar.dir" file="${{dist.ear.war}}"/>
1411	<mkdir dir="${{dist.jar.dir}}"/>	1414	<mkdir dir="${{dist.jar.dir}}"/>
1412	<jar jarfile="${{dist.ear.war}}" compress="${{jar.compress}}" manifest="${{build.web.dir}}/META-INF/MANIFEST.MF">	1415	<jar jarfile="${{dist.ear.war}}" compress="${{jar.compress}}" manifest="${{build.web.dir}}/META-INF/MANIFEST.MF">