Menu
▾
▴
gpe4gtk-cvs-commits — Information on the project repository updates
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(899) |
Aug
(493) |
Sep
(542) |
Oct
(674) |
Nov
(365) |
Dec
(906) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(159) |
Feb
(547) |
Mar
(583) |
Apr
(775) |
May
(1169) |
Jun
(809) |
Jul
(287) |
Aug
(629) |
Sep
(734) |
Oct
(952) |
Nov
(493) |
Dec
(493) |
| 2007 |
Jan
(292) |
Feb
(1007) |
Mar
(137) |
Apr
(19) |
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Maxim L. <mlu...@us...> - 2007-03-29 14:33:47
|
Update of /cvsroot/gpe4gtk/gpe_installer/installer2/src/com/intel/gpe/installer2/impl/client/actions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15805/installer2/src/com/intel/gpe/installer2/impl/client/actions Modified Files: InstallClientComponent.java Log Message: Index: InstallClientComponent.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe_installer/installer2/src/com/intel/gpe/installer2/impl/client/actions/InstallClientComponent.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** InstallClientComponent.java 29 Mar 2007 12:03:31 -0000 1.12 --- InstallClientComponent.java 29 Mar 2007 14:33:46 -0000 1.13 *************** *** 53,59 **** import org.bouncycastle.asn1.x509.X509Name; import com.intel.gpe.installer2.PropertyKeys; import com.intel.gpe.installer2.PropertyManager; - import com.intel.gpe.installer2.common.UserPreferences; import com.intel.gpe.installer2.common.config.InstallationComponent; import com.intel.gpe.security.CertUtils; --- 53,60 ---- import org.bouncycastle.asn1.x509.X509Name; + import com.intel.gpe.client2.UserPreferences; + import com.intel.gpe.client2.defaults.preferences.CommonKeys; import com.intel.gpe.installer2.PropertyKeys; import com.intel.gpe.installer2.PropertyManager; import com.intel.gpe.installer2.common.config.InstallationComponent; import com.intel.gpe.security.CertUtils; *************** *** 403,406 **** --- 404,410 ---- keystore.store(); + Preferences node = UserPreferences.getRoot().node(CommonKeys.Common.getName()); + node.put(CommonKeys.KEYSTOREDIR.getName(), keyStoreFile); + String desc = "- New Keystore file was generated and placed to: " + kf.getAbsolutePath(); finalDescription += "\n " + desc + "\n"; *************** *** 412,417 **** File file = new File(keyStoreFile); if (file.exists()){ ! Preferences node = UserPreferences.getRoot().node("Common"); ! node.put("KEYSTOREDIR", keyStoreFile); String desc = "- The existing Keystore file was used: " + file.getAbsolutePath(); --- 416,421 ---- File file = new File(keyStoreFile); if (file.exists()){ ! Preferences node = UserPreferences.getRoot().node(CommonKeys.Common.getName()); ! node.put(CommonKeys.KEYSTOREDIR.getName(), keyStoreFile); String desc = "- The existing Keystore file was used: " + file.getAbsolutePath(); |
|
From: Maxim L. <mlu...@us...> - 2007-03-29 14:33:45
|
Update of /cvsroot/gpe4gtk/gpe_installer In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15796 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/gpe4gtk/gpe_installer/build.xml,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** build.xml 1 Mar 2007 11:43:02 -0000 1.23 --- build.xml 29 Mar 2007 14:33:35 -0000 1.24 *************** *** 35,39 **** <property name="gpe.common.jar" value="gpe-common.jar" /> <property name="gpe.commons.jar" value="gpe-commons.jar" /> ! <property name="wscore.zip.file" value="ws-core-4.0.2.zip" /> --- 35,39 ---- <property name="gpe.common.jar" value="gpe-common.jar" /> <property name="gpe.commons.jar" value="gpe-commons.jar" /> ! <property name="gpe.clients.common.jar" value="gpe-clients-common.jar"/> <property name="wscore.zip.file" value="ws-core-4.0.2.zip" /> *************** *** 57,60 **** --- 57,61 ---- <fileset dir="${gpe4gtk.release.dir}"> <include name="${gpe.common.jar}" /> + <include name="${gpe.clients.common.jar}" /> </fileset> <fileset dir="${common.release.dir}"> |
|
From: Maxim L. <mlu...@us...> - 2007-03-29 13:46:57
|
Update of /cvsroot/gpe4gtk/gpe_installer/installer2/src/com/intel/gpe/installer2/impl/tutorial/actions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv31751/installer2/src/com/intel/gpe/installer2/impl/tutorial/actions Modified Files: InstallTutorialComponent.java Log Message: Index: InstallTutorialComponent.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe_installer/installer2/src/com/intel/gpe/installer2/impl/tutorial/actions/InstallTutorialComponent.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** InstallTutorialComponent.java 29 Mar 2007 12:03:31 -0000 1.13 --- InstallTutorialComponent.java 29 Mar 2007 13:46:10 -0000 1.14 *************** *** 131,135 **** fireProgressChanged(70); ! clientComponent.setCreds(caComponent.getUserCred()); clientComponent.install(); fireProgressChanged(100); --- 131,136 ---- fireProgressChanged(70); ! clientComponent.setUserCred(caComponent.getUserCred()); ! clientComponent.setCaCreds(caComponent.getCredential()); clientComponent.install(); fireProgressChanged(100); *************** *** 725,729 **** private class InstallClient extends InstallationComponent{ ! private Credential creds; public InstallClient(PropertyManager manager){ --- 726,731 ---- private class InstallClient extends InstallationComponent{ ! private Credential caCred; ! private Credential userCred; public InstallClient(PropertyManager manager){ *************** *** 731,736 **** } ! public void setCreds(Credential creds) { ! this.creds = creds; } --- 733,742 ---- } ! public void setCaCreds(Credential creds) { ! this.caCred = creds; ! } ! ! public void setUserCred(Credential creds) { ! this.userCred = creds; } *************** *** 823,827 **** String passw = getPropertyManager().getProperty(PropertyKeys.TutorialKeys.TUTORIAL_CLIENT_SECURITY_PASSW); ! X509Certificate certificate = creds.getCertificateChain()[0]; //create parent directory if not exists --- 829,833 ---- String passw = getPropertyManager().getProperty(PropertyKeys.TutorialKeys.TUTORIAL_CLIENT_SECURITY_PASSW); ! X509Certificate caCertificate = caCred.getCertificateChain()[0]; //create parent directory if not exists *************** *** 832,836 **** Keystore keystore = new Keystore(keyStoreFile, "JKS", passw.toCharArray()); ! keystore.putCertificate("root", certificate); keystore.store(); } --- 838,844 ---- Keystore keystore = new Keystore(keyStoreFile, "JKS", passw.toCharArray()); ! keystore.putCertificate("root", caCertificate); ! keystore.setCredential("user", userCred, passw.toCharArray()); ! keystore.store(); } |
|
From: Maxim L. <mlu...@us...> - 2007-03-29 12:04:36
|
Update of /cvsroot/gpe4gtk/gpe_installer/installer2/src/com/intel/gpe/installer2/impl/tutorial/actions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv24403/installer2/src/com/intel/gpe/installer2/impl/tutorial/actions Modified Files: InstallTutorialComponent.java Log Message: Index: InstallTutorialComponent.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe_installer/installer2/src/com/intel/gpe/installer2/impl/tutorial/actions/InstallTutorialComponent.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** InstallTutorialComponent.java 28 Mar 2007 13:34:38 -0000 1.12 --- InstallTutorialComponent.java 29 Mar 2007 12:03:31 -0000 1.13 *************** *** 250,254 **** String cn = "root"; DERSet set = DERUtils.createDistinguishedNameElement(X509Name.CN, cn); ! DERUtils.addElement(sequence, set); Date currentDate = new Date(); --- 250,254 ---- String cn = "root"; DERSet set = DERUtils.createDistinguishedNameElement(X509Name.CN, cn); ! sequence = DERUtils.addElement(sequence, set); Date currentDate = new Date(); *************** *** 259,264 **** try { credential = CertUtils.getSelfSignedCertificate(name, 2048, currentDate, expiredDate, true); ! userCred = getUserCreds(); ! hostCred = getHostCreds(); } catch (Exception e) { --- 259,264 ---- try { credential = CertUtils.getSelfSignedCertificate(name, 2048, currentDate, expiredDate, true); ! userCred = obtainUserCreds(); ! hostCred = obtainHostCreds(); } catch (Exception e) { *************** *** 267,271 **** } ! private Credential getHostCreds() throws Exception{ String dn = "CN=host/" + getHost(); X500Principal principal = new X500Principal(dn); --- 267,271 ---- } ! private Credential obtainHostCreds() throws Exception{ String dn = "CN=host/" + getHost(); X500Principal principal = new X500Principal(dn); *************** *** 279,283 **** } ! private Credential getUserCreds() throws Exception{ String dn = "CN=" + getPropertyManager().getProperty("user.name"); X500Principal principal = new X500Principal(dn); --- 279,283 ---- } ! private Credential obtainUserCreds() throws Exception{ String dn = "CN=" + getPropertyManager().getProperty("user.name"); X500Principal principal = new X500Principal(dn); |
|
From: Maxim L. <mlu...@us...> - 2007-03-29 12:03:36
|
Update of /cvsroot/gpe4gtk/gpe_installer/installer2/src/com/intel/gpe/installer2/impl/client/actions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv24403/installer2/src/com/intel/gpe/installer2/impl/client/actions Modified Files: InstallClientComponent.java Log Message: Index: InstallClientComponent.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe_installer/installer2/src/com/intel/gpe/installer2/impl/client/actions/InstallClientComponent.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** InstallClientComponent.java 28 Feb 2007 15:23:31 -0000 1.11 --- InstallClientComponent.java 29 Mar 2007 12:03:31 -0000 1.12 *************** *** 366,388 **** DERSequence sequence = new DERSequence(); DERSet set = DERUtils.createDistinguishedNameElement(X509Name.CN, cn); ! DERUtils.addElement(sequence, set); set = DERUtils.createDistinguishedNameElement(X509Name.EmailAddress, email); ! DERUtils.addElement(sequence, set); set = DERUtils.createDistinguishedNameElement(X509Name.O, o); ! DERUtils.addElement(sequence, set); set = DERUtils.createDistinguishedNameElement(X509Name.OU, ou); ! DERUtils.addElement(sequence, set); set = DERUtils.createDistinguishedNameElement(X509Name.ST, st); ! DERUtils.addElement(sequence, set); set = DERUtils.createDistinguishedNameElement(X509Name.L, loc); ! DERUtils.addElement(sequence, set); set = DERUtils.createDistinguishedNameElement(X509Name.C, c); ! DERUtils.addElement(sequence, set); X509Name name = new X509Name(sequence); --- 366,388 ---- DERSequence sequence = new DERSequence(); DERSet set = DERUtils.createDistinguishedNameElement(X509Name.CN, cn); ! sequence = DERUtils.addElement(sequence, set); set = DERUtils.createDistinguishedNameElement(X509Name.EmailAddress, email); ! sequence = DERUtils.addElement(sequence, set); set = DERUtils.createDistinguishedNameElement(X509Name.O, o); ! sequence = DERUtils.addElement(sequence, set); set = DERUtils.createDistinguishedNameElement(X509Name.OU, ou); ! sequence = DERUtils.addElement(sequence, set); set = DERUtils.createDistinguishedNameElement(X509Name.ST, st); ! sequence = DERUtils.addElement(sequence, set); set = DERUtils.createDistinguishedNameElement(X509Name.L, loc); ! sequence = DERUtils.addElement(sequence, set); set = DERUtils.createDistinguishedNameElement(X509Name.C, c); ! sequence = DERUtils.addElement(sequence, set); X509Name name = new X509Name(sequence); |
|
From: Maxim L. <mlu...@us...> - 2007-03-29 11:19:10
|
Update of /cvsroot/gpe4gtk/gpe_installer/resources/gpe In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv7166/resources/gpe Modified Files: windows.properties unix.properties Log Message: Index: windows.properties =================================================================== RCS file: /cvsroot/gpe4gtk/gpe_installer/resources/gpe/windows.properties,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** windows.properties 28 Mar 2007 10:18:57 -0000 1.12 --- windows.properties 29 Mar 2007 11:19:04 -0000 1.13 *************** *** 3,10 **** client.dir=${common.dir}\\gpe\\clients client.conf.dir=${user.home}\\.gpe4gtkconfig ! client.conf.file=${client.conf.dir}\\UserDefaults1.txt ! client.conf.plugin.dir=${client.conf.dir}\\plugins1 ! client.security.keystore.file=${client.conf.dir}\\keystore1.jks client.security.setup.cred=true client.security.keycert.dir=${common.dir}\\gpe\\grid-security --- 3,10 ---- client.dir=${common.dir}\\gpe\\clients client.conf.dir=${user.home}\\.gpe4gtkconfig ! client.conf.file=${client.conf.dir}\\UserDefaults.txt ! client.conf.plugin.dir=${client.conf.dir}\\plugins ! client.security.keystore.file=${client.conf.dir}\\keystore.jks client.security.setup.cred=true client.security.keycert.dir=${common.dir}\\gpe\\grid-security Index: unix.properties =================================================================== RCS file: /cvsroot/gpe4gtk/gpe_installer/resources/gpe/unix.properties,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** unix.properties 22 Feb 2007 14:10:08 -0000 1.9 --- unix.properties 29 Mar 2007 11:19:04 -0000 1.10 *************** *** 3,9 **** client.dir=${common.dir}/gpe/clients client.conf.dir=${user.home}/.gpe4gtkconfig ! client.conf.file=${client.conf.dir}/UserDefaults1.txt ! client.conf.plugin.dir=${client.conf.dir}/plugins1 ! client.security.keystore.file=${client.conf.dir}/keystore1.jks client.security.setup.cred=true --- 3,9 ---- client.dir=${common.dir}/gpe/clients client.conf.dir=${user.home}/.gpe4gtkconfig ! client.conf.file=${client.conf.dir}/UserDefaults.txt ! client.conf.plugin.dir=${client.conf.dir}/plugins ! client.security.keystore.file=${client.conf.dir}/keystore.jks client.security.setup.cred=true |
|
From: Denis Z. <diz...@us...> - 2007-03-29 10:36:08
|
Update of /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/filemanager/nodes/localfs In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv21783/clients/src/com/intel/gpe/client2/filemanager/nodes/localfs Modified Files: GridFileImpl.java Added Files: PermissionsImpl.java Log Message: fix for [ gpe4gtk-Bugs-1690405 ] FileManager: local file permissions reference GTK --- NEW FILE: PermissionsImpl.java --- /* * Copyright (c) 2000-2007, Intel Corporation All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: * * (1) Redistributions of source code must retain the above copyright notice, * this list of conditions and the disclaimer at the end. Redistributions in * binary form must reproduce the above copyright notice, this list of * conditions and the following disclaimer in the documentation and/or other * materials provided with the distribution. * * (2) Neither the name of Intel Corporation nor the names of its contributors * may be used to endorse or promote products derived from this software without * specific prior written permission. * * DISCLAIMER * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ package com.intel.gpe.client2.filemanager.nodes.localfs; import com.intel.gpe.clients.api.Permissions; /** * @version $Id: PermissionsImpl.java,v 1.1 2007/03/29 10:36:07 dizhigul Exp $ * @author Denis Zhigula */ public class PermissionsImpl implements Permissions { private boolean executable = true; private boolean writable = true; private boolean readable = true; public PermissionsImpl() { } public boolean getExecutable() { return executable; } public boolean getReadable() { return readable; } public boolean getWritable() { return writable; } public void setExecutable(boolean executable) { this.executable = executable; } public void setReadable(boolean readable) { this.readable = readable; } public void setWritable(boolean writable) { this.writable = writable; } } Index: GridFileImpl.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/clients/src/com/intel/gpe/client2/filemanager/nodes/localfs/GridFileImpl.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** GridFileImpl.java 20 Sep 2006 10:16:38 -0000 1.3 --- GridFileImpl.java 29 Mar 2007 10:36:07 -0000 1.4 *************** *** 36,40 **** import com.intel.gpe.clients.api.GridFile; import com.intel.gpe.clients.api.Permissions; - import com.intel.gpe.clients.gpe4gtk.sms.PermissionsImpl; /** --- 36,39 ---- |
|
From: Nikolay M. <nbm...@us...> - 2007-03-29 07:09:26
|
Update of /cvsroot/gpe4gtk/gpe4gtk/tests/src/com/intel/gpe/tests/func In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv7754/tests/src/com/intel/gpe/tests/func Modified Files: TestInfo.java Log Message: Print TSI object name Index: TestInfo.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/tests/src/com/intel/gpe/tests/func/TestInfo.java,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** TestInfo.java 26 Jan 2007 14:12:18 -0000 1.32 --- TestInfo.java 29 Mar 2007 07:09:25 -0000 1.33 *************** *** 414,417 **** --- 414,418 ---- if (printInfo) { System.out.println("TSI host - " + tsrHost); + System.out.println("TSI object - " + tsiObject); System.out.println("TSI port - " + tsiPort); System.out.println("Uspaces directory - " + uspaces + u); |
|
From: Maxim L. <mlu...@us...> - 2007-03-28 13:34:39
|
Update of /cvsroot/gpe4gtk/gpe_installer/installer2/src/com/intel/gpe/installer2/impl/tutorial/actions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26394/installer2/src/com/intel/gpe/installer2/impl/tutorial/actions Modified Files: InstallTutorialComponent.java Log Message: Index: InstallTutorialComponent.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe_installer/installer2/src/com/intel/gpe/installer2/impl/tutorial/actions/InstallTutorialComponent.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** InstallTutorialComponent.java 28 Mar 2007 10:37:12 -0000 1.11 --- InstallTutorialComponent.java 28 Mar 2007 13:34:38 -0000 1.12 *************** *** 88,91 **** --- 88,92 ---- import com.intel.gpe.security.PEMTools; import com.intel.gpe.security.keystore.Keystore; + import com.sun.org.apache.xerces.internal.parsers.IntegratedParserConfiguration; public class InstallTutorialComponent extends InstallationComponent{ *************** *** 293,297 **** X509Certificate cert = credential.getCertificateChain()[0]; ! String name = String.valueOf(cert.hashCode()); String usHome = getPropertyManager().getProperty("user.home"); String dest = usHome + "/.globus/certificates/" + name + ".0"; --- 294,299 ---- X509Certificate cert = credential.getCertificateChain()[0]; ! ! String name = Integer.toHexString(cert.hashCode()); String usHome = getPropertyManager().getProperty("user.home"); String dest = usHome + "/.globus/certificates/" + name + ".0"; |
|
From: Maxim L. <mlu...@us...> - 2007-03-28 10:37:17
|
Update of /cvsroot/gpe4gtk/gpe_installer/installer2/src/com/intel/gpe/installer2/impl/tutorial/actions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv21475/installer2/src/com/intel/gpe/installer2/impl/tutorial/actions Modified Files: InstallTutorialComponent.java Log Message: Index: InstallTutorialComponent.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe_installer/installer2/src/com/intel/gpe/installer2/impl/tutorial/actions/InstallTutorialComponent.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** InstallTutorialComponent.java 28 Mar 2007 08:21:02 -0000 1.10 --- InstallTutorialComponent.java 28 Mar 2007 10:37:12 -0000 1.11 *************** *** 696,703 **** FilterSet filterSet = copy.createFilterSet(); Filter filter = new Filter(); ! filter.setToken("server.container.dir"); filter.setValue(containerDir); filterSet.addFilter(filter); copy.addFileset(fileSet); --- 696,713 ---- FilterSet filterSet = copy.createFilterSet(); Filter filter = new Filter(); ! filter.setToken("globus.location"); filter.setValue(containerDir); filterSet.addFilter(filter); + filter = new Filter(); + filter.setToken("java.home"); + filter.setValue(getPropertyManager().getProperty("java.home")); + filterSet.addFilter(filter); + + filter = new Filter(); + filter.setToken("prettyglobus.dir"); + filter.setValue(toDir.getAbsolutePath()); + filterSet.addFilter(filter); + copy.addFileset(fileSet); *************** *** 768,772 **** fileSet.setDir(new File("resources/gpe/client")); copy.addFileset(fileSet); ! mkdir.execute(); copy.execute(); --- 778,787 ---- fileSet.setDir(new File("resources/gpe/client")); copy.addFileset(fileSet); ! ! fileSet = new FileSet(); ! fileSet.setDir(new File(".")); ! fileSet.setIncludes("lib/bcprov-jdk15-133.jar"); ! copy.addFileset(fileSet); ! mkdir.execute(); copy.execute(); |
|
From: Maxim L. <mlu...@us...> - 2007-03-28 10:18:59
|
Update of /cvsroot/gpe4gtk/gpe_installer/resources/gpe In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv13908/resources/gpe Modified Files: windows.properties Log Message: Index: windows.properties =================================================================== RCS file: /cvsroot/gpe4gtk/gpe_installer/resources/gpe/windows.properties,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** windows.properties 22 Feb 2007 16:01:21 -0000 1.11 --- windows.properties 28 Mar 2007 10:18:57 -0000 1.12 *************** *** 47,51 **** tutorial.dir=${common.dir}\\tutorial tutorial.tsi.dir=${tutorial.dir}\\gpe\\tsi ! tutorial.tsi.port=3888; tutorial.tsi.remote.runscript.name=javatsi.bat tutorial.tsi.remote.runscript=${tsi.common.dir}\\bin\\javatsi.bat --- 47,51 ---- tutorial.dir=${common.dir}\\tutorial tutorial.tsi.dir=${tutorial.dir}\\gpe\\tsi ! tutorial.tsi.port=3888 tutorial.tsi.remote.runscript.name=javatsi.bat tutorial.tsi.remote.runscript=${tsi.common.dir}\\bin\\javatsi.bat |
|
From: Maxim L. <mlu...@us...> - 2007-03-28 08:21:06
|
Update of /cvsroot/gpe4gtk/gpe_installer/installer2/src/com/intel/gpe/installer2/impl/tutorial/actions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2446/installer2/src/com/intel/gpe/installer2/impl/tutorial/actions Modified Files: InstallTutorialComponent.java Log Message: the bug with creation jf directory .gpe4gtkconfig fixed Index: InstallTutorialComponent.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe_installer/installer2/src/com/intel/gpe/installer2/impl/tutorial/actions/InstallTutorialComponent.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** InstallTutorialComponent.java 28 Feb 2007 15:23:29 -0000 1.9 --- InstallTutorialComponent.java 28 Mar 2007 08:21:02 -0000 1.10 *************** *** 808,811 **** --- 808,817 ---- X509Certificate certificate = creds.getCertificateChain()[0]; + //create parent directory if not exists + File kf = new File(keyStoreFile); + if (!kf.exists()){ + new File(kf.getParent()).mkdirs(); + } + Keystore keystore = new Keystore(keyStoreFile, "JKS", passw.toCharArray()); keystore.putCertificate("root", certificate); |
|
From: Maxim L. <mlu...@us...> - 2007-03-28 08:21:06
|
Update of /cvsroot/gpe4gtk/gpe_installer/installer2/src/com/intel/gpe/installer2/impl/tsi/actions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2446/installer2/src/com/intel/gpe/installer2/impl/tsi/actions Modified Files: InstallTSIComponent.java Log Message: the bug with creation jf directory .gpe4gtkconfig fixed Index: InstallTSIComponent.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe_installer/installer2/src/com/intel/gpe/installer2/impl/tsi/actions/InstallTSIComponent.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** InstallTSIComponent.java 1 Mar 2007 14:57:25 -0000 1.16 --- InstallTSIComponent.java 28 Mar 2007 08:21:01 -0000 1.17 *************** *** 36,57 **** import java.net.InetAddress; import java.net.UnknownHostException; - import java.util.ArrayList; - import java.util.List; import java.util.Properties; import org.apache.tools.ant.Project; - import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.Chmod; import org.apache.tools.ant.taskdefs.Copy; import org.apache.tools.ant.taskdefs.Delete; - import org.apache.tools.ant.taskdefs.Expand; - import org.apache.tools.ant.taskdefs.Jar; - import org.apache.tools.ant.taskdefs.Manifest; - import org.apache.tools.ant.taskdefs.ManifestException; import org.apache.tools.ant.taskdefs.Mkdir; import org.apache.tools.ant.taskdefs.Replace; import org.apache.tools.ant.taskdefs.Zip; - import org.apache.tools.ant.taskdefs.Manifest.Attribute; - import org.apache.tools.ant.taskdefs.Manifest.Section; import org.apache.tools.ant.taskdefs.Replace.Replacefilter; import org.apache.tools.ant.types.FileSet; --- 36,48 ---- |
|
From: Dmitry N. P. <dnp...@us...> - 2007-03-26 14:33:15
|
Update of /cvsroot/gpe4gtk/NativeTSI/c/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv30963/c/src Modified Files: fileio.c Log Message: use DEFAULT_FILE_ATTR when creating file in truncAppend(...) Index: fileio.c =================================================================== RCS file: /cvsroot/gpe4gtk/NativeTSI/c/src/fileio.c,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** fileio.c 21 Mar 2007 11:21:36 -0000 1.9 --- fileio.c 26 Mar 2007 14:02:36 -0000 1.10 *************** *** 149,153 **** } ! int fd = open(path, O_WRONLY | O_CREAT, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH); if (fd == -1) { prints(tsiSocket, "#Cannot open file %s: %s", --- 149,153 ---- } ! int fd = open(path, O_WRONLY | O_CREAT, DEFAULT_FILE_ATTR); if (fd == -1) { prints(tsiSocket, "#Cannot open file %s: %s", |
|
From: Nikolay M. <nbm...@us...> - 2007-03-24 12:32:44
|
Update of /cvsroot/gpe4gtk/gpe4gtk/tests/src/com/intel/gpe/tests/gui In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv30584/tests/src/com/intel/gpe/tests/gui Modified Files: GUITestStarter.java Log Message: print auto_delay Index: GUITestStarter.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/tests/src/com/intel/gpe/tests/gui/GUITestStarter.java,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** GUITestStarter.java 24 Mar 2007 07:05:52 -0000 1.65 --- GUITestStarter.java 24 Mar 2007 12:32:43 -0000 1.66 *************** *** 188,191 **** --- 188,192 ---- if (auto_delay != null) System.setProperty("abbot.robot.auto_delay", auto_delay); + System.out.println("abbot.robot.auto_delay = " + (auto_delay != null ? auto_delay : "null")); System.setProperty("com.intel.gpe.tests.passwd", testProp.getProperty("tests.passwd", "changeit")); } |
|
From: Nikolay M. <nbm...@us...> - 2007-03-24 07:05:59
|
Update of /cvsroot/gpe4gtk/gpe4gtk/tests/src/com/intel/gpe/tests/gui In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2368/tests/src/com/intel/gpe/tests/gui Modified Files: GUITestStarter.java Log Message: change default for abbot.robot.auto_delay Index: GUITestStarter.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/tests/src/com/intel/gpe/tests/gui/GUITestStarter.java,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** GUITestStarter.java 16 Mar 2007 10:50:17 -0000 1.64 --- GUITestStarter.java 24 Mar 2007 07:05:52 -0000 1.65 *************** *** 185,189 **** "com.intel.gpe.client2.common.gpe4gtk.NonsecureManagerConfiguratorImpl"); } else { ! System.setProperty("abbot.robot.auto_delay", testProp.getProperty("abbot.robot.auto_delay", "400")); System.setProperty("com.intel.gpe.tests.passwd", testProp.getProperty("tests.passwd", "changeit")); } --- 185,191 ---- "com.intel.gpe.client2.common.gpe4gtk.NonsecureManagerConfiguratorImpl"); } else { ! String auto_delay = testProp.getProperty("abbot.robot.auto_delay"); ! if (auto_delay != null) ! System.setProperty("abbot.robot.auto_delay", auto_delay); System.setProperty("com.intel.gpe.tests.passwd", testProp.getProperty("tests.passwd", "changeit")); } |
|
From: Dmitry N. P. <dnp...@us...> - 2007-03-21 15:07:20
|
Update of /cvsroot/gpe4gtk/gpe4gtk/services/src/com/intel/gpe/nativetsi In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv9483/services/src/com/intel/gpe/nativetsi Modified Files: NativeTSIClient.java Log Message: fix for enclosing directories Index: NativeTSIClient.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/services/src/com/intel/gpe/nativetsi/NativeTSIClient.java,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** NativeTSIClient.java 21 Mar 2007 14:17:58 -0000 1.29 --- NativeTSIClient.java 21 Mar 2007 15:06:53 -0000 1.30 *************** *** 293,297 **** } ! private static FileInfo decodeFileInfo(String line) { if (line.startsWith("*")) { return new FileInfo(line.substring(1), FileInfo.TYPE_FILE, 0, 0, --- 293,297 ---- } ! private static FileInfo decodeFileInfo(String dirPrefix, String line) { if (line.startsWith("*")) { return new FileInfo(line.substring(1), FileInfo.TYPE_FILE, 0, 0, *************** *** 319,325 **** writable, executable); ! FileInfo fi = new FileInfo(name, isdir ? FileInfo.TYPE_DIR ! : FileInfo.TYPE_FILE, size, lastModified ! .getTimeInMillis(), perms); fi.setIsOwner(line.charAt(0)=='o'); --- 319,328 ---- writable, executable); ! FileInfo fi = new FileInfo(dirPrefix + name, ! isdir ? FileInfo.TYPE_DIR : FileInfo.TYPE_FILE, ! size, ! lastModified.getTimeInMillis(), ! perms ! ); fi.setIsOwner(line.charAt(0)=='o'); *************** *** 333,336 **** --- 336,345 ---- logger.log(Level.INFO, u.getUserName() + ": listDir " + f.getPath()); + String dirPrefix = f.getRelativePath() + java.io.File.separator; + String localPrefix = "." + java.io.File.separator; + if (dirPrefix.startsWith(localPrefix)) { + dirPrefix = dirPrefix.substring(localPrefix.length()); + } + Socket sock = new Socket(hostName, port); InputStreamReader isr = new InputStreamReader(sock.getInputStream()); *************** *** 358,362 **** return files.toArray(new FileInfo[] {}); } else { ! files.add(decodeFileInfo(line)); } } --- 367,371 ---- return files.toArray(new FileInfo[] {}); } else { ! files.add(decodeFileInfo(dirPrefix, line)); } } *************** *** 370,373 **** --- 379,388 ---- String line = null; + String dirPrefix = f.getRelativePath() + java.io.File.separator; + String localPrefix = "." + java.io.File.separator; + if (dirPrefix.startsWith(localPrefix)) { + dirPrefix = dirPrefix.substring(localPrefix.length()); + } + try { logger.log(Level.INFO, u.getUserName() + ": listFile " + f.getPath()); *************** *** 400,404 **** } ! return decodeFileInfo(line); } --- 415,419 ---- } ! return decodeFileInfo(dirPrefix, line); } |
|
From: Dmitry N. P. <dnp...@us...> - 2007-03-21 14:18:05
|
Update of /cvsroot/gpe4gtk/gpe4gtk/services/src/com/intel/gpe/nativetsi In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv22444/services/src/com/intel/gpe/nativetsi Modified Files: NativeTSIClient.java Log Message: always pass directories with trailing "/" Index: NativeTSIClient.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/services/src/com/intel/gpe/nativetsi/NativeTSIClient.java,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** NativeTSIClient.java 19 Mar 2007 10:18:23 -0000 1.28 --- NativeTSIClient.java 21 Mar 2007 14:17:58 -0000 1.29 *************** *** 140,147 **** .getOutputStream()); BufferedReader br = new BufferedReader(isr); osw.write("CREATE_DIR\n"); osw.write(u.getUserName() + "\n"); ! osw.write(f.getPath() + "\n"); osw.flush(); --- 140,152 ---- .getOutputStream()); BufferedReader br = new BufferedReader(isr); + + String normalizedDirParh = f.getPath(); + if (!normalizedDirParh.endsWith("/")) { + normalizedDirParh += "/"; + } osw.write("CREATE_DIR\n"); osw.write(u.getUserName() + "\n"); ! osw.write(normalizedDirParh + "\n"); osw.flush(); |
|
From: Dmitry N. P. <dnp...@us...> - 2007-03-21 14:03:03
|
Update of /cvsroot/gpe4gtk/NativeTSI/c/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv16562/c/src Modified Files: filecontrol.c Log Message: directory ends with "/" Index: filecontrol.c =================================================================== RCS file: /cvsroot/gpe4gtk/NativeTSI/c/src/filecontrol.c,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** filecontrol.c 21 Mar 2007 11:21:36 -0000 1.14 --- filecontrol.c 21 Mar 2007 14:02:31 -0000 1.15 *************** *** 40,48 **** if (makeAllDirs(dirPath)) { ! prints(tsiSocket, "#Cannot create subdirectory in path to %s: %s", ! dirPath, strerror(errno)); ! } ! else if (mkdir(dirPath, DEFAULT_DIR_ATTR)) { ! prints(tsiSocket, "#Cannot create directory %s: %s", dirPath, strerror(errno)); } else if (chown(dirPath, uentry->pw_uid, uentry->pw_gid)) { --- 40,44 ---- if (makeAllDirs(dirPath)) { ! prints(tsiSocket, "#Cannot create directory: %s", dirPath, strerror(errno)); } else if (chown(dirPath, uentry->pw_uid, uentry->pw_gid)) { |
|
From: Dmitry N. P. <dnp...@us...> - 2007-03-21 12:50:05
|
Update of /cvsroot/gpe4gtk/NativeTSI In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv20445 Modified Files: Makefile Log Message: Makefile for modified NTSI Index: Makefile =================================================================== RCS file: /cvsroot/gpe4gtk/NativeTSI/Makefile,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Makefile 21 Mar 2007 11:22:17 -0000 1.15 --- Makefile 21 Mar 2007 12:49:55 -0000 1.16 *************** *** 67,70 **** --- 67,73 ---- $(CC) -c $(SRC)/logging.c -o $(BIN)/logging.o + $(BIN)/mkdir.o: $(SRC)/mkdir.c + $(CC) -c $(SRC)/mkdir.c -o $(BIN)/mkdir.o + $(BIN)/ntsi.o: $(SRC)/ntsi.c $(CC) -c $(SRC)/ntsi.c -o $(BIN)/ntsi.o |
|
From: Dmitry N. P. <dnp...@us...> - 2007-03-21 11:22:18
|
Update of /cvsroot/gpe4gtk/NativeTSI In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18077 Modified Files: Makefile Log Message: recursive mkdir with default attributes Index: Makefile =================================================================== RCS file: /cvsroot/gpe4gtk/NativeTSI/Makefile,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Makefile 1 Mar 2007 07:27:17 -0000 1.14 --- Makefile 21 Mar 2007 11:22:17 -0000 1.15 *************** *** 11,14 **** --- 11,15 ---- $(SRC)/jobcontrol.c \ $(SRC)/logging.c \ + $(SRC)/mkdir.c \ $(SRC)/ntsi.c \ $(SRC)/readexecute.c \ *************** *** 22,25 **** --- 23,27 ---- $(BIN)/jobcontrol.o \ $(BIN)/logging.o \ + $(BIN)/mkdir.o \ $(BIN)/ntsi.o \ $(BIN)/readexecute.o \ |
|
From: Dmitry N. P. <dnp...@us...> - 2007-03-21 11:21:41
|
Update of /cvsroot/gpe4gtk/NativeTSI/c/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17722/c/src Modified Files: filecontrol.c fileio.c Added Files: mkdir.h mkdir.c defaults.h Log Message: recursive mkdir with default attributes --- NEW FILE: mkdir.h --- #ifndef MKDIR_H_ #define MKDIR_H_ int makeAllDirs(char *path); #endif /*MKDIR_H_*/ Index: filecontrol.c =================================================================== RCS file: /cvsroot/gpe4gtk/NativeTSI/c/src/filecontrol.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** filecontrol.c 28 Feb 2007 14:17:08 -0000 1.13 --- filecontrol.c 21 Mar 2007 11:21:36 -0000 1.14 *************** *** 15,18 **** --- 15,20 ---- #include "tsiprotocol.h" #include "logging.h" + #include "defaults.h" + #include "mkdir.h" #include "filecontrol.h" *************** *** 37,41 **** struct passwd *uentry = getpwnam(uname); ! if (mkdir(dirPath, S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IROTH)) { prints(tsiSocket, "#Cannot create directory %s: %s", dirPath, strerror(errno)); --- 39,47 ---- struct passwd *uentry = getpwnam(uname); ! if (makeAllDirs(dirPath)) { ! prints(tsiSocket, "#Cannot create subdirectory in path to %s: %s", ! dirPath, strerror(errno)); ! } ! else if (mkdir(dirPath, DEFAULT_DIR_ATTR)) { prints(tsiSocket, "#Cannot create directory %s: %s", dirPath, strerror(errno)); Index: fileio.c =================================================================== RCS file: /cvsroot/gpe4gtk/NativeTSI/c/src/fileio.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** fileio.c 19 Mar 2007 16:01:35 -0000 1.8 --- fileio.c 21 Mar 2007 11:21:36 -0000 1.9 *************** *** 9,12 **** --- 9,14 ---- #include "tsiprotocol.h" + #include "defaults.h" + #include "mkdir.h" #include "fileio.h" *************** *** 62,92 **** } - int makeAllDirs(char *path) { - char tmpPath[MAX_LINE_LENGTH]; - char *path_ptr = path; - char *tmp_ptr = tmpPath; - - if (*path_ptr == '/') { - *tmp_ptr = '/'; - path_ptr++; - tmp_ptr++; - } - - while (*path_ptr) { - if (*path_ptr == '/') { - *tmp_ptr = 0; - int code = mkdir(tmpPath, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH); - if (code != 0 && errno != EEXIST) { - return code; - } - } - *tmp_ptr = *path_ptr; - path_ptr++; - tmp_ptr++; - } - - return 0; - } - void putChunk(int tsiSocket) { if (readAndSetUID(tsiSocket)) { --- 64,67 ---- *************** *** 119,123 **** } ! int fd = open(path, O_WRONLY | O_CREAT, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH); if (fd == -1) { prints(tsiSocket, "#Cannot open file %s: %s", --- 94,98 ---- } ! int fd = open(path, O_WRONLY | O_CREAT, DEFAULT_FILE_ATTR); if (fd == -1) { prints(tsiSocket, "#Cannot open file %s: %s", --- NEW FILE: mkdir.c --- #include <stdio.h> #include <stdlib.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> #include <unistd.h> #include <string.h> #include <errno.h> #include "tsiprotocol.h" #include "defaults.h" #include "mkdir.h" int makeAllDirs(char *path) { char tmpPath[MAX_LINE_LENGTH]; char *path_ptr = path; char *tmp_ptr = tmpPath; if (*path_ptr == '/') { *tmp_ptr = '/'; path_ptr++; tmp_ptr++; } while (*path_ptr) { if (*path_ptr == '/') { *tmp_ptr = 0; int code = mkdir(tmpPath, DEFAULT_DIR_ATTR); if (code != 0 && errno != EEXIST) { return code; } } *tmp_ptr = *path_ptr; path_ptr++; tmp_ptr++; } return 0; } --- NEW FILE: defaults.h --- #ifndef DEFAULTS_H_ #define DEFAULTS_H_ #define DEFAULT_FILE_ATTR 0755 #define DEFAULT_DIR_ATTR 0755 #endif /*DEFAULTS_H_*/ |
|
From: Dmitry N. P. <dnp...@us...> - 2007-03-20 12:43:00
|
Update of /cvsroot/gpe4gtk/gpe4gtk/services/src/com/intel/gpe/services/tss/common/incarnations In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv8053/services/src/com/intel/gpe/services/tss/common/incarnations Modified Files: Template.java Log Message: make TSI log more useful Index: Template.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/services/src/com/intel/gpe/services/tss/common/incarnations/Template.java,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** Template.java 15 Sep 2006 14:06:29 -0000 1.31 --- Template.java 20 Mar 2007 12:41:06 -0000 1.32 *************** *** 26,29 **** --- 26,30 ---- import java.io.Serializable; import java.util.HashMap; + import java.util.logging.Level; import java.util.logging.Logger; import java.util.regex.Matcher; *************** *** 180,184 **** String incVariation = ir.getIncarnationVariation(); ! logger.info("Incarnating " + name + ":" + incVariation); Invocation inv = invocations.get(incVariation); --- 181,185 ---- String incVariation = ir.getIncarnationVariation(); ! logger.log(Level.FINE, "Incarnating " + name + ":" + incVariation); Invocation inv = invocations.get(incVariation); |
|
From: Dmitry N. P. <dnp...@us...> - 2007-03-20 09:43:37
|
Update of /cvsroot/gpe4gtk/gpe4gtk/services/src/com/intel/gpe/rmitsi In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17381/services/src/com/intel/gpe/rmitsi Modified Files: BaseTSI.java Log Message: make TSI log more useful Index: BaseTSI.java =================================================================== RCS file: /cvsroot/gpe4gtk/gpe4gtk/services/src/com/intel/gpe/rmitsi/BaseTSI.java,v retrieving revision 1.77 retrieving revision 1.78 diff -C2 -d -r1.77 -r1.78 *** BaseTSI.java 27 Feb 2007 10:50:22 -0000 1.77 --- BaseTSI.java 20 Mar 2007 08:54:19 -0000 1.78 *************** *** 131,138 **** String scriptFileName = scriptFile.getAbsolutePath(); - logger.info("Script file written to " + scriptFileName - + "\nScript content:\n" + content - ); - ir.setIncarnationName("CHANGE_OWNER"); ir.setIncarnationVariation(""); --- 131,134 ---- *************** *** 169,176 **** String scriptFileName = scriptFile.getAbsolutePath(); - logger.info("Script file written to " + scriptFileName - + "\nScript content:\n" + content - ); - ir.setIncarnationName("CHANGE_OWNER"); ir.setIncarnationVariation(""); --- 165,168 ---- *************** *** 201,206 **** } - logCommand(cmd); - java.lang.Process process = Runtime.getRuntime().exec(cmd); --- 193,196 ---- *************** *** 222,227 **** } - logCommand(cmd); - return Runtime.getRuntime().exec(cmd); } --- 212,215 ---- *************** *** 229,234 **** public int executeCommand(String[] cmd, String[] env, boolean failOnNonZero) throws Exception { - logCommand(cmd, env); - java.lang.Process process = Runtime.getRuntime().exec(cmd, env); --- 217,220 ---- *************** *** 244,269 **** public java.lang.Process invokeCommand(String[] cmd, String[] env) throws Exception { - logCommand(cmd, env); - return Runtime.getRuntime().exec(cmd, env); } - private void logCommand(String cmd) { - logger.info("Command: " + cmd); - } - - private void logCommand(String[] cmd, String[] env) { - StringBuffer message = new StringBuffer("System command:"); - for (String cmdI : cmd) { - message.append("\nArg: " + cmdI); - } - if (env != null) { - for (String envI : env) { - message.append("\nEnv: " + envI); - } - } - logger.info(message.toString()); - } - private int waitAndDestroy(java.lang.Process process) { int exitStatus = 0; --- 230,236 ---- *************** *** 329,340 **** } - logCommand(body); - return Runtime.getRuntime().exec(body, null, workingDir); } public java.lang.Process invokeCommand(String[] cmd, String[] env, java.io.File workingDir) throws Exception{ - logCommand(cmd, env); - return Runtime.getRuntime().exec(cmd, env, workingDir); } --- 296,303 ---- *************** *** 377,380 **** --- 340,345 ---- public FileInfo listFile(User u, File f) throws RemoteException { + logger.log(Level.INFO, u.getUserName() + ": listFile " + f.getPath()); + IncarnationRequest ir = new IncarnationRequest(); ir.setIncarnationName("LIST"); *************** *** 563,566 **** --- 528,533 ---- public long getFileSize(User u, File f) throws RemoteException { + logger.log(Level.INFO, u.getUserName() + ": getFileSize " + f.getPath()); + java.io.File file = new java.io.File(f.getPath()); return file.length(); *************** *** 596,599 **** --- 563,568 ---- public FileInfo[] listDir(User u, File f) throws RemoteException { + logger.log(Level.INFO, u.getUserName() + ": listDir " + f.getPath()); + IncarnationRequest ir = new IncarnationRequest(); ir.setIncarnationName("LIST"); *************** *** 790,793 **** --- 759,764 ---- public void createDir(User u, File f) throws RemoteException { + logger.log(Level.INFO, u.getUserName() + ": createDir " + f.getPath()); + IncarnationRequest ir = new IncarnationRequest(); ir.setIncarnationName("CREATE_DIR"); *************** *** 817,820 **** --- 788,793 ---- public void remove(User u, File f) throws RemoteException { + logger.log(Level.INFO, u.getUserName() + ": remove " + f.getPath()); + String fileType = getFileType(f); *************** *** 840,843 **** --- 813,819 ---- public void move(User u, File from, File to) throws RemoteException { + logger.log(Level.INFO, u.getUserName() + ": move " + from.getPath() + + " to " + to.getPath()); + IncarnationRequest ir = new IncarnationRequest(); ir.setIncarnationName("MOVE"); *************** *** 856,859 **** --- 832,838 ---- public void copy(User u, File from, File to) throws RemoteException { + logger.log(Level.INFO, u.getUserName() + ": copy " + from.getPath() + + " to " + to.getPath()); + IncarnationRequest ir = new IncarnationRequest(); ir.setIncarnationName("COPY"); *************** *** 872,875 **** --- 851,862 ---- public void setPermissions(User u, File f, FilePermissions p) throws RemoteException { + String rwx = ""; + rwx += p.isReadable() ? "r" : "-"; + rwx += p.isWritable() ? "w" : "-"; + rwx += p.isExecutable() ? "x" : "-"; + + logger.log(Level.INFO, u.getUserName() + ": setPermissions" + f.getPath() + + " permissions=" + rwx); + IncarnationRequest ir = new IncarnationRequest(); *************** *** 910,913 **** --- 897,903 ---- public void setOwner(User u, File f, User newOwner) throws RemoteException { + logger.log(Level.INFO, u.getUserName() + ": setOwner " + f.getPath() + + " newOwner=" + newOwner.getUserName()); + IncarnationRequest ir = new IncarnationRequest(); ir.setIncarnationName("CHANGE_OWNER"); *************** *** 926,929 **** --- 916,922 ---- public byte[] getChunk(User u, File f, long offset, int size) throws RemoteException { + logger.log(Level.INFO, u.getUserName() + ": getChunk " + f.getPath() + + " offset=" + offset + " size=" + size); + long fileSize; RandomAccessFile raf = null; *************** *** 969,973 **** public void putChunk(User u, File f, boolean overwrite, byte[] data, long offset, int size) throws RemoteException { ! try { logger.log(Level.INFO, "putChunk by user " --- 962,968 ---- public void putChunk(User u, File f, boolean overwrite, byte[] data, long offset, int size) throws RemoteException { ! logger.log(Level.INFO, u.getUserName() + ": putChunk " + f.getPath() ! + " offset=" + offset + " size=" + size); ! try { logger.log(Level.INFO, "putChunk by user " *************** *** 1002,1010 **** throws RemoteException { ! logger.log(Level.INFO, "truncAppend by user " ! + u.getUserName() + "." + u.getGroupName() ! + " for file " + f.getPath() ! + ", offset: " + startOffset ! + ", size: " + size); try { --- 997,1002 ---- throws RemoteException { ! logger.log(Level.INFO, u.getUserName() + ": truncAppend " + f.getPath() ! + " offset=" + startOffset + " size=" + size); try { *************** *** 1083,1086 **** --- 1075,1080 ---- String stdinName, String stdoutName, String stderrName, Map<String, String> submissionArguments) throws RemoteException { + logger.log(Level.INFO, u.getUserName() + ": start job"); + try { if (pcf==null) { *************** *** 1093,1096 **** --- 1087,1092 ---- Process p = new Process(uuid, stdinName, stdoutName, stderrName, workingDirectory.getPath()); + logger.log(Level.INFO, u.getUserName() + ": started job ID=" + uuid); + return p; } catch (Exception e) { *************** *** 1101,1104 **** --- 1097,1102 ---- public ProcessStatus getStatus(User u, Process p) throws RemoteException { + // logger.log(...) -- will quickly fill the log making it unreadable. + if (p==null || !processRepository.containsKey(p.getUuid())) return null; *************** *** 1115,1118 **** --- 1113,1118 ---- public void abort(User u, Process p) throws RemoteException { + logger.log(Level.INFO, u.getUserName() + ": abort " + p.getUuid()); + if (p==null || !processRepository.containsKey(p.getUuid())) return; *************** *** 1129,1132 **** --- 1129,1134 ---- public void hold(User u, Process p) throws RemoteException { + logger.log(Level.INFO, u.getUserName() + ": hold " + p.getUuid()); + if (p==null || !processRepository.containsKey(p.getUuid())) return; *************** *** 1143,1146 **** --- 1145,1150 ---- public void resume(User u, Process p) throws RemoteException { + logger.log(Level.INFO, u.getUserName() + ": resume " + p.getUuid()); + if (p==null || !processRepository.containsKey(p.getUuid())) return; *************** *** 1172,1175 **** --- 1176,1181 ---- public SystemStatus getSystemStatus() throws RemoteException{ + // logger.log(Level.INFO, "getSystemStatus"); -- another bad idea + if (noMonitoringSoftware) { throw new RemoteException("No performance monitoring software available on this system"); |
|
From: Dmitry N. P. <dnp...@us...> - 2007-03-19 16:54:37
|
Update of /cvsroot/gpe4gtk/NativeTSI/c/src In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv3900/c/src Modified Files: fileinfo.c Log Message: additional info on error Index: fileinfo.c =================================================================== RCS file: /cvsroot/gpe4gtk/NativeTSI/c/src/fileinfo.c,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** fileinfo.c 22 Feb 2007 14:09:07 -0000 1.15 --- fileinfo.c 19 Mar 2007 16:54:33 -0000 1.16 *************** *** 88,95 **** } else if (!testPermissions(&dirStat, S_IREAD)) { ! prints(tsiSocket, "#%s is not readable", path); } else if (!testPermissions(&dirStat, S_IEXEC)) { ! prints(tsiSocket, "#%s is not executable", path); } else { --- 88,97 ---- } else if (!testPermissions(&dirStat, S_IREAD)) { ! prints(tsiSocket, "#%s is not readable (mode=%o)", path, ! dirStat.st_mode & ACCESSPERMS); } else if (!testPermissions(&dirStat, S_IEXEC)) { ! prints(tsiSocket, "#%s is not executable (mode=%o)", path, ! dirStat.st_mode & ACCESSPERMS); } else { |
