build clean and speedup

diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile
index d95eb01..8a3f542 100644 (file)
--- a/org.glite.lb.client-java/Makefile
+++ b/org.glite.lb.client-java/Makefile
@@ -1,24 +1,54 @@
 -include Makefile.inc
 
-EXAMPLES := SimpleLLTest.class SSLClient.class SSLServer.class QueryDemo.class ProducerTestIL.class ProducerTestLL.class NotificationExample.class CreamTest.class
+# broken 
+# SimpleLLTest.class ProducerTestLL.class ProducerTestIL.class
+
+EXAMPLES := SSLClient.class SSLServer.class QueryDemo.class NotificationExample.class CreamTest.class
 
 VPATH := examples
 
-all compile:
-       JAVA_HOME=${jdk_prefix} \
-       ${ant_prefix}/bin/ant -Dno.deps=yes -DstageDir=${stagedir} \
-               -Dfile.reference.commons-lang.jar=${commons-lang_jar} \
-               -Dreference.jobid-api-java.jar=${stagedir}/share/java/jobid-api-java.jar \
-               -Dreference.trustmanager.jar=${trustmanager_prefix}/share/java/glite-security-trustmanager.jar \
-               -Daxis.classpath=`ls ${axis_prefix}/lib/*.jar | tr '\012' :` 
-       javah -classpath build/classes -jni org.glite.lb.ContextIL
-       cd src_c && make PREFIX=${PREFIX} JAVA_HOME=${jdk_prefix} topdir=..
+JAVAC:=${jdk_prefix}/bin/javac
+JAVAH:=${jdk_prefix}/bin/javah
+JAVA:=${jdk_prefix}/bin/java
+
+all compile: genevents genws compile-java build-jar build-c
+
+compile-java:
+       ${JAVAC} \
+               -classpath ${commons-lang_jar}:${stagedir}/share/java/jobid-api-java.jar:${trustmanager_prefix}/share/java/glite-security-trustmanager.jar:`ls ${axis_prefix}/lib/*.jar | tr '\012' :` \
+               -d build \
+               src/org/glite/lb/*.java \
+               build/gen/*.java \
+               build/axis/org/glite/wsdl/services/lb/*.java \
+               build/axis/org/glite/wsdl/types/lb/*.java \
+               build/axis/org/glite/wsdl/types/lb/holders/*.java \
+               build/axis/holders/StringArrayHolder.java
+
+build-jar:
+       cd build && ${jdk_prefix}/bin/jar cf lb-client-java.jar holders org
+
+
+build-c:
+       ${JAVAH} -classpath build -jni -d build org.glite.lb.ContextIL
+       -mkdir -p build/c
+       -ln -s ../../src_c/Makefile build/c
+       cd build/c && make PREFIX=${PREFIX} JAVA_HOME=${jdk_prefix} topdir=../..
 
 examples: ${EXAMPLES}
 
+GEN:=${stagedir}/sbin/glite-lb-at3 project/genEventTypes.pl
+AT3DIR:=${stagedir}/share/lb/at3
+axis_classpath:=`ls ${axis_prefix}/lib/*.jar | tr '\012' :`
+
+genevents:
+       -mkdir -p build/gen
+       ${GEN} build/gen
+
+genws: 
+       ${JAVA} -classpath ${axis_classpath} org.apache.axis.wsdl.WSDL2Java -o build/axis ${stagedir}/interface/LB.wsdl
 
 ${EXAMPLES}: %.class: %.java
-       ${jdk_prefix}/bin/javac -cp build/classes/:${stagedir}/share/java/jobid-api-java.jar:`ls ${axis_prefix}/lib/*.jar | tr '\012' :` $<
+       ${jdk_prefix}/bin/javac -d build -cp build:build/classes/:${stagedir}/share/java/jobid-api-java.jar:`ls ${axis_prefix}/lib/*.jar | tr '\012' :` $<
 
 
 check:
@@ -26,12 +56,11 @@ check:
 
 install:
        mkdir -p ${PREFIX}/share/java
-       cp dist/lb-client-java.jar ${PREFIX}/share/java
-       cd src_c && make install PREFIX=${PREFIX}
+       cp build/lb-client-java.jar ${PREFIX}/share/java
+       cd build/c && make install PREFIX=${PREFIX}
 
 clean:
-       rm -rf dist
-       find . -name \*.class -exec rm {} \;
+       rm -rf build
        cd src_c && make clean
 
 

diff --git a/org.glite.lb.client-java/build.xml b/org.glite.lb.client-java/build.xml
deleted file mode 100755 (executable)
index 483d39b..0000000
--- a/org.glite.lb.client-java/build.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?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="lb-client-java" default="default" basedir=".">
-    <description>Builds, tests, and runs the project lb-client-java.</description>
-    <import file="nbproject/build-impl.xml"/>
-
-
-       <target name="-pre-compile">
-               <exec executable="${stageDir}/sbin/glite-lb-at3">
-                       <arg line="project/genEventTypes.pl src/org/glite/lb"/>
-               </exec>
-               <java fork="true" dir="src" classname="org.apache.axis.wsdl.WSDL2Java">
-                       <arg value="${stageDir}/interface/LB.wsdl"/>
-                       <classpath path="${axis.classpath}"/>
-               </java>
-       </target>
-    <!--
-
-    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-compile-test:         called before javac compilation of JUnit tests
-      -post-compile-test:        called after javac compilation of JUnit tests
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
-      -post-compile-test-single: called after javac compilation of single JUunit test
-      -pre-jar:                  called before JAR building
-      -post-jar:                 called after JAR building
-      -post-clean:               called after cleaning build products
-
-    (Targets beginning with '-' are not intended to be called on their own.)
-
-    Example of inserting an obfuscator after compilation could look like this:
-
-        <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. 
-
-
-    Another way to customize the build is by overriding existing main targets.
-    The targets of interest are: 
-
-      -init-macrodef-javac:     defines macro for javac compilation
-      -init-macrodef-junit:     defines macro for junit execution
-      -init-macrodef-debug:     defines macro for class debugging
-      -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
-      run:                      execution of project 
-      -javadoc-build:           Javadoc generation
-      test-report:              JUnit report generation
-
-    An example of overriding the target for project execution could look like this:
-
-        <target name="run" depends="lb-client-java-impl.jar">
-            <exec dir="bin" executable="launcher.exe">
-                <arg file="${dist.jar}"/>
-            </exec>
-        </target>
-
-    Notice that the overridden target depends on the jar target and not only on 
-    the compile target as the regular run target does. Again, for a list of available 
-    properties which you can use, check the target you are overriding in the
-    nbproject/build-impl.xml file. 
-
-    -->
-</project>

diff --git a/org.glite.lb.client-java/examples/CreamTest.java b/org.glite.lb.client-java/examples/CreamTest.java
index 3a28c5e..32b4631 100644 (file)
--- a/org.glite.lb.client-java/examples/CreamTest.java
+++ b/org.glite.lb.client-java/examples/CreamTest.java
@@ -30,10 +30,11 @@ public static void main(String[] args)
        ctxd.setJobid(job);
        ctxd.setSeqCode(new SeqCode(SeqCode.CREAM,"no_seqcodes_with_cream"));
 
+
+/* initial registration goes directly */
        EventRegJob     reg = new EventRegJob();
        reg.setNs("https://where.is.cream:1234");
        reg.setJobtype(EventRegJob.Jobtype.JOBTYPE_CREAM);
-
        ctxd.log(reg);
 
        System.out.println("JOBID="+job);
@@ -44,8 +45,12 @@ public static void main(String[] args)
        ctx.setSeqCode(new SeqCode(SeqCode.CREAM,"no_seqcodes_with_cream"));
        ctx.setUser(ctxd.getUser());
 
+/* 2nd registration with JDL, via IL */
        reg.setJdl("[\n\ttest = \"hellow, world\";\n]");
        ctx.log(reg);
+
+       Event e = new EventCREAMStart();
+       ctx.log(e);
        
 
    } catch (Exception e)

diff --git a/org.glite.lb.client-java/examples/QueryDemo.java b/org.glite.lb.client-java/examples/QueryDemo.java
index 0c48e84..1b4c779 100644 (file)
--- a/org.glite.lb.client-java/examples/QueryDemo.java
+++ b/org.glite.lb.client-java/examples/QueryDemo.java
@@ -175,7 +175,7 @@ public class QueryDemo {
             List<Event> events = myJob.getEvents();
             System.out.println("Found "+events.size()+" events:");
             for (int i=0;i<events.size();i++) {
-                System.out.println("Event: " + events.get(i).info());
+                System.out.println("Event: " + events.get(i).ulm());
             }
 
             /**

diff --git a/org.glite.lb.client-java/nbproject/build-impl.xml b/org.glite.lb.client-java/nbproject/build-impl.xml
deleted file mode 100755 (executable)
index 9bdbafd..0000000
--- a/org.glite.lb.client-java/nbproject/build-impl.xml
+++ /dev/null
@@ -1,631 +0,0 @@
-<?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
-  - compilation
-  - jar
-  - execution
-  - debugging
-  - javadoc
-  - junit compilation
-  - junit execution
-  - junit debugging
-  - applet
-  - cleanup
-
-        -->
-<project xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:jaxrpc="http://www.netbeans.org/ns/j2se-project/jax-rpc" basedir=".." default="default" name="lb-client-java-impl">
-    <target depends="test,jar,javadoc" description="Build and test whole project." name="default"/>
-    <!-- 
-                ======================
-                INITIALIZATION SECTION 
-                ======================
-            -->
-    <target name="-pre-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init" name="-init-private">
-        <property file="nbproject/private/config.properties"/>
-        <property file="nbproject/private/configs/${config}.properties"/>
-        <property file="nbproject/private/private.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private" name="-init-user">
-        <property file="${user.properties.file}"/>
-        <!-- The two properties below are usually overridden -->
-        <!-- by the active platform. Just a fallback. -->
-        <property name="default.javac.source" value="1.4"/>
-        <property name="default.javac.target" value="1.4"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user" name="-init-project">
-        <property file="nbproject/configs/${config}.properties"/>
-        <property file="nbproject/project.properties"/>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
-        <available file="${manifest.file}" property="manifest.available"/>
-        <condition property="manifest.available+main.class">
-            <and>
-                <isset property="manifest.available"/>
-                <isset property="main.class"/>
-                <not>
-                    <equals arg1="${main.class}" arg2="" trim="true"/>
-                </not>
-            </and>
-        </condition>
-        <condition property="manifest.available+main.class+mkdist.available">
-            <and>
-                <istrue value="${manifest.available+main.class}"/>
-                <isset property="libs.CopyLibs.classpath"/>
-            </and>
-        </condition>
-        <condition property="have.tests">
-            <or>
-                <available file="${test.src.dir}"/>
-            </or>
-        </condition>
-        <condition property="have.sources">
-            <or>
-                <available file="${src.dir}"/>
-            </or>
-        </condition>
-        <condition property="netbeans.home+have.tests">
-            <and>
-                <isset property="netbeans.home"/>
-                <isset property="have.tests"/>
-            </and>
-        </condition>
-        <condition property="no.javadoc.preview">
-            <and>
-                <isset property="javadoc.preview"/>
-                <isfalse value="${javadoc.preview}"/>
-            </and>
-        </condition>
-        <property name="run.jvmargs" value=""/>
-        <property name="javac.compilerargs" value=""/>
-        <property name="work.dir" value="${basedir}"/>
-        <condition property="no.deps">
-            <and>
-                <istrue value="${no.dependencies}"/>
-            </and>
-        </condition>
-        <property name="javac.debug" value="true"/>
-        <property name="javadoc.preview" value="true"/>
-        <property name="application.args" value=""/>
-        <property name="source.encoding" value="${file.encoding}"/>
-        <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
-            <and>
-                <isset property="javadoc.encoding"/>
-                <not>
-                    <equals arg1="${javadoc.encoding}" arg2=""/>
-                </not>
-            </and>
-        </condition>
-        <property name="javadoc.encoding.used" value="${source.encoding}"/>
-        <property name="includes" value="**"/>
-        <property name="excludes" value=""/>
-        <property name="do.depend" value="false"/>
-        <condition property="do.depend.true">
-            <istrue value="${do.depend}"/>
-        </condition>
-        <condition property="javac.compilerargs.jaxws" value="-Djava.endorsed.dirs='${jaxws.endorsed.dir}'">
-            <and>
-                <isset property="jaxws.endorsed.dir"/>
-                <available file="nbproject/jaxws-build.xml"/>
-            </and>
-        </condition>
-    </target>
-    <target name="-post-init">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
-        <fail unless="src.dir">Must set src.dir</fail>
-        <fail unless="test.src.dir">Must set test.src.dir</fail>
-        <fail unless="build.dir">Must set build.dir</fail>
-        <fail unless="dist.dir">Must set dist.dir</fail>
-        <fail unless="build.classes.dir">Must set build.classes.dir</fail>
-        <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
-        <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
-        <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
-        <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
-        <fail unless="dist.jar">Must set dist.jar</fail>
-    </target>
-    <target name="-init-macrodef-property">
-        <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute name="name"/>
-            <attribute name="value"/>
-            <sequential>
-                <property name="@{name}" value="${@{value}}"/>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-javac">
-        <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="${javac.debug}" name="debug"/>
-            <attribute default="" name="sourcepath"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" sourcepath="@{sourcepath}" srcdir="@{srcdir}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
-                    <customize/>
-                </javac>
-            </sequential>
-        </macrodef>
-        <macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${src.dir}" name="srcdir"/>
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <attribute default="${javac.classpath}" name="classpath"/>
-            <sequential>
-                <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </depend>
-            </sequential>
-        </macrodef>
-        <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${build.classes.dir}" name="destdir"/>
-            <sequential>
-                <fail unless="javac.includes">Must set javac.includes</fail>
-                <pathconvert pathsep="," property="javac.includes.binary">
-                    <path>
-                        <filelist dir="@{destdir}" files="${javac.includes}"/>
-                    </path>
-                    <globmapper from="*.java" to="*.class"/>
-                </pathconvert>
-                <delete>
-                    <files includes="${javac.includes.binary}"/>
-                </delete>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-junit">
-        <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${includes}" name="includes"/>
-            <attribute default="${excludes}" name="excludes"/>
-            <attribute default="**" name="testincludes"/>
-            <sequential>
-                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
-                    <batchtest todir="${build.test.results.dir}">
-                        <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
-                            <filename name="@{testincludes}"/>
-                        </fileset>
-                    </batchtest>
-                    <classpath>
-                        <path path="${run.test.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="test-sys-prop."/>
-                        <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <formatter type="brief" usefile="false"/>
-                    <formatter type="xml"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                </junit>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-nbjpda">
-        <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="name"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <attribute default="" name="stopclassname"/>
-            <sequential>
-                <nbjpdastart addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}" transport="dt_socket">
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                </nbjpdastart>
-            </sequential>
-        </macrodef>
-        <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${build.classes.dir}" name="dir"/>
-            <sequential>
-                <nbjpdareload>
-                    <fileset dir="@{dir}" includes="${fix.includes}*.class"/>
-                </nbjpdareload>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-debug-args">
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>
-        <condition property="have-jdk-older-than-1.4">
-            <or>
-                <contains string="${version-output}" substring="java version &quot;1.0"/>
-                <contains string="${version-output}" substring="java version &quot;1.1"/>
-                <contains string="${version-output}" substring="java version &quot;1.2"/>
-                <contains string="${version-output}" substring="java version &quot;1.3"/>
-            </or>
-        </condition>
-        <condition property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
-            <istrue value="${have-jdk-older-than-1.4}"/>
-        </condition>
-    </target>
-    <target depends="-init-debug-args" name="-init-macrodef-debug">
-        <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
-            <attribute default="${main.class}" name="classname"/>
-            <attribute default="${debug.classpath}" name="classpath"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
-                    <jvmarg line="${run.jvmargs}"/>
-                    <classpath>
-                        <path path="@{classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-macrodef-java">
-        <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <attribute default="${main.class}" name="classname"/>
-            <element name="customize" optional="true"/>
-            <sequential>
-                <java classname="@{classname}" dir="${work.dir}" fork="true">
-                    <jvmarg line="${run.jvmargs}"/>
-                    <classpath>
-                        <path path="${run.classpath}"/>
-                    </classpath>
-                    <syspropertyset>
-                        <propertyref prefix="run-sys-prop."/>
-                        <mapper from="run-sys-prop.*" to="*" type="glob"/>
-                    </syspropertyset>
-                    <customize/>
-                </java>
-            </sequential>
-        </macrodef>
-    </target>
-    <target name="-init-presetdef-jar">
-        <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
-            <jar compress="${jar.compress}" jarfile="${dist.jar}">
-                <j2seproject1:fileset dir="${build.classes.dir}"/>
-            </jar>
-        </presetdef>
-    </target>
-    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar" name="init"/>
-    <!--
-                ===================
-                COMPILATION SECTION
-                ===================
-            -->
-    <target depends="init" name="deps-jar" unless="no.deps">
-        <ant antfile="${project.jobid-api-java}/build.xml" inheritall="false" target="jar"/>
-    </target>
-    <target depends="init,deps-jar" name="-pre-pre-compile">
-        <mkdir dir="${build.classes.dir}"/>
-    </target>
-    <target name="-pre-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-depend">
-        <j2seproject3:depend/>
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-compile-depend" if="have.sources" name="-do-compile">
-        <j2seproject3:javac/>
-        <copy todir="${build.classes.dir}">
-            <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
-    <target name="-pre-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile/>
-        <j2seproject3:javac excludes="" includes="${javac.includes}" sourcepath="${src.dir}"/>
-    </target>
-    <target name="-post-compile-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
-    <!--
-                ====================
-                JAR BUILDING SECTION
-                ====================
-            -->
-    <target depends="init" name="-pre-pre-jar">
-        <dirname file="${dist.jar}" property="dist.jar.dir"/>
-        <mkdir dir="${dist.jar.dir}"/>
-    </target>
-    <target name="-pre-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" name="-do-jar-without-manifest" unless="manifest.available">
-        <j2seproject1:jar/>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class">
-        <j2seproject1:jar manifest="${manifest.file}"/>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
-        <j2seproject1:jar manifest="${manifest.file}">
-            <j2seproject1:manifest>
-                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
-            </j2seproject1:manifest>
-        </j2seproject1:jar>
-        <echo>To run this application from the command line without Ant, try:</echo>
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <pathconvert property="run.classpath.with.dist.jar">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
-        </pathconvert>
-        <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available" name="-do-jar-with-libraries">
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <pathconvert property="run.classpath.without.build.classes.dir">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to=""/>
-        </pathconvert>
-        <pathconvert pathsep=" " property="jar.classpath">
-            <path path="${run.classpath.without.build.classes.dir}"/>
-            <chainedmapper>
-                <flattenmapper/>
-                <globmapper from="*" to="lib/*"/>
-            </chainedmapper>
-        </pathconvert>
-        <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-        <copylibs compress="${jar.compress}" jarfile="${dist.jar}" manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-            <fileset dir="${build.classes.dir}"/>
-            <manifest>
-                <attribute name="Main-Class" value="${main.class}"/>
-                <attribute name="Class-Path" value="${jar.classpath}"/>
-            </manifest>
-        </copylibs>
-        <echo>To run this application from the command line without Ant, try:</echo>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <echo>java -jar "${dist.jar.resolved}"</echo>
-    </target>
-    <target name="-post-jar">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
-    <!--
-                =================
-                EXECUTION SECTION
-                =================
-            -->
-    <target depends="init,compile" description="Run a main class." name="run">
-        <j2seproject1:java>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <target name="-do-not-recompile">
-        <property name="javac.includes.binary" value=""/>
-    </target>
-    <target depends="init,-do-not-recompile,compile-single" name="run-single">
-        <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
-        <j2seproject1:java classname="${run.class}"/>
-    </target>
-    <!--
-                =================
-                DEBUGGING SECTION
-                =================
-            -->
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger">
-        <j2seproject1:nbjpdastart name="${debug.class}"/>
-    </target>
-    <target depends="init,compile" name="-debug-start-debuggee">
-        <j2seproject3:debug>
-            <customize>
-                <arg line="${application.args}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE." if="netbeans.home" name="debug"/>
-    <target depends="init" if="netbeans.home" name="-debug-start-debugger-stepinto">
-        <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
-    </target>
-    <target depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee" if="netbeans.home" name="debug-stepinto"/>
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
-        <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
-        <j2seproject3:debug classname="${debug.class}"/>
-    </target>
-    <target depends="init,-do-not-recompile,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single"/>
-    <target depends="init" name="-pre-debug-fix">
-        <fail unless="fix.includes">Must set fix.includes</fail>
-        <property name="javac.includes" value="${fix.includes}.java"/>
-    </target>
-    <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
-        <j2seproject1:nbjpdareload/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
-    <!--
-                ===============
-                JAVADOC SECTION
-                ===============
-            -->
-    <target depends="init" name="-javadoc-build">
-        <mkdir dir="${dist.javadoc.dir}"/>
-        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
-            <classpath>
-                <path path="${javac.classpath}"/>
-            </classpath>
-            <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
-        </javadoc>
-    </target>
-    <target depends="init,-javadoc-build" if="netbeans.home" name="-javadoc-browse" unless="no.javadoc.preview">
-        <nbbrowse file="${dist.javadoc.dir}/index.html"/>
-    </target>
-    <target depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc." name="javadoc"/>
-    <!--
-                =========================
-                JUNIT COMPILATION SECTION
-                =========================
-            -->
-    <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
-        <mkdir dir="${build.test.classes.dir}"/>
-    </target>
-    <target name="-pre-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target if="do.depend.true" name="-compile-test-depend">
-        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
-    <target name="-pre-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
-        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
-        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
-        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
-        <copy todir="${build.test.classes.dir}">
-            <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
-        </copy>
-    </target>
-    <target name="-post-compile-test-single">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
-    <!--
-                =======================
-                JUNIT EXECUTION SECTION
-                =======================
-            -->
-    <target depends="init" if="have.tests" name="-pre-test-run">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-        <j2seproject3:junit testincludes="**/*Test.java"/>
-    </target>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
-        <fail if="tests.failed">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init" if="have.tests" name="test-report"/>
-    <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
-    <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
-    <target depends="init" if="have.tests" name="-pre-test-run-single">
-        <mkdir dir="${build.test.results.dir}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
-        <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
-        <j2seproject3:junit excludes="" includes="${test.includes}"/>
-    </target>
-    <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
-        <fail if="tests.failed">Some tests failed; see details above.</fail>
-    </target>
-    <target depends="init,-do-not-recompile,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
-    <!--
-                =======================
-                JUNIT DEBUGGING SECTION
-                =======================
-            -->
-    <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
-        <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
-        <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
-        <delete file="${test.report.file}"/>
-        <mkdir dir="${build.test.results.dir}"/>
-        <j2seproject3:debug classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
-            <customize>
-                <syspropertyset>
-                    <propertyref prefix="test-sys-prop."/>
-                    <mapper from="test-sys-prop.*" to="*" type="glob"/>
-                </syspropertyset>
-                <arg value="${test.class}"/>
-                <arg value="showoutput=true"/>
-                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
-                <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
-        <j2seproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
-    </target>
-    <target depends="init,-do-not-recompile,compile-test-single,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
-    <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
-        <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
-    </target>
-    <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
-    <!--
-                =========================
-                APPLET EXECUTION SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" name="run-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject1:java classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject1:java>
-    </target>
-    <!--
-                =========================
-                APPLET DEBUGGING  SECTION
-                =========================
-            -->
-    <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-applet">
-        <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
-        <j2seproject3:debug classname="sun.applet.AppletViewer">
-            <customize>
-                <arg value="${applet.url}"/>
-            </customize>
-        </j2seproject3:debug>
-    </target>
-    <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet" if="netbeans.home" name="debug-applet"/>
-    <!--
-                ===============
-                CLEANUP SECTION
-                ===============
-            -->
-    <target depends="init" name="deps-clean" unless="no.deps">
-        <ant antfile="${project.jobid-api-java}/build.xml" inheritall="false" target="clean"/>
-    </target>
-    <target depends="init" name="-do-clean">
-        <delete dir="${build.dir}"/>
-        <delete dir="${dist.dir}"/>
-    </target>
-    <target name="-post-clean">
-        <!-- Empty placeholder for easier customization. -->
-        <!-- You can override this target in the ../build.xml file. -->
-    </target>
-    <target depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products." name="clean"/>
-</project>

diff --git a/org.glite.lb.client-java/nbproject/genfiles.properties b/org.glite.lb.client-java/nbproject/genfiles.properties
deleted file mode 100755 (executable)
index 9a7491e..0000000
--- a/org.glite.lb.client-java/nbproject/genfiles.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-build.xml.data.CRC32=2a7fa1fb
-build.xml.script.CRC32=584b0e83
-build.xml.stylesheet.CRC32=be360661
-# 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=2a7fa1fb
-nbproject/build-impl.xml.script.CRC32=1298608d
-nbproject/build-impl.xml.stylesheet.CRC32=f1d9da08

diff --git a/org.glite.lb.client-java/nbproject/private/config.properties b/org.glite.lb.client-java/nbproject/private/config.properties
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/org.glite.lb.client-java/nbproject/private/private.properties b/org.glite.lb.client-java/nbproject/private/private.properties
deleted file mode 100755 (executable)
index 6a0a467..0000000
--- a/org.glite.lb.client-java/nbproject/private/private.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-do.depend=false
-do.jar=true
-javac.debug=true
-javadoc.preview=true
-jaxws.endorsed.dir=/home/pavel/netbeans-6.0.1/java1/modules/ext/jaxws21/api
-project.jobid-api-java=/home/pavel/Desktop/bakalarka/org.glite.jobid.api-java
-user.properties.file=/home/pavel/.netbeans/6.0/build.properties

diff --git a/org.glite.lb.client-java/nbproject/project.properties b/org.glite.lb.client-java/nbproject/project.properties
deleted file mode 100755 (executable)
index 1ebbb91..0000000
--- a/org.glite.lb.client-java/nbproject/project.properties
+++ /dev/null
@@ -1,68 +0,0 @@
-application.title=locallogger
-application.vendor=pavel
-build.classes.dir=${build.dir}/classes
-build.classes.excludes=**/*.java,**/*.form
-# This directory is removed when the project is cleaned:
-build.dir=build
-build.generated.dir=${build.dir}/generated
-# Only compile against the classpath explicitly listed here:
-build.sysclasspath=ignore
-build.test.classes.dir=${build.dir}/test/classes
-build.test.results.dir=${build.dir}/test/results
-debug.classpath=\
-    ${run.classpath}
-debug.test.classpath=\
-    ${run.test.classpath}
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/lb-client-java.jar
-dist.javadoc.dir=${dist.dir}/javadoc
-excludes=
-includes=**
-jar.compress=false
-javac.classpath=\
-    ${file.reference.commons-lang.jar}:\
-    ${axis.classpath}:\
-    ${reference.jobid-api-java.jar}:\
-    ${reference.trustmanager.jar}:\
-# Space-separated list of extra javac options
-javac.compilerargs=
-javac.deprecation=false
-javac.source=
-javac.target=
-javac.test.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}:\
-    ${libs.junit.classpath}:\
-    ${libs.junit_4.classpath}
-javadoc.additionalparam=
-javadoc.author=false
-javadoc.encoding=${source.encoding}
-javadoc.noindex=false
-javadoc.nonavbar=false
-javadoc.notree=false
-javadoc.private=false
-javadoc.splitindex=true
-javadoc.use=true
-javadoc.version=false
-javadoc.windowtitle=
-main.class=org.glite.test.Test
-manifest.file=manifest.mf
-meta.inf.dir=${src.dir}/META-INF
-platform.active=default_platform
-project.jobid-api-java=../jobid-api-java
-reference.jobid-api-java.jar=${project.jobid-api-java}/dist/jobid-api-java.jar
-run.classpath=\
-    ${javac.classpath}:\
-    ${build.classes.dir}
-# Space-separated list of JVM arguments used when running the project
-# (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value
-# or test-sys-prop.name=value to set system properties for unit tests):
-run.jvmargs=-Djava.library.path=/media/f/skola/bakalarka/locallogger/build/classes/org/glite/lb/
-run.test.classpath=\
-    ${javac.test.classpath}:\
-    ${build.test.classes.dir}
-source.encoding=UTF-8
-src.dir=src
-test.src.dir=test
-javac.compilerargs.jaxws=

