|
Lines 267-273
Link Here
|
| 267 |
--> |
267 |
--> |
| 268 |
<xsl:attribute name="property">build.deploy.on.save</xsl:attribute> |
268 |
<xsl:attribute name="property">build.deploy.on.save</xsl:attribute> |
| 269 |
<xsl:attribute name="else">false</xsl:attribute> |
269 |
<xsl:attribute name="else">false</xsl:attribute> |
| 270 |
<istrue value="${{j2ee.deploy.on.save}}"/> |
270 |
<or> |
|
|
271 |
<istrue value="${{j2ee.deploy.on.save}}"/> |
| 272 |
<istrue value="${{j2ee.compile.on.save}}"/> |
| 273 |
</or> |
| 271 |
</condition> |
274 |
</condition> |
| 272 |
</target> |
275 |
</target> |
| 273 |
|
276 |
|
|
Lines 969-974
Link Here
|
| 969 |
<target name="{$targetname}"> |
972 |
<target name="{$targetname}"> |
| 970 |
<xsl:attribute name="depends">init</xsl:attribute> |
973 |
<xsl:attribute name="depends">init</xsl:attribute> |
| 971 |
<xsl:attribute name="unless">no.deps</xsl:attribute> |
974 |
<xsl:attribute name="unless">no.deps</xsl:attribute> |
|
|
975 |
<!-- |
| 976 |
If build.deploy.on.save is not set init-cos hasn't |
| 977 |
been called so we are running the old style build. |
| 978 |
--> |
| 979 |
<condition> |
| 980 |
<xsl:attribute name="property">build.deploy.on.save</xsl:attribute> |
| 981 |
<xsl:attribute name="value">false</xsl:attribute> |
| 982 |
<not><isset property="build.deploy.on.save"/></not> |
| 983 |
</condition> |
| 972 |
<xsl:variable name="references" select="/p:project/p:configuration/projdeps:references"/> |
984 |
<xsl:variable name="references" select="/p:project/p:configuration/projdeps:references"/> |
| 973 |
<xsl:for-each select="$references/projdeps:reference[not($type) or projdeps:artifact-type = $type]"> |
985 |
<xsl:for-each select="$references/projdeps:reference[not($type) or projdeps:artifact-type = $type]"> |
| 974 |
<xsl:variable name="subproj" select="projdeps:foreign-project"/> |
986 |
<xsl:variable name="subproj" select="projdeps:foreign-project"/> |
|
Lines 983-997
Link Here
|
| 983 |
</xsl:choose> |
995 |
</xsl:choose> |
| 984 |
</xsl:variable> |
996 |
</xsl:variable> |
| 985 |
<xsl:variable name="script" select="projdeps:script"/> |
997 |
<xsl:variable name="script" select="projdeps:script"/> |
| 986 |
<!-- |
|
|
| 987 |
If build.deploy.on.save is not set init-cos hasn't |
| 988 |
been called so we are running the old style build. |
| 989 |
--> |
| 990 |
<condition> |
| 991 |
<xsl:attribute name="property">build.deploy.on.save</xsl:attribute> |
| 992 |
<xsl:attribute name="value">false</xsl:attribute> |
| 993 |
<not><isset property="build.deploy.on.save"/></not> |
| 994 |
</condition> |
| 995 |
<ant target="{$subtarget}" inheritall="false" antfile="${{project.{$subproj}}}/{$script}"> |
998 |
<ant target="{$subtarget}" inheritall="false" antfile="${{project.{$subproj}}}/{$script}"> |
| 996 |
<property name="dist.ear.dir" location="${{build.dir}}"/> |
999 |
<property name="dist.ear.dir" location="${{build.dir}}"/> |
| 997 |
<xsl:choose> |
1000 |
<xsl:choose> |
|
Lines 1017-1031
Link Here
|
| 1017 |
</xsl:choose> |
1020 |
</xsl:choose> |
| 1018 |
</xsl:variable> |
1021 |
</xsl:variable> |
| 1019 |
<xsl:variable name="script" select="projdeps2:script"/> |
1022 |
<xsl:variable name="script" select="projdeps2:script"/> |
| 1020 |
<!-- |
|
|
| 1021 |
If build.deploy.on.save is not set init-cos hasn't |
| 1022 |
been called so we are running the old style build. |
| 1023 |
--> |
| 1024 |
<condition> |
| 1025 |
<xsl:attribute name="property">build.deploy.on.save</xsl:attribute> |
| 1026 |
<xsl:attribute name="value">false</xsl:attribute> |
| 1027 |
<not><isset property="build.deploy.on.save"/></not> |
| 1028 |
</condition> |
| 1029 |
<ant target="{$subtarget}" inheritall="false" antfile="{$script}"> |
1023 |
<ant target="{$subtarget}" inheritall="false" antfile="{$script}"> |
| 1030 |
<property name="dist.ear.dir" location="${{build.dir}}"/> |
1024 |
<property name="dist.ear.dir" location="${{build.dir}}"/> |
| 1031 |
<xsl:for-each select="projdeps2:properties/projdeps2:property"> |
1025 |
<xsl:for-each select="projdeps2:properties/projdeps2:property"> |