From: <ale...@us...> - 2009-06-25 14:27:40
|
Revision: 269 http://cse-ip.svn.sourceforge.net/cse-ip/?rev=269&view=rev Author: alexloewen Date: 2009-06-25 13:51:28 +0000 (Thu, 25 Jun 2009) Log Message: ----------- fault handling is almost compleet. changed updateCourse. Modified Paths: -------------- trunk/sandbox/lsf-adapter-demo/Common/build.xml trunk/sandbox/lsf-adapter-demo/Common/nbproject/build-impl.xml trunk/sandbox/lsf-adapter-demo/Common/nbproject/genfiles.properties Modified: trunk/sandbox/lsf-adapter-demo/Common/build.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/Common/build.xml 2009-06-25 13:51:16 UTC (rev 268) +++ trunk/sandbox/lsf-adapter-demo/Common/build.xml 2009-06-25 13:51:28 UTC (rev 269) @@ -1,66 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- You may freely edit this file. See commented blocks below for --> -<!-- some examples of how to customize the build. --> -<!-- (If you delete it and reopen the project it will be recreated.) --> <project name="" default="default" basedir="." xmlns:web="http://www.netbeans.org/ns/j2ee-ejbjarproject/1"> - <description>Builds, tests, and runs the project .</description> <import file="nbproject/build-impl.xml"/> - <!-- - There exist several targets which are by default empty and which can be - used for execution of your tasks. These targets are usually executed - before and after some main targets. They are: - - -pre-init called before initialization of project properties - -post-init called after initialization of project properties - -pre-compile called before javac compilation - -post-compile called after javac compilation - -pre-compile-single called before javac compilation of single file - -post-compile-single called after javac compilation of single file - -pre-dist called before jar building - -post-dist called after jar building - -post-clean called after cleaning build products - - Example of pluging an obfuscator after the compilation could look like - - <target name="post-compile"> - <obfuscate> - <fileset dir="${build.classes.dir}"/> - </obfuscate> - </target> - - For list of available properties check the imported - nbproject/build-impl.xml file. - - Other way how to customize the build is by overriding existing main targets. - The target of interest are: - - init-macrodef-javac defines macro for javac compilation - init-macrodef-debug defines macro for class debugging - do-dist jar archive building - run execution of project - javadoc-build javadoc generation - - Example of overriding the target for project execution could look like - - <target name="run" depends="<PROJNAME>-impl.jar"> - <exec dir="bin" executable="launcher.exe"> - <arg file="${dist.jar}"/> - </exec> - </target> - - Notice that overridden target depends on jar target and not only on - compile target as regular run target does. Again, for list of available - properties which you can use check the target you are overriding in - nbproject/build-impl.xml file. - --> - <target name="-init-esb-ide" if="netbeans.home"> + <target name="init-esb-ide" if="netbeans.home"> <property name="esb.netbeans.platform" value="${netbeans.home}"/> </target> - <target name="-init-esb-cmdline" unless="netbeans.home"> + <target name="init-esb-cli" unless="netbeans.home"> <property file="${basedir}/nbproject/private/private.properties"/> <property name="esb.netbeans.platform" value="${esb.netbeans.home}/platform9"/> <property name="netbeans.user" value="${esb.netbeans.user}"/> <property name="from.commandline" value="true"/> </target> - <target name="-pre-init" depends="-init-esb-ide,-init-esb-cmdline"/> + <target name="check-catd-context"> + <condition property="no.catd.context"> + <not> + <isset property="org.netbeans.modules.compapp.catd.context"/> + </not> + </condition> + </target> + <target name="init-catd" if="no.catd.context"> + <property name="org.netbeans.modules.compapp.catd.context" value=""/> + </target> + <target name="pre-init" depends="init-esb-ide,init-esb-cli,check-catd-context,init-catd"/> </project> Modified: trunk/sandbox/lsf-adapter-demo/Common/nbproject/build-impl.xml =================================================================== --- trunk/sandbox/lsf-adapter-demo/Common/nbproject/build-impl.xml 2009-06-25 13:51:16 UTC (rev 268) +++ trunk/sandbox/lsf-adapter-demo/Common/nbproject/build-impl.xml 2009-06-25 13:51:28 UTC (rev 269) @@ -1,52 +1,43 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - *** GENERATED FROM project.xml - DO NOT EDIT *** - *** EDIT ../build.xml INSTEAD *** - - For the purpose of easier reading the script - is divided into following sections: - - - initialization - - dist - - cleanup + *** GENERATED FROM project.xml - DO NOT EDIT *** + *** EDIT ../build.xml INSTEAD *** --> <project name="Common-impl" default="default" basedir=".."> - <target name="default" depends="dist_se" description="Build whole project."/> + <target name="default" depends="dist_se"/> <!-- - ====================== INITIALIZATION SECTION - ====================== --> - <target name="-pre-init"> + <target name="pre-init"> <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> - <target name="-init-private" depends="-pre-init"> + <target name="init-private" depends="pre-init"> <property file="nbproject/private/private.properties"/> </target> - <target name="-init-userdir" depends="-pre-init,-init-private"> + <target name="init-userdir" depends="pre-init,init-private"> <property name="user.properties.file" location="${netbeans.user}/build.properties"/> </target> - <target name="-init-user" depends="-pre-init,-init-private,-init-userdir"> + <target name="init-user" depends="pre-init,init-private,init-userdir"> <property file="${user.properties.file}"/> </target> - <target name="-init-project" depends="-pre-init,-init-private,-init-userdir,-init-user"> + <target name="init-project" depends="pre-init,init-private,init-userdir,init-user"> <property file="nbproject/project.properties"/> </target> - <target name="-do-init" depends="-pre-init,-init-private,-init-userdir,-init-user,-init-project"> + <target name="do-init" depends="pre-init,init-private,init-userdir,init-user,init-project"> <available file="${src.dir}/../retrieved" property="retrieved.exists"/> </target> - <target name="-post-init"> + <target name="post-init"> <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> - <target name="-init-check" depends="-pre-init,-init-private,-init-userdir,-init-user,-init-project,-do-init"> + <target name="init-check" depends="pre-init,init-private,init-userdir,init-user,init-project,do-init"> <fail unless="src.dir">Must set src.dir</fail> <fail unless="build.dir">Must set build.dir</fail> <fail unless="dist.dir">Must set dist.dir</fail> <fail unless="dist.jar">Must set dist.jar</fail> </target> - <target name="-init-taskdefs" if="from.commandline"> + <target name="init-taskdefs" if="from.commandline"> <path id="ant.task.classpath"> <pathelement location="${esb.netbeans.platform}/../ide10/modules/ext/resolver-1.2.jar"/> <pathelement location="${esb.netbeans.platform}/../ide10/modules/org-apache-xml-resolver.jar"/> @@ -95,22 +86,18 @@ <classpath refid="ant.task.classpath"/> </taskdef> </target> - <target name="init" depends="-pre-init,-init-private,-init-userdir,-init-user,-init-project,-do-init,-post-init,-init-check,-init-taskdefs"/> + <target name="init" depends="pre-init,init-private,init-userdir,init-user,init-project,do-init,post-init,init-check,init-taskdefs"/> <!-- - ===================== DIST BUILDING SECTION - ===================== --> - <target name="-pre-dist"> + <target name="pre-dist"> <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> - <target name="-deps-jar-dist" depends="init" unless="${no.dependencies}"/> - <target name="-do-dist" depends="init,-pre-dist"> + <target name="deps-jar-dist" depends="init" unless="${no.dependencies}"/> + <target name="do-dist" depends="init,pre-dist"> <mkdir dir="${build.dir}"/> - <!--validation--> <validate-project buildDirectory="${basedir}/${build.dir}" sourceDirectory="${basedir}/${src.dir}" projectClassPath="${javac.classpath}" buildDependentProjectDir="${basedir}/${build.dir}/dependentProjectFiles" classpathRef="ant.task.classpath" allowBuildWithError="${allow.build.with.error}" validation="${validation}"/> - <!-- copy all files from project source directory to build directory. --> <copy todir="${build.dir}" preservelastmodified="true"> <fileset includes="**/*.bpel,**/*.wsdl,**/*.xsd, **/*.xsl, **/*.xslt, **/*.jar" dir="${src.dir}"/> </copy> @@ -124,28 +111,26 @@ </fileset> </jar> </target> - <target name="-post-dist"> + <target name="post-dist"> <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> - <target name="dist_se" depends="init,-pre-dist,-deps-jar-dist,-do-dist,-post-dist" description="Build distribution."/> + <target name="dist_se" depends="init,pre-dist,deps-jar-dist,do-dist,post-dist"/> <!-- - =============== CLEANUP SECTION - =============== --> - <target name="-pre-clean"> + <target name="pre-clean"> <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> - <target name="-deps-clean" depends="init" unless="${no.dependencies}"/> - <target name="-do-clean" depends="init,-pre-clean"> + <target name="deps-clean" depends="init" unless="${no.dependencies}"/> + <target name="do-clean" depends="init,pre-clean"> <delete dir="${build.dir}"/> <delete dir="${dist.dir}"/> </target> - <target name="-post-clean"> + <target name="post-clean"> <!-- Empty placeholder for easier customization. --> <!-- You can override this target in the ../build.xml file. --> </target> - <target name="clean" depends="init,-pre-clean,-deps-clean,-do-clean,-post-clean" description="Clean build products."/> + <target name="clean" depends="init,pre-clean,deps-clean,do-clean,post-clean"/> </project> Modified: trunk/sandbox/lsf-adapter-demo/Common/nbproject/genfiles.properties =================================================================== --- trunk/sandbox/lsf-adapter-demo/Common/nbproject/genfiles.properties 2009-06-25 13:51:16 UTC (rev 268) +++ trunk/sandbox/lsf-adapter-demo/Common/nbproject/genfiles.properties 2009-06-25 13:51:28 UTC (rev 269) @@ -1,8 +1,8 @@ build.xml.data.CRC32=56915d2e -build.xml.script.CRC32=60b50638 -build.xml.stylesheet.CRC32=f35fd70d +build.xml.script.CRC32=22f94a4b +build.xml.stylesheet.CRC32=b168c0ed # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. nbproject/build-impl.xml.data.CRC32=56915d2e -nbproject/build-impl.xml.script.CRC32=704fb878 -nbproject/build-impl.xml.stylesheet.CRC32=5068533b +nbproject/build-impl.xml.script.CRC32=44b49d75 +nbproject/build-impl.xml.stylesheet.CRC32=2e896532 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |