[Cse-ip-svn-commits] SF.net SVN: cse-ip:[260] trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 260
          http://cse-ip.svn.sourceforge.net/cse-ip/?rev=260&view=rev
Author:   pkasprzak
Date:     2009-06-16 19:50:12 +0000 (Tue, 16 Jun 2009)

Log Message:
-----------
* Cleanup of local modifications (no relevant change)

Modified Paths:
--------------
    trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/build.xml
    trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/catalog.xml
    trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/nbproject/build-impl.xml

Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/build.xml
===================================================================

--- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/build.xml	2009-06-16 18:15:09 UTC (rev 259)
+++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/build.xml	2009-06-16 19:50:12 UTC (rev 260)
@@ -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/ILIASClientAdapter/catalog.xml
===================================================================
--- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/catalog.xml	2009-06-16 18:15:09 UTC (rev 259)
+++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/catalog.xml	2009-06-16 19:50:12 UTC (rev 260)
@@ -4,7 +4,8 @@
     <system systemId="Common/CDDM.xsd"          uri="nb-uri:Common#src/CDDM.xsd"/>
     <system systemId="Common/WS-Addressing.xsd" uri="nb-uri:Common#src/schemas.xmlsoap.org/ws/2004/08/addressing.xsd"/>
     <system systemId="ObjectProcessor/ReplyProcessor.wsdl" uri="nb-uri:ObjectProcessor#src/ReplyProcessor.wsdl"/>
-    <nextCatalog catalog="nbproject/private/cache/retriever/catalog.xml"/>
     <system systemId="http://schemas.xmlsoap.org/soap/encoding/" uri="retrieved/src/schemas.xmlsoap.org/soap/encoding.xsd"/>
     <system systemId="http://schemas.xmlsoap.org/ws/2004/08/addressing" uri="retrieved/src/schemas.xmlsoap.org/ws/2004/08/addressing.xsd"/>
+    <system systemId="ObjectProcessor/ReplyProcessor.wsdl" uri="nb-uri:ObjectProcessor#src/ReplyProcessor.wsdl"/>
+    <nextCatalog catalog="nbproject/private/cache/retriever/catalog.xml"/>
 </catalog>

Modified: trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/nbproject/build-impl.xml
===================================================================
--- trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/nbproject/build-impl.xml	2009-06-16 18:15:09 UTC (rev 259)
+++ trunk/sandbox/lsf-adapter-demo/ILIASClientAdapter/nbproject/build-impl.xml	2009-06-16 19:50:12 UTC (rev 260)
@@ -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="ILIASClientAdapter-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,25 +86,21 @@
             <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="deps-jar-dist" depends="init" unless="${no.dependencies}">
         <ant target="dist_se" inheritall="false" dir="${project.Common}"/>
         <ant target="dist_se" inheritall="false" dir="${project.ObjectProcessor}"/>
     </target>
-    <target name="-do-dist" depends="init,-pre-dist">
+    <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>
@@ -127,31 +114,29 @@
             </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="deps-clean" depends="init" unless="${no.dependencies}">
         <ant target="clean" inheritall="false" dir="${project.Common}"/>
         <ant target="clean" inheritall="false" dir="${project.ObjectProcessor}"/>
     </target>
-    <target name="-do-clean" depends="init,-pre-clean">
+    <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>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


