git://scientific.zcu.cz / jra1mw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a1b79ee)
actualized patches
authorMiloš Mulač <mulac@civ.zcu.cz>
Fri, 30 Jun 2006 11:30:28 +0000 (11:30 +0000)
committerMiloš Mulač <mulac@civ.zcu.cz>
Fri, 30 Jun 2006 11:30:28 +0000 (11:30 +0000)
- against org.glite a org.glite.deployment from glite_R_3_0_0

org.glite.lb/deployment/deploy_jp.diff patch | blob | blame | history
org.glite.lb/deployment/deploy_lb.diff patch | blob | blame | history

diff --git a/org.glite.lb/deployment/deploy_jp.diff b/org.glite.lb/deployment/deploy_jp.diff
index c6cd4d0..bed14dd 100644 (file)
--- a/org.glite.lb/deployment/deploy_jp.diff
+++ b/org.glite.lb/deployment/deploy_jp.diff
@@ -1,43 +1,76 @@
 Index: org.glite/project/global.dependencies.properties
 ===================================================================
 RCS file: /cvs/jra1mw/org.glite/project/global.dependencies.properties,v
-retrieving revision 1.493
-diff -u -r1.493 global.dependencies.properties
---- org.glite/project/global.dependencies.properties   21 Jun 2006 13:24:58 -0000      1.493
-+++ org.glite/project/global.dependencies.properties   28 Jun 2006 09:53:25 -0000
-@@ -1337,6 +1337,24 @@
+retrieving revision 1.479.2.70.2.3.2.3.2.1
+diff -u -r1.479.2.70.2.3.2.3.2.1 global.dependencies.properties
+--- org.glite/project/global.dependencies.properties   9 May 2006 16:17:50 -0000       1.479.2.70.2.3.2.3.2.1
++++ org.glite/project/global.dependencies.properties   30 Jun 2006 11:13:49 -0000
+@@ -15,7 +15,7 @@
+ # Authors: Joachim Flammer <joachim.flammer@cern.ch>          
+ #
+ # Version info: $Id$
+-# Release: $Name$
++# Release: $Name$
+ # 
+ # Revision history:
+ # $Log$
+@@ -1562,7 +1562,26 @@
  ext.globus-sdk.rpm.name    = vdt_globus_sdk
  ext.globus-sdk.rpm.version = ${ext.vdt.version}
  ext.globus-sdk.rpm.age     = 1
-+
+-                                      
++  
 +# Globus vdt data server - grid ftp server
-+ext.globus-data-server.name           = ${ext.globus.name}
-+ext.globus-data-server.vendor         = ${ext.globus.vendor}
-+ext.globus-data-server.version                = ${ext.globus.version}
-+ext.globus-data-server.platform               = ${platform}
-+ext.globus-data-server.subdir         = ${ext.globus-data-server.name}/${ext.globus-data-server.version}/${ext.globus-data-server.platform}
-+ext.globus-data-server.rep.base               = ${jra1.rep.base}
-+ext.globus-data-server.rep.file               = 
-+ext.globus-data-server.rep.subdir     =
-+ext.globus-data-server.rep.url                = ${ext.globus-data-server.rep.base}/${ext.globus-data-server.subdir}/${ext.globus-data-server.rep.subdir}/${ext.globus-data-server.rep.file}
-+ext.globus-data-server.files          =
-+ext.globus-data-server.download               = http://www.cs.wisc.edu/vdt/releases/1.2.2/installing-rpms.html
-+ext.globus-data-server.homepage               = http://www.cs.wisc.edu/vdt//index.html
-+ext.globus-data-server.description    = The Globus Toolkit(R). This is the version packaged by VDT.
-+ext.globus-data-server.rpm.name       = vdt_globus_data_server
-+ext.globus-data-server.rpm.version    = ${ext.vdt.version}
-+ext.globus-data-server.rpm.age                = 1
-                                       
++ext.globus-data-server.name           = ${ext.globus.name}
++ext.globus-data-server.vendor         = ${ext.globus.vendor}
++ext.globus-data-server.version                = ${ext.globus.version}
++ext.globus-data-server.platform               = ${platform}
++ext.globus-data-server.subdir         = ${ext.globus-data-server.name}/${ext.globus-data-server.version}/${ext.globus-data-server.platform}
++ext.globus-data-server.rep.base               = ${jra1.rep.base}
++ext.globus-data-server.rep.file               =
++ext.globus-data-server.rep.subdir     =
++ext.globus-data-server.rep.url                = ${ext.globus-data-server.rep.base}/${ext.globus-data-server.subdir}/${ext.globus-data-server.rep.subdir}/${ext.globus-data-server.rep.file}
++ext.globus-data-server.files          =
++ext.globus-data-server.download               = http://www.cs.wisc.edu/vdt/releases/1.2.2/installing-rpms.html
++ext.globus-data-server.homepage               = http://www.cs.wisc.edu/vdt//index.html
++ext.globus-data-server.description    = The Globus Toolkit(R). This is the version packaged by VDT.
++ext.globus-data-server.rpm.name       = vdt_globus_data_server
++ext.globus-data-server.rpm.version    = ${ext.vdt.version}
++ext.globus-data-server.rpm.age                = 1
++
++                                    
  # GPT
  ext.gpt.name        = gpt
+ ext.gpt.vendor      = gpt
+@@ -3266,8 +3285,9 @@
+ org.glite.dgas.version                          = glite-dgas_R_1_1_16
+ org.glite.gpbox.version                         = glite-gpbox_R_1_0_15
+ org.glite.jdl.version                           = glite-jdl_R_1_0_0
+-org.glite.jp.version                            = glite-jp_R_1_1_3
+-org.glite.lb.version                            = glite-lb_R_1_2_9
++org.glite.jp.version                            = glite-jp_R_1_3_0
++org.glite.lb.version                            = glite-lb_R_1_2_11
++
+ org.glite.rgma.version                          = glite-rgma_R_5_0_26
+ org.glite.security.version                      = glite-security_R_3_0_15
+ org.glite.service-discovery.version             = glite-service-discovery_R_2_0_12
 Index: org.glite.deployment/build.xml
 ===================================================================
 RCS file: /cvs/jra1mw/org.glite.deployment/build.xml,v
-retrieving revision 1.62
-diff -u -r1.62 build.xml
---- org.glite.deployment/build.xml     22 Aug 2005 17:00:02 -0000      1.62
-+++ org.glite.deployment/build.xml     30 Mar 2006 11:32:58 -0000
-@@ -814,6 +814,39 @@
+retrieving revision 1.61.2.2.2.12.2.26
+diff -u -r1.61.2.2.2.12.2.26 build.xml
+--- org.glite.deployment/build.xml     24 Apr 2006 13:39:27 -0000      1.61.2.2.2.12.2.26
++++ org.glite.deployment/build.xml     30 Jun 2006 11:13:49 -0000
+@@ -9,7 +9,7 @@
+       Authors: Alberto Di Meglio <alberto.di.meglio@cern.ch>          
+       Version info: $Id$
+ 
+-      Release: $Name$
++      Release: $Name$
+ 
+       Revision history:
+       $Log$
+@@ -1619,6 +1619,39 @@
                </if>
        </target>
  
@@ -77,7 +110,7 @@ diff -u -r1.62 build.xml
        <target name="io-server" unless="setenvonly" depends="envset,config">
                <if>
                        <isset property="small.memory"/>
-@@ -891,6 +924,8 @@
+@@ -1730,6 +1763,8 @@
                                        wn,
                                        wms,
                                        lb,
@@ -89,27 +122,38 @@ diff -u -r1.62 build.xml
 Index: org.glite.deployment/project/dependencies.properties
 ===================================================================
 RCS file: /cvs/jra1mw/org.glite.deployment/project/dependencies.properties,v
-retrieving revision 1.528
-diff -u -r1.528 dependencies.properties
---- org.glite.deployment/project/dependencies.properties       22 Aug 2005 17:00:02 -0000      1.528
-+++ org.glite.deployment/project/dependencies.properties       30 Mar 2006 11:32:58 -0000
-@@ -33,6 +33,8 @@
- org.glite.deployment.wn.version                               = HEAD
- org.glite.deployment.wms.version                              = HEAD
- org.glite.deployment.lb.version                               = HEAD
-+org.glite.deployment.jpps.version                             = HEAD
-+org.glite.deployment.jpis.version                             = HEAD
- org.glite.deployment.io-server.version                        = HEAD
- org.glite.deployment.io-client.version                        = HEAD
- org.glite.deployment.ce.version                               = HEAD
+retrieving revision 1.526.2.5.2.127.2.415.2.22
+diff -u -r1.526.2.5.2.127.2.415.2.22 dependencies.properties
+--- org.glite.deployment/project/dependencies.properties       9 May 2006 12:33:18 -0000       1.526.2.5.2.127.2.415.2.22
++++ org.glite.deployment/project/dependencies.properties       30 Jun 2006 11:13:49 -0000
+@@ -80,6 +80,10 @@
+                               
+       org.glite.deployment.lb.version                         = glite-deployment-lb_R_2_2_3
+                               
++      org.glite.deployment.jpis.version                               = HEAD
++
++      org.glite.deployment.jpps.version                               = HEAD
++
+       org.glite.deployment.glite-WMSLB.version                                = glite-deployment-glite-WMSLB_R_2_4_2
+                               
+       org.glite.deployment.wn.version                         = glite-deployment-wn_R_2_3_7
 Index: org.glite.deployment/project/glite.deployment.csf.xml
 ===================================================================
 RCS file: /cvs/jra1mw/org.glite.deployment/project/glite.deployment.csf.xml,v
-retrieving revision 1.45
-diff -u -r1.45 glite.deployment.csf.xml
---- org.glite.deployment/project/glite.deployment.csf.xml      22 Aug 2005 17:00:02 -0000      1.45
-+++ org.glite.deployment/project/glite.deployment.csf.xml      30 Mar 2006 11:32:58 -0000
-@@ -389,6 +389,14 @@
+retrieving revision 1.44.2.1.2.11.2.24
+diff -u -r1.44.2.1.2.11.2.24 glite.deployment.csf.xml
+--- org.glite.deployment/project/glite.deployment.csf.xml      18 Apr 2006 15:42:14 -0000      1.44.2.1.2.11.2.24
++++ org.glite.deployment/project/glite.deployment.csf.xml      30 Jun 2006 11:13:50 -0000
+@@ -9,7 +9,7 @@
+       Authors: Joachim Flammer <Joachim.Flammer@cern.ch>      
+ 
+       Version info: $Id$
+-      Release: $Name$
++      Release: $Name$
+ 
+       Revision history:
+       $Log$
+@@ -667,6 +667,14 @@
                        <equals arg1="${org.glite.deployment.lb.version}" arg2="HEAD" />
                </condition>
  
@@ -124,7 +168,7 @@ diff -u -r1.45 glite.deployment.csf.xml
                <condition property="io-server.head">
                        <equals arg1="${org.glite.deployment.io-server.version}" arg2="HEAD" />
                </condition>
-@@ -832,6 +840,28 @@
+@@ -1571,6 +1579,28 @@
                        tag="${org.glite.deployment.lb.version}" />
        </target>
  
@@ -153,4 +197,12 @@ diff -u -r1.45 glite.deployment.csf.xml
        <!-- io-server component -->
        <target name="io-server" depends="get.io-server.head, get.io-server.tag"/>
        <target name="get.io-server.head" if="io-server.head">
-
+@@ -1667,6 +1697,8 @@
+                                       wn,
+                                       wms,
+                                       lb,
++                                      jpis,
++                                      jpps,
+                                       io-server,
+                                       io-client,
+                                       ce" />
diff --git a/org.glite.lb/deployment/deploy_lb.diff b/org.glite.lb/deployment/deploy_lb.diff
index 54b7c46..36bdf67 100644 (file)
--- a/org.glite.lb/deployment/deploy_lb.diff
+++ b/org.glite.lb/deployment/deploy_lb.diff
@@ -1,11 +1,11 @@
 Index: org.glite.deployment.lb/config/scripts/glite-lb-config.py
 ===================================================================
 RCS file: /cvs/jra1mw/org.glite.deployment.lb/config/scripts/glite-lb-config.py,v
-retrieving revision 1.66
-diff -u -r1.66 glite-lb-config.py
---- org.glite.deployment.lb/config/scripts/glite-lb-config.py  13 Mar 2006 15:22:31 -0000      1.66
-+++ org.glite.deployment.lb/config/scripts/glite-lb-config.py  15 Mar 2006 14:51:40 -0000
-@@ -120,7 +120,12 @@
+retrieving revision 1.65.2.3
+diff -u -r1.65.2.3 glite-lb-config.py
+--- org.glite.deployment.lb/config/scripts/glite-lb-config.py  2 May 2006 10:36:16 -0000       1.65.2.3
++++ org.glite.deployment.lb/config/scripts/glite-lb-config.py  30 Jun 2006 09:29:21 -0000
+@@ -127,7 +127,12 @@
  
          if not os.path.exists('/tmp/mysql.sock'):
              os.symlink('/var/lib/mysql/mysql.sock', '/tmp/mysql.sock')
@@ -19,7 +19,7 @@ diff -u -r1.66 glite-lb-config.py
          pid = glib.getPID('bkserverd')
          if pid != 0:
              print 'The gLite LB Server service is already running. Restarting...'
-@@ -133,7 +138,7 @@
+@@ -140,7 +145,7 @@
          pid = glib.getPID('bkserverd')
  
          if (pid != 0):
@@ -28,7 +28,7 @@ diff -u -r1.66 glite-lb-config.py
              glib.printOkMessage()
          else:
              glib.printErrorMessage("Could not start the gLite LB Server service")
-@@ -142,6 +147,36 @@
+@@ -149,6 +154,36 @@
              return 1
          
          #-------------------------------------------------------------------
@@ -65,7 +65,7 @@ diff -u -r1.66 glite-lb-config.py
          # Start Servicetool
          #-------------------------------------------------------------------
  
-@@ -161,6 +196,10 @@
+@@ -168,6 +203,10 @@
          if (pid != 0):
              os.system('%s/etc/init.d/glite-lb-bkserverd stop' % os.environ['GLITE_LOCATION'])
  
@@ -76,7 +76,7 @@ diff -u -r1.66 glite-lb-config.py
          pid = glib.getPID('bkserverd')
          if (pid != 0):
              print 'Could not stop the LB Server service            ',
-@@ -171,6 +210,25 @@
+@@ -178,6 +217,25 @@
              glib.printOkMessage()
          
          #-------------------------------------------------------------------
@@ -102,7 +102,7 @@ diff -u -r1.66 glite-lb-config.py
          # MySQL
          #-------------------------------------------------------------------
  
-@@ -195,6 +253,10 @@
+@@ -202,6 +260,10 @@
          if retval != 0:
              error_level = 1
  
@@ -113,7 +113,7 @@ diff -u -r1.66 glite-lb-config.py
          #-------------------------------------------------------------------
          # Servicetool
          #-------------------------------------------------------------------
-@@ -325,7 +387,27 @@
+@@ -332,7 +394,27 @@
              print "\n==> MySQL database %s already exist\n" % params['lb.database.name']
              
          self.mysql.stop()
@@ -142,7 +142,7 @@ diff -u -r1.66 glite-lb-config.py
          #-------------------------------------------------------------------
          # RGMA servicetool: configure servicetool
          #-------------------------------------------------------------------
