included ws-interface

diff --git a/org.glite.jp/build.xml b/org.glite.jp/build.xml
index 74ce806..7871c14 100644 (file)
--- a/org.glite.jp/build.xml
+++ b/org.glite.jp/build.xml
@@ -12,6 +12,9 @@
 
        Revision history:
        $Log$
+       Revision 1.2  2004/12/01 18:36:00  zsalvet
+       Add component targets.
+       
        Revision 1.1  2004/11/22 13:21:49  dimeglio
        First version of this file
        
@@ -181,6 +184,22 @@
 
        <!-- component targets definitions tag = do not remove = -->
 
+       <target name="ws-interface" unless="setenvonly" depends="envset" >
+               <if>
+                       <isset property="small.memory" />
+                       <then>
+                               <exec dir="${jp.subsystem.dir}.ws-interface" executable="${antExec}" failonerror="${failonerror}">
+                                       <arg line="${target} &quot;-Dsmall.memory=true&quot; &quot;-Dbootstrap=${bootstrap}&quot; &quot;-Dfailonerror=${failonerror}&quot; &quot;-Ddo.cvs.tag=${do.cvs.tag}&quot;"/>
+                               </exec>
+                       </then>
+                       <else>
+                               <ant dir="${jp.subsystem.dir}.ws-interface"
+                                       target="${target}"
+                                       inheritall="false" />
+                       </else>
+               </if>
+       </target>
+
        <target name="common" unless="setenvonly" depends="envset" >
                <if>
                        <isset property="small.memory" />
@@ -213,7 +232,7 @@
                </if>
        </target>
 
-       <target name="primary" unless="setenvonly" depends="envset, common" >
+       <target name="primary" unless="setenvonly" depends="envset, ws-interface, common" >
                <if>
                        <isset property="small.memory" />
                        <then>
@@ -231,6 +250,7 @@
 
        <!-- Main proxy -->
        <target name="buildmodules" depends="envset,
+                                               ws-interface,
                                                common,
                                                index,
                                                primary">

diff --git a/org.glite.jp/project/dependencies.properties b/org.glite.jp/project/dependencies.properties
index afbbc58..ab3b83f 100644 (file)
--- a/org.glite.jp/project/dependencies.properties
+++ b/org.glite.jp/project/dependencies.properties
@@ -6,6 +6,7 @@ org.glite.version               = HEAD
 org.glite.jp.version           = HEAD
 
 # Component dependencies tag = do not remove this line =
+org.glite.jp.ws-interface.version      = HEAD
 org.glite.jp.common.version    = HEAD
 org.glite.jp.index.version     = HEAD
 org.glite.jp.primary.version   = HEAD

diff --git a/org.glite.jp/project/glite.jp.csf.xml b/org.glite.jp/project/glite.jp.csf.xml
index 5189cea..fd68f71 100644 (file)
--- a/org.glite.jp/project/glite.jp.csf.xml
+++ b/org.glite.jp/project/glite.jp.csf.xml
@@ -12,6 +12,9 @@
 
        Revision history:
        $Log$
+       Revision 1.2  2004/12/01 18:24:25  zsalvet
+       common, index, and primary components defined
+       
        Revision 1.1  2004/11/22 13:21:49  dimeglio
        First version of this file
        
@@ -116,6 +119,10 @@
                        <equals arg1="${org.glite.jp.common.version}" arg2="HEAD" />
                </condition>
 
+               <condition property="ws-interface.head">
+                       <equals arg1="${org.glite.jp.ws-interface.version}" arg2="HEAD" />
+               </condition>
+
                <condition property="index.head">
                        <equals arg1="${org.glite.jp.index.version}" arg2="HEAD" />
                </condition>
@@ -191,6 +198,16 @@
        
        <!-- component targets tag = do not remove = -->
 
+       <!-- ws-interface -->
+       <target name="ws-interface" depends="evaluate.cvs.tags, get.ws-interface.head, get.ws-interface.tag"/>
+       <target name="get.ws-interface.head" if="ws-interface.head">
+               <cvs-co package="org.glite.jp.ws-interface" />
+       </target>
+       <target name="get.ws-interface.tag" unless="ws-interface.head">
+               <cvs-co package="org.glite.jp.ws-interface"
+                       tag="${org.glite.jp.ws-interface.version}" />
+       </target>
+
        <!-- common -->
        <target name="common" depends="evaluate.cvs.tags, get.common.head, get.common.tag"/>
        <target name="get.common.head" if="common.head">
@@ -222,7 +239,8 @@
        </target>
 
        <!-- All project modules -->
-       <target name="project" depends="common,
+       <target name="project" depends="ws-interface,
+                                       common,
                                        index,
                                        primary" />