diff --git a/org.glite.lb.client-java/nbproject/project.xml b/org.glite.lb.client-java/nbproject/project.xml
deleted file mode 100755 (executable)
index 7152d94..0000000
--- a/org.glite.lb.client-java/nbproject/project.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.java.j2seproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>lb-client-java</name>
-            <minimum-ant-version>1.6.5</minimum-ant-version>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
-            <reference>
-                <foreign-project>jobid-api-java</foreign-project>
-                <artifact-type>jar</artifact-type>
-                <script>build.xml</script>
-                <target>jar</target>
-                <clean-target>clean</clean-target>
-                <id>jar</id>
-            </reference>
-        </references>
-    </configuration>
-</project>

diff --git a/org.glite.lb.client-java/src/org/glite/lb/Context.java b/org.glite.lb.client-java/src/org/glite/lb/Context.java
index 87af110..a41c15d 100644 (file)
--- a/org.glite.lb.client-java/src/org/glite/lb/Context.java
+++ b/org.glite.lb.client-java/src/org/glite/lb/Context.java
@@ -1,5 +1,7 @@
 package org.glite.lb;
 
+import java.text.SimpleDateFormat;
+
 import java.net.UnknownHostException;
 import java.util.Calendar;
 import java.util.Random;
@@ -184,28 +186,14 @@ public abstract class Context {
             srcInstance = new String("");
         }
 
-        String output;
-        String date = "";
-        String tmp;
-        date = String.valueOf(Calendar.getInstance().get(Calendar.YEAR));
-        tmp = String.valueOf(Calendar.getInstance().get(Calendar.MONTH) + 1);
-        date += "00".substring(0, 2 - tmp.length()) + tmp;
-        tmp = String.valueOf(Calendar.getInstance().get(Calendar.DATE));
-        date += "00".substring(0, 2 - tmp.length()) + tmp;
-        tmp = String.valueOf(Calendar.getInstance().get(Calendar.HOUR));
-        date += "00".substring(0, 2 - tmp.length()) + tmp;
-        tmp = String.valueOf(Calendar.getInstance().get(Calendar.MINUTE));
-        date += "00".substring(0, 2 - tmp.length()) + tmp;
-        tmp = String.valueOf(Calendar.getInstance().get(Calendar.SECOND));
-        date += "00".substring(0, 2 - tmp.length()) + tmp;
-        date += ".";
-        tmp = String.valueOf(Calendar.getInstance().get(Calendar.MILLISECOND));
-        String tmp2 = "000".substring(0, 3 - tmp.length()) + tmp;
-        date += tmp2 + "000000".substring(tmp.length(), 6);
-
+       Calendar cal = Calendar.getInstance();
+       cal.set(Calendar.ZONE_OFFSET,0);
+       SimpleDateFormat df = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+       String date = df.format(cal.getTime()) + "000";
+       
         if (seqCode != null) seqCode.incrementSeqCode(source);
 
