first fill-up

diff --git a/org.glite.deployment.lb/build.xml b/org.glite.deployment.lb/build.xml
index 088b493..2c432e0 100644 (file)
--- a/org.glite.deployment.lb/build.xml
+++ b/org.glite.deployment.lb/build.xml
@@ -13,14 +13,17 @@
 
        Revision history:
        $Log$
+       Revision 1.1  2004/10/06 09:19:24  dimeglio
+       First version of this file
+       
 -->
 
 <project name="deployment-lb-server" default="dist">
-       
+
        <!-- =========================================
                 Builds the gLite LB Server Deployment Unit
                 ========================================= -->
-       
+
        <!-- =========================================
             Import properties (order is important)
                 ========================================= -->
@@ -32,7 +35,7 @@
                        component properties &
                        component common properties -->
        <import file="./project/properties.xml"/>
-       
+
        <!-- import subsystem build properties,
                        subsystem properties &
                        subsystem common properties -->
@@ -41,7 +44,7 @@
        <!-- import global build properties &
                        global properties -->
        <import file="${global.properties.file}" />
-               
+
        <!-- =========================================
                 Load dependency property files (order is important)
                 ========================================= -->
@@ -49,14 +52,14 @@
        <property file="${component.dependencies.file}" />
        <property file="${subsystem.dependencies.file}" />
        <property file="${global.dependencies.file}"/>
-       
-       
+
+
        <!-- =========================================
                 Import task definitions (order is important)
                 ========================================= -->
        <import file="${subsystem.taskdefs.file}" />
        <import file="${global.taskdefs.file}" />
-                       
+
        <!-- =========================================
                 Load configure options
                 ========================================= -->
@@ -65,34 +68,67 @@
        <!-- =========================================
                 Load common targets
                 ========================================= -->
-       <import file="${global.targets-external-dependencies.file}"/>   
+       <import file="${global.targets-external-dependencies.file}"/>
        <import file="${global.targets-deploy.file}" />
 
        <!-- =========================================
                 Load version file 
                 ========================================= -->
        <property file="${module.version.file}"/>
-               
+
        <!-- ==============================================
                 Local private targets
                 ============================================== -->
-       
+
        <target name="localinit"
                description="Module specific initialization tasks">
        </target>
-               
+
        <target name="localcompile"
                description="Module specific compilation tasks">
                <copy file="${module.project.dir}/${global.prefix}-${component.prefix}.sdf.xml.template"
                        tofile="${module.project.dir}/${global.prefix}-${component.prefix}.sdf.xml" overwrite="true">
                        <filterset>
+                               <filter token="org.glite.lb.client-interface.version" value="${org.glite.lb.client-interface.version}" />
+                               <filter token="org.glite.lb.client-interface.age" value="${org.glite.lb.client-interface.age}" />
+                               <filter token="org.glite.lb.client-interface.build" value="${org.glite.lb.client-interface.build}" />
+
+                               <filter token="org.glite.lb.common.version" value="${org.glite.lb.common.version}" />
+                               <filter token="org.glite.lb.common.age" value="${org.glite.lb.common.age}" />
+                               <filter token="org.glite.lb.common.build" value="${org.glite.lb.common.build}" />
+
+                               <filter token="org.glite.lb.logger.version" value="${org.glite.lb.logger.version}" />
+                               <filter token="org.glite.lb.logger.age" value="${org.glite.lb.logger.age}" />
+                               <filter token="org.glite.lb.logger.build" value="${org.glite.lb.logger.build}" />
+
+                               <filter token="org.glite.lb.server.version" value="${org.glite.lb.server.version}" />
+                               <filter token="org.glite.lb.server.age" value="${org.glite.lb.server.age}" />
+                               <filter token="org.glite.lb.server.build" value="${org.glite.lb.server.build}" />
+
+                               <filter token="org.glite.wms-utils.jobid.version" value="${org.glite.wms-utils.jobid.version}" />
+                               <filter token="org.glite.wms-utils.jobid.age" value="${org.glite.wms-utils.jobid.age}" />
+                               <filter token="org.glite.wms-utils.jobid.build" value="${org.glite.wms-utils.jobid.build}" />
+
 
-               </filterset>
+                               <filter token="org.glite.wms-utils.exception.version" value="${org.glite.wms-utils.exception.version}" />
+                               <filter token="org.glite.wms-utils.exception.age" value="${org.glite.wms-utils.exception.age}" />
+                               <filter token="org.glite.wms-utils.exception.build" value="${org.glite.wms-utils.exception.build}" />
+
+                               <filter token="org.glite.wms-utils.thirdparty-globus_ssl_utils.version" value="${org.glite.wms-utils.thirdparty-globus_ssl_utils.version}" />
+                               <filter token="org.glite.wms-utils.thirdparty-globus_ssl_utils.age" value="${org.glite.wms-utils.thirdparty-globus_ssl_utils.age}" />
+                               <filter token="org.glite.wms-utils.thirdparty-globus_ssl_utils.build" value="${org.glite.wms-utils.thirdparty-globus_ssl_utils.build}" />
+
+                               <filter token="org.glite.security.proxyrenewal.version" value="${org.glite.security.proxyrenewal.version}" />
+                               <filter token="org.glite.security.proxyrenewal.age" value="${org.glite.security.proxyrenewal.age}" />
+                               <filter token="org.glite.security.proxyrenewal.build" value="${org.glite.security.proxyrenewalon.build}" />
+
+
+                       </filterset>
                </copy>
        </target>
