Merged from sierra_jcaps branch. IM73_beta_branch_point TRUNK_SYNC_WITH_SIERRA
authorahimanikya@netbeans.org
Thu, 20 Dec 2007 08:36:43 +0000
changeset 145099893e3f210a
parent 1449 7bb7eff16f9c
child 1451 1f3b10137605
Merged from sierra_jcaps branch.
etl.editor/build.xml
etl.project/build.xml
etl.project/nbproject/project.xml
etl.project/src/org/netbeans/modules/etl/project/resources/build-impl.xsl
     1.1 --- a/etl.editor/build.xml	Thu Dec 20 07:58:09 2007 +0000
     1.2 +++ b/etl.editor/build.xml	Thu Dec 20 08:36:43 2007 +0000
     1.3 @@ -53,7 +53,6 @@
     1.4  		<copy todir="${cluster}/modules/ext/etl">
     1.5  			<fileset dir="../external">
     1.6  				<include name="*.jar" />
     1.7 -                                <include name="mashupdb.zip" />
     1.8  			</fileset>
     1.9  		</copy>
    1.10  	</target>
     2.1 --- a/etl.project/build.xml	Thu Dec 20 07:58:09 2007 +0000
     2.2 +++ b/etl.project/build.xml	Thu Dec 20 08:36:43 2007 +0000
     2.3 @@ -54,7 +54,7 @@
     2.4                  <path refid="cp"/>
     2.5                  <pathelement location="${netbeans.dest.dir}/${nb.cluster.java.dir}/ant/lib/ant.jar"/>
     2.6                  <pathelement location="${cluster}/${module.jar}"/>
     2.7 -            	<!--pathelement location="../external/wsdl4j.jar"/-->
     2.8 +            	<pathelement location="../external/wsdl4j.jar"/>
     2.9              	<pathelement location="${cluster}/modules/org-netbeans-modules-etl-editor.jar"/>
    2.10              	<!--pathelement location="../external/etlengine.jar"/-->
    2.11              	
     3.1 --- a/etl.project/nbproject/project.xml	Thu Dec 20 07:58:09 2007 +0000
     3.2 +++ b/etl.project/nbproject/project.xml	Thu Dec 20 08:36:43 2007 +0000
     3.3 @@ -47,30 +47,6 @@
     3.4              <code-name-base>org.netbeans.modules.etl.project</code-name-base>
     3.5              <module-dependencies>
     3.6                  <dependency>
     3.7 -                    <code-name-base>org.netbeans.modules.compapp.projects.base</code-name-base>
     3.8 -                    <build-prerequisite/>
     3.9 -                    <compile-dependency/>
    3.10 -                    <run-dependency>
    3.11 -                        <specification-version>1.1</specification-version>
    3.12 -                    </run-dependency>
    3.13 -                </dependency>
    3.14 -                <dependency>
    3.15 -                    <code-name-base>org.netbeans.modules.etl.editor</code-name-base>
    3.16 -                    <build-prerequisite/>
    3.17 -                    <compile-dependency/>
    3.18 -                    <run-dependency>
    3.19 -                        <specification-version>1.0</specification-version>
    3.20 -                    </run-dependency>
    3.21 -                </dependency>
    3.22 -                <!--dependency>
    3.23 -                    <code-name-base>org.apache.tools</code-name-base>
    3.24 -                    <build-prerequisite/>
    3.25 -                    <compile-dependency/>
    3.26 -                    <run-dependency>
    3.27 -                        <specification-version>1.0</specification-version>
    3.28 -                    </run-dependency>
    3.29 -                </dependency-->
    3.30 -                <dependency>
    3.31                      <code-name-base>org.apache.tools.ant.module</code-name-base>
    3.32                      <build-prerequisite/>
    3.33                      <compile-dependency/>
    3.34 @@ -98,6 +74,31 @@
    3.35                      </run-dependency>
    3.36                  </dependency>
    3.37                  <dependency>
    3.38 +                    <code-name-base>org.netbeans.modules.compapp.projects.base</code-name-base>
    3.39 +                    <build-prerequisite/>
    3.40 +                    <compile-dependency/>
    3.41 +                    <run-dependency>
    3.42 +                        <specification-version>1.1</specification-version>
    3.43 +                    </run-dependency>
    3.44 +                </dependency>
    3.45 +                <dependency>
    3.46 +                    <code-name-base>org.netbeans.modules.db</code-name-base>
    3.47 +                    <build-prerequisite/>
    3.48 +                    <compile-dependency/>
    3.49 +                    <run-dependency>
    3.50 +                        <release-version>1</release-version>
    3.51 +                        <specification-version>1.25</specification-version>
    3.52 +                    </run-dependency>
    3.53 +                </dependency>
    3.54 +                <dependency>
    3.55 +                    <code-name-base>org.netbeans.modules.etl.editor</code-name-base>
    3.56 +                    <build-prerequisite/>
    3.57 +                    <compile-dependency/>
    3.58 +                    <run-dependency>
    3.59 +                        <specification-version>1.0</specification-version>
    3.60 +                    </run-dependency>
    3.61 +                </dependency>
    3.62 +                <dependency>
    3.63                      <code-name-base>org.netbeans.modules.j2eeserver</code-name-base>
    3.64                      <build-prerequisite/>
    3.65                      <compile-dependency/>
     4.1 --- a/etl.project/src/org/netbeans/modules/etl/project/resources/build-impl.xsl	Thu Dec 20 07:58:09 2007 +0000
     4.2 +++ b/etl.project/src/org/netbeans/modules/etl/project/resources/build-impl.xsl	Thu Dec 20 08:36:43 2007 +0000
     4.3 @@ -1,57 +1,34 @@
     4.4  <?xml version="1.0" encoding="UTF-8"?>
     4.5  <!--
     4.6 -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
     4.7 +The contents of this file are subject to the terms of the Common Development
     4.8 +and Distribution License (the License). You may not use this file except in
     4.9 +compliance with the License.
    4.10  
    4.11 -Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
    4.12 +You can obtain a copy of the License at http://www.netbeans.org/cddl.html
    4.13 +or http://www.netbeans.org/cddl.txt.
    4.14  
    4.15 -
    4.16 -The contents of this file are subject to the terms of either the GNU
    4.17 -General Public License Version 2 only ("GPL") or the Common
    4.18 -Development and Distribution License("CDDL") (collectively, the
    4.19 -"License"). You may not use this file except in compliance with the
    4.20 -License. You can obtain a copy of the License at
    4.21 -http://www.netbeans.org/cddl-gplv2.html
    4.22 -or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
    4.23 -specific language governing permissions and limitations under the
    4.24 -License.  When distributing the software, include this License Header
    4.25 -Notice in each file and include the License file at
    4.26 -nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
    4.27 -particular file as subject to the "Classpath" exception as provided
    4.28 -by Sun in the GPL Version 2 section of the License file that
    4.29 -accompanied this code. If applicable, add the following below the
    4.30 -License Header, with the fields enclosed by brackets [] replaced by
    4.31 -your own identifying information:
    4.32 +When distributing Covered Code, include this CDDL Header Notice in each file
    4.33 +and include the License file at http://www.netbeans.org/cddl.txt.
    4.34 +If applicable, add the following below the CDDL Header, with the fields
    4.35 +enclosed by brackets [] replaced by your own identifying information:
    4.36  "Portions Copyrighted [year] [name of copyright owner]"
    4.37  
    4.38 -Contributor(s):
    4.39 -
    4.40  The Original Software is NetBeans. The Initial Developer of the Original
    4.41  Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
    4.42  Microsystems, Inc. All Rights Reserved.
    4.43 -
    4.44 -If you wish your version of this file to be governed by only the CDDL
    4.45 -or only the GPL Version 2, indicate your decision by adding
    4.46 -"[Contributor] elects to include this software in this distribution
    4.47 -under the [CDDL or GPL Version 2] license." If you do not indicate a
    4.48 -single choice of license, a recipient has the option to distribute
    4.49 -your version of this file under either the CDDL, the GPL Version 2 or
    4.50 -to extend the choice of license to its licensees as provided above.
    4.51 -However, if you add GPL Version 2 code and therefore, elected the GPL
    4.52 -Version 2 license, then the option applies only if the new code is
    4.53 -made subject to such option by the copyright holder.
    4.54  -->
    4.55  <xsl:stylesheet version="1.0"
    4.56 -    xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
    4.57 -    xmlns:p="http://www.netbeans.org/ns/project/1"
    4.58 -    xmlns:xalan="http://xml.apache.org/xslt"
    4.59 -    xmlns:ejb="http://www.netbeans.org/ns/j2ee-ejbjarproject/1"
    4.60 -    xmlns:projdeps="http://www.netbeans.org/ns/ant-project-references/1"
    4.61 -    exclude-result-prefixes="xalan p ejb projdeps">
    4.62 +                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
    4.63 +                xmlns:p="http://www.netbeans.org/ns/project/1"
    4.64 +                xmlns:xalan="http://xml.apache.org/xslt"
    4.65 +                xmlns:ejb="http://www.netbeans.org/ns/j2ee-ejbjarproject/1"
    4.66 +                xmlns:projdeps="http://www.netbeans.org/ns/ant-project-references/1"
    4.67 +                exclude-result-prefixes="xalan p ejb projdeps">
    4.68      <xsl:output method="xml" indent="yes" encoding="UTF-8" xalan:indent-amount="4" />
    4.69      <xsl:template match="/">
    4.70 -
    4.71 -		<xsl:comment>
    4.72 -			<![CDATA[
    4.73 +        
    4.74 +        <xsl:comment>
    4.75 +            <![CDATA[
    4.76  *** GENERATED FROM project.xml - DO NOT EDIT  ***
    4.77  ***         EDIT ../build.xml INSTEAD         ***
    4.78  
    4.79 @@ -67,50 +44,50 @@
    4.80    - cleanup
    4.81  
    4.82  ]]>
    4.83 -		</xsl:comment>
    4.84 -
    4.85 +        </xsl:comment>
    4.86 +        
    4.87          <xsl:variable name="name" select="/p:project/p:configuration/ejb:data/ejb:name" />
    4.88          <project name="{$name}-impl">
    4.89              <xsl:attribute name="default">build</xsl:attribute>
    4.90              <xsl:attribute name="basedir">..</xsl:attribute>
    4.91 -
    4.92 +            
    4.93              <target name="default">
    4.94 -                    <xsl:attribute name="depends">dist,javadoc</xsl:attribute>
    4.95 -                    <xsl:attribute name="description">Build whole project.</xsl:attribute>
    4.96 +                <xsl:attribute name="depends">dist,javadoc</xsl:attribute>
    4.97 +                <xsl:attribute name="description">Build whole project.</xsl:attribute>
    4.98              </target>
    4.99 -
   4.100 +            
   4.101              <xsl:comment>
   4.102                  ====================== 
   4.103                  INITIALIZATION SECTION
   4.104                  ======================
   4.105              </xsl:comment>
   4.106 -
   4.107 +            
   4.108              <target name="pre-init">
   4.109                  <xsl:comment> Empty placeholder for easier customization. </xsl:comment>
   4.110                  <xsl:comment> You can override this target in the ../build.xml file. </xsl:comment>
   4.111              </target>
   4.112 -
   4.113 +            
   4.114              <target name="init-private">
   4.115                  <xsl:attribute name="depends">pre-init</xsl:attribute>
   4.116                  <property file="nbproject/private/private.properties"/>
   4.117              </target>
   4.118 -
   4.119 +            
   4.120              <target name="init-userdir">
   4.121                  <xsl:attribute name="depends">pre-init,init-private</xsl:attribute>
   4.122                  <property name="user.properties.file" location="${{netbeans.user}}/build.properties"/>
   4.123              </target>
   4.124 -
   4.125 +            
   4.126              <target name="init-user">
   4.127                  <xsl:attribute name="depends">pre-init,init-private,init-userdir</xsl:attribute>
   4.128                  <property file="${{user.properties.file}}"/>
   4.129              </target>
   4.130 -
   4.131 +            
   4.132              <target name="init-project">
   4.133                  <xsl:attribute name="depends">pre-init,init-private,init-userdir,init-user</xsl:attribute>
   4.134                  <property file="nbproject/project.properties"/>
   4.135              </target>
   4.136 -
   4.137 -	   <target name="do-init">
   4.138 +            
   4.139 +            <target name="do-init">
   4.140                  <xsl:attribute name="depends">pre-init,init-private,init-userdir,init-user,init-project</xsl:attribute>
   4.141                  <xsl:if test="/p:project/p:configuration/ejb:data/ejb:explicit-platform">
   4.142                      <!--Setting java and javac default location -->
   4.143 @@ -126,7 +103,7 @@
   4.144                          platform.javac=$${platforms.${platform.active}.javac}
   4.145                      </echo>
   4.146                      <property file="${{file.tmp}}"/>
   4.147 -
   4.148 +                    
   4.149                      <delete file="${{file.tmp}}"/>
   4.150                      <fail unless="platform.home">Must set platform.home</fail>
   4.151                      <fail unless="platform.bootcp">Must set platform.bootcp</fail>                        
   4.152 @@ -144,12 +121,12 @@
   4.153                      <isfalse value="${{javadoc.preview}}"/>
   4.154                  </condition>
   4.155              </target>
   4.156 -
   4.157 +            
   4.158              <target name="post-init">
   4.159                  <xsl:comment> Empty placeholder for easier customization. </xsl:comment>
   4.160                  <xsl:comment> You can override this target in the ../build.xml file. </xsl:comment>
   4.161              </target>
   4.162 -
   4.163 +            
   4.164              <target name="init-check">
   4.165                  <xsl:attribute name="depends">pre-init,init-private,init-userdir,init-user,init-project,do-init</xsl:attribute>
   4.166                  <!-- XXX XSLT 2.0 would make it possible to use a for-each here -->
   4.167 @@ -164,301 +141,322 @@
   4.168              </target>
   4.169              
   4.170              <target name="init-taskdefs">
   4.171 -                    <taskdef name="generate-wsdl" classname="org.netbeans.modules.etl.project.anttasks.GenerateWSDL">
   4.172 -                        <classpath>
   4.173 -                                    <fileset dir="${{module.install.dir}}"><include name="*.jar" /></fileset>
   4.174 -                                    <fileset dir="${{module.install.dir}}/ext/etlpro"><include name="*.jar" /></fileset>
   4.175 -                                    <fileset dir="${{module.install.dir}}/ext/etl"><include name="*.jar" /></fileset>                                                
   4.176 -                                    <fileset dir="${{module.install.dir}}/ext"><include name="*.jar" /></fileset>
   4.177 -                                    <fileset dir="${{netbeans.home}}/../ide8/modules"><include name="*.jar" /></fileset>
   4.178 -                                    <fileset dir="${{netbeans.home}}/../platform7/modules"><include name="*.jar" /></fileset>
   4.179 -                                    <fileset dir="${{netbeans.home}}/../platform7/core"><include name="*.jar" /></fileset>
   4.180 -                                    <fileset dir="${{netbeans.home}}/../platform7/lib"><include name="*.jar" /></fileset>
   4.181 -                        </classpath>
   4.182 -                        </taskdef>
   4.183 +                <taskdef name="generate-wsdl" classname="org.netbeans.modules.etl.project.anttasks.GenerateWSDL">
   4.184 +                    <classpath>
   4.185 +                        <fileset dir="${{module.install.dir}}"><include name="*.jar" /></fileset>
   4.186 +                        <fileset dir="${{module.install.dir}}/ext/etlpro"><include name="*.jar" /></fileset>
   4.187 +                        <fileset dir="${{module.install.dir}}/ext/etl"><include name="*.jar" /></fileset>                                                
   4.188 +                        <fileset dir="${{module.install.dir}}/ext"><include name="*.jar" /></fileset>
   4.189 +                        <fileset dir="${{netbeans.home}}/../ide8/modules"><include name="*.jar" /></fileset>
   4.190 +                        <fileset dir="${{netbeans.home}}/../platform7/modules"><include name="*.jar" /></fileset>
   4.191 +                        <fileset dir="${{netbeans.home}}/../platform7/core"><include name="*.jar" /></fileset>
   4.192 +                        <fileset dir="${{netbeans.home}}/../platform7/lib"><include name="*.jar" /></fileset>
   4.193 +                    </classpath>
   4.194 +                </taskdef>   
   4.195 +                <taskdef name="generate-schema" classname="org.netbeans.modules.etl.project.anttasks.EViewDesignTime">
   4.196 +                    <classpath>
   4.197 +                        <fileset dir="${{module.install.dir}}"><include name="*.jar" /></fileset>
   4.198 +                        <fileset dir="${{module.install.dir}}/ext/etlpro"><include name="*.jar" /></fileset>
   4.199 +                        <fileset dir="${{module.install.dir}}/ext/etl"><include name="*.jar" /></fileset>                                                
   4.200 +                        <fileset dir="${{module.install.dir}}/ext"><include name="*.jar" /></fileset>
   4.201 +                        <fileset dir="${{netbeans.home}}/../ide8/modules"><include name="*.jar" /></fileset>
   4.202 +                        <fileset dir="${{netbeans.home}}/../platform7/modules"><include name="*.jar" /></fileset>
   4.203 +                        <fileset dir="${{netbeans.home}}/../platform7/core"><include name="*.jar" /></fileset>
   4.204 +                        <fileset dir="${{netbeans.home}}/../platform7/lib"><include name="*.jar" /></fileset>
   4.205 +                    </classpath>
   4.206 +                </taskdef>
   4.207              </target>
   4.208 -			<target name="init">
   4.209 -				<!-- //B20050104                <xsl:attribute name="depends">pre-init,init-private,init-userdir,init-user,init-project,do-init,post-init,init-check,init-macrodef-javac,init-macrodef-nbjpda,init-macrodef-debug,init-taskdefs</xsl:attribute> -->
   4.210 -				<xsl:attribute name="depends">
   4.211 -					pre-init,init-private,init-userdir,init-user,init-project,do-init,post-init,init-check,init-taskdefs
   4.212 -				</xsl:attribute>
   4.213 -			</target>
   4.214 -
   4.215 -			<xsl:comment>
   4.216 -                            =================== 
   4.217 -                            COMPILATION SECTION
   4.218 -                            ===================
   4.219 -			</xsl:comment>
   4.220 -
   4.221 -			<xsl:call-template name="deps.target">
   4.222 -				<xsl:with-param name="targetname" select="'deps-jar'" />
   4.223 -				<xsl:with-param name="type" select="'jar'" />
   4.224 -			</xsl:call-template>
   4.225 -
   4.226 -			<xsl:if
   4.227 -				test="/p:project/p:configuration/ejb:data/ejb:web-services/ejb:web-service|/p:project/p:configuration/ejb:data/ejb:web-service-clients/ejb:web-service-client">
   4.228 -				<target name="wscompile-init">
   4.229 -					<taskdef name="wscompile"
   4.230 -						classname="com.sun.xml.rpc.tools.ant.Wscompile">
   4.231 -						<classpath path="${{wscompile.classpath}}" />
   4.232 -					</taskdef>
   4.233 -					<mkdir dir="${{build.classes.dir}}/META-INF/wsdl" />
   4.234 -					<mkdir dir="${{build.generated.dir}}/wssrc" />
   4.235 -				</target>
   4.236 -			</xsl:if>
   4.237 -
   4.238 -			<xsl:for-each
   4.239 -				select="/p:project/p:configuration/ejb:data/ejb:web-services/ejb:web-service">
   4.240 -				<xsl:variable name="wsname">
   4.241 -					<xsl:value-of select="ejb:web-service-name" />
   4.242 -				</xsl:variable>
   4.243 -
   4.244 -				<target name="{$wsname}_wscompile"
   4.245 -					depends="wscompile-init">
   4.246 -					<wscompile server="true" fork="true" keep="true"
   4.247 -						base="${{build.generated.dir}}/wssrc" xPrintStackTrace="true"
   4.248 -						verbose="true" nonClassDir="${{build.classes.dir}}/META-INF/wsdl"
   4.249 -						classpath="${{wscompile.classpath}}:${{build.classes.dir}}"
   4.250 -						mapping="${{build.classes.dir}}/META-INF/wsdl/${{{$wsname}.mapping}}"
   4.251 -						config="${{src.dir}}/${{{$wsname}.config.name}}">
   4.252 -						<!-- HTTPProxy="${http.proxyHost}:${http.proxyPort}" -->
   4.253 -					</wscompile>
   4.254 -				</target>
   4.255 -			</xsl:for-each>
   4.256 -
   4.257 -			<xsl:for-each
   4.258 -				select="/p:project/p:configuration/ejb:data/ejb:web-service-clients/ejb:web-service-client">
   4.259 -				<xsl:variable name="wsclientname">
   4.260 -					<xsl:value-of select="ejb:web-service-client-name" />
   4.261 -				</xsl:variable>
   4.262 -
   4.263 -				<target name="{$wsclientname}_client_wscompile"
   4.264 -					depends="wscompile-init">
   4.265 -					<copy
   4.266 -						file="${{web.docbase.dir}}/WEB-INF/wsdl/{$wsclientname}-config.xml"
   4.267 -						tofile="${{build.generated.dir}}/wssrc/wsdl/{$wsclientname}-config.xml"
   4.268 -						filtering="on">
   4.269 -						<filterset>
   4.270 -							<!-- replace token with reference to WSDL file in source tree, not build tree, since the
   4.271 +            <target name="init">
   4.272 +                <!-- //B20050104                <xsl:attribute name="depends">pre-init,init-private,init-userdir,init-user,init-project,do-init,post-init,init-check,init-macrodef-javac,init-macrodef-nbjpda,init-macrodef-debug,init-taskdefs</xsl:attribute> -->
   4.273 +                <xsl:attribute name="depends">
   4.274 +                    pre-init,init-private,init-userdir,init-user,init-project,do-init,post-init,init-check,init-taskdefs
   4.275 +                </xsl:attribute>
   4.276 +            </target>
   4.277 +            
   4.278 +            <xsl:comment>
   4.279 +                =================== 
   4.280 +                COMPILATION SECTION
   4.281 +                ===================
   4.282 +            </xsl:comment>
   4.283 +            
   4.284 +            <xsl:call-template name="deps.target">
   4.285 +                <xsl:with-param name="targetname" select="'deps-jar'" />
   4.286 +                <xsl:with-param name="type" select="'jar'" />
   4.287 +            </xsl:call-template>
   4.288 +            
   4.289 +            <xsl:if
   4.290 +                test="/p:project/p:configuration/ejb:data/ejb:web-services/ejb:web-service|/p:project/p:configuration/ejb:data/ejb:web-service-clients/ejb:web-service-client">
   4.291 +                <target name="wscompile-init">
   4.292 +                    <taskdef name="wscompile"
   4.293 +                             classname="com.sun.xml.rpc.tools.ant.Wscompile">
   4.294 +                        <classpath path="${{wscompile.classpath}}" />
   4.295 +                    </taskdef>
   4.296 +                    <mkdir dir="${{build.classes.dir}}/META-INF/wsdl" />
   4.297 +                    <mkdir dir="${{build.generated.dir}}/wssrc" />
   4.298 +                </target>
   4.299 +            </xsl:if>
   4.300 +            
   4.301 +            <xsl:for-each
   4.302 +                select="/p:project/p:configuration/ejb:data/ejb:web-services/ejb:web-service">
   4.303 +                <xsl:variable name="wsname">
   4.304 +                    <xsl:value-of select="ejb:web-service-name" />
   4.305 +                </xsl:variable>
   4.306 +                
   4.307 +                <target name="{$wsname}_wscompile"
   4.308 +                        depends="wscompile-init">
   4.309 +                    <wscompile server="true" fork="true" keep="true"
   4.310 +                               base="${{build.generated.dir}}/wssrc" xPrintStackTrace="true"
   4.311 +                               verbose="true" nonClassDir="${{build.classes.dir}}/META-INF/wsdl"
   4.312 +                               classpath="${{wscompile.classpath}}:${{build.classes.dir}}"
   4.313 +                               mapping="${{build.classes.dir}}/META-INF/wsdl/${{{$wsname}.mapping}}"
   4.314 +                               config="${{src.dir}}/${{{$wsname}.config.name}}">
   4.315 +                        <!-- HTTPProxy="${http.proxyHost}:${http.proxyPort}" -->
   4.316 +                    </wscompile>
   4.317 +                </target>
   4.318 +            </xsl:for-each>
   4.319 +            
   4.320 +            <xsl:for-each
   4.321 +                select="/p:project/p:configuration/ejb:data/ejb:web-service-clients/ejb:web-service-client">
   4.322 +                <xsl:variable name="wsclientname">
   4.323 +                    <xsl:value-of select="ejb:web-service-client-name" />
   4.324 +                </xsl:variable>
   4.325 +                
   4.326 +                <target name="{$wsclientname}_client_wscompile"
   4.327 +                        depends="wscompile-init">
   4.328 +                    <copy
   4.329 +                        file="${{web.docbase.dir}}/WEB-INF/wsdl/{$wsclientname}-config.xml"
   4.330 +                        tofile="${{build.generated.dir}}/wssrc/wsdl/{$wsclientname}-config.xml"
   4.331 +                        filtering="on">
   4.332 +                        <filterset>
   4.333 +                            <!-- replace token with reference to WSDL file in source tree, not build tree, since the
   4.334  								the file probably has not have been copied to the build tree yet. -->
   4.335 -							<filter token="CONFIG_ABSOLUTE_PATH"
   4.336 -								value="${{basedir}}/${{web.docbase.dir}}/WEB-INF/wsdl" />
   4.337 -						</filterset>
   4.338 -					</copy>
   4.339 -					<wscompile xPrintStackTrace="true" verbose="true"
   4.340 -						fork="true" keep="true" import="true" features="norpcstructures"
   4.341 -						base="${{build.classes.dir}}"
   4.342 -						sourceBase="${{build.generated.dir}}/wssrc"
   4.343 -						classpath="${{wscompile.classpath}}"
   4.344 -						mapping="${{build.web.dir}}/WEB-INF/wsdl/{$wsclientname}-mapping.xml"
   4.345 -						config="${{build.generated.dir}}/wssrc/wsdl/{$wsclientname}-config.xml">
   4.346 -					</wscompile>
   4.347 -				</target>
   4.348 -			</xsl:for-each>
   4.349 -
   4.350 -			<target name="pre-pre-compile">
   4.351 -				<xsl:attribute name="depends">
   4.352 -					init,deps-jar
   4.353 -				</xsl:attribute>
   4.354 -				<mkdir dir="${{build.classes.dir}}" />
   4.355 -			</target>
   4.356 -
   4.357 -			<target name="pre-compile">
   4.358 -				<xsl:comment>
   4.359 -					Empty placeholder for easier customization.
   4.360 -				</xsl:comment>
   4.361 -				<xsl:comment>
   4.362 -					You can override this target in the ../build.xml
   4.363 -					file.
   4.364 -				</xsl:comment>
   4.365 -			</target>
   4.366 -
   4.367 -			<target name="library-inclusion-in-archive"
   4.368 -				depends="compile">
   4.369 -				<xsl:for-each select="//ejb:included-library">
   4.370 -					<xsl:variable name="included.prop.name">
   4.371 -						<xsl:value-of select="." />
   4.372 -					</xsl:variable>
   4.373 -					<unjar dest="${{build.classes.dir}}">
   4.374 -						<xsl:attribute name="src">
   4.375 -							${
   4.376 -							<xsl:value-of select="$included.prop.name" />
   4.377 -							}
   4.378 -						</xsl:attribute>
   4.379 -					</unjar>
   4.380 -				</xsl:for-each>
   4.381 -			</target>
   4.382 -
   4.383 -			<target name="library-inclusion-in-manifest"
   4.384 -				depends="compile">
   4.385 -				<xsl:for-each select="//ejb:included-library">
   4.386 -					<xsl:variable name="included.prop.name">
   4.387 -						<xsl:value-of select="." />
   4.388 -					</xsl:variable>
   4.389 -					<xsl:variable name="base.prop.name">
   4.390 -						<xsl:value-of
   4.391 -							select="concat('included.lib.', $included.prop.name, '')" />
   4.392 -					</xsl:variable>
   4.393 -					<basename>
   4.394 -						<xsl:attribute name="property">
   4.395 -							<xsl:value-of select="$base.prop.name" />
   4.396 -						</xsl:attribute>
   4.397 -						<xsl:attribute name="file">
   4.398 -							${
   4.399 -							<xsl:value-of select="$included.prop.name" />
   4.400 -							}
   4.401 -						</xsl:attribute>
   4.402 -					</basename>
   4.403 -					<copy todir="${{build.classes.dir}}">
   4.404 -						<xsl:attribute name="file">
   4.405 -							${
   4.406 -							<xsl:value-of select="$included.prop.name" />
   4.407 -							}
   4.408 -						</xsl:attribute>
   4.409 -					</copy>
   4.410 -				</xsl:for-each>
   4.411 -				<manifest
   4.412 -					file="${{build.classes.dir}}/META-INF/MANIFEST.MF" mode="update">
   4.413 -					<attribute>
   4.414 -						<xsl:attribute name="name">
   4.415 -							Class-Path
   4.416 -						</xsl:attribute>
   4.417 -						<xsl:attribute name="value">
   4.418 -							<xsl:for-each
   4.419 -								select="//ejb:included-library">
   4.420 -								<xsl:variable name="base.prop.name">
   4.421 -									<xsl:value-of
   4.422 -										select="concat('${included.lib.', ., '}')" />
   4.423 -								</xsl:variable>
   4.424 -								<xsl:if test="position()>1">,</xsl:if>
   4.425 -								<xsl:value-of select="$base.prop.name" />
   4.426 -							</xsl:for-each>
   4.427 -						</xsl:attribute>
   4.428 -					</attribute>
   4.429 -				</manifest>
   4.430 -			</target>
   4.431 -
   4.432 -			<target name="do-compile">
   4.433 -				<xsl:attribute name="depends">
   4.434 -					init,deps-jar,pre-pre-compile,pre-compile
   4.435 -				</xsl:attribute>
   4.436 -				<xsl:if
   4.437 -					test="/p:project/p:configuration/ejb:data/ejb:web-services/ejb:web-service">
   4.438 -					<xsl:comment>
   4.439 -						For web services, refresh the Tie and
   4.440 -						SerializerRegistry classes
   4.441 -					</xsl:comment>
   4.442 -					<delete>
   4.443 -						<fileset dir="${{build.classes.dir}}"
   4.444 -							includes="**/*_Tie.* **/*_SerializerRegistry.*" />
   4.445 -					</delete>
   4.446 -				</xsl:if>
   4.447 -			</target>
   4.448 -
   4.449 -			<target name="post-compile">
   4.450 -				<xsl:if
   4.451 -					test="/p:project/p:configuration/ejb:data/ejb:web-services/ejb:web-service">
   4.452 -					<xsl:attribute name="depends">
   4.453 -						<xsl:for-each
   4.454 -							select="/p:project/p:configuration/ejb:data/ejb:web-services/ejb:web-service">
   4.455 -							<xsl:if test="position()!=1">
   4.456 -								<xsl:text>,</xsl:text>
   4.457 -							</xsl:if>
   4.458 -							<xsl:variable name="wsname2">
   4.459 -								<xsl:value-of
   4.460 -									select="ejb:web-service-name" />
   4.461 -							</xsl:variable>
   4.462 -							<xsl:value-of select="ejb:web-service-name" />
   4.463 -							<xsl:text>_wscompile</xsl:text>
   4.464 -						</xsl:for-each>
   4.465 -					</xsl:attribute>
   4.466 -				</xsl:if>
   4.467 -				<xsl:comment>
   4.468 -					Empty placeholder for easier customization.
   4.469 -				</xsl:comment>
   4.470 -				<xsl:comment>
   4.471 -					You can override this target in the ../build.xml
   4.472 -					file.
   4.473 -				</xsl:comment>
   4.474 -			</target>
   4.475 -
   4.476 -			<target name="compile">
   4.477 -				<xsl:attribute name="depends">
   4.478 -					init,deps-jar,pre-pre-compile,pre-compile,do-compile,post-compile
   4.479 -				</xsl:attribute>
   4.480 -				<xsl:attribute name="description">
   4.481 -					Compile project.
   4.482 -				</xsl:attribute>
   4.483 -			</target>
   4.484 -
   4.485 -			<target name="pre-compile-single">
   4.486 -				<xsl:comment>
   4.487 -					Empty placeholder for easier customization.
   4.488 -				</xsl:comment>
   4.489 -				<xsl:comment>
   4.490 -					You can override this target in the ../build.xml
   4.491 -					file.
   4.492 -				</xsl:comment>
   4.493 -			</target>
   4.494 -
   4.495 -			<target name="do-compile-single">
   4.496 -				<xsl:attribute name="depends">
   4.497 -					init,deps-jar,pre-pre-compile
   4.498 -				</xsl:attribute>
   4.499 -				<fail unless="javac.includes">
   4.500 -					Must select some files in the IDE or set
   4.501 -					javac.includes
   4.502 -				</fail>
   4.503 -				<ejbproject:javac
   4.504 -					xmlns:ejbproject="http://www.netbeans.org/ns/j2ee-ejbjarproject/1">
   4.505 -					<customize>
   4.506 -						<include name="${{javac.includes}}" />
   4.507 -					</customize>
   4.508 -				</ejbproject:javac>
   4.509 -			</target>
   4.510 -
   4.511 -			<target name="post-compile-single">
   4.512 -				<xsl:comment>
   4.513 -					Empty placeholder for easier customization.
   4.514 -				</xsl:comment>
   4.515 -				<xsl:comment>
   4.516 -					You can override this target in the ../build.xml
   4.517 -					file.
   4.518 -				</xsl:comment>
   4.519 -			</target>
   4.520 -
   4.521 -			<target name="compile-single">
   4.522 -				<xsl:attribute name="depends">
   4.523 -					init,deps-jar,pre-pre-compile,pre-compile-single,do-compile-single,post-compile-single
   4.524 -				</xsl:attribute>
   4.525 -			</target>
   4.526 -
   4.527 -			<xsl:comment>
   4.528 -				==================== DIST BUILDING SECTION
   4.529 -				====================
   4.530 -			</xsl:comment>
   4.531 -			<target name="gen-wsdl">
   4.532 -				<xsl:attribute name="depends">init</xsl:attribute>
   4.533 -				<mkdir dir="${{build.dir}}" />
   4.534 -				<generate-wsdl
   4.535 -					srcDirectoryLocation="${{basedir}}/${{src.dir}}"
   4.536 -					buildDirectoryLocation="${{basedir}}/${{build.dir}}" />
   4.537 -			</target>
   4.538 -
   4.539 -			<target name="pre-dist">
   4.540 -				<xsl:comment>
   4.541 -					Empty placeholder for easier customization.
   4.542 -				</xsl:comment>
   4.543 -				<xsl:comment>
   4.544 -					You can override this target in the ../build.xml
   4.545 -					file.
   4.546 -				</xsl:comment>
   4.547 -				<mkdir dir="${{build.dir}}" />
   4.548 -				<generate-wsdl
   4.549 -					srcDirectoryLocation="${{basedir}}/${{src.dir}}"
   4.550 -					buildDirectoryLocation="${{basedir}}/${{build.dir}}">
   4.551 -				</generate-wsdl>
   4.552 -				<!--
   4.553 +                            <filter token="CONFIG_ABSOLUTE_PATH"
   4.554 +                                    value="${{basedir}}/${{web.docbase.dir}}/WEB-INF/wsdl" />
   4.555 +                        </filterset>
   4.556 +                    </copy>
   4.557 +                    <wscompile xPrintStackTrace="true" verbose="true"
   4.558 +                               fork="true" keep="true" import="true" features="norpcstructures"
   4.559 +                               base="${{build.classes.dir}}"
   4.560 +                               sourceBase="${{build.generated.dir}}/wssrc"
   4.561 +                               classpath="${{wscompile.classpath}}"
   4.562 +                               mapping="${{build.web.dir}}/WEB-INF/wsdl/{$wsclientname}-mapping.xml"
   4.563 +                               config="${{build.generated.dir}}/wssrc/wsdl/{$wsclientname}-config.xml">
   4.564 +                    </wscompile>
   4.565 +                </target>
   4.566 +            </xsl:for-each>
   4.567 +            
   4.568 +            <target name="pre-pre-compile">
   4.569 +                <xsl:attribute name="depends">
   4.570 +                    init,deps-jar
   4.571 +                </xsl:attribute>
   4.572 +                <mkdir dir="${{build.classes.dir}}" />
   4.573 +            </target>
   4.574 +            
   4.575 +            <target name="pre-compile">
   4.576 +                <xsl:comment>
   4.577 +                    Empty placeholder for easier customization.
   4.578 +                </xsl:comment>
   4.579 +                <xsl:comment>
   4.580 +                    You can override this target in the ../build.xml
   4.581 +                    file.
   4.582 +                </xsl:comment>
   4.583 +            </target>
   4.584 +            
   4.585 +            <target name="library-inclusion-in-archive"
   4.586 +                    depends="compile">
   4.587 +                <xsl:for-each select="//ejb:included-library">
   4.588 +                    <xsl:variable name="included.prop.name">
   4.589 +                        <xsl:value-of select="." />
   4.590 +                    </xsl:variable>
   4.591 +                    <unjar dest="${{build.classes.dir}}">
   4.592 +                        <xsl:attribute name="src">
   4.593 +                            ${
   4.594 +                            <xsl:value-of select="$included.prop.name" />
   4.595 +                            }
   4.596 +                        </xsl:attribute>
   4.597 +                    </unjar>
   4.598 +                </xsl:for-each>
   4.599 +            </target>
   4.600 +            
   4.601 +            <target name="library-inclusion-in-manifest"
   4.602 +                    depends="compile">
   4.603 +                <xsl:for-each select="//ejb:included-library">
   4.604 +                    <xsl:variable name="included.prop.name">
   4.605 +                        <xsl:value-of select="." />
   4.606 +                    </xsl:variable>
   4.607 +                    <xsl:variable name="base.prop.name">
   4.608 +                        <xsl:value-of
   4.609 +                            select="concat('included.lib.', $included.prop.name, '')" />
   4.610 +                    </xsl:variable>
   4.611 +                    <basename>
   4.612 +                        <xsl:attribute name="property">
   4.613 +                            <xsl:value-of select="$base.prop.name" />
   4.614 +                        </xsl:attribute>
   4.615 +                        <xsl:attribute name="file">
   4.616 +                            ${
   4.617 +                            <xsl:value-of select="$included.prop.name" />
   4.618 +                            }
   4.619 +                        </xsl:attribute>
   4.620 +                    </basename>
   4.621 +                    <copy todir="${{build.classes.dir}}">
   4.622 +                        <xsl:attribute name="file">
   4.623 +                            ${
   4.624 +                            <xsl:value-of select="$included.prop.name" />
   4.625 +                            }
   4.626 +                        </xsl:attribute>
   4.627 +                    </copy>
   4.628 +                </xsl:for-each>
   4.629 +                <manifest
   4.630 +                    file="${{build.classes.dir}}/META-INF/MANIFEST.MF" mode="update">
   4.631 +                    <attribute>
   4.632 +                        <xsl:attribute name="name">
   4.633 +                            Class-Path
   4.634 +                        </xsl:attribute>
   4.635 +                        <xsl:attribute name="value">
   4.636 +                            <xsl:for-each
   4.637 +                                select="//ejb:included-library">
   4.638 +                                <xsl:variable name="base.prop.name">
   4.639 +                                    <xsl:value-of
   4.640 +                                        select="concat('${included.lib.', ., '}')" />
   4.641 +                                </xsl:variable>
   4.642 +                                <xsl:if test="position()>1">,</xsl:if>
   4.643 +                                <xsl:value-of select="$base.prop.name" />
   4.644 +                            </xsl:for-each>
   4.645 +                        </xsl:attribute>
   4.646 +                    </attribute>
   4.647 +                </manifest>
   4.648 +            </target>
   4.649 +            
   4.650 +            <target name="do-compile">
   4.651 +                <xsl:attribute name="depends">
   4.652 +                    init,deps-jar,pre-pre-compile,pre-compile
   4.653 +                </xsl:attribute>
   4.654 +                <xsl:if
   4.655 +                    test="/p:project/p:configuration/ejb:data/ejb:web-services/ejb:web-service">
   4.656 +                    <xsl:comment>
   4.657 +                        For web services, refresh the Tie and
   4.658 +                        SerializerRegistry classes
   4.659 +                    </xsl:comment>
   4.660 +                    <delete>
   4.661 +                        <fileset dir="${{build.classes.dir}}"
   4.662 +                                 includes="**/*_Tie.* **/*_SerializerRegistry.*" />
   4.663 +                    </delete>
   4.664 +                </xsl:if>
   4.665 +            </target>
   4.666 +            
   4.667 +            <target name="post-compile">
   4.668 +                <xsl:if
   4.669 +                    test="/p:project/p:configuration/ejb:data/ejb:web-services/ejb:web-service">
   4.670 +                    <xsl:attribute name="depends">
   4.671 +                        <xsl:for-each
   4.672 +                            select="/p:project/p:configuration/ejb:data/ejb:web-services/ejb:web-service">
   4.673 +                            <xsl:if test="position()!=1">
   4.674 +                                <xsl:text>,</xsl:text>
   4.675 +                            </xsl:if>
   4.676 +                            <xsl:variable name="wsname2">
   4.677 +                                <xsl:value-of
   4.678 +                                    select="ejb:web-service-name" />
   4.679 +                            </xsl:variable>
   4.680 +                            <xsl:value-of select="ejb:web-service-name" />
   4.681 +                            <xsl:text>_wscompile</xsl:text>
   4.682 +                        </xsl:for-each>
   4.683 +                    </xsl:attribute>
   4.684 +                </xsl:if>
   4.685 +                <xsl:comment>
   4.686 +                    Empty placeholder for easier customization.
   4.687 +                </xsl:comment>
   4.688 +                <xsl:comment>
   4.689 +                    You can override this target in the ../build.xml
   4.690 +                    file.
   4.691 +                </xsl:comment>
   4.692 +            </target>
   4.693 +            
   4.694 +            <target name="compile">
   4.695 +                <xsl:attribute name="depends">
   4.696 +                    init,deps-jar,pre-pre-compile,pre-compile,do-compile,post-compile
   4.697 +                </xsl:attribute>
   4.698 +                <xsl:attribute name="description">
   4.699 +                    Compile project.
   4.700 +                </xsl:attribute>
   4.701 +            </target>
   4.702 +            
   4.703 +            <target name="pre-compile-single">
   4.704 +                <xsl:comment>
   4.705 +                    Empty placeholder for easier customization.
   4.706 +                </xsl:comment>
   4.707 +                <xsl:comment>
   4.708 +                    You can override this target in the ../build.xml
   4.709 +                    file.
   4.710 +                </xsl:comment>
   4.711 +            </target>
   4.712 +            
   4.713 +            <target name="do-compile-single">
   4.714 +                <xsl:attribute name="depends">
   4.715 +                    init,deps-jar,pre-pre-compile
   4.716 +                </xsl:attribute>
   4.717 +                <fail unless="javac.includes">
   4.718 +                    Must select some files in the IDE or set
   4.719 +                    javac.includes
   4.720 +                </fail>
   4.721 +                <ejbproject:javac
   4.722 +                    xmlns:ejbproject="http://www.netbeans.org/ns/j2ee-ejbjarproject/1">
   4.723 +                    <customize>
   4.724 +                        <include name="${{javac.includes}}" />
   4.725 +                    </customize>
   4.726 +                </ejbproject:javac>
   4.727 +            </target>
   4.728 +            
   4.729 +            <target name="post-compile-single">
   4.730 +                <xsl:comment>
   4.731 +                    Empty placeholder for easier customization.
   4.732 +                </xsl:comment>
   4.733 +                <xsl:comment>
   4.734 +                    You can override this target in the ../build.xml
   4.735 +                    file.
   4.736 +                </xsl:comment>
   4.737 +            </target>
   4.738 +            
   4.739 +            <target name="compile-single">
   4.740 +                <xsl:attribute name="depends">
   4.741 +                    init,deps-jar,pre-pre-compile,pre-compile-single,do-compile-single,post-compile-single
   4.742 +                </xsl:attribute>
   4.743 +            </target>
   4.744 +            
   4.745 +            <xsl:comment>
   4.746 +                ==================== DIST BUILDING SECTION
   4.747 +                ====================
   4.748 +            </xsl:comment>
   4.749 +            <target name="gen-wsdl">
   4.750 +                <xsl:attribute name="depends">init</xsl:attribute>
   4.751 +                <mkdir dir="${{build.dir}}" />
   4.752 +                <generate-wsdl
   4.753 +                    srcDirectoryLocation="${{basedir}}/${{src.dir}}"
   4.754 +                    buildDirectoryLocation="${{basedir}}/${{build.dir}}" />
   4.755 +            </target>
   4.756 +            <target name="gen-schema">      
   4.757 +                <xsl:attribute name="depends">init</xsl:attribute>
   4.758 +                <!--echo message="SAMPLE" /--> 
   4.759 +                <generate-schema/>      
   4.760 +                <!--taskdef name="generate-schema" classname="org.netbeans.modules.etl.project.anttasks.EViewDesignTime">                        
   4.761 +                </taskdef-->
   4.762 +                <!--echo message="SAMPLE COMPLETED" /--> 
   4.763 +            </target>
   4.764 +            
   4.765 +            <target name="pre-dist">
   4.766 +                <xsl:comment>
   4.767 +                    Empty placeholder for easier customization.
   4.768 +                </xsl:comment>
   4.769 +                <xsl:comment>
   4.770 +                    You can override this target in the ../build.xml
   4.771 +                    file.
   4.772 +                </xsl:comment>
   4.773 +                <mkdir dir="${{build.dir}}" />
   4.774 +                <generate-wsdl
   4.775 +                    srcDirectoryLocation="${{basedir}}/${{src.dir}}"
   4.776 +                    buildDirectoryLocation="${{basedir}}/${{build.dir}}">
   4.777 +                </generate-wsdl>  
   4.778 +                <!--generate-schema/-->
   4.779 +                <!--
   4.780  					<xslt in="${{basedir}}/${{build.dir}}/etlmap.xml" out="${{build.dir}}/portmap.xml"
   4.781  					style="${{basedir}}/nbproject/genPortmap.xsl">
   4.782  					<outputproperty name="method" value="xml"/>
   4.783 @@ -468,70 +466,70 @@
   4.784  					</xslt>
   4.785  				-->
   4.786  
   4.787 -			</target>
   4.788 -
   4.789 -			<target name="dist_se">
   4.790 -				<xsl:attribute name="depends">
   4.791 -					init,pre-dist
   4.792 -				</xsl:attribute>
   4.793 -				<jar compress="${{jar.compress}}"
   4.794 -					jarfile="${{build.dir}}/SEDeployment.jar">
   4.795 -					<fileset
   4.796 -						includes="**/*_engine.xml,**/*.wsdl,**/*.xsd" dir="${{src.dir}}" />
   4.797 -					<fileset dir="${{src.dir}}/">
   4.798 -						<include name="etlmap.xml" />
   4.799 -					</fileset>
   4.800 -					<fileset dir="${{build.dir}}">
   4.801 -						<include name="**/*.xml" />
   4.802 -						<include name="**/*.wsdl" />
   4.803 -					</fileset>
   4.804 -				</jar>
   4.805 -			</target>
   4.806 -
   4.807 -			<target name="do-dist">
   4.808 -				<xsl:attribute name="depends">
   4.809 -					init,pre-dist,dist_se
   4.810 -				</xsl:attribute>
   4.811 -			</target>
   4.812 -
   4.813 -			<target name="post-dist">
   4.814 -				<xsl:comment>
   4.815 -					Empty placeholder for easier customization.
   4.816 -				</xsl:comment>
   4.817 -				<xsl:comment>
   4.818 -					You can override this target in the ../build.xml
   4.819 -					file.
   4.820 -				</xsl:comment>
   4.821 -			</target>
   4.822 -
   4.823 -			<target name="dist">
   4.824 -				<xsl:attribute name="depends">
   4.825 -					init,pre-dist,do-dist,post-dist
   4.826 -				</xsl:attribute>
   4.827 -				<!--
   4.828 +            </target>
   4.829 +            
   4.830 +            <target name="dist_se">
   4.831 +                <xsl:attribute name="depends">
   4.832 +                    init,pre-dist
   4.833 +                </xsl:attribute>
   4.834 +                <jar compress="${{jar.compress}}"
   4.835 +                     jarfile="${{build.dir}}/SEDeployment.jar">
   4.836 +                    <fileset
   4.837 +                        includes="**/*_engine.xml,**/*.wsdl,**/*.xsd" dir="${{src.dir}}" />
   4.838 +                    <fileset dir="${{src.dir}}/">
   4.839 +                        <include name="etlmap.xml" />
   4.840 +                    </fileset>
   4.841 +                    <fileset dir="${{build.dir}}">
   4.842 +                        <include name="**/*.xml" />
   4.843 +                        <include name="**/*.wsdl" />
   4.844 +                    </fileset>
   4.845 +                </jar>
   4.846 +            </target>
   4.847 +            
   4.848 +            <target name="do-dist">
   4.849 +                <xsl:attribute name="depends">
   4.850 +                    init,pre-dist,dist_se
   4.851 +                </xsl:attribute>
   4.852 +            </target>
   4.853 +            
   4.854 +            <target name="post-dist">
   4.855 +                <xsl:comment>
   4.856 +                    Empty placeholder for easier customization.
   4.857 +                </xsl:comment>
   4.858 +                <xsl:comment>
   4.859 +                    You can override this target in the ../build.xml
   4.860 +                    file.
   4.861 +                </xsl:comment>
   4.862 +            </target>
   4.863 +            
   4.864 +            <target name="dist">
   4.865 +                <xsl:attribute name="depends">
   4.866 +                    init,pre-dist,do-dist,post-dist
   4.867 +                </xsl:attribute>
   4.868 +                <!--
   4.869  					<xsl:attribute name="depends">init,compile,pre-dist,do-dist,post-dist,library-inclusion-in-manifest</xsl:attribute>
   4.870  				-->
   4.871 -				<xsl:attribute name="description">
   4.872 -					Build distribution (JAR).
   4.873 -				</xsl:attribute>
   4.874 -			</target>
   4.875 -
   4.876 -			<xsl:comment>
   4.877 -				================= EXECUTION SECTION =================
   4.878 -			</xsl:comment>
   4.879 -			<target name="run">
   4.880 -				<xsl:attribute name="depends">run-deploy</xsl:attribute>
   4.881 -				<xsl:attribute name="description">
   4.882 -					Deploy to server.
   4.883 -				</xsl:attribute>
   4.884 -			</target>
   4.885 -
   4.886 -			<target name="init-deploy">
   4.887 -				<property name="include.jar.manifest" value="" />
   4.888 -			</target>
   4.889 -
   4.890 -			<target name="run-deploy">
   4.891 -				<!-- No more deploy action in subprojects
   4.892 +                <xsl:attribute name="description">
   4.893 +                    Build distribution (JAR).
   4.894 +                </xsl:attribute>
   4.895 +            </target>
   4.896 +            
   4.897 +            <xsl:comment>
   4.898 +                ================= EXECUTION SECTION =================
   4.899 +            </xsl:comment>
   4.900 +            <target name="run">
   4.901 +                <xsl:attribute name="depends">run-deploy</xsl:attribute>
   4.902 +                <xsl:attribute name="description">
   4.903 +                    Deploy to server.
   4.904 +                </xsl:attribute>
   4.905 +            </target>
   4.906 +            
   4.907 +            <target name="init-deploy">
   4.908 +                <property name="include.jar.manifest" value="" />
   4.909 +            </target>
   4.910 +            
   4.911 +            <target name="run-deploy">
   4.912 +                <!-- No more deploy action in subprojects
   4.913  					<xsl:attribute name="depends">init,init-deploy,compile,library-inclusion-in-archive</xsl:attribute>
   4.914  					
   4.915  					<generate-deployment-path
   4.916 @@ -559,148 +557,148 @@
   4.917  					<arg value="deploy"/>
   4.918  					</exec>
   4.919  				-->
   4.920 -			</target>
   4.921 -
   4.922 -			<xsl:comment>
   4.923 -				================= DEBUGGING SECTION =================
   4.924 -			</xsl:comment>
   4.925 -			<target name="debug">
   4.926 -				<xsl:attribute name="description">
   4.927 -					Debug project in IDE.
   4.928 -				</xsl:attribute>
   4.929 -				<xsl:attribute name="depends">
   4.930 -					init,compile
   4.931 -				</xsl:attribute>
   4.932 -				<xsl:attribute name="if">netbeans.home</xsl:attribute>
   4.933 -				<nbdeploy debugmode="true"
   4.934 -					clientUrlPart="${{client.urlPart}}" />
   4.935 -				<nbjpdaconnect name="${{name}}" host="${{jpda.host}}"
   4.936 -					address="${{jpda.address}}" transport="${{jpda.transport}}">
   4.937 -					<classpath>
   4.938 -						<path path="${{debug.classpath}}" />
   4.939 -					</classpath>
   4.940 -					<sourcepath>
   4.941 -						<path path="${{web.docbase.dir}}" />
   4.942 -					</sourcepath>
   4.943 -					<xsl:if
   4.944 -						test="/p:project/p:configuration/ejb:data/ejb:explicit-platform">
   4.945 -						<bootclasspath>
   4.946 -							<path path="${{platform.bootcp}}" />
   4.947 -						</bootclasspath>
   4.948 -					</xsl:if>
   4.949 -				</nbjpdaconnect>
   4.950 -			</target>
   4.951 -
   4.952 -			<target name="pre-debug-fix">
   4.953 -				<xsl:attribute name="depends">init</xsl:attribute>
   4.954 -				<fail unless="fix.includes">Must set fix.includes</fail>
   4.955 -				<property name="javac.includes"
   4.956 -					value="${{fix.includes}}.java" />
   4.957 -			</target>
   4.958 -
   4.959 -			<target name="do-debug-fix">
   4.960 -				<xsl:attribute name="if">netbeans.home</xsl:attribute>
   4.961 -				<xsl:attribute name="depends">
   4.962 -					init,pre-debug-fix,compile-single
   4.963 -				</xsl:attribute>
   4.964 -				<j2seproject:nbjpdareload
   4.965 -					xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1" />
   4.966 -			</target>
   4.967 -
   4.968 -			<target name="debug-fix">
   4.969 -				<xsl:attribute name="if">netbeans.home</xsl:attribute>
   4.970 -				<xsl:attribute name="depends">
   4.971 -					init,pre-debug-fix,do-debug-fix
   4.972 -				</xsl:attribute>
   4.973 -			</target>
   4.974 -
   4.975 -			<xsl:comment>
   4.976 -				=============== JAVADOC SECTION ===============
   4.977 -			</xsl:comment>
   4.978 -
   4.979 -			<target name="javadoc-build">
   4.980 -				<xsl:attribute name="depends">init</xsl:attribute>
   4.981 -				<mkdir dir="${{dist.javadoc.dir}}" />
   4.982 -				<!-- XXX do an up-to-date check first -->
   4.983 -				<javadoc destdir="${{dist.javadoc.dir}}"
   4.984 -					source="${{javac.source}}" notree="${{javadoc.notree}}"
   4.985 -					use="${{javadoc.use}}" nonavbar="${{javadoc.nonavbar}}"
   4.986 -					noindex="${{javadoc.noindex}}" splitindex="${{javadoc.splitindex}}"
   4.987 -					author="${{javadoc.author}}" version="${{javadoc.version}}"
   4.988 -					windowtitle="${{javadoc.windowtitle}}"
   4.989 -					private="${{javadoc.private}}">
   4.990 -					<!-- encoding="${{javadoc.encoding}}" -->
   4.991 -					<classpath>
   4.992 -						<path path="${{javac.classpath}}" />
   4.993 -					</classpath>
   4.994 -					<sourcepath>
   4.995 -						<pathelement location="${{src.dir}}" />
   4.996 -					</sourcepath>
   4.997 -					<xsl:if
   4.998 -						test="/p:project/p:configuration/ejb:data/ejb:explicit-platform">
   4.999 -						<bootclasspath>
  4.1000 -							<path path="${{platform.bootcp}}" />
  4.1001 -						</bootclasspath>
  4.1002 -					</xsl:if>
  4.1003 -					<fileset dir="${{src.dir}}" />
  4.1004 -				</javadoc>
  4.1005 -			</target>
  4.1006 -
  4.1007 -			<target name="javadoc-browse">
  4.1008 -				<xsl:attribute name="if">netbeans.home</xsl:attribute>
  4.1009 -				<xsl:attribute name="unless">
  4.1010 -					no.javadoc.preview
  4.1011 -				</xsl:attribute>
  4.1012 -				<xsl:attribute name="depends">
  4.1013 -					init,javadoc-build
  4.1014 -				</xsl:attribute>
  4.1015 -				<nbbrowse file="${{dist.javadoc.dir}}/index.html" />
  4.1016 -			</target>
  4.1017 -
  4.1018 -			<target name="javadoc">
  4.1019 -				<xsl:attribute name="depends">
  4.1020 -					init,javadoc-build,javadoc-browse
  4.1021 -				</xsl:attribute>
  4.1022 -				<xsl:attribute name="description">
  4.1023 -					Build Javadoc.
  4.1024 -				</xsl:attribute>
  4.1025 -			</target>
  4.1026 -
  4.1027 -			<xsl:comment>
  4.1028 -				=============== CLEANUP SECTION ===============
  4.1029 -			</xsl:comment>
  4.1030 -
  4.1031 -			<xsl:call-template name="deps.target">
  4.1032 -				<xsl:with-param name="targetname" select="'deps-clean'" />
  4.1033 -			</xsl:call-template>
  4.1034 -
  4.1035 -			<target name="do-clean">
  4.1036 -				<xsl:attribute name="depends">init</xsl:attribute>
  4.1037 -				<delete dir="${{build.dir}}" />
  4.1038 -				<delete dir="${{dist.dir}}" />
  4.1039 -			</target>
  4.1040 -
  4.1041 -			<target name="post-clean">
  4.1042 -				<xsl:comment>
  4.1043 -					Empty placeholder for easier customization.
  4.1044 -				</xsl:comment>
  4.1045 -				<xsl:comment>
  4.1046 -					You can override this target in the ../build.xml
  4.1047 -					file.
  4.1048 -				</xsl:comment>
  4.1049 -			</target>
  4.1050 -
  4.1051 -			<target name="clean">
  4.1052 -				<xsl:attribute name="depends">
  4.1053 -					init,deps-clean,do-clean,post-clean
  4.1054 -				</xsl:attribute>
  4.1055 -				<xsl:attribute name="description">
  4.1056 -					Clean build products.
  4.1057 -				</xsl:attribute>
  4.1058 -			</target>
  4.1059 -		</project>
  4.1060 -
  4.1061 -		<!-- TBD items:
  4.1062 +            </target>
  4.1063 +            
  4.1064 +            <xsl:comment>
  4.1065 +                ================= DEBUGGING SECTION =================
  4.1066 +            </xsl:comment>
  4.1067 +            <target name="debug">
  4.1068 +                <xsl:attribute name="description">
  4.1069 +                    Debug project in IDE.
  4.1070 +                </xsl:attribute>
  4.1071 +                <xsl:attribute name="depends">
  4.1072 +                    init,compile
  4.1073 +                </xsl:attribute>
  4.1074 +                <xsl:attribute name="if">netbeans.home</xsl:attribute>
  4.1075 +                <nbdeploy debugmode="true"
  4.1076 +                          clientUrlPart="${{client.urlPart}}" />
  4.1077 +                <nbjpdaconnect name="${{name}}" host="${{jpda.host}}"
  4.1078 +                               address="${{jpda.address}}" transport="${{jpda.transport}}">
  4.1079 +                    <classpath>
  4.1080 +                        <path path="${{debug.classpath}}" />
  4.1081 +                    </classpath>
  4.1082 +                    <sourcepath>
  4.1083 +                        <path path="${{web.docbase.dir}}" />
  4.1084 +                    </sourcepath>
  4.1085 +                    <xsl:if
  4.1086 +                        test="/p:project/p:configuration/ejb:data/ejb:explicit-platform">
  4.1087 +                        <bootclasspath>
  4.1088 +                            <path path="${{platform.bootcp}}" />
  4.1089 +                        </bootclasspath>
  4.1090 +                    </xsl:if>
  4.1091 +                </nbjpdaconnect>
  4.1092 +            </target>
  4.1093 +            
  4.1094 +            <target name="pre-debug-fix">
  4.1095 +                <xsl:attribute name="depends">init</xsl:attribute>
  4.1096 +                <fail unless="fix.includes">Must set fix.includes</fail>
  4.1097 +                <property name="javac.includes"
  4.1098 +                          value="${{fix.includes}}.java" />
  4.1099 +            </target>
  4.1100 +            
  4.1101 +            <target name="do-debug-fix">
  4.1102 +                <xsl:attribute name="if">netbeans.home</xsl:attribute>
  4.1103 +                <xsl:attribute name="depends">
  4.1104 +                    init,pre-debug-fix,compile-single
  4.1105 +                </xsl:attribute>
  4.1106 +                <j2seproject:nbjpdareload
  4.1107 +                    xmlns:j2seproject="http://www.netbeans.org/ns/j2se-project/1" />
  4.1108 +            </target>
  4.1109 +            
  4.1110 +            <target name="debug-fix">
  4.1111 +                <xsl:attribute name="if">netbeans.home</xsl:attribute>
  4.1112 +                <xsl:attribute name="depends">
  4.1113 +                    init,pre-debug-fix,do-debug-fix
  4.1114 +                </xsl:attribute>
  4.1115 +            </target>
  4.1116 +            
  4.1117 +            <xsl:comment>
  4.1118 +                =============== JAVADOC SECTION ===============
  4.1119 +            </xsl:comment>
  4.1120 +            
  4.1121 +            <target name="javadoc-build">
  4.1122 +                <xsl:attribute name="depends">init</xsl:attribute>
  4.1123 +                <mkdir dir="${{dist.javadoc.dir}}" />
  4.1124 +                <!-- XXX do an up-to-date check first -->
  4.1125 +                <javadoc destdir="${{dist.javadoc.dir}}"
  4.1126 +                         source="${{javac.source}}" notree="${{javadoc.notree}}"
  4.1127 +                         use="${{javadoc.use}}" nonavbar="${{javadoc.nonavbar}}"
  4.1128 +                         noindex="${{javadoc.noindex}}" splitindex="${{javadoc.splitindex}}"
  4.1129 +                         author="${{javadoc.author}}" version="${{javadoc.version}}"
  4.1130 +                         windowtitle="${{javadoc.windowtitle}}"
  4.1131 +                         private="${{javadoc.private}}">
  4.1132 +                    <!-- encoding="${{javadoc.encoding}}" -->
  4.1133 +                    <classpath>
  4.1134 +                        <path path="${{javac.classpath}}" />
  4.1135 +                    </classpath>
  4.1136 +                    <sourcepath>
  4.1137 +                        <pathelement location="${{src.dir}}" />
  4.1138 +                    </sourcepath>
  4.1139 +                    <xsl:if
  4.1140 +                        test="/p:project/p:configuration/ejb:data/ejb:explicit-platform">
  4.1141 +                        <bootclasspath>
  4.1142 +                            <path path="${{platform.bootcp}}" />
  4.1143 +                        </bootclasspath>
  4.1144 +                    </xsl:if>
  4.1145 +                    <fileset dir="${{src.dir}}" />
  4.1146 +                </javadoc>
  4.1147 +            </target>
  4.1148 +            
  4.1149 +            <target name="javadoc-browse">
  4.1150 +                <xsl:attribute name="if">netbeans.home</xsl:attribute>
  4.1151 +                <xsl:attribute name="unless">
  4.1152 +                    no.javadoc.preview
  4.1153 +                </xsl:attribute>
  4.1154 +                <xsl:attribute name="depends">
  4.1155 +                    init,javadoc-build
  4.1156 +                </xsl:attribute>
  4.1157 +                <nbbrowse file="${{dist.javadoc.dir}}/index.html" />
  4.1158 +            </target>
  4.1159 +            
  4.1160 +            <target name="javadoc">
  4.1161 +                <xsl:attribute name="depends">
  4.1162 +                    init,javadoc-build,javadoc-browse
  4.1163 +                </xsl:attribute>
  4.1164 +                <xsl:attribute name="description">
  4.1165 +                    Build Javadoc.
  4.1166 +                </xsl:attribute>
  4.1167 +            </target>
  4.1168 +            
  4.1169 +            <xsl:comment>
  4.1170 +                =============== CLEANUP SECTION ===============
  4.1171 +            </xsl:comment>
  4.1172 +            
  4.1173 +            <xsl:call-template name="deps.target">
  4.1174 +                <xsl:with-param name="targetname" select="'deps-clean'" />
  4.1175 +            </xsl:call-template>
  4.1176 +            
  4.1177 +            <target name="do-clean">
  4.1178 +                <xsl:attribute name="depends">init</xsl:attribute>
  4.1179 +                <delete dir="${{build.dir}}" />
  4.1180 +                <delete dir="${{dist.dir}}" />
  4.1181 +            </target>
  4.1182 +            
  4.1183 +            <target name="post-clean">
  4.1184 +                <xsl:comment>
  4.1185 +                    Empty placeholder for easier customization.
  4.1186 +                </xsl:comment>
  4.1187 +                <xsl:comment>
  4.1188 +                    You can override this target in the ../build.xml
  4.1189 +                    file.
  4.1190 +                </xsl:comment>
  4.1191 +            </target>
  4.1192 +            
  4.1193 +            <target name="clean">
  4.1194 +                <xsl:attribute name="depends">
  4.1195 +                    init,deps-clean,do-clean,post-clean
  4.1196 +                </xsl:attribute>
  4.1197 +                <xsl:attribute name="description">
  4.1198 +                    Clean build products.
  4.1199 +                </xsl:attribute>
  4.1200 +            </target>
  4.1201 +        </project>
  4.1202 +        
  4.1203 +        <!-- TBD items:
  4.1204  			
  4.1205  			Could pass <propertyset> to run, debug, etc. under Ant 1.6,
  4.1206  			optionally, by doing e.g.
  4.1207 @@ -717,9 +715,9 @@
  4.1208  			
  4.1209  		-->
  4.1210  
  4.1211 -	</xsl:template>
  4.1212 -
  4.1213 -	<!---
  4.1214 +    </xsl:template>
  4.1215 +    
  4.1216 +    <!---
  4.1217  		Generic template to build subdependencies of a certain type.
  4.1218  		Feel free to copy into other modules.
  4.1219  		@param targetname required name of target to generate
  4.1220 @@ -727,71 +725,71 @@
  4.1221  		all references, and looks for clean targets rather than build targets
  4.1222  		@return an Ant target which builds (or cleans) all known subprojects
  4.1223  	-->
  4.1224 -	<xsl:template name="deps.target">
  4.1225 -		<xsl:param name="targetname" />
  4.1226 -		<xsl:param name="type" />
  4.1227 -		<target name="{$targetname}">
  4.1228 -			<xsl:attribute name="depends">init</xsl:attribute>
  4.1229 -			<xsl:attribute name="unless">
  4.1230 -				${no.dependencies}
  4.1231 -			</xsl:attribute>
  4.1232 -			<xsl:variable name="references"
  4.1233 -				select="/p:project/p:configuration/projdeps:references" />
  4.1234 -			<xsl:for-each
  4.1235 -				select="$references/projdeps:reference[not($type) or projdeps:artifact-type = $type]">
  4.1236 -				<xsl:variable name="subproj"
  4.1237 -					select="projdeps:foreign-project" />
  4.1238 -				<xsl:variable name="subtarget">
  4.1239 -					<xsl:choose>
  4.1240 -						<xsl:when test="$type">
  4.1241 -							<xsl:value-of select="projdeps:target" />
  4.1242 -						</xsl:when>
  4.1243 -						<xsl:otherwise>
  4.1244 -							<xsl:value-of
  4.1245 -								select="projdeps:clean-target" />
  4.1246 -						</xsl:otherwise>
  4.1247 -					</xsl:choose>
  4.1248 -				</xsl:variable>
  4.1249 -				<xsl:variable name="script" select="projdeps:script" />
  4.1250 -				<xsl:variable name="scriptdir"
  4.1251 -					select="substring-before($script, '/')" />
  4.1252 -				<xsl:variable name="scriptdirslash">
  4.1253 -					<xsl:choose>
  4.1254 -						<xsl:when test="$scriptdir = ''" />
  4.1255 -						<xsl:otherwise>
  4.1256 -							<xsl:text>/</xsl:text>
  4.1257 -							<xsl:value-of select="$scriptdir" />
  4.1258 -						</xsl:otherwise>
  4.1259 -					</xsl:choose>
  4.1260 -				</xsl:variable>
  4.1261 -				<xsl:variable name="scriptfileorblank"
  4.1262 -					select="substring-after($script, '/')" />
  4.1263 -				<xsl:variable name="scriptfile">
  4.1264 -					<xsl:choose>
  4.1265 -						<xsl:when test="$scriptfileorblank != ''">
  4.1266 -							<xsl:value-of select="$scriptfileorblank" />
  4.1267 -						</xsl:when>
  4.1268 -						<xsl:otherwise>
  4.1269 -							<xsl:value-of select="$script" />
  4.1270 -						</xsl:otherwise>
  4.1271 -					</xsl:choose>
  4.1272 -				</xsl:variable>
  4.1273 -				<ant target="{$subtarget}" inheritall="false">
  4.1274 -					<!-- XXX #43624: cannot use inline attr on JDK 1.5 -->
  4.1275 -					<xsl:attribute name="dir">
  4.1276 -						${project.
  4.1277 -						<xsl:value-of select="$subproj" />
  4.1278 -						}
  4.1279 -						<xsl:value-of select="$scriptdirslash" />
  4.1280 -					</xsl:attribute>
  4.1281 -					<xsl:if test="$scriptfile != 'build.xml'">
  4.1282 -						<xsl:attribute name="antfile">
  4.1283 -							<xsl:value-of select="$scriptfile" />
  4.1284 -						</xsl:attribute>
  4.1285 -					</xsl:if>
  4.1286 -				</ant>
  4.1287 -			</xsl:for-each>
  4.1288 -		</target>
  4.1289 -	</xsl:template>
  4.1290 -
  4.1291 +    <xsl:template name="deps.target">
  4.1292 +        <xsl:param name="targetname" />
  4.1293 +        <xsl:param name="type" />
  4.1294 +        <target name="{$targetname}">
  4.1295 +            <xsl:attribute name="depends">init</xsl:attribute>
  4.1296 +            <xsl:attribute name="unless">
  4.1297 +                ${no.dependencies}
  4.1298 +            </xsl:attribute>
  4.1299 +            <xsl:variable name="references"
  4.1300 +                          select="/p:project/p:configuration/projdeps:references" />
  4.1301 +            <xsl:for-each
  4.1302 +                select="$references/projdeps:reference[not($type) or projdeps:artifact-type = $type]">
  4.1303 +                <xsl:variable name="subproj"
  4.1304 +                              select="projdeps:foreign-project" />
  4.1305 +                <xsl:variable name="subtarget">
  4.1306 +                    <xsl:choose>
  4.1307 +                        <xsl:when test="$type">
  4.1308 +                            <xsl:value-of select="projdeps:target" />
  4.1309 +                        </xsl:when>
  4.1310 +                        <xsl:otherwise>
  4.1311 +                            <xsl:value-of
  4.1312 +                                select="projdeps:clean-target" />
  4.1313 +                        </xsl:otherwise>
  4.1314 +                    </xsl:choose>
  4.1315 +                </xsl:variable>
  4.1316 +                <xsl:variable name="script" select="projdeps:script" />
  4.1317 +                <xsl:variable name="scriptdir"
  4.1318 +                              select="substring-before($script, '/')" />
  4.1319 +                <xsl:variable name="scriptdirslash">
  4.1320 +                    <xsl:choose>
  4.1321 +                        <xsl:when test="$scriptdir = ''" />
  4.1322 +                        <xsl:otherwise>
  4.1323 +                            <xsl:text>/</xsl:text>
  4.1324 +                            <xsl:value-of select="$scriptdir" />
  4.1325 +                        </xsl:otherwise>
  4.1326 +                    </xsl:choose>
  4.1327 +                </xsl:variable>
  4.1328 +                <xsl:variable name="scriptfileorblank"
  4.1329 +                              select="substring-after($script, '/')" />
  4.1330 +                <xsl:variable name="scriptfile">
  4.1331 +                    <xsl:choose>
  4.1332 +                        <xsl:when test="$scriptfileorblank != ''">
  4.1333 +                            <xsl:value-of select="$scriptfileorblank" />
  4.1334 +                        </xsl:when>
  4.1335 +                        <xsl:otherwise>
  4.1336 +                            <xsl:value-of select="$script" />
  4.1337 +                        </xsl:otherwise>
  4.1338 +                    </xsl:choose>
  4.1339 +                </xsl:variable>
  4.1340 +                <ant target="{$subtarget}" inheritall="false">
  4.1341 +                    <!-- XXX #43624: cannot use inline attr on JDK 1.5 -->
  4.1342 +                    <xsl:attribute name="dir">
  4.1343 +                        ${project.
  4.1344 +                        <xsl:value-of select="$subproj" />
  4.1345 +                        }
  4.1346 +                        <xsl:value-of select="$scriptdirslash" />
  4.1347 +                    </xsl:attribute>
  4.1348 +                    <xsl:if test="$scriptfile != 'build.xml'">
  4.1349 +                        <xsl:attribute name="antfile">
  4.1350 +                            <xsl:value-of select="$scriptfile" />
  4.1351 +                        </xsl:attribute>
  4.1352 +                    </xsl:if>
  4.1353 +                </ant>
  4.1354 +            </xsl:for-each>
  4.1355 +        </target>
  4.1356 +    </xsl:template>
  4.1357 +    
  4.1358  </xsl:stylesheet>