-        output = (" DG.USER=\"" + Escape.ulm(user) + "\"" +
+        String output = (" DG.USER=\"" + Escape.ulm(user) + "\"" +
                 " DATE=" + date +
                 " HOST=\"" + Escape.ulm(host) + "\"" +
                 " PROG=" + Escape.ulm(prog) +

diff --git a/org.glite.lb.client-java/src/org/glite/lb/ContextLL.java b/org.glite.lb.client-java/src/org/glite/lb/ContextLL.java
index 8fe35a0..8e8276b 100644 (file)
--- a/org.glite.lb.client-java/src/org/glite/lb/ContextLL.java
+++ b/org.glite.lb.client-java/src/org/glite/lb/ContextLL.java
@@ -26,6 +26,7 @@ public class ContextLL extends Context {
         this.port = port;
     }
 
+/* XXX
     public ContextLL(int id,
             int source,
             int flag,
@@ -54,6 +55,7 @@ public class ContextLL extends Context {
         this.address = address;
     }
 
+*/
     @Override
     public void log(Event event) throws LBException {
         if (event == null) {

diff --git a/org.glite.lb.client-java/src/org/glite/lb/Event.java b/org.glite.lb.client-java/src/org/glite/lb/Event.java
index 334dac9..c4f0fc8 100644 (file)
--- a/org.glite.lb.client-java/src/org/glite/lb/Event.java
+++ b/org.glite.lb.client-java/src/org/glite/lb/Event.java
@@ -51,6 +51,7 @@ public abstract class Event {
      */
     public abstract String getEventType();
 
+/*
     public String info() {
         String date = "";
         if (arrived != null) {
@@ -65,6 +66,7 @@ public abstract class Event {
                 "DG.EVNT=\""+getEventType()+"\" "+"DG.JOBID=\""+jobId+"\" "+
                 "DG.SEQCODE=\""+seqcode+"\" "+"DG.USER=\""+user+"\""+ulm();
     }
+*/
 
     /**
      * Get and set methods for Event attributes.

diff --git a/org.glite.lb.client-java/src/org/glite/lb/EventConvertor.java b/org.glite.lb.client-java/src/org/glite/lb/EventConvertor.java
index 04aaf2c..76080ea 100644 (file)
--- a/org.glite.lb.client-java/src/org/glite/lb/EventConvertor.java
+++ b/org.glite.lb.client-java/src/org/glite/lb/EventConvertor.java
@@ -95,7 +95,7 @@ public class EventConvertor {
         if (jobId != null) event.setJobId(new Jobid(jobId));
         if (level != null) event.setLevel(getLevelFromString(level.getValue()));
         if (priority != null) event.setPriority(priority);
-        if (seqcode != null) event.setSeqcode(new SeqCode(seqcode));
+        if (seqcode != null) event.setSeqcode(new SeqCode(SeqCode.NORMAL,seqcode));    /* XXX */
         if (source != null) event.setSource(getSourceFromString(source.getValue()));
         if (srcInstance != null) event.setSrcInstance(srcInstance);
         if (timestamp != null) event.setTimestamp(new Timeval(timestamp.getTvSec(), timestamp.getTvUsec()));

diff --git a/org.glite.lb.client-java/src/org/glite/lb/ILFileWriter.java b/org.glite.lb.client-java/src/org/glite/lb/ILFileWriter.java
index 28cb84d..026b41b 100644 (file)
--- a/org.glite.lb.client-java/src/org/glite/lb/ILFileWriter.java
+++ b/org.glite.lb.client-java/src/org/glite/lb/ILFileWriter.java
@@ -50,7 +50,7 @@ public class ILFileWriter {
 
                     BufferedWriter bufferedFileWriter = new BufferedWriter(fileWriter);
 
-                    bufferedFileWriter.write(message + '\n');
+                    bufferedFileWriter.write(message);
                     bufferedFileWriter.flush();
 
                     if (file.exists()) {

diff --git a/org.glite.lb.client-java/src/org/glite/lb/ServerConnectionExample.java b/org.glite.lb.client-java/src/org/glite/lb/ServerConnectionExample.java
deleted file mode 100644 (file)
index 78ef777..0000000
--- a/org.glite.lb.client-java/src/org/glite/lb/ServerConnectionExample.java
+++ /dev/null
@@ -1,249 +0,0 @@
-package org.glite.lb;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import org.glite.jobid.Jobid;
-import org.glite.lb.Event;
-import org.glite.wsdl.types.lb.JobStatus;
-import org.glite.wsdl.types.lb.QueryAttr;
-import org.glite.wsdl.types.lb.QueryConditions;
-import org.glite.wsdl.types.lb.QueryOp;
-import org.glite.wsdl.types.lb.QueryRecValue;
-import org.glite.wsdl.types.lb.QueryRecord;
-import org.glite.wsdl.types.lb.StatName;
-import org.glite.wsdl.types.lb.Timeval;
-
-
-
-/**
- * This is a demonstration class for query API.
- * It contains all possible methodes that can be called on ServerConnection
- * and Job objects.
- * @author Tomas Kramec, 207545@mail.muni.cz
- */
-public class ServerConnectionExample {
-
-
-    /**
-     * This method serves for formating output information about given job status.
-     * It is only an example of how the data can be presented. It can be changed
-     * by user's needs.
-     *
-     * @param status Job status
-     * @return text representation of the given status
-     */
-    private static String jobStatusToString(JobStatus status) {
-        StringBuilder sb = new StringBuilder();
-        sb.append("State:      "+status.getState()+"\n");
-        sb.append("Job ID:     "+status.getJobId()+"\n");
-        sb.append("Owner:      "+status.getOwner()+"\n");
-        sb.append("Job type:   "+status.getJobtype()+"\n");
-        sb.append("Destination:   "+status.getLocation()+"\n");
-        sb.append("Done code:  "+status.getDoneCode()+"\n");
-        sb.append("User tags:  ");
-        //if there are some user tags write it out.
-        if (status.getUserTags() != null) {
-            for (int i=0;i<status.getUserTags().length;i++) {
-                if (i==0) {
-                    sb.append(status.getUserTags()[i].getTag()+" = "+
-                            status.getUserTags()[i].getValue()+"\n");
-                } else sb.append("            "+status.getUserTags()[i].getTag()+
-                        " = "+ status.getUserTags()[i].getValue()+"\n");
-            }
-        } else sb.append("\n");
-        //Write the time info in a readable form.
-        Calendar calendar = new GregorianCalendar();
-        DateFormat df = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
-        calendar.setTimeInMillis(status.getStateEnterTime().getTvSec()*1000);
-
-        sb.append("Enter time: "+ df.format(calendar.getTime())+"\n");
-        calendar.setTimeInMillis(status.getLastUpdateTime().getTvSec()*1000);
-        sb.append("Last update time: "+df.format(calendar.getTime())+"\n");
-        return sb.toString();
-    }
-
-    /**
-     * @param args the command line arguments
-     */
-    public static void main(String[] args) throws LBException {
-
-        if (args.length != 8) {
-            System.out.println("To use this class you have to run it with these arguments," +
-                    "in this order: \n" +
-                    "1. path to the trusted CA's files, default is /etc/grid-security/certificates/\n"+
-                    "2. -p for proxy based authentication\n" +
-                    "   -c for certificate based authentication\n"+
-                    "3. proxy certificate\n"+
-                    "4. user certificate\n"+
-                    "5. user key\n"+
-                    "6. user password\n"+
-                    "7. LB server addres in format \"https://somehost:port\"\n"+
-                    "8. jobid for queries in format \"https://somehost:port/uniquePart\"\n"+
-                    "Enter \"\" for empty option.");
-
-        } else {
-
-            /**
-             * create new instance of LBCredentials that holds credentials data
-             * used for authentication
-             */
-            LBCredentials lbCredent = null;
-
-            //if -p option is choosed set the proxy file for authentication
-            //if -c option is choosed set user certificate, key and password
-            if (args[1].equals("-p")) {
-                lbCredent = new LBCredentials(args[2], args[0]);
-            } else if (args[1].equals("-c")) {
-                lbCredent = new LBCredentials(args[3], args[4], args[5], args[0]);
-            } else {
-                System.err.println("Wrong option: "+args[1]+". Only -p and -c is allowed.");
-                System.exit(-1);
-            }
-         
-            //create new instance of ServerConnection with the given LB server address
-            ServerConnection sc = new ServerConnection(args[6], lbCredent);
-            
-            /**
-             * It is also possible to set these attributes of ServerConnection instance:
-             * timeout for server response
-             * limit for job results
-             * limit for event results
-             * flag indicating the way of handling too large results
-             * loggin level for events
-             * LB server addres
-             */
-//            sc.setQueryTimeout(60);
-//            sc.setQueryJobsLimit(100);
-//            sc.setQueryEventsLimit(50);
-//            sc.setQueryResultsFlag(ServerConnection.QueryResultsFlag.LIMITED);
-//            sc.setEventLoggingLevel(Level.LEVEL_DEBUG);
-//            sc.setQueryServerAddress("https://changedHost", 1234);
-
-            //Get the server limit for query results
-            System.out.println("Limit: " + sc.getServerLimit());
-
-            System.out.println();
-            /**
-             * Print all indexed attributes from LB database.
-             * If the attribute is USERTAG then print its name,
-             * if it is TIME then print state name.
-             */
-            System.out.println("Indexed attributes:");
-            List<QueryConditions> idx = sc.getIndexedAttrs();
-            for (int i=0;i<idx.size();i++) {
-                String name = idx.get(i).getAttr().getValue();
-                System.out.print(idx.get(i).getAttr().getValue());
-                if(name.equals("USERTAG"))
-                    System.out.print(" "+ idx.get(0).getTagName());
-                if(name.equals("TIME"))
-                    System.out.print(" "+ idx.get(0).getStatName());
-                System.out.println();
-            }
-
-
-            /**
-             * Print all user's jobs and their states.
-             */
-            System.out.println();
-            System.out.println("-----ALL USER's JOBS and STATES----");
-            //get user jobs
-            List<Jobid> jobs = sc.userJobs();
-            //get their states
-            List<JobStatus> js = sc.userJobStates();
-            Iterator<Jobid> it = jobs.iterator();
-            Iterator<JobStatus> itJs = js.iterator();
-            while (it.hasNext()) {
-                System.out.println(it.next());
-                System.out.println(jobStatusToString(itJs.next()));
-            }
-
-            //Demonstration of Job class
-            System.out.println();
-            System.out.println("----------------JOB----------------");
-
-            //create new Job
-            Job myJob = new Job(args[7], sc);
-            //print job state info
-            System.out.println();
-            System.out.println("Status: " + jobStatusToString(myJob.getStatus(null)));
-
-            //print info about job's events
-            System.out.println();
-            List<Event> events = myJob.getEvents();
-            System.out.println("Found "+events.size()+" events:");
-            for (int i=0;i<events.size();i++) {
-                System.out.println("Event: " + events.get(i).info());
-            }
-
-            /**
-             * This is demonstration of creating and using query conditions.
-             * It prints information about all user's jobs registered in LB
-             * submitted in last 3 days.
-             */
-            if (!jobs.isEmpty()) {
-                System.out.println();
-                System.out.println("-------------CONDITIONS------------");
-
-                //create query record for job ids from the previous query on all user's jobs.
-                List<QueryRecord> recList = new ArrayList<QueryRecord>();
-                int port = Integer.parseInt((args[6].split(":"))[2]);
-                for (int i=0;i<jobs.size();i++) {
-                    if(jobs.get(i).getPort() == port) {
-                        QueryRecValue jobIdValue = new QueryRecValue(null, jobs.get(i).toString(), null);
-                        recList.add(new QueryRecord(QueryOp.EQUAL, jobIdValue, null));
-                        System.out.println(jobIdValue.getC());
-                    } 
-                }
-                QueryRecord[] jobIdRec = new  QueryRecord[]{};
-                jobIdRec = recList.toArray(jobIdRec);
-
-                //crete QueryConditions instance this formula:
-                //(JOBID='jobId1' or JOBID='jobId2 or ...) where jobId1,... are ids of user's jobs
-                QueryConditions condOnJobid = new QueryConditions(QueryAttr.JOBID, null, null, jobIdRec);
-
-                //create query record for time
-                long time = System.currentTimeMillis()/1000;
-                QueryRecValue timeFrom = new QueryRecValue(null, null, new Timeval(time-259200, 0));
-                QueryRecValue timeTo = new QueryRecValue(null, null, new Timeval(System.currentTimeMillis()/1000, 0));
-                QueryRecord[] timeRec = new QueryRecord[]{new QueryRecord(QueryOp.WITHIN, timeFrom, timeTo)};
-                //create QueryConditions instance representing this formula:
-                //(TIME is in <timeFrom, timeTo> interval)
-                QueryConditions condOnTime = new QueryConditions(QueryAttr.TIME, null, StatName.SUBMITTED, timeRec);
-
-                //create QueryConditions list representing this formula:
-                //(JOBID='jobId1' or JOBID='jobId2 or ...) AND (TIME is in <timeFrom, timeTo> interval)
-                //where jobId1,... are ids of user's jobs
-                List<QueryConditions> condList = new ArrayList<QueryConditions>();
-                condList.add(condOnJobid);
-                condList.add(condOnTime);
-
-                //get all jobs matching the given conditions
-                List<Jobid> jobResult = sc.queryJobs(condList);
-                //get all their states
-                List<JobStatus> jobStatesResult = sc.queryJobStates(condList, null);
-
-                //Print information about results
-                Calendar calendar = new GregorianCalendar();
-                DateFormat df = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
-                System.out.println();
-                System.out.print("Jobs registered ");
-                calendar.setTimeInMillis(timeFrom.getT().getTvSec()*1000);
-                System.out.print("from "+ df.format(calendar.getTime())+" ");
-                calendar.setTimeInMillis(timeTo.getT().getTvSec()*1000);
-                System.out.print("to "+ df.format(calendar.getTime())+"\n");
-                Iterator<Jobid> jobsit = jobResult.iterator();
-                Iterator<JobStatus> statusit = jobStatesResult.iterator();
-                while (jobsit.hasNext()) {
-                    System.out.println(jobsit.next());
-                    System.out.println(jobStatusToString(statusit.next()));
-                }
-            }
-
-        }
-    }
-}

diff --git a/org.glite.lb.client-java/src_c/Makefile b/org.glite.lb.client-java/src_c/Makefile
index f17d815..ea08cc3 100755 (executable)
--- a/org.glite.lb.client-java/src_c/Makefile
+++ b/org.glite.lb.client-java/src_c/Makefile
@@ -4,13 +4,15 @@ PATH_TO_JAVA=${JAVA_HOME}
 LIB=libglite_lb_sendviasocket.la
 OBJ=send_via_socket.lo
 
+VPATH=${topdir}/src_c
+
 compile: ${LIB}
 
 ${LIB}: ${OBJ}
        libtool --mode=link ${CC} -rpath ${PREFIX}/lib -o $@ ${OBJ}
 
 %.lo: %.c
-       libtool --mode=compile ${CC} -I${topdir} -I${PATH_TO_JAVA}/include -I${PATH_TO_JAVA}/include/linux -c $<
+       libtool --mode=compile ${CC} -I.. -I${PATH_TO_JAVA}/include -I${PATH_TO_JAVA}/include/linux -c $<
 
 install: compile
        -mkdir -p ${PREFIX}/lib