-@@ -411,6 +493,17 @@
+@@ -418,6 +500,17 @@
      # Perl
      glib.addEnvPath("PERL5LIB", "%s/lib/perl:%s/lib/perl5" % (os.environ['GPT_LOCATION'],os.environ['GLITE_LOCATION']))
  
@@ -166,7 +166,7 @@ RCS file: /cvs/jra1mw/org.glite.deployment.lb/config/templates/glite-lb.cfg.xml,
 retrieving revision 1.21
 diff -u -r1.21 glite-lb.cfg.xml
 --- org.glite.deployment.lb/config/templates/glite-lb.cfg.xml  13 Mar 2006 15:19:21 -0000      1.21
-+++ org.glite.deployment.lb/config/templates/glite-lb.cfg.xml  15 Mar 2006 14:51:40 -0000
++++ org.glite.deployment.lb/config/templates/glite-lb.cfg.xml  30 Jun 2006 09:29:21 -0000
 @@ -17,9 +17,16 @@
                        parameter. Leave it empty of comment it out to use the same as 'glite.user.name'"
                        value="changeme"/>
@@ -247,10 +247,10 @@ diff -u -r1.21 glite-lb.cfg.xml
 Index: org.glite.deployment.lb/project/glite-lb.sdf.xml.template
 ===================================================================
 RCS file: /cvs/jra1mw/org.glite.deployment.lb/project/glite-lb.sdf.xml.template,v
-retrieving revision 1.38
-diff -u -r1.38 glite-lb.sdf.xml.template
---- org.glite.deployment.lb/project/glite-lb.sdf.xml.template  13 Mar 2006 15:19:21 -0000      1.38
-+++ org.glite.deployment.lb/project/glite-lb.sdf.xml.template  15 Mar 2006 14:51:40 -0000
+retrieving revision 1.38.2.2
+diff -u -r1.38.2.2 glite-lb.sdf.xml.template
+--- org.glite.deployment.lb/project/glite-lb.sdf.xml.template  2 May 2006 10:36:19 -0000       1.38.2.2
++++ org.glite.deployment.lb/project/glite-lb.sdf.xml.template  30 Jun 2006 09:29:21 -0000
 @@ -57,6 +57,12 @@
                                        build="@org.glite.lb.server-bones.info.build@"
                                        arch="i386"/>
@@ -277,23 +277,3 @@ diff -u -r1.38 glite-lb.sdf.xml.template
                  <component name="gridsite"
                      version="@org.gridsite.core.info.version@"
                      age="@org.gridsite.core.info.age@"
-Index: org.glite.deployment.lb/project/properties.xml
-===================================================================
-RCS file: /cvs/jra1mw/org.glite.deployment.lb/project/properties.xml,v
-retrieving revision 1.3
-diff -u -r1.3 properties.xml
---- org.glite.deployment.lb/project/properties.xml     13 Mar 2006 15:19:21 -0000      1.3
-+++ org.glite.deployment.lb/project/properties.xml     28 Jun 2006 10:38:15 -0000
-@@ -68,9 +68,9 @@
-       <property name="build.package.files" value="
- %attr(755,root,root) %{prefix}/etc/config/scripts/glite-lb-config.py\n
- %attr(600,root,root) %{prefix}/etc/config/templates/glite-lb.cfg.xml\n
--%attr(644,root,root) %{prefix}/share/doc/glite-LB/release_notes/release_notes.doc\n
--%attr(644,root,root) %{prefix}/share/doc/glite-LB/release_notes/release_notes.pdf\n
--%attr(644,root,root) %{prefix}/share/doc/glite-LB/release_notes/release_notes.html\n"/>
-+%attr(644,root,root) %{prefix}/share/doc/glite-lb/release_notes/release_notes.doc\n
-+%attr(644,root,root) %{prefix}/share/doc/glite-lb/release_notes/release_notes.pdf\n
-+%attr(644,root,root) %{prefix}/share/doc/glite-lb/release_notes/release_notes.html\n"/>
-       <property name="build.package.obsolete" value="glite-lb-config"/>
- 
- </project>
jra1mw project from LCG CVS.