-               
+
        <target name="localclean"
                description="Module specific cleaning tasks">
        </target>
-       
-</project>             
+
+</project>

diff --git a/org.glite.deployment.lb/project/glite-lb-server.sdf.xml.template b/org.glite.deployment.lb/project/glite-lb-server.sdf.xml.template
new file mode 100644 (file)
index 0000000..936bdaf
--- /dev/null
+++ b/org.glite.deployment.lb/project/glite-lb-server.sdf.xml.template
@@ -0,0 +1,78 @@
+<?xml version ="1.0" encoding="UTF-8"?>
+<!--
+       Copyright (c) Members of the EGEE Collaboration. 2004 
+       See http://eu-egee.org/partners/ for details on the copyright holders
+       For license conditions see the license file or http://eu-egee.org/license.html
+-->
+
+<service name="glite-lb-server">
+       <components>
+                               <component name="glite-lb-client-interface"
+                                  version="@org.glite.lb.client-interface.version@"
+                                  age="@org.glite.lb.client-interface.age@"
+                                  build="@org.glite.lb.client-interface.build@"/>              
+       
+                       <component name="glite-lb-logger"
+                                  version="@org.glite.lb.logger.version@"
+                                  age="@org.glite.lb.logger.age@"
+                                  build="@org.glite.lb.logger.build@"/>
+
+                       <component name="glite-lb-common"
+                                  version="@org.glite.lb.common.version@"
+                                  age="@org.glite.lb.common.age@"
+                                  build="@org.glite.lb.common.build@"/>
+
+                       <component name="glite-lb-server"
+                                  version="@org.glite.lb.server.version@"
+                                  age="@org.glite.lb.server.age@"
+                                  build="@org.glite.lb.server.build@"/>
+                                  
+                       <component name="glite-wms-utils-jobid"
+                                  version="@org.glite.wms-utils.jobid.version@"
+                                  age="@org.glite.wms-utils.jobid.age@"
+                                  build="@org.glite.wms-utils.jobid.build@"/>  
+
+                       <component name="glite-wms-utils-exception"
+                                  version="@org.glite.wms-utils.exception.version@"
+                                  age="@org.glite.wms-utils.exception.age@"
+                                  build="@org.glite.wms-utils.exception.build@"/>
+
+                       <component name="glite-wms-utils-thirdparty-globus_ssl_utils"
+                                  version="@org.glite.wms-utils.thirdparty-globus_ssl_utils.version@"
+                                  age="@org.glite.wms-utils.thirdparty-globus_ssl_utils.age@"
+                                  build="@org.glite.wms-utils.thirdparty-globus_ssl_utils.build@"/>
+
+                       <component name=" glite-security-proxyrenewal"
+                                  version="@org.glite.security.proxyrenewal.version@"
+                                  age="@org.glite.security.proxyrenewal.age@"
+                                  build="@org.glite.security.proxyrenewal.build@"/>
+
+       </components>
+       <dependencies>
+                               <external name="MySQL-server"
+                                 version=""
+                                 age=""
+                                 build=""/>
+                               <external name="expat"
+                                 version=""
+                                 age=""
+                                 build=""/>
+                               <external name="ares"
+                                 version=""
+                                 age=""
+                                 build=""/>
+                               <external name="vdt_globus_essentials"
+                                 version=""
+                                 age=""
+                                 build=""/>
+                               <external name="myproxy"
+                                 version=""
+                                 age=""
+                                 build=""/>
+                               <external name="perl-Expect.pm"
+                                 version=""
+                                 age=""
+                                 build=""/>
+       
+       </dependencies>
+</service>

diff --git a/org.glite.deployment.lb/project/glite-lb.sdf.xml.template b/org.glite.deployment.lb/project/glite-lb.sdf.xml.template
deleted file mode 100644 (file)
index 3b8b5ad..0000000
--- a/org.glite.deployment.lb/project/glite-lb.sdf.xml.template
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version ="1.0" encoding="UTF-8"?>
-<!--
-       Copyright (c) Members of the EGEE Collaboration. 2004 
-       See http://eu-egee.org/partners/ for details on the copyright holders
-       For license conditions see the license file or http://eu-egee.org/license.html
--->
-
-<service name="glite-wms-node">
-       <components>
-       </components>
-       <dependencies>
-       </dependencies>
-</service>
\ No newline at end of file