simias-svn Mailing List for simias (Page 4)
Brought to you by:
srinidhi_bs
Menu
▾
▴
simias-svn
You can subscribe to this list here.
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2010 |
Jan
|
Feb
(16) |
Mar
(9) |
Apr
(20) |
May
(24) |
Jun
(30) |
Jul
(29) |
Aug
(47) |
Sep
(11) |
Oct
(5) |
Nov
(3) |
Dec
(1) |
| 2011 |
Jan
(5) |
Feb
(2) |
Mar
(6) |
Apr
(15) |
May
(3) |
Jun
(2) |
Jul
(2) |
Aug
(5) |
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
(1) |
Apr
(5) |
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
(6) |
Sep
(20) |
Oct
(5) |
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
(3) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(4) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <mv...@us...> - 2011-04-13 16:12:18
|
Revision: 7585
http://simias.svn.sourceforge.net/simias/?rev=7585&view=rev
Author: mvikash
Date: 2011-04-13 16:12:10 +0000 (Wed, 13 Apr 2011)
Log Message:
-----------
ID: #686231
Reviewer: GG
Localization Required: No
Documentation Required: No
Description:changes done to support client upgrade
Modified Paths:
--------------
trunk/src/server/Simias.ClientUpdate/ClientUpdate.asmx.cs
Modified: trunk/src/server/Simias.ClientUpdate/ClientUpdate.asmx.cs
===================================================================
--- trunk/src/server/Simias.ClientUpdate/ClientUpdate.asmx.cs 2011-04-13 16:09:23 UTC (rev 7584)
+++ trunk/src/server/Simias.ClientUpdate/ClientUpdate.asmx.cs 2011-04-13 16:12:10 UTC (rev 7585)
@@ -70,7 +70,7 @@
private static string[,] VersionCompatibilityTable = new string[,]{
{"1.0.1", "3.0", "3.4"},
- {"1.1.0", "3.7", "3.8"}
+ {"1.1.0", "3.7", "3.9"}
};
/// <summary>
/// Xml tags used to defined the version information in the version.config file.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2011-04-13 16:09:33
|
Revision: 7584
http://simias.svn.sourceforge.net/simias/?rev=7584&view=rev
Author: mvikash
Date: 2011-04-13 16:09:23 +0000 (Wed, 13 Apr 2011)
Log Message:
-----------
ID: #670529
Reviewer: GG
Localization Required: Yes
Documentation Required: No
Description:
Modified Paths:
--------------
trunk/src/admin/iFolderAdmin.resx
trunk/src/webaccess/iFolderWeb.resx
Modified: trunk/src/admin/iFolderAdmin.resx
===================================================================
--- trunk/src/admin/iFolderAdmin.resx 2011-04-13 15:56:56 UTC (rev 7583)
+++ trunk/src/admin/iFolderAdmin.resx 2011-04-13 16:09:23 UTC (rev 7584)
@@ -592,7 +592,7 @@
<value>Unable to connect to the iFolder server. Revoke sharing once the server is reachable.</value>
</data>
<data name="LOGINCOPYRIGHT">
- <value>&copy; Copyright 2010 Novell, Inc. All rights reserved.</value>
+ <value>&copy; Copyright 2011 Novell, Inc. All rights reserved.</value>
</data>
<data name="LOGINERROR">
<value>Error:</value>
Modified: trunk/src/webaccess/iFolderWeb.resx
===================================================================
--- trunk/src/webaccess/iFolderWeb.resx 2011-04-13 15:56:56 UTC (rev 7583)
+++ trunk/src/webaccess/iFolderWeb.resx 2011-04-13 16:09:23 UTC (rev 7584)
@@ -127,7 +127,7 @@
<value>Language:</value>
</data>
<data name="LOGIN.COPYRIGHT">
- <value>&copy; Copyright 2010 Novell, Inc. All rights reserved.</value>
+ <value>&copy; Copyright 2011 Novell, Inc. All rights reserved.</value>
</data>
<data name="LOGIN">
<value>Log In</value>
@@ -735,4 +735,7 @@
<data name="DIRECTORY">
<value>Directory</value>
</data>
+ <data name="UNSUPPORTEDCHAR">
+ <value>Special characters are not supported. For more details, contact your administrator.</value>
+ </data>
</root>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2011-04-13 15:57:03
|
Revision: 7583
http://simias.svn.sourceforge.net/simias/?rev=7583&view=rev
Author: mvikash
Date: 2011-04-13 15:56:56 +0000 (Wed, 13 Apr 2011)
Log Message:
-----------
ID:#670529
Reviewer:GG
Localization Required:No
Documentation Required:No
Description:Reverting previous wrong check-in 7582
Modified Paths:
--------------
branches/iFolder_3.8.4_updates/src/admin/iFolderAdmin.resx
branches/iFolder_3.8.4_updates/src/webaccess/iFolderWeb.resx
Modified: branches/iFolder_3.8.4_updates/src/admin/iFolderAdmin.resx
===================================================================
--- branches/iFolder_3.8.4_updates/src/admin/iFolderAdmin.resx 2011-04-13 15:50:04 UTC (rev 7582)
+++ branches/iFolder_3.8.4_updates/src/admin/iFolderAdmin.resx 2011-04-13 15:56:56 UTC (rev 7583)
@@ -592,7 +592,7 @@
<value>Unable to connect to the iFolder server. Revoke sharing once the server is reachable.</value>
</data>
<data name="LOGINCOPYRIGHT">
- <value>&copy; Copyright 2011 Novell, Inc. All rights reserved.</value>
+ <value>&copy; Copyright 2010 Novell, Inc. All rights reserved.</value>
</data>
<data name="LOGINERROR">
<value>Error:</value>
Modified: branches/iFolder_3.8.4_updates/src/webaccess/iFolderWeb.resx
===================================================================
--- branches/iFolder_3.8.4_updates/src/webaccess/iFolderWeb.resx 2011-04-13 15:50:04 UTC (rev 7582)
+++ branches/iFolder_3.8.4_updates/src/webaccess/iFolderWeb.resx 2011-04-13 15:56:56 UTC (rev 7583)
@@ -127,7 +127,7 @@
<value>Language:</value>
</data>
<data name="LOGIN.COPYRIGHT">
- <value>&copy; Copyright 2011 Novell, Inc. All rights reserved.</value>
+ <value>&copy; Copyright 2010 Novell, Inc. All rights reserved.</value>
</data>
<data name="LOGIN">
<value>Log In</value>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2011-04-13 15:50:13
|
Revision: 7582
http://simias.svn.sourceforge.net/simias/?rev=7582&view=rev
Author: mvikash
Date: 2011-04-13 15:50:04 +0000 (Wed, 13 Apr 2011)
Log Message:
-----------
ID:#670529
Reviewer:GG
Localization Required:Yes
Documentation Required:No
Description:
Modified Paths:
--------------
branches/iFolder_3.8.4_updates/src/admin/iFolderAdmin.resx
branches/iFolder_3.8.4_updates/src/webaccess/iFolderWeb.resx
Modified: branches/iFolder_3.8.4_updates/src/admin/iFolderAdmin.resx
===================================================================
--- branches/iFolder_3.8.4_updates/src/admin/iFolderAdmin.resx 2011-04-13 14:48:31 UTC (rev 7581)
+++ branches/iFolder_3.8.4_updates/src/admin/iFolderAdmin.resx 2011-04-13 15:50:04 UTC (rev 7582)
@@ -592,7 +592,7 @@
<value>Unable to connect to the iFolder server. Revoke sharing once the server is reachable.</value>
</data>
<data name="LOGINCOPYRIGHT">
- <value>&copy; Copyright 2010 Novell, Inc. All rights reserved.</value>
+ <value>&copy; Copyright 2011 Novell, Inc. All rights reserved.</value>
</data>
<data name="LOGINERROR">
<value>Error:</value>
Modified: branches/iFolder_3.8.4_updates/src/webaccess/iFolderWeb.resx
===================================================================
--- branches/iFolder_3.8.4_updates/src/webaccess/iFolderWeb.resx 2011-04-13 14:48:31 UTC (rev 7581)
+++ branches/iFolder_3.8.4_updates/src/webaccess/iFolderWeb.resx 2011-04-13 15:50:04 UTC (rev 7582)
@@ -127,7 +127,7 @@
<value>Language:</value>
</data>
<data name="LOGIN.COPYRIGHT">
- <value>&copy; Copyright 2010 Novell, Inc. All rights reserved.</value>
+ <value>&copy; Copyright 2011 Novell, Inc. All rights reserved.</value>
</data>
<data name="LOGIN">
<value>Log In</value>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spr...@us...> - 2011-04-13 14:48:44
|
Revision: 7581
http://simias.svn.sourceforge.net/simias/?rev=7581&view=rev
Author: spratima
Date: 2011-04-13 14:48:31 +0000 (Wed, 13 Apr 2011)
Log Message:
-----------
fix for bugs : 674934, 686531 - changes to add FlaimWrapper.so and delete novell-ifodler-mono
Modified Paths:
--------------
trunk/package/linux/ifolder3-enterprise.spec.autobuild
Modified: trunk/package/linux/ifolder3-enterprise.spec.autobuild
===================================================================
--- trunk/package/linux/ifolder3-enterprise.spec.autobuild 2011-03-30 14:59:49 UTC (rev 7580)
+++ trunk/package/linux/ifolder3-enterprise.spec.autobuild 2011-04-13 14:48:31 UTC (rev 7581)
@@ -20,6 +20,7 @@
Name: ifolder3-enterprise
BuildRequires: e2fsprogs e2fsprogs-devel gcc-c++ glib2 glib2-devel libflaim libflaim-devel libxml2 libxml2-devel log4net pkgconfig xsp ncurses ncurses-devel novell-NLDAPbase novell-NLDAPsdk-devel libstdc++ libstdc++-devel apache2-mod_mono-addon mono-addon-core mono-addon-data mono-addon-devel mono-addon-web
+Obsoletes: novell-ifolder-mono
%if %suse_version <= 1100
BuildRequires: compat-libstdc++
@@ -230,8 +231,8 @@
/etc/ld.so.conf.d/novell-ifolder3.conf
%attr(655,root,root) %{novellmandir}/man8/ifolder-data-recovery.8.gz
%ghost %{OES_LOG}/adminweb.log
+%{prefix}/%_lib/simias/web/bin/FlaimWrapper.so
-
%files devel
%defattr(644,root,root,755)
%{prefix}/%_lib/libsimias-manager.a
@@ -240,7 +241,6 @@
%dir %{prefix}/%_lib/simias/
%dir %{prefix}/%_lib/simias/web/
%dir %{prefix}/%_lib/simias/web/bin/
-%{prefix}/%_lib/simias/web/bin/FlaimWrapper.so
%{prefix}/%_lib/libsimias-event.so
%dir %{prefix}/%_lib/pkgconfig
%{prefix}/%_lib/pkgconfig/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2011-03-30 14:59:55
|
Revision: 7580
http://simias.svn.sourceforge.net/simias/?rev=7580&view=rev
Author: mvikash
Date: 2011-03-30 14:59:49 +0000 (Wed, 30 Mar 2011)
Log Message:
-----------
ID:#670853
Reviewer: GG
Localization Required: No
Documentation Required: No
Description: mono path corrected in ifolder_shutdown script.
Modified Paths:
--------------
trunk/src/server/setup/ifolder_shutdown
Modified: trunk/src/server/setup/ifolder_shutdown
===================================================================
--- trunk/src/server/setup/ifolder_shutdown 2011-03-23 15:52:37 UTC (rev 7579)
+++ trunk/src/server/setup/ifolder_shutdown 2011-03-30 14:59:49 UTC (rev 7580)
@@ -36,21 +36,21 @@
#*
#*******************************************************************************/
-if [ -f /opt/novell/ifolder3/mono/bin/mod-mono-server2 ]; then
+if [ -f /opt/novell/mono/bin/mod-mono-server2 ]; then
source /opt/novell/mono/bin/mono-addon-environment.sh
- /opt/novell/ifolder3/mono/bin/mod-mono-server2 --filename /tmp/mod_mono_server_simias10 --terminate
+ /opt/novell/mono/bin/mod-mono-server2 --filename /tmp/mod_mono_server_simias10 --terminate
- /opt/novell/ifolder3/mono/bin/mod-mono-server2 --filename /tmp/mod_mono_server_admin --terminate
+ /opt/novell/mono/bin/mod-mono-server2 --filename /tmp/mod_mono_server_admin --terminate
- /opt/novell/ifolder3/mono/bin/mod-mono-server2 --filename /tmp/mod_mono_server_ifolder --terminate
+ /opt/novell/mono/bin/mod-mono-server2 --filename /tmp/mod_mono_server_ifolder --terminate
for (( i = 0 ; i < 4; i++ ))
do
SimiasProcess=`ps -ef | grep -c mod_mono_server_simias1[0]`
if [ $SimiasProcess -gt 0 ]; then
sleep 5
- /opt/novell/ifolder3/mono/bin/mod-mono-server2 --filename /tmp/mod_mono_server_simias10 --terminate
+ /opt/novell/mono/bin/mod-mono-server2 --filename /tmp/mod_mono_server_simias10 --terminate
else
exit 0
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spr...@us...> - 2011-03-23 15:52:43
|
Revision: 7579
http://simias.svn.sourceforge.net/simias/?rev=7579&view=rev
Author: spratima
Date: 2011-03-23 15:52:37 +0000 (Wed, 23 Mar 2011)
Log Message:
-----------
Changes has been done to spec files to include all the 'so' files instead of 'so.' files
Modified Paths:
--------------
trunk/package/linux/ifolder3-enterprise.spec.autobuild
Modified: trunk/package/linux/ifolder3-enterprise.spec.autobuild
===================================================================
--- trunk/package/linux/ifolder3-enterprise.spec.autobuild 2011-03-17 12:16:39 UTC (rev 7578)
+++ trunk/package/linux/ifolder3-enterprise.spec.autobuild 2011-03-23 15:52:37 UTC (rev 7579)
@@ -178,7 +178,7 @@
%{prefix}/etc/simias/Simias.config
%{prefix}/etc/simias/Simias.log4net
%dir %{prefix}/%_lib
-%{prefix}/%_lib/*.so.*
+%{prefix}/%_lib/*.so*
#%{prefix}/%_lib/*
%dir %{prefix}/share
%{prefix}/share/*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2011-03-17 12:16:46
|
Revision: 7578
http://simias.svn.sourceforge.net/simias/?rev=7578&view=rev
Author: mvikash
Date: 2011-03-17 12:16:39 +0000 (Thu, 17 Mar 2011)
Log Message:
-----------
ID:#675485
Reviewer: GG
Localization Required: No
Documentation Required: No
Description: version bump
Modified Paths:
--------------
trunk/configure.in
trunk/package/linux/ifolder3-enterprise.spec.autobuild
trunk/package/linux/ifolder3-enterprise.spec.in
trunk/package/linux/simias.spec.autobuild
trunk/package/linux/simias.spec.in
trunk/src/core/FlaimProvider/FlaimWrapper/FlaimWrapper.vcproj
trunk/src/core/POBoxWS/Properties/AssemblyInfo.cs
trunk/src/core/Properties/AssemblyInfo.cs
trunk/src/core/SimiasApp/Properties/AssemblyInfo.cs
trunk/src/core/SimiasClient/Properties/AssemblyInfo.cs
trunk/src/core/SyncService/Properties/AssemblyInfo.cs
trunk/src/core/WebService/Properties/AssemblyInfo.cs
trunk/src/server/Simias.ClientUpdate/mac-version.config
trunk/src/server/Simias.ClientUpdate/unix-version.config
trunk/src/server/Simias.ClientUpdate/version.config
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2011-03-16 11:47:37 UTC (rev 7577)
+++ trunk/configure.in 2011-03-17 12:16:39 UTC (rev 7578)
@@ -1,11 +1,11 @@
AC_INIT(./src/core/Common/Configuration.cs)
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(simias, 1.8)
+AM_INIT_AUTOMAKE(simias, 1.9)
# Check to see if the BUILDNUM is set by global build
#if test "$BUILDNUM" = ""; then
# let "BUILDNUM=`date +%G%j`-2000000"
#fi
-ASSEMBLY_VERSION=5
+ASSEMBLY_VERSION=0
VERSION=$VERSION.$ASSEMBLY_VERSION.0
AM_MAINTAINER_MODE
AC_PROG_CC
Modified: trunk/package/linux/ifolder3-enterprise.spec.autobuild
===================================================================
--- trunk/package/linux/ifolder3-enterprise.spec.autobuild 2011-03-16 11:47:37 UTC (rev 7577)
+++ trunk/package/linux/ifolder3-enterprise.spec.autobuild 2011-03-17 12:16:39 UTC (rev 7578)
@@ -49,7 +49,7 @@
Requires: apache2-mod_mono-addon
Requires: novell-NLDAPbase
#Obsoletes: %{name} < %{version}
-Version: 3.8.4.@@BUILDNUM@@.1
+Version: 3.9.0.@@BUILDNUM@@.0
Release: 0.2
Summary: Novell iFolder 3 Enterprise
Source: ifolder3-enterprise.tar.gz
Modified: trunk/package/linux/ifolder3-enterprise.spec.in
===================================================================
--- trunk/package/linux/ifolder3-enterprise.spec.in 2011-03-16 11:47:37 UTC (rev 7577)
+++ trunk/package/linux/ifolder3-enterprise.spec.in 2011-03-17 12:16:39 UTC (rev 7578)
@@ -42,7 +42,7 @@
Requires: mono-web >= 2.4.2.3
Requires: log4net >= 1.2.10
Requires: apache2-mod_mono >= 2.4
-Version: 3.8.4.@@BUILDNUM@@.1
+Version: 3.9.0.@@BUILDNUM@@.0
Release: 0.2
Summary: Novell iFolder 3 Enterprise
Source: ifolder3-enterprise.tar.gz
Modified: trunk/package/linux/simias.spec.autobuild
===================================================================
--- trunk/package/linux/simias.spec.autobuild 2011-03-16 11:47:37 UTC (rev 7577)
+++ trunk/package/linux/simias.spec.autobuild 2011-03-17 12:16:39 UTC (rev 7578)
@@ -44,7 +44,7 @@
Requires: log4net >= 1.2.9
Requires: xsp >= 1.2.5
#Obsoletes: %{name} < %{version}
-Version: 1.8.5.@@BUILDNUM@@.1
+Version: 1.9.0.@@BUILDNUM@@.0
Release: 0.3
Summary: Collection-Oriented Data Storage
Vendor: Novell, Inc.
Modified: trunk/package/linux/simias.spec.in
===================================================================
--- trunk/package/linux/simias.spec.in 2011-03-16 11:47:37 UTC (rev 7577)
+++ trunk/package/linux/simias.spec.in 2011-03-17 12:16:39 UTC (rev 7578)
@@ -38,7 +38,7 @@
Requires: log4net >= 1.2.9
Requires: xsp >= 1.2.5
#Obsoletes: %{name} < 1.8.2.@@BUILDNUM@@.1
-Version: 1.8.5.@@BUILDNUM@@.1
+Version: 1.9.0.@@BUILDNUM@@.0
Release: 0.3
Summary: Collection-Oriented Data Storage
Source: simias.tar.gz
Modified: trunk/src/core/FlaimProvider/FlaimWrapper/FlaimWrapper.vcproj
===================================================================
--- trunk/src/core/FlaimProvider/FlaimWrapper/FlaimWrapper.vcproj 2011-03-16 11:47:37 UTC (rev 7577)
+++ trunk/src/core/FlaimProvider/FlaimWrapper/FlaimWrapper.vcproj 2011-03-17 12:16:39 UTC (rev 7578)
@@ -84,7 +84,7 @@
Name="VCLinkerTool"
AdditionalDependencies="rpcrt4.lib ws2_32.lib odbc32.lib odbccp32.lib flaim.lib msvcrt.lib"
OutputFile=".\Release/FlaimWrapper.dll"
- Version="3.8.4.0"
+ Version="3.9.0.0"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""$(SolutionDir)..\..\dependencies\external\libflaim\win32""
@@ -186,7 +186,7 @@
Name="VCLinkerTool"
AdditionalDependencies="rpcrt4.lib ws2_32.lib odbc32.lib odbccp32.lib dbghelp.lib flaim.lib flaimtk.lib msvcrt.lib"
OutputFile=".\Release/FlaimWrapper.dll"
- Version="3.8.4.0"
+ Version="3.9.0.0"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""$(SolutionDir)..\..\dependencies\external\libflaim\win64""
Modified: trunk/src/core/POBoxWS/Properties/AssemblyInfo.cs
===================================================================
--- trunk/src/core/POBoxWS/Properties/AssemblyInfo.cs 2011-03-16 11:47:37 UTC (rev 7577)
+++ trunk/src/core/POBoxWS/Properties/AssemblyInfo.cs 2011-03-17 12:16:39 UTC (rev 7578)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.4.0")]
-[assembly: AssemblyFileVersion("3.8.4.0")]
+[assembly: AssemblyVersion("3.9.0.0")]
+[assembly: AssemblyFileVersion("3.9.0.0")]
Modified: trunk/src/core/Properties/AssemblyInfo.cs
===================================================================
--- trunk/src/core/Properties/AssemblyInfo.cs 2011-03-16 11:47:37 UTC (rev 7577)
+++ trunk/src/core/Properties/AssemblyInfo.cs 2011-03-17 12:16:39 UTC (rev 7578)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.4.0")]
-[assembly: AssemblyFileVersion("3.8.4.0")]
+[assembly: AssemblyVersion("3.9.0.0")]
+[assembly: AssemblyFileVersion("3.9.0.0")]
Modified: trunk/src/core/SimiasApp/Properties/AssemblyInfo.cs
===================================================================
--- trunk/src/core/SimiasApp/Properties/AssemblyInfo.cs 2011-03-16 11:47:37 UTC (rev 7577)
+++ trunk/src/core/SimiasApp/Properties/AssemblyInfo.cs 2011-03-17 12:16:39 UTC (rev 7578)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.4.0")]
-[assembly: AssemblyFileVersion("3.8.4.0")]
+[assembly: AssemblyVersion("3.9.0.0")]
+[assembly: AssemblyFileVersion("3.9.0.0")]
Modified: trunk/src/core/SimiasClient/Properties/AssemblyInfo.cs
===================================================================
--- trunk/src/core/SimiasClient/Properties/AssemblyInfo.cs 2011-03-16 11:47:37 UTC (rev 7577)
+++ trunk/src/core/SimiasClient/Properties/AssemblyInfo.cs 2011-03-17 12:16:39 UTC (rev 7578)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.4.0")]
-[assembly: AssemblyFileVersion("3.8.4.0")]
+[assembly: AssemblyVersion("3.9.0.0")]
+[assembly: AssemblyFileVersion("3.9.0.0")]
Modified: trunk/src/core/SyncService/Properties/AssemblyInfo.cs
===================================================================
--- trunk/src/core/SyncService/Properties/AssemblyInfo.cs 2011-03-16 11:47:37 UTC (rev 7577)
+++ trunk/src/core/SyncService/Properties/AssemblyInfo.cs 2011-03-17 12:16:39 UTC (rev 7578)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.4.0")]
-[assembly: AssemblyFileVersion("3.8.4.0")]
+[assembly: AssemblyVersion("3.9.0.0")]
+[assembly: AssemblyFileVersion("3.9.0.0")]
Modified: trunk/src/core/WebService/Properties/AssemblyInfo.cs
===================================================================
--- trunk/src/core/WebService/Properties/AssemblyInfo.cs 2011-03-16 11:47:37 UTC (rev 7577)
+++ trunk/src/core/WebService/Properties/AssemblyInfo.cs 2011-03-17 12:16:39 UTC (rev 7578)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.4.0")]
-[assembly: AssemblyFileVersion("3.8.4.0")]
+[assembly: AssemblyVersion("3.9.0.0")]
+[assembly: AssemblyFileVersion("3.9.0.0")]
Modified: trunk/src/server/Simias.ClientUpdate/mac-version.config
===================================================================
--- trunk/src/server/Simias.ClientUpdate/mac-version.config 2011-03-16 11:47:37 UTC (rev 7577)
+++ trunk/src/server/Simias.ClientUpdate/mac-version.config 2011-03-17 12:16:39 UTC (rev 7578)
@@ -7,7 +7,7 @@
<!-- Put Version string here. Should be in the format of
Major Version.Minor Version.Build Version.Revision
Example: <version>1.0.1817.29628</version> -->
- <version>3.8.4.0</version>
+ <version>3.9.0.0</version>
<!-- Put name of Mac ifolder client application file
to be upgraded here. The specified file must be in
Modified: trunk/src/server/Simias.ClientUpdate/unix-version.config
===================================================================
--- trunk/src/server/Simias.ClientUpdate/unix-version.config 2011-03-16 11:47:37 UTC (rev 7577)
+++ trunk/src/server/Simias.ClientUpdate/unix-version.config 2011-03-17 12:16:39 UTC (rev 7578)
@@ -24,7 +24,7 @@
you are doing.
-->
<distribution match="DEFAULT">
- <version>3.8.4.0</version>
+ <version>3.9.0.0</version>
<download-directory>default</download-directory>
</distribution>
@@ -51,17 +51,17 @@
-->
<distribution match="SUSE Linux Enterprise Desktop 10">
- <version>3.8.4.0</version>
+ <version>3.9.0.0</version>
<download-directory>suse-linux-10.0</download-directory>
</distribution>
<distribution match="SUSE Linux Enterprise Desktop 11">
- <version>3.8.4.0</version>
+ <version>3.9.0.0</version>
<download-directory>suse-linux-11.0</download-directory>
</distribution>
<distribution match="openSUSE">
- <version>3.8.4.0</version>
+ <version>3.9.0.0</version>
<download-directory>opensuse-linux</download-directory>
</distribution>
Modified: trunk/src/server/Simias.ClientUpdate/version.config
===================================================================
--- trunk/src/server/Simias.ClientUpdate/version.config 2011-03-16 11:47:37 UTC (rev 7577)
+++ trunk/src/server/Simias.ClientUpdate/version.config 2011-03-17 12:16:39 UTC (rev 7578)
@@ -4,15 +4,15 @@
with the one specified here by 'filename'. -->
<versioninfo>
<distribution match="windows32">
- <version>3.8.4.0</version>
+ <version>3.9.0.0</version>
<filename>ifolder3-windows.exe</filename>
</distribution>
<distribution match="windows64">
- <version>3.8.4.0</version>
+ <version>3.9.0.0</version>
<filename>ifolder3-windows-x64.exe</filename>
</distribution>
<distribution match="DEFAULT">
- <version>3.8.4.0</version>
+ <version>3.9.0.0</version>
<filename>ifolder3-windows.exe</filename>
</distribution>
</versioninfo>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2011-03-16 11:47:43
|
Revision: 7577
http://simias.svn.sourceforge.net/simias/?rev=7577&view=rev
Author: mvikash
Date: 2011-03-16 11:47:37 +0000 (Wed, 16 Mar 2011)
Log Message:
-----------
ID:#678861
Reviewer: Ramesh
Localization Required: No
Documentation Required: No
Description: Changes done to pass encoded crdentials.
Modified Paths:
--------------
trunk/src/utils/restore/iFolderServer.cs
Modified: trunk/src/utils/restore/iFolderServer.cs
===================================================================
--- trunk/src/utils/restore/iFolderServer.cs 2011-03-09 08:17:36 UTC (rev 7576)
+++ trunk/src/utils/restore/iFolderServer.cs 2011-03-16 11:47:37 UTC (rev 7577)
@@ -215,7 +215,7 @@
adminNameForAuth = Convert.ToBase64String(EncodedCredInByte);
EncodedCredInByte = utf8Name.GetBytes(adminPassword);
adminPasswordForAuth = Convert.ToBase64String(EncodedCredInByte);
- web.Credentials = new NetworkCredential(this.adminNameForAuth, this.adminPasswordForAuth);
+ web.Credentials = new NetworkCredential(this.adminNameForAuth, this.adminPasswordForAuth);
if( !this.CheckCredentials() )
{
@@ -2482,8 +2482,8 @@
{
MainClass.DebugLog.Write(string.Format("url: {0}", OldServerUrl));
string url = OldServerUrl+"/Simias.asmx";
- string adminname = oldserver.adminName;
- string adminpassword = oldserver.adminPassword;
+ string adminname = oldserver.adminNameForAuth;
+ string adminpassword = oldserver.adminPasswordForAuth;
MainClass.DebugLog.Write(string.Format("Url: {0} relativepath: {1} oldpath: {2} ", url, relativepath, oldpath));
retval = newserver.RestoreiFolderData(url, adminname, adminpassword, ifolderid, relativepath, oldpath, startindex);
if( retval != 0)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2011-03-09 08:17:42
|
Revision: 7576
http://simias.svn.sourceforge.net/simias/?rev=7576&view=rev
Author: mvikash
Date: 2011-03-09 08:17:36 +0000 (Wed, 09 Mar 2011)
Log Message:
-----------
ID:#672361
Reviewer: Ramesh/GG
Localization Required: No
Documentation Required: No
Description: Changes done to update the mono-addon script path and rpm
name.
Modified Paths:
--------------
trunk/src/utils/restore/ifolder-data-recovery.in
Modified: trunk/src/utils/restore/ifolder-data-recovery.in
===================================================================
--- trunk/src/utils/restore/ifolder-data-recovery.in 2011-03-01 11:24:49 UTC (rev 7575)
+++ trunk/src/utils/restore/ifolder-data-recovery.in 2011-03-09 08:17:36 UTC (rev 7576)
@@ -38,7 +38,7 @@
then
export OS_ARCH=`uname -m`
fi
-rpm -q mono-core-addon > /dev/null 2>&1
+rpm -q mono-addon-core > /dev/null 2>&1
if [ $? -gt 0 ]
then
@@ -49,7 +49,7 @@
else
MONO_RUNTIME_PATH=/opt/novell/mono
export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@
- source $MONO_RUNTIME_PATH/bin/novell-ifolder-mono-environment.sh
+ source $MONO_RUNTIME_PATH/bin/mono-addon-environment.sh
export MONO_CFG_DIR=/etc
export IFOLDER_MOD_MONO_SERVER2_PATH=@_bindir_@
export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2011-03-01 11:24:56
|
Revision: 7575
http://simias.svn.sourceforge.net/simias/?rev=7575&view=rev
Author: mvikash
Date: 2011-03-01 11:24:49 +0000 (Tue, 01 Mar 2011)
Log Message:
-----------
ID:#672361
Reviewer: GG
Localization Required: No
Documentation Required: No
Description: Changes done to include mono-addon-wcf dependency.
Modified Paths:
--------------
trunk/package/linux/ifolder3-enterprise.spec.autobuild
Modified: trunk/package/linux/ifolder3-enterprise.spec.autobuild
===================================================================
--- trunk/package/linux/ifolder3-enterprise.spec.autobuild 2011-02-28 10:03:32 UTC (rev 7574)
+++ trunk/package/linux/ifolder3-enterprise.spec.autobuild 2011-03-01 11:24:49 UTC (rev 7575)
@@ -44,6 +44,7 @@
Requires: mono-addon-core >= 2.6.7
Requires: mono-addon-data >= 2.6.7
Requires: mono-addon-web >= 2.6.7
+Requires: mono-addon-wcf >= 2.6.7
Requires: log4net >= 1.2.10
Requires: apache2-mod_mono-addon
Requires: novell-NLDAPbase
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2011-02-28 10:03:38
|
Revision: 7574
http://simias.svn.sourceforge.net/simias/?rev=7574&view=rev
Author: jshaju
Date: 2011-02-28 10:03:32 +0000 (Mon, 28 Feb 2011)
Log Message:
-----------
ID: bug#675485
Reviewer: shilpa
Localization Required: Yes
Documentation Required: Yes
Description: Updated the version of ifolder to 3.9
Modified Paths:
--------------
trunk/src/admin/help/en/imgr_legalnotices.html
Property Changed:
----------------
trunk/src/admin/help/en/
Property changes on: trunk/src/admin/help/en
___________________________________________________________________
Modified: tsvn:logtemplate
- ID:
Reviewer:
Localization Required: No
Documentation Required: No
Description:
+ ID:
Reviewer:
Localization Required: No
Documentation Required: No
Description:
Modified: trunk/src/admin/help/en/imgr_legalnotices.html
===================================================================
--- trunk/src/admin/help/en/imgr_legalnotices.html 2011-02-28 07:27:26 UTC (rev 7573)
+++ trunk/src/admin/help/en/imgr_legalnotices.html 2011-02-28 10:03:32 UTC (rev 7574)
@@ -76,7 +76,7 @@
Novell software. Novell assumes no responsibility for your failure to obtain
any necessary export approvals.</p>
<h3>Copyright</h3>
- <p>Copyright © 2010 Novell, Inc. All rights reserved. No part of this
+ <p>Copyright © 2011 Novell, Inc. All rights reserved. No part of this
publication may be reproduced, photocopied, stored on a retrieval system,
or transmitted without the express written consent of the publisher.</p>
<h3> </h3>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2011-02-23 12:21:33
|
Revision: 7570
http://simias.svn.sourceforge.net/simias/?rev=7570&view=rev
Author: mvikash
Date: 2011-02-23 12:21:26 +0000 (Wed, 23 Feb 2011)
Log Message:
-----------
ID:#672361
Reviewer: Ramesh/GG
Localization Required: No
Documentation Required: No
Description: Changes done to include log4net path for restore tool.
Modified Paths:
--------------
trunk/src/server/simias-server.in
Modified: trunk/src/server/simias-server.in
===================================================================
--- trunk/src/server/simias-server.in 2011-02-23 06:30:48 UTC (rev 7569)
+++ trunk/src/server/simias-server.in 2011-02-23 12:21:26 UTC (rev 7570)
@@ -36,7 +36,7 @@
#*
#*******************************************************************************/
-export MONO_PATH=@_webbindir_@:$MONO_PATH
+export MONO_PATH=@_webbindir_@:/usr/lib/mono/:$MONO_PATH
if [ "${OSTYPE:0:6}" == "darwin" ]
then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2011-01-28 13:28:47
|
Revision: 7567
http://simias.svn.sourceforge.net/simias/?rev=7567&view=rev
Author: hegdegg
Date: 2011-01-28 13:28:41 +0000 (Fri, 28 Jan 2011)
Log Message:
-----------
ID:#664946
Reviewer: Srinidhi
Localization Required: No
Documentation Required: No
Description: Created the missing link for FlaimWrapper.so
Modified Paths:
--------------
trunk/package/linux/ifolder3-enterprise.spec.autobuild
trunk/src/server/setup/ifolder-mod-mono-server2.in
Modified: trunk/package/linux/ifolder3-enterprise.spec.autobuild
===================================================================
--- trunk/package/linux/ifolder3-enterprise.spec.autobuild 2011-01-27 16:09:54 UTC (rev 7566)
+++ trunk/package/linux/ifolder3-enterprise.spec.autobuild 2011-01-28 13:28:41 UTC (rev 7567)
@@ -133,7 +133,7 @@
%{prefix}/%_lib/simias/web/update/windows/ifolder3-windows-x64.exe
ln -sf /srv/www/novell/clients/ifolder3/ifolder3-mac.dmg \
%{prefix}/%_lib/simias/web/update/mac/ifolder3-mac.dmg
-
+ln -sf %{prefix}/%_lib/libFlaimWrapper.so.0 %{prefix}/%_lib/simias/web/bin/FlaimWrapper.so
# Set LD_LIBRARY_PATH
grep -q "include /etc/ld.so.conf.d/\*.conf" /etc/ld.so.conf || \
echo "include /etc/ld.so.conf.d/*.conf" >> /etc/ld.so.conf
Modified: trunk/src/server/setup/ifolder-mod-mono-server2.in
===================================================================
--- trunk/src/server/setup/ifolder-mod-mono-server2.in 2011-01-27 16:09:54 UTC (rev 7566)
+++ trunk/src/server/setup/ifolder-mod-mono-server2.in 2011-01-28 13:28:41 UTC (rev 7567)
@@ -36,7 +36,7 @@
#*
#*******************************************************************************/
-export MONO_PATH=/opt/novell/mono/lib/mono/2.0/:@_bindir_@/../lib:@_bindir_@/../lib/simias/web/bin:@_bindir_@/../lib/simias/admin/bin:@_bindir_@/../lib/simias/webaccess/bin
+export MONO_PATH=/opt/novell/mono/lib/mono/2.0/:@_bindir_@/../lib:@_bindir_@/../lib/simias/web/bin:@_bindir_@/../lib/simias/admin/bin:@_bindir_@/../lib/simias/webaccess/bin:/usr/lib/mono/log4net
source /opt/novell/mono/bin/mono-addon-environment.sh
export MONO_CFG_DIR=/etc
exec /opt/novell/mono/bin/mod-mono-server2 "$@"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2011-01-27 16:10:01
|
Revision: 7566
http://simias.svn.sourceforge.net/simias/?rev=7566&view=rev
Author: hegdegg
Date: 2011-01-27 16:09:54 +0000 (Thu, 27 Jan 2011)
Log Message:
-----------
ID:#000
Reviewer: Vikash Mehta
Localization Required: No
Documentation Required: No
Description: Update for script files for using mono-addon
Modified Paths:
--------------
trunk/src/server/setup/iFolder_retrieve_proxy_creds.in
trunk/src/server/setup/ifolder-admin-setup.in
trunk/src/server/setup/ifolder-web-setup.in
trunk/src/server/setup/simias-server-setup.in
trunk/src/utils/restore/ifolder-data-recovery.in
Modified: trunk/src/server/setup/iFolder_retrieve_proxy_creds.in
===================================================================
--- trunk/src/server/setup/iFolder_retrieve_proxy_creds.in 2011-01-27 12:36:19 UTC (rev 7565)
+++ trunk/src/server/setup/iFolder_retrieve_proxy_creds.in 2011-01-27 16:09:54 UTC (rev 7566)
@@ -79,7 +79,7 @@
source $MONO_RUNTIME_PATH/bin/mono-addon-environment.sh
export MONO_CFG_DIR=/etc
export IFOLDER_MOD_MONO_SERVER2_PATH=@_bindir_@
- export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH
+ #export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH
cd @_bindir_@
MONO_CMD=$MONO_RUNTIME_PATH/bin/mono
fi
Modified: trunk/src/server/setup/ifolder-admin-setup.in
===================================================================
--- trunk/src/server/setup/ifolder-admin-setup.in 2011-01-27 12:36:19 UTC (rev 7565)
+++ trunk/src/server/setup/ifolder-admin-setup.in 2011-01-27 16:09:54 UTC (rev 7566)
@@ -54,11 +54,11 @@
mono @_bindir_@/iFolderAdminSetup.exe "$@"
else
MONO_RUNTIME_PATH=/opt/novell/mono
- export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@
+ export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@:/usr/lib/mono/log4net
source $MONO_RUNTIME_PATH/bin/mono-addon-environment.sh
export MONO_CFG_DIR=/etc
export IFOLDER_MOD_MONO_SERVER2_PATH=@_bindir_@
- export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH
+ #export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH
cd @_bindir_@
$MONO_RUNTIME_PATH/bin/mono @_bindir_@/iFolderAdminSetup.exe "$@"
Modified: trunk/src/server/setup/ifolder-web-setup.in
===================================================================
--- trunk/src/server/setup/ifolder-web-setup.in 2011-01-27 12:36:19 UTC (rev 7565)
+++ trunk/src/server/setup/ifolder-web-setup.in 2011-01-27 16:09:54 UTC (rev 7566)
@@ -56,11 +56,11 @@
else
MONO_RUNTIME_PATH=/opt/novell/mono
- export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@
+ export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@:/usr/lib/mono/log4net
source $MONO_RUNTIME_PATH/bin/mono-addon-environment.sh
export MONO_CFG_DIR=/etc
export IFOLDER_MOD_MONO_SERVER2_PATH=@_bindir_@
- export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH
+ #export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH
cd @_bindir_@
$MONO_RUNTIME_PATH/bin/mono @_bindir_@/iFolderWebSetup.exe "$@"
Modified: trunk/src/server/setup/simias-server-setup.in
===================================================================
--- trunk/src/server/setup/simias-server-setup.in 2011-01-27 12:36:19 UTC (rev 7565)
+++ trunk/src/server/setup/simias-server-setup.in 2011-01-27 16:09:54 UTC (rev 7566)
@@ -54,11 +54,11 @@
else
MONO_RUNTIME_PATH=/opt/novell/mono
- export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@
+ export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@:/usr/lib/mono/log4net
source $MONO_RUNTIME_PATH/bin/mono-addon-environment.sh
export MONO_CFG_DIR=/etc
export IFOLDER_MOD_MONO_SERVER2_PATH=@_bindir_@
- export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH
+ #export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH
cd @_bindir_@
$MONO_RUNTIME_PATH/bin/mono @_bindir_@/SimiasServerSetup.exe "$@"
Modified: trunk/src/utils/restore/ifolder-data-recovery.in
===================================================================
--- trunk/src/utils/restore/ifolder-data-recovery.in 2011-01-27 12:36:19 UTC (rev 7565)
+++ trunk/src/utils/restore/ifolder-data-recovery.in 2011-01-27 16:09:54 UTC (rev 7566)
@@ -47,7 +47,7 @@
export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:@_webbindir_@
cd @_bindir_@
else
- MONO_RUNTIME_PATH=/opt/novell/bin
+ MONO_RUNTIME_PATH=/opt/novell/mono
export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@
source $MONO_RUNTIME_PATH/bin/novell-ifolder-mono-environment.sh
export MONO_CFG_DIR=/etc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2011-01-27 12:36:30
|
Revision: 7565
http://simias.svn.sourceforge.net/simias/?rev=7565&view=rev
Author: mvikash
Date: 2011-01-27 12:36:19 +0000 (Thu, 27 Jan 2011)
Log Message:
-----------
ID:#667616
Reviewer: GG
Localization Required: No
Documentation Required: No
Description: Warning removal
Modified Paths:
--------------
trunk/src/core/CollectionStore/BaseFileNode.cs
trunk/src/core/CollectionStore/Collection.cs
trunk/src/core/CollectionStore/CryptoKey.cs
trunk/src/core/CollectionStore/Domain.cs
trunk/src/core/CollectionStore/HostNode.cs
trunk/src/core/CollectionStore/ICSEnumerator.cs
trunk/src/core/CollectionStore/Identity.cs
trunk/src/core/CollectionStore/Member.cs
trunk/src/core/CollectionStore/Policy.cs
trunk/src/core/CollectionStore/PropertyList.cs
trunk/src/core/CollectionStore/Store.cs
trunk/src/core/Common/CertificateStore.cs
trunk/src/core/Common/Configuration.cs
trunk/src/core/Common/SimiasLog.cs
trunk/src/core/Common/WebState.cs
trunk/src/core/Discovery/Discovery.cs
trunk/src/core/Discovery/DiscoveryFramework.cs
trunk/src/core/Domain/DomainAgent.cs
trunk/src/core/Domain/WSInspection.cs
trunk/src/core/DomainProvider/DomainProvider.cs
trunk/src/core/DomainProvider/EnterpriseProvider.cs
trunk/src/core/DomainProvider/LocalProvider.cs
trunk/src/core/Encryption/Blowfish.cs
trunk/src/core/FlaimProvider/FlaimResultSet.cs
trunk/src/core/FlaimProvider/FlaimServer.cs
trunk/src/core/HttpAuthentication/AuthHandler.cs
trunk/src/core/HttpAuthentication/HttpAuth.cs
trunk/src/core/HttpAuthentication/IAuthService.cs
trunk/src/core/Journal/Journal.cs
trunk/src/core/POBox/POBox.cs
trunk/src/core/Policy/SecurityState.cs
trunk/src/core/Policy/Sharing.cs
trunk/src/core/Service/IThreadService.cs
trunk/src/core/Simias.Web/SharedCollection.cs
trunk/src/core/Simias.Web/SimiasBrowser.asmx.cs
trunk/src/core/SimiasClient/SimiasService.cs
trunk/src/core/Storage/PropertyTags.cs
trunk/src/core/StoreProvider/IResultSet.cs
trunk/src/core/Sync/ClientFile.cs
trunk/src/core/Sync/FileMonitor.cs
trunk/src/core/Sync/HashMap.cs
trunk/src/core/Sync/Http.cs
trunk/src/core/Sync/StartSyncInfo.cs
trunk/src/core/Sync/StreamStream.cs
trunk/src/core/Sync/StrongWeakHashtable.cs
trunk/src/core/Sync/SyncClient.cs
trunk/src/core/Sync/SyncFile.cs
trunk/src/core/Sync/SyncNode.cs
trunk/src/core/Sync/SyncPolicy.cs
trunk/src/core/Sync/SyncService.cs
trunk/src/core/WebService/Global.asax.cs
trunk/src/core/WebService/Simias.asmx.cs
Modified: trunk/src/core/CollectionStore/BaseFileNode.cs
===================================================================
--- trunk/src/core/CollectionStore/BaseFileNode.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/CollectionStore/BaseFileNode.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -315,6 +315,12 @@
return infoChanged;
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="collection"></param>
+ /// <param name="length"></param>
+ /// <returns></returns>
public bool UpdateWebFileInfo( Collection collection, long length)
{
bool infoChanged = false;
Modified: trunk/src/core/CollectionStore/Collection.cs
===================================================================
--- trunk/src/core/CollectionStore/Collection.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/CollectionStore/Collection.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -61,14 +61,32 @@
/// </summary>
public enum SecurityStatus : int
{
+ /// <summary>
+ ///
+ /// </summary>
Encryption = 0x0001,
+ /// <summary>
+ ///
+ /// </summary>
SSL = 0x0002,
+ /// <summary>
+ ///
+ /// </summary>
UNSET = 0x0000
};
+ /// <summary>
+ ///
+ /// </summary>
public enum SecurityStatusMask : int
{
+ /// <summary>
+ ///
+ /// </summary>
Encryption = 0x0001, // yet to be set
+ /// <summary>
+ ///
+ /// </summary>
SSL = 0xfffd
};
@@ -77,28 +95,50 @@
/// </summary>
public class SearchPropertyList
{
+
+ /// <summary>
+ ///
+ /// </summary>
public ArrayList PropList;
+ /// <summary>
+ ///
+ /// </summary>
public ArrayList SearchOpList;
+ /// <summary>
+ ///
+ /// </summary>
public SearchPropertyList()
{
PropList = new ArrayList();
SearchOpList = new ArrayList();
}
-
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="propertyName"></param>
+ /// <param name="propertyValue"></param>
+ /// <param name="searchOperator"></param>
public void Add(string propertyName, string propertyValue, SearchOp searchOperator)
{
Property prop = new Property(propertyName, propertyValue );
PropList.Add(prop);
SearchOpList.Add(searchOperator);
}
-
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="propertyName"></param>
+ /// <param name="propertyValue"></param>
+ /// <param name="searchOperator"></param>
public void Add(string propertyName, int propertyValue, SearchOp searchOperator)
{
Property prop = new Property(propertyName, propertyValue );
PropList.Add(prop);
SearchOpList.Add(searchOperator);
}
-
+ /// <summary>
+ ///
+ /// </summary>
public void Clean()
{
PropList.Clear();
@@ -182,7 +222,7 @@
///<summary>
/// Enable
///</summary>
- private bool disabled;
+ //private bool disabled;
private static AutoResetEvent syncEvent = new AutoResetEvent(false);
@@ -374,7 +414,9 @@
}
}
-
+ /// <summary>
+ /// Return information about, count of file restored.
+ /// </summary>
public int RestoredFileCount
{
get
@@ -874,6 +916,8 @@
/// <param name="storeObject">Store object that this collection belongs to.</param>
/// <param name="collectionName">This is the friendly name that is used by applications to describe the collection.</param>
/// <param name="domainID">The domain that this object is stored in.</param>
+ /// <param name="domainID">The domain that this object is stored in.</param>
+ /// <param name="encryptionKey">encryption key.</param>
public Collection( Store storeObject, string collectionName, string domainID, byte[] encryptionKey ) :
this ( storeObject, collectionName, Guid.NewGuid().ToString(), domainID )
{
@@ -938,8 +982,17 @@
lockString = collection.lockString;
createManagedPath = collection.createManagedPath;
}
-
- //TODO: add comment
+
+ /// <summary>
+ /// Constructor
+ /// </summary>
+ /// <param name="storeObject">Store object that this collection belongs to.</param>
+ /// <param name="collectionName">This is the friendly name that is used by applications to describe this object.</param>
+ /// <param name="domainID">The domain that this object is stored in.</param>
+ /// <param name="ssl">whether connection is SSL enabled or not.</param>
+ /// <param name="encryptionAlgorithm">Encryption algorithm used.</param>
+ /// <param name="passphrase">passphrase used for encryption.</param>
+ /// <param name="raPublicKey">public key of RA Agent.</param>
public Collection( Store storeObject, string collectionName, string domainID, bool ssl, string encryptionAlgorithm, string passphrase, string raPublicKey ) :
this ( storeObject, collectionName, Guid.NewGuid().ToString(), domainID, ssl, encryptionAlgorithm, passphrase, raPublicKey)
{
@@ -1097,13 +1150,13 @@
#endregion
#region Private Methods
+ /*
/// <summary>
/// A member node object has been added to a collection. Look up the POBox for
/// the new member and create a subscription object letting the new member know
/// that the collection has been shared with them.
/// </summary>
/// <param name="args">The member node that was added to this collection.</param>
- /*
private void AddSubscription( Member member )
{
// Get the current domain for the collection.
@@ -1481,7 +1534,6 @@
/// this node has been committed to disk.
/// </summary>
/// <param name="node">Node object that contains the local incarnation value.</param>
- /// <param name="commitTime">The time of the commit operation.</param>
public void DecrementLocalIncarnation( Node node)
{
ulong incarnationValue = node.LocalIncarnation - 1;
@@ -1492,7 +1544,14 @@
// Update the local incarnation value to the specified value.
node.Properties.ModifyNodeProperty( PropertyTags.LocalIncarnation, incarnationValue);
}
-
+ /// <summary>
+ /// Setting Encryption properties.
+ /// </summary>
+ /// <param name="eKey">Key</param>
+ /// <param name="eBlob">Blob</param>
+ /// <param name="eAlgorithm">Algorithm</param>
+ /// <param name="rKey">recovery Key</param>
+ /// <returns>Collection</returns>
public Collection SetEncryptionProperties(string eKey, string eBlob, string eAlgorithm, string rKey)
{
//Set the Encryption status of the collection. This needs to be used for all reporting
@@ -3545,7 +3604,7 @@
/// <summary>
/// Gets the Member's all parent group id's
/// </summary>
- /// <param name="dn">Member ID</param>
+ /// <param name="userID">Member ID</param>
/// <returns>Returns all Members parent group id's
/// </returns>
public string[] GetMemberFamilyList( string userID )
@@ -3589,7 +3648,7 @@
/// <summary>
/// Gets the Member's all parent group DN List
/// </summary>
- /// <param name="dn">Member ID</param>
+ /// <param name="DN">Distinguesh Name</param>
/// <returns>Returns all Members parent group DN's
/// </returns>
public string[] GetMemberFamilyDNList( string DN )
@@ -3632,7 +3691,7 @@
/// Gets the groupids of a deleted member i.e. groups which he belonged to before deletion
/// this method is useful after deleted user is disabled in ifolder domain and all his group belonging informations are removed
/// </summary>
- /// <param name="dn">Member ID</param>
+ /// <param name="userID">Member ID</param>
/// <returns>Returns all Members old group id's (old group ids means that the user might be a member of a group but user was deleted, so we store it in temp property as e-dir does not give this information)
/// </returns>
public string[] GetDeletedMembersGroupList( string userID )
@@ -3677,7 +3736,7 @@
/// <summary>
/// Gets the Groups Member list
/// </summary>
- /// <param name="dn">Member ID</param>
+ /// <param name="userID">Member ID</param>
/// <returns>Returns all Groups Members id list
/// </returns>
public string[] GetGroupsMemberList( string userID )
@@ -3723,7 +3782,7 @@
/// <summary>
/// Gets the Groups subgroup DN list
/// </summary>
- /// <param name="dn">Parent group DN</param>
+ /// <param name="DN">Parent group DN</param>
/// <returns>Returns all Groups subgroup DN list
/// </returns>
public string[] GetGroupsSubgroupList( string DN)
@@ -3836,7 +3895,12 @@
return node;
}
-
+
+ /// <summary>
+ /// Get Node by given path
+ /// </summary>
+ /// <param name="entryPath">entry Path for which node to be found</param>
+ /// <returns>Node object.</returns>
public Node GetNodeByPath( string entryPath)
{
ICSList children = this.Search(PropertyTags.FileSystemPath, entryPath, SearchOp.Equal);
@@ -4551,7 +4615,7 @@
/// Searches the collection for the specified properties. An enumerator is returned that
/// returns all of the ShallowNode objects that match the query criteria.
/// </summary>
- /// <param name="property">Property objects list containing the value to search for.</param>
+ /// <param name="PropList">Property objects list containing the value to search for.</param>
/// <returns>An ICSList object that contains the results of the search.</returns>
public ICSList Search( SearchPropertyList PropList)
{
@@ -4678,7 +4742,7 @@
/// Constructor for the NodeEnumerator object.
/// </summary>
/// <param name="collection">Collection object that this enumerator belongs to.</param>
- /// <param name="property">Property objects list containing the data to search for.</param>
+ /// <param name="PropList">Property objects list containing the data to search for.</param>
public NodeEnumerator( Collection collection, SearchPropertyList PropList)
{
this.collection = collection;
@@ -4956,6 +5020,8 @@
/// <param name="MemberUserID">User ID</param>
/// <param name="colMemberNodeID">Collection's member node ID</param>
/// <param name="iFolderLocalPath">Path of Local iFolder</param>
+ /// <param name="sourceFileCount">source File count</param>
+ /// <param name="sourceDirCount">source Directory count</param>
/// <returns></returns>
public static bool DownloadCollection(string iFolderID, string iFolderName, string DomainID, string HostID, string DirNodeID, string MemberUserID, string colMemberNodeID, string iFolderLocalPath, int sourceFileCount, int sourceDirCount)
{
@@ -4994,6 +5060,8 @@
/// <param name="MemberUserID">Member user id</param>
/// <param name="colMemberNodeID">ID of collection member node</param>
/// <param name="iFolderLocalPath">Path of iFolder</param>
+ /// <param name="oldHomeFileCount">File Count</param>
+ /// <param name="oldHomeDirCount">Dir Count</param>
/// <returns></returns>
public static bool DownloadCollectionLocally(string iFolderID, string iFolderName, string DomainID, string HostID, string DirNodeID, string MemberUserID, string colMemberNodeID, string iFolderLocalPath, int oldHomeFileCount, int oldHomeDirCount)
{
@@ -5146,6 +5214,19 @@
}
// moved the creating proxy collection part to a seperate methos since it was called from 2 places
+ /// <summary>
+ /// Creating Proxy collection
+ /// </summary>
+ /// <param name="store">Store</param>
+ /// <param name="iFolderName">iFolder name</param>
+ /// <param name="iFolderID">ifolder id</param>
+ /// <param name="DomainID">domain id</param>
+ /// <param name="HostID">hostid</param>
+ /// <param name="newOwnerMember">new owner member</param>
+ /// <param name="newDomainMember">new domain member</param>
+ /// <param name="iFolderLocalPath">local path</param>
+ /// <param name="DirNodeID">dir node id</param>
+ /// <returns>proxy collection</returns>
public static Collection CreateProxyCollection(Store store, string iFolderName, string iFolderID, string DomainID, string HostID, Member newOwnerMember, Member newDomainMember, string iFolderLocalPath, string DirNodeID)
{
log.Debug("CreateProxyCollection: Entered");
@@ -5175,6 +5256,10 @@
// add the collectionID into MovingCollections Hashtable used in catalog.cs so that delete event for those ifolders will be ignored which
// fail to sync full in one cycle.
+ /// <summary>
+ /// Function add given ifolderid to catalog table
+ /// </summary>
+ /// <param name="iFolderID">ifolder id to be added on catalog.</param>
public static void AddToCatalogTable( string iFolderID)
{
string titleClass = "Simias.Server.Catalog";
@@ -5195,6 +5280,10 @@
// remove the collectionID into MovingCollections Hashtable used in catalog.cs so that delete event for those ifolders will be ignored which
// fail to sync full in one cycle.
+ /// <summary>
+ /// Function remove given ifolder id entry from catalog table
+ /// </summary>
+ /// <param name="iFolderID">ifolder id to be removed from catalog table</param>
public static void RemoveFromCatalogTable( string iFolderID)
{
string titleClass = "Simias.Server.Catalog";
@@ -5214,6 +5303,12 @@
}
// count total no of files and dirs in this collection (goto actual storage and count)
+ /// <summary>
+ /// Retrive directory and file count for given DirectoryInfo
+ /// </summary>
+ /// <param name="d">directory infor</param>
+ /// <param name="filecount">filecount</param>
+ /// <param name="dircount">directory count</param>
public static void GetDirAndFileCount(DirectoryInfo d, ref int filecount, ref int dircount)
{
FileInfo[] fis = d.GetFiles();
Modified: trunk/src/core/CollectionStore/CryptoKey.cs
===================================================================
--- trunk/src/core/CollectionStore/CryptoKey.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/CollectionStore/CryptoKey.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -44,7 +44,9 @@
using System.Threading;
using System.Xml;
using Simias.Storage;
-
+/// <summary>
+///
+/// </summary>
namespace Simias.CryptoKey
{
[Serializable]
@@ -84,10 +86,22 @@
}
}
+ /// <summary>
+ ///
+ /// </summary>
public enum EncType : int
{
+ /// <summary>
+ ///
+ /// </summary>
X509 = 0x00000001,
+ /// <summary>
+ ///
+ /// </summary>
RSA = 0x00000010,
+ /// <summary>
+ ///
+ /// </summary>
PGP = 0x00000100
};
/// <summary>
@@ -121,6 +135,10 @@
}
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="RAData"></param>
public RecoveryAgent(RSACryptoServiceProvider RAData)
{
RSAData = RAData;
Modified: trunk/src/core/CollectionStore/Domain.cs
===================================================================
--- trunk/src/core/CollectionStore/Domain.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/CollectionStore/Domain.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -83,7 +83,13 @@
/// Configuration section name where enterprise key value pairs are stored.
/// </summary>
static public string SectionName = "Domain";
+ /// <summary>
+ /// Admin DN Tag
+ /// </summary>
static public string AdminDNTag = "AdminDN";
+ /// <summary>
+ /// Encoding Tag
+ /// </summary>
static public string Encoding = "Encoding";
/// <summary>
@@ -308,7 +314,7 @@
/// <summary>
/// Returns if the specified user's login is disabled.
/// </summary>
- /// <param name="userID">User ID for the member to check.</param>
+ /// <param name="member">Member for which login information to be retrived.</param>
/// <returns>True if the login for the specified user is disabled.</returns>
public bool IsLoginDisabledForUser( Member member )
{
Modified: trunk/src/core/CollectionStore/HostNode.cs
===================================================================
--- trunk/src/core/CollectionStore/HostNode.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/CollectionStore/HostNode.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -48,10 +48,16 @@
public class HostNode : Member
{
#region Class Members
+ /// <summary>
+ ///
+ /// </summary>
public const string HostNodeType = "Host";
const string LocalHostTag = "LocalHost";
#endregion
+ /// <summary>
+ ///
+ /// </summary>
public enum changeMasterStates
{
/// <summary>
@@ -129,7 +135,6 @@
Properties.ModifyNodeProperty(new Property(PropertyTags.MasterUrl, value));
}
}
- /// <summary>
/// <summary>
/// Gets/Sets if HostNode is the Master Host.
@@ -254,15 +259,21 @@
/// <summary>
///
/// </summary>
- /// <param name="name"></param>
- /// <param name="nodeID"></param>
- /// <param name="userId"></param>
+ /// <param name="hInfo"></param>
/// <param name="publicAddress"></param>
public HostNode(HostInfo hInfo, string publicAddress) :
this(hInfo.Name, hInfo.ID, hInfo.MemberID, publicAddress, publicAddress, null)
{
}
-
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="name"></param>
+ /// <param name="nodeID"></param>
+ /// <param name="userId"></param>
+ /// <param name="publicUrl"></param>
+ /// <param name="privateUrl"></param>
+ /// <param name="publicKey"></param>
public HostNode(string name, string nodeID, string userId, string publicUrl, string privateUrl, RSACryptoServiceProvider publicKey):
base(name, nodeID, userId, Access.Rights.ReadOnly, publicKey)
{
@@ -398,9 +409,9 @@
{
Store store = Store.GetStore();
Domain domain = null;
- /// this might given an exception if the Default Domain is not set up.
- /// this is true when the entire iFolder store is restored - so the try/catch
- /// Need to find a better way to fix this without try/catch - FIXME
+ // this might given an exception if the Default Domain is not set up.
+ // this is true when the entire iFolder store is restored - so the try/catch
+ // Need to find a better way to fix this without try/catch - FIXME
try
{
domain = store.GetDomain(store.DefaultDomain);
Modified: trunk/src/core/CollectionStore/ICSEnumerator.cs
===================================================================
--- trunk/src/core/CollectionStore/ICSEnumerator.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/CollectionStore/ICSEnumerator.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -182,8 +182,7 @@
/// <summary>
/// Constructs the object.
/// </summary>
- /// <param name="iEnumerator">Enumerator from the ICSList object.</param>
- /// <param name="count">Number of objects contained in the enumerator.</param>
+ /// <param name="list">Array list of ICSList object.</param>
public ICSListEnumerator( ArrayList list )
{
this.list = list;
Modified: trunk/src/core/CollectionStore/Identity.cs
===================================================================
--- trunk/src/core/CollectionStore/Identity.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/CollectionStore/Identity.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -574,8 +574,6 @@
/// Gets the user identifier and pass-phrase for the specified domain.
/// </summary>
/// <param name="domainID">The identifier for the domain.</param>
- /// <param name="userID">Gets the userID of the user associated with the specified domain.</param>
- /// <param name="credentials">Gets the credentials for the user.</param>
/// <returns>CredentialType enumerated object.</returns>
internal bool GetRememberOption( string domainID)
{
@@ -600,8 +598,6 @@
/// Gets the user identifier and pass-phrase for the specified domain.
/// </summary>
/// <param name="domainID">The identifier for the domain.</param>
- /// <param name="userID">Gets the userID of the user associated with the specified domain.</param>
- /// <param name="credentials">Gets the credentials for the user.</param>
/// <returns>CredentialType enumerated object.</returns>
internal string GetPassPhrase( string domainID)
{
@@ -685,6 +681,7 @@
/// <param name="domainID">The domain to store the passphrase for.</param>
/// <param name="passPhrase">The domain passphrase.</param>
/// <param name="type">Type of credentials.</param>
+ /// <param name="rememberPassPhrase"></param>
/// <returns>The modified identity object.</returns>
internal Identity StorePassPhrase( string domainID, string passPhrase, CredentialType type, bool rememberPassPhrase)
{
@@ -722,7 +719,11 @@
p.SetPropertyValue( mapDoc );
return this;
}
-
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="domainID"></param>
+ /// <returns></returns>
public RSACryptoServiceProvider GetDomainCredential(string domainID)
{
RSACryptoServiceProvider credential = null;
Modified: trunk/src/core/CollectionStore/Member.cs
===================================================================
--- trunk/src/core/CollectionStore/Member.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/CollectionStore/Member.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -49,6 +49,9 @@
namespace Simias.Storage
{
+ /// <summary>
+ /// Encryption version
+ /// </summary>
public enum EncVersion
{
/// <summary>
@@ -72,7 +75,8 @@
#endregion
/// <summary>
-
+ /// Simias log
+ /// </summary>
private static readonly ISimiasLog log = SimiasLogManager.GetLogger(typeof(Member));
private SimiasAccessLogger accessLog = new SimiasAccessLogger("Passphrase",null);
@@ -86,7 +90,9 @@
BlobFlag = 32
};
-
+ /// <summary>
+ ///
+ /// </summary>
public enum userMoveStates
{
/// <summary>
@@ -136,7 +142,6 @@
};
- /// </summary>
/// <summary>
/// Get/Set the encryption key
/// </summary>
@@ -156,7 +161,6 @@
}
}
- /// </summary>
/// <summary>
/// Get/Set the encryption version
/// </summary>
@@ -176,7 +180,6 @@
}
}
- /// </summary>
/// <summary>
/// Get/Set the encryption key
/// </summary>
@@ -569,7 +572,8 @@
set
{
- if ( ! String.IsNullOrEmpty( value) )
+ //if ( ! String.IsNullOrEmpty( value) )
+ if ( value != null && value != "")
{
properties.ModifyNodeProperty( PropertyTags.OldDN, value );
}
@@ -936,7 +940,7 @@
Property Groupproperty = member.Properties.GetSingleProperty( "GroupType" );
if( Groupproperty == null)
{
- /// Member node.
+ // Member node.
groupadmins = domain.GetMemberFamilyList(groupid);
}
else
@@ -1108,7 +1112,7 @@
Property Groupproperty = member.Properties.GetSingleProperty( "GroupType" );
if( Groupproperty == null)
{
- /// Member node.
+ // Member node.
return IsGroupAdmin(nodeid, 0);
}
else
@@ -1124,7 +1128,7 @@
{
if( membertype == 0)
{
- /// Member node. Get all the groups.
+ // Member node. Get all the groups.
Store store = Store.GetStore();
Domain domain = store.GetDomain(store.DefaultDomain);
string[] groupids = domain.GetMemberFamilyList(nodeid);
@@ -1132,7 +1136,7 @@
}
else
{
- /// Group node.
+ // Group node.
string[] groupids = new string[1];
groupids[0] = nodeid;
return IsGroupAdmin(groupids);
@@ -1147,7 +1151,7 @@
{
string[] groupadmins = GetGroupListValues(true);
- /// Checks whether the given member is admin for any of the groups mentioned above...
+ // Checks whether the given member is admin for any of the groups mentioned above...
if( groupids == null || groupadmins == null)
return false;
@@ -1581,7 +1585,7 @@
SetEncryptionBlobFlag(store);
//making it local variable for faster disposal
- CollectionSyncClient syncClient = null;
+ //CollectionSyncClient syncClient = null;
// commit encryption related values locally on client for faster access. it will be overwritten in
// next fomain sync
@@ -2720,7 +2724,14 @@
if(FilePath != null)
ImportiFoldersCryptoKeys(null, NewPassphrase, OneTimePassword, true, FilePath);
}
-
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="RAName"></param>
+ /// <param name="isRSA"></param>
+ /// <param name="keyDocument"></param>
+ /// <param name="oneTimePP"></param>
+ /// <param name="decryptedKeyDoc"></param>
public void RecoverKeys(string RAName, bool isRSA, XmlDocument keyDocument, string oneTimePP, out XmlDocument decryptedKeyDoc)
{
string titleTag = "CryptoKeyRecovery";
@@ -2792,7 +2803,6 @@
/// <summary>
/// Gets the credentials from the specified domain object.
/// </summary>
- /// <param name="DomainID">The ID of the domain to set the credentials on.</param>
/// <returns>The Default public key </returns>
public string GetDefaultRSAFromServer()
{
@@ -2817,7 +2827,6 @@
/// <summary>
/// Gets the credentials from the specified domain object.
/// </summary>
- /// <param name="DomainID">The ID of the domain to set the credentials on.</param>
/// <returns>The Default public key </returns>
public string GetDefaultPublicKeyFromServer()
{
@@ -2845,7 +2854,6 @@
/// <summary>
/// Gets the credentials from the specified domain object.
/// </summary>
- /// <param name="DomainID">The ID of the domain to set the credentials on.</param>
/// <returns>The Default public key </returns>
public string GetDefaultRSAKey()
{
@@ -2858,7 +2866,6 @@
/// <summary>
/// Gets the credentials from the specified domain object.
/// </summary>
- /// <param name="DomainID">The ID of the domain to set the credentials on.</param>
/// <returns>The Default public key </returns>
public string GetDefaultPublicKey()
{
@@ -2876,9 +2883,17 @@
/// </summary>
public class PassphraseHash
{
+ /// <summary>
+ ///
+ /// </summary>
public PassphraseHash()
{
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="Passphrase"></param>
+ /// <returns></returns>
public byte[] HashPassPhrase(string Passphrase)
{
/*change to PasswordDeriveBytes.CryptDeriveKey once the implementation is done mono
Modified: trunk/src/core/CollectionStore/Policy.cs
===================================================================
--- trunk/src/core/CollectionStore/Policy.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/CollectionStore/Policy.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -55,7 +55,7 @@
/// <summary>
/// Used to log messages.
/// </summary>
- static private readonly ISimiasLog log = SimiasLogManager.GetLogger( typeof( Store ) );
+ //static private readonly ISimiasLog log = SimiasLogManager.GetLogger( typeof( Store ) );
/// <summary>
/// Property names to store rules and time condition on the policy Node.
@@ -435,11 +435,16 @@
}
}
+ /// <summary>
+ /// Function for adding user rules
+ /// </summary>
+ /// <param name="rule">rule to be added</param>
+ /// <param name="policyID">policy for which rule to be added</param>
public void AddUserRule( Rule rule , string policyID)
{
// Make sure the rule doesn't already exist.
- Property property = null;
+// Property property = null;
// See if the rule already exists.
MultiValuedList mvl = properties.GetProperties( policyID );
@@ -453,10 +458,14 @@
properties.AddNodeProperty( policyID, rule.ToXml() );
}
-
+ /// <summary>
+ /// Deletes user rules
+ /// </summary>
+ /// <param name="rule">rule to be deleted</param>
+ /// <param name="policyID">policy id for which rule to be deleted</param>
public void DeleteUserRule( Rule rule , string policyID)
{
- Property property = null;
+// Property property = null;
// See if the rule exists.
MultiValuedList mvl = properties.GetProperties( policyID );
@@ -605,7 +614,7 @@
/// <summary>
/// Used to log messages.
/// </summary>
- static private readonly ISimiasLog log = SimiasLogManager.GetLogger( typeof( Store ) );
+ //static private readonly ISimiasLog log = SimiasLogManager.GetLogger( typeof( Store ) );
/// <summary>
/// Store handle.
@@ -687,7 +696,7 @@
/// The caller must possess Admin rights in order to commit a Policy.
/// </summary>
/// <param name="policyID">Policy identifier to be saved.</param>
- /// <param name='ruleList">Rules to be added to the Policy identifier</param>
+ /// <param name="ruleList">Rules to be added to the Policy identifier</param>
/// <param name="member">Member to associate the Policy identifier with.</param>
public void CommitPolicy( string policyID, ICSList ruleList, Member member)
{
@@ -717,7 +726,7 @@
/// Saves and associates the Policy with the user.
/// The caller must possess Admin rights in order to commit a Policy.
/// </summary>
- /// <param name="policy">Policy to be saved.</param>
+ /// <param name="policyID">Policy to be saved.</param>
/// <param name="member">Member to associate the Policy with.</param>
public void CommitPolicy( string policyID, object value, Member member)
{
@@ -1325,7 +1334,7 @@
/// <summary>
/// Used to log messages.
/// </summary>
- static private readonly ISimiasLog log = SimiasLogManager.GetLogger( typeof( Store ) );
+ //static private readonly ISimiasLog log = SimiasLogManager.GetLogger( typeof( Store ) );
/// <summary>
/// Result of applying input value to policy rule.
Modified: trunk/src/core/CollectionStore/PropertyList.cs
===================================================================
--- trunk/src/core/CollectionStore/PropertyList.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/CollectionStore/PropertyList.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -827,6 +827,7 @@
/// Removes all properties from the specified document that are marked as non-transient.
/// </summary>
/// <param name="document">Xml document that describes the Node object's properties.</param>
+ /// <param name="LoggedInMember"></param>
internal void StripLocalNServerLocalProperties( XmlDocument document, bool LoggedInMember )
{
XmlNodeList nonTransList = document.DocumentElement.SelectNodes( "//" + XmlTags.PropertyTag + "[@" + XmlTags.FlagsAttr + "]" );
@@ -1388,8 +1389,8 @@
/// <summary>
/// Converts the PropertyList to a string representation, and strips local as well as client specific info.
/// </summary>
- /// <param name="stripLocalProperties">Always, the local properties will be stripped
- /// <param name="LoggedInMember">If this is a member node and the member is currently logged in, then its true ,
+ /// <param name="stripLocalProperties">Always, the local properties will be stripped.</param>
+ /// <param name="LoggedInMember">If this is a member node and the member is currently logged in, then its true.</param>
/// <returns>A string containing the contents of the property list.</returns>
public string ToString( bool stripLocalProperties, bool LoggedInMember )
{
Modified: trunk/src/core/CollectionStore/Store.cs
===================================================================
--- trunk/src/core/CollectionStore/Store.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/CollectionStore/Store.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -357,7 +357,9 @@
return ( p != null ) ? p.ToString() : "Unknown version";
}
}
-
+ /// <summary>
+ ///
+ /// </summary>
public static string storeversion
{
get
@@ -375,6 +377,9 @@
get { return shuttingDown; }
}
+ /// <summary>
+ ///
+ /// </summary>
public RSACryptoServiceProvider DefaultRSARA
{
get{
@@ -815,7 +820,7 @@
/// <summary>
/// Gets a path to where the store unmanaged files for the specified collection should be created.
/// </summary>
- /// <param name="collectionID">Collection identifier that files will be associated with.</param>
+ /// <param name="StoreVersion">Collection identifier that files will be associated with.</param>
/// <returns>A path string that represents the store unmanaged path.</returns>
internal string GetStoreUnmanagedPrefix(string StoreVersion)
{
@@ -1106,7 +1111,14 @@
log.Debug("CID {0}\n Blob {1}\n", collectionID,c.EncryptionBlob);
return c.EncryptionBlob;
}
-
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="userID"></param>
+ /// <param name="domainID"></param>
+ /// <param name="cKey"></param>
+ /// <returns></returns>
public bool SetCollectionCryptoKeysByOwner( string userID, string domainID, CollectionKey cKey)
{
accessLog.LogAccess("ImportiFoldersCryptoKeys","Importing CryptoKeys","Starting",userID);
@@ -1349,8 +1361,6 @@
/// Gets the passphrasefor the specified domain.
/// </summary>
/// <param name="domainID">Identifier of the domain to get the credentials from.</param>
- /// <param name="userID">Gets the identifier of the domain user.</param>
- /// <param name="passPhrase">Gets the passPhrase for the domain.</param>
/// <returns>The type of credentials.</returns>
public string GetPassPhrase( string domainID)
{
@@ -1361,8 +1371,6 @@
/// Gets the passphrasefor the specified domain.
/// </summary>
/// <param name="domainID">Identifier of the domain to get the credentials from.</param>
- /// <param name="userID">Gets the identifier of the domain user.</param>
- /// <param name="passPhrase">Gets the passPhrase for the domain.</param>
/// <returns>The type of credentials.</returns>
public bool GetRememberOption( string domainID )
{
@@ -1510,10 +1518,11 @@
/// <param name="domainID">The domain ID to store the passphrase for.</param>
/// <param name="passPhrase">Credentials for the domain.</param>
/// <param name="credType">Type of credentials being stored.</param>
+ /// <param name="rememberPassPhrase"></param>
public void StorePassPhrase( string domainID, string passPhrase, CredentialType credType, bool rememberPassPhrase )
{
LocalDb.Commit( CurrentUser.StorePassPhrase( domainID.ToLower(), passPhrase, credType, rememberPassPhrase ) );
- /// Schedule all encrypted iFolders for sync...
+ // Schedule all encrypted iFolders for sync...
if( credType == CredentialType.Basic )
SyncClient.RescheduleAllEncryptedColSync(domainID);
}
@@ -1792,7 +1801,11 @@
#endregion
}
-
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="ifolderid"></param>
+ /// <returns></returns>
public static int ResetRootNode(string ifolderid)
{
try{
@@ -1831,6 +1844,16 @@
return 0;
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="ifolderid"></param>
+ /// <param name="nodeid"></param>
+ /// <param name="relativepath"></param>
+ /// <param name="basepath"></param>
+ /// <param name="filetype"></param>
+ /// <param name="length"></param>
+ /// <returns></returns>
public int RestoreData(string ifolderid, string nodeid, string relativepath, string basepath, string filetype, long length)
{
log.Info("Entered RestoreData.");
@@ -1850,16 +1873,23 @@
{
return RestoreDirectory( ifolderid, relativepath, nodeid, basepath);
}
- return 0;
+ //return 0;
}
-
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="ifolderid"></param>
+ /// <param name="relativepath"></param>
+ /// <param name="nodeid"></param>
+ /// <param name="basepath"></param>
+ /// <returns></returns>
public int RestoreDirectory(string ifolderid, string relativepath, string nodeid, string basepath)
{
string backedpath = Path.Combine( basepath, relativepath);
log.Debug("backedpath: {0}", backedpath);
- /// Check whether the directory present on the target. If not create. else return;
+ // Check whether the directory present on the target. If not create. else return;
Store store = Store.GetStore();
if(store == null)
return 1000;
@@ -1922,6 +1952,15 @@
return 0;
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="ifolderid"></param>
+ /// <param name="relativepath"></param>
+ /// <param name="nodeid"></param>
+ /// <param name="basepath"></param>
+ /// <param name="length"></param>
+ /// <returns></returns>
public int RestoreFile(string ifolderid, string relativepath, string nodeid, string basepath, long length)
{
log.Debug("Entered RestoreFile.");
@@ -1931,12 +1970,12 @@
// string nodeid = "d081e003-23b9-404a-8bb7-9832bb2cdc7113";
// string basepath = "/home/banderso/ifolder/recovery/recoverytool/testrecovery"; /// TODO: Add base path of the iFolder of the backed up data in xml file...
string backedpath = Path.Combine( basepath, relativepath);
- bool encrypted = false;
+ //bool encrypted = false;
FileInfo fi = new FileInfo( backedpath);
long nodelength = fi.Length;
log.Info("Starting with datamove from {0}--{1}.", backedpath, nodelength);
if( !File.Exists(backedpath) && !Directory.Exists(backedpath))
- return 2; /// Path does not exist...
+ return 2; // Path does not exist...
Store store = Store.GetStore();
if( store == null)
return 1000;
@@ -1958,32 +1997,32 @@
node = new FileNode(n1);
if( node == null)
{
- /// This is a new file. Direct copy and create node.
+ // This is a new file. Direct copy and create node.
newpath = Path.Combine(newbasepath, relativepath);
log.Info("newpath: {0}", newpath);
if( File.Exists(newpath))
{
- /// File with same name but different nodeID already exists.
- /// may be a delet and upload of a file with same name has happened after backup is taken. skipping for now.
+ // File with same name but different nodeID already exists.
+ // may be a delet and upload of a file with same name has happened after backup is taken. skipping for now.
return 3;
}
}
else
{
- /// The file is renamed after taking backup. so the file name is different but node id is same.
- /// Get current file name with the node ID and overwrite this content with the backedup data.
+ // The file is renamed after taking backup. so the file name is different but node id is same.
+ // Get current file name with the node ID and overwrite this content with the backedup data.
newpath = node.GetFullPath(col);
log.Debug("newpath in else: {0}", newpath);
}
- /// Check for the existence of the directory...
+ // Check for the existence of the directory...
if( !Directory.Exists( Path.GetDirectoryName(newpath)))
{
log.Info("new path directory does not exist. {0}", Path.GetDirectoryName(newpath));
return 4;
}
log.Info("fetching parent dir node. {0}", Path.GetDirectoryName(relativepath));
- /// Get the dirnode for the parent directory...
+ // Get the dirnode for the parent directory...
DirNode parentnode = new DirNode( col.GetNodeByPath(Path.GetDirectoryName(relativepath)));
if( parentnode == null)
return 6;
@@ -1997,7 +2036,7 @@
return 5;
}
- /// Create the file node...
+ // Create the file node...
if( node == null)
{
log.Debug("Creating file node. parent ID: {0}", parentnode.ID);
@@ -2095,6 +2134,8 @@
/// <summary>
/// Encrypt the key in the instance and returns
/// </summary>
+ /// <param name="PassPhrase"></param>
+ /// <param name="EncryptedKey"></param>
public void EncrypytKey(string PassPhrase, out string EncryptedKey)
{
this.CryptoKeySize = (PassPhrase.Length)*8;
@@ -2113,6 +2154,12 @@
EncryptedKey = Convert.ToBase64String(output);
m_des.Clear();
}
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="PassPhrase"></param>
+ /// <param name="EncryptedKey"></param>
public void EncrypytKey(byte[] PassPhrase, out string EncryptedKey)
{
this.CryptoKeySize = (PassPhrase.Length)*8;
@@ -2135,6 +2182,8 @@
/// <summary>
/// Decrypt the key in the instance and returns
/// </summary>
+ /// <param name="PassPhrase"></param>
+ /// <param name="DecryptedKey"></param>
public void DecrypytKey(string PassPhrase, out string DecryptedKey)
{
this.CryptoKeySize = (PassPhrase.Length)*8;
Modified: trunk/src/core/Common/CertificateStore.cs
===================================================================
--- trunk/src/core/Common/CertificateStore.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/Common/CertificateStore.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -42,7 +42,9 @@
namespace Simias.Security
{
-
+ /// <summary>
+ ///
+ /// </summary>
public class SecurityStore
{
const string certificateProperty = "Certificate";
@@ -55,10 +57,12 @@
/// <summary>
/// Store the PPKData with the specified property.
/// </summary>
- /// <param name="PPK">The PPK to store.</param>
- /// <param name="Property">The property PPK belongs to.</param>
+ /// <param name="ppkData">The PPK to store.</param>
+ /// <param name="prop">The property PPK belongs to.</param>
/// <param name="persist">If true save in store.</param>
/// <param name="inTable">If true save in Policy HashTable.</param>
+ /// <param name="isRA">.</param>
+ /// <param name="PPKtype">.</param>
public static void StorePPKData(byte[] ppkData, string prop, bool persist, bool inTable, bool isRA, string PPKtype)
{
Domain domain;
@@ -169,6 +173,7 @@
/// Get the Certificate for the specified store along with Problem.
/// </summary>
/// <param name="host">The host who owns the certificate.</param>
+ /// <param name="Problem"></param>
/// <returns>The certificate as a byte array.</returns>
public static byte[] GetCertificate(string host, out CertPolicy.CertificateProblem Problem)
{
@@ -351,7 +356,7 @@
/// <summary>
/// Get the Certificate for the specified store.
/// </summary>
- /// <param name="host">The host who owns the certificate.</param>
+ /// <param name="recoveryAgnt">The host who owns the certificate.</param>
/// <returns>The certificate as a byte array.</returns>
public static byte[] GetRACertificate(string recoveryAgnt)
{
@@ -368,7 +373,7 @@
/// Store the certificate for the specified RA.
/// </summary>
/// <param name="certificate">The certificate to store.</param>
- /// <param name="host">The host the certificate belongs to.</param>
+ /// <param name="recoveryAgnt">The host the certificate belongs to.</param>
/// <param name="persist">If true save in store.</param>
public static void StoreRACertificate(byte[] certificate, string recoveryAgnt, bool persist)
{
@@ -558,6 +563,9 @@
const string certificateProperty = "Certificate";
const string raProperty = "RecoveryAgent";
const string RSAType = "RSA";
+ /// <summary>
+ ///
+ /// </summary>
static public RSACryptoServiceProvider Default_RA = null;
static private readonly ISimiasLog log = SimiasLogManager.GetLogger( typeof( Store ) );
@@ -565,8 +573,8 @@
/// <summary>
/// Store the RSA for the specified RA.
/// </summary>
- /// <param name="certificate">The certificate to store.</param>
- /// <param name="host">The host the certificate belongs to.</param>
+ /// <param name="rsa">The certificate to store.</param>
+ /// <param name="recoveryAgnt">The host the certificate belongs to.</param>
/// <param name="persist">If true save in store.</param>
public static void StoreRARSA(string rsa, string recoveryAgnt, bool persist)
{
@@ -575,12 +583,21 @@
byte[] rsabytes = utf8.GetBytes(rsa);
SecurityStore.StorePPKData(rsabytes, recoveryAgnt, persist, true, true, RSAType);
}
-
+
+ /// <summary>
+ ///
+ /// </summary>
public static RSACryptoServiceProvider GetRARSA()
{
return Default_RA;
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="rsa"></param>
+ /// <param name="recoveryAgnt"></param>
+ /// <param name="persist"></param>
public static void CheckAndStoreRSA(string rsa, string recoveryAgnt, bool persist)
{
bool toStore = true;
@@ -617,7 +634,10 @@
StoreRARSA(rsa, recoveryAgnt, persist);
}
}
-
+
+ /// <summary>
+ ///
+ /// </summary>
public static void LoadRSAFromStore()
{
Store store = Store.GetStore();
Modified: trunk/src/core/Common/Configuration.cs
===================================================================
--- trunk/src/core/Common/Configuration.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/Common/Configuration.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -47,7 +47,13 @@
public sealed class Configuration
{
#region Class Members
+ /// <summary>
+ ///
+ /// </summary>
public const string DefaultConfigFileName = "Simias.config";
+ /// <summary>
+ ///
+ /// </summary>
public const string RenamedConfigFileName = "Simiasconfig.removed";
@@ -56,10 +62,16 @@
private const string NameAttr = "name";
private const string ValueAttr = "value";
private const string DefaultSection = "SimiasDefault";
+ /// <summary>
+ ///
+ /// </summary>
public string ConfigPath;
private static string defaultConfigPath;
private XmlDocument configDoc;
+ /// <summary>
+ ///
+ /// </summary>
public static string DefaultPath
{
get
@@ -67,7 +79,10 @@
return defaultConfigPath;
}
}
-
+
+ /// <summary>
+ ///
+ /// </summary>
public static string DefaultFilePath
{
get
Modified: trunk/src/core/Common/SimiasLog.cs
===================================================================
--- trunk/src/core/Common/SimiasLog.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/Common/SimiasLog.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -192,6 +192,9 @@
}
}
+ /// <summary>
+ ///
+ /// </summary>
public class SimiasAccessLogger
{
private static readonly string AccessLoggerName = "AccessLogger";
@@ -202,6 +205,12 @@
string user;
string collectionId;
+
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="user"></param>
+ /// <param name="collectionId"></param>
public SimiasAccessLogger(string user, string collectionId)
{
this.user = user;
@@ -268,6 +277,13 @@
}
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="method"></param>
+ /// <param name="uri"></param>
+ /// <param name="id"></param>
+ /// <param name="status"></param>
public void LogAccess(string method, string uri, string id, string status)
{
if (logger.IsInfoEnabled)
@@ -277,6 +293,13 @@
}
}
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="method"></param>
+ /// <param name="uri"></param>
+ /// <param name="id"></param>
+ /// <param name="status"></param>
public void LogAccessDebug(string method, string uri, string id, string status)
{
if (logger.IsInfoEnabled)
Modified: trunk/src/core/Common/WebState.cs
===================================================================
--- trunk/src/core/Common/WebState.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/Common/WebState.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -239,8 +239,8 @@
/// <summary>
/// Get a WebState object for the specified domain and collection.
/// </summary>
- /// <param name="domainID">The domain ID.</param>
- /// <param name="collectionID">The collection associated with the domain</param>
+ /// <param name="DomainID">The domain ID.</param>
+ /// <param name="CollectionID">The collection associated with the domain</param>
public WebState(string DomainID, string CollectionID) :
this(DomainID, CollectionID, null)
{
@@ -249,9 +249,9 @@
/// <summary>
/// Get a WebState object for the specified domain.
/// </summary>
- /// <param name="domainID">The domain ID.</param>
- /// <param name="collectionID">The collection ID.</param>
- /// <param name="userID">User ID of a member in the domain.</param>
+ /// <param name="DomainID">The domain ID.</param>
+ /// <param name="CollectionID">The collection ID.</param>
+ /// <param name="UserID">User ID of a member in the domain.</param>
public WebState(string DomainID, string CollectionID, string UserID) :
this( DomainID, CollectionID, UserID, SimiasConnection.AuthType.BASIC )
{
@@ -315,7 +315,7 @@
/// <summary>
/// Get a WebState with the specified credential.
/// </summary>
- /// <param name="domainID">The identifier for the domain.</param>
+ /// <param name="DomainID">The identifier for the domain.</param>
public WebState( string DomainID )
{
lock( cookieHash )
@@ -490,7 +490,7 @@
}
// finally
// {
- /// ssl = this.HostSSL;
+ // ssl = this.HostSSL;
// }
}
if (sslInitialized == false && ssl == true)
@@ -515,9 +515,9 @@
/// Get a connection that can be used to access the host of specified collection.
/// </summary>
/// <param name="domainID">The domain ID</param>
- /// <param name="collection">The collection to be accessed</param>
/// <param name="userID">The user to authenticate as.</param>
/// <param name="authType">The type of authentication.</param>
+ /// <param name="collection">The collection to be accessed</param>
/// <returns>Connection</returns>
internal static HostConnection GetConnection( string domainID, string userID, SimiasConnection.AuthType authType, Collection collection )
{
@@ -549,9 +549,9 @@
/// Get a connection to the home server of the specified member
/// </summary>
/// <param name="domainID">The domain ID</param>
- /// <param name="member">The member</param>
/// <param name="userID">The user to authenticate as.</param>
/// <param name="authType">The authentication type.</param>
+ /// <param name="member">The member</param>
/// <returns>a connection.</returns>
internal static HostConnection GetConnection(string domainID, string userID, SimiasConnection.AuthType authType, Member member )
{
@@ -582,9 +582,9 @@
/// Get a connection to the home server of the specified member
/// </summary>
/// <param name="domainID">The domain ID</param>
- /// <param name="member">The member</param>
/// <param name="userID">The user to authenticate as.</param>
/// <param name="authType">The authentication type.</param>
+ /// <param name="host">Host information against which authentication has to be done.</param>
/// <returns>a connection.</returns>
internal static HostConnection GetConnection( string domainID, string userID, SimiasConnection.AuthType authType, HostNode host )
{
@@ -744,12 +744,24 @@
}
#endregion
}
-
+
+ /// <summary>
+ ///
+ /// </summary>
public class SimiasConnection
{
+ /// <summary>
+ ///
+ /// </summary>
public enum AuthType
{
+ /// <summary>
+ ///
+ /// </summary>
BASIC,
+ /// <summary>
+ ///
+ /// </summary>
PPK,
}
Modified: trunk/src/core/Discovery/Discovery.cs
===================================================================
--- trunk/src/core/Discovery/Discovery.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/Discovery/Discovery.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -52,6 +52,9 @@
namespace Simias.Discovery
{
+ /// <summary>
+ ///
+ /// </summary>
public class CollectionList
{
private static readonly ISimiasLog log =
@@ -80,6 +83,9 @@
/// Atleast one domain should be processed for shared collection display.
/// </summary>
private bool processedOne = false;
+ /// <summary>
+ ///
+ /// </summary>
public bool processed = false;
@@ -91,6 +97,10 @@
//TODO - we need to ensure collectionList has latest data when a Refresh is triggered
// now the collectionList gets populated every 60 secs - even this should be configurable from user end.
// we need to expose a function that will trigger the listEvent, so that the timer expires and the list is generated.
+ /// <summary>
+ ///
+ /// </summary>
+ /// <returns></returns>
static public ArrayList GetCollectionList()
{
lock(collectionList)
Modified: trunk/src/core/Discovery/DiscoveryFramework.cs
===================================================================
--- trunk/src/core/Discovery/DiscoveryFramework.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/Discovery/DiscoveryFramework.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -50,6 +50,9 @@
namespace Simias.Discovery
{
+ /// <summary>
+ ///
+ /// </summary>
public class DiscoveryFramework
{
private static ArrayList collList;
Modified: trunk/src/core/Domain/DomainAgent.cs
===================================================================
--- trunk/src/core/Domain/DomainAgent.cs 2011-01-27 11:54:30 UTC (rev 7564)
+++ trunk/src/core/Domain/DomainAgent.cs 2011-01-27 12:36:19 UTC (rev 7565)
@@ -84,8 +84,14 @@
private Store store = Store.GetStore();
private static Hashtable domainTable = new Hashtable();
private static string domainID;
+ /// <summary>
+ /// Hashtable representing blockedIP list
+ /// </summary>
public static Hashtable blockedIPs = new Hashtable();
+ /// <summary>
+ /// string representing currentDomainID
+ /// </summary>
public static string currentDomainID = null;
#endregion
@@ -485,7 +491,7 @@
Uri domainServiceUrl = null;
string homeServerURL = null;
Simias.Authentication.Status status = null;
- Simias.Authentication.Status status2 = null;
+ //Simias.Authentication.Status status2 = null;
#if WS_INSPECTION
try
{
@@ -528,15 +534,15 @@
else
tempUri = new UriBuilder(host);
log.Debug("The temp uri is: {0}", tempUri );
- /// There was a failure in obtaining the service url. Try a hard coded one.
+ // There was a failure in obtaining the service url. Try a hard coded one.
if (tempUri.Scheme.Equals(Uri.UriSchemeHttp))
{
- /// change to SSL
+ // change to SSL
tempUri.Scheme = Uri.UriSchemeHttps;
- /// changing to default port - this needs to be fixed once we change the client UI to have the SSL port
+ // changing to default port - this needs to be fixed once we change the client UI to have the SSL port
tempUri.Port = 443;
}
- /// al...
[truncated message content] |
|
From: <he...@us...> - 2011-01-27 11:54:37
|
Revision: 7564
http://simias.svn.sourceforge.net/simias/?rev=7564&view=rev
Author: hegdegg
Date: 2011-01-27 11:54:30 +0000 (Thu, 27 Jan 2011)
Log Message:
-----------
ID: #0000
Reviewer: Vikash Mehta
Localization Required: No
Documentation Required: No
Description: Updates to use mono-addon.
Modified Paths:
--------------
trunk/ifolder3-enterprise.sh
trunk/src/server/setup/iFolder_proxy_rights_assign.in
trunk/src/server/setup/iFolder_retrieve_proxy_creds.in
trunk/src/server/setup/iFolder_update_proxy_cred_store.in
trunk/src/server/setup/ifolder-admin-setup.in
trunk/src/server/setup/ifolder-mod-mono-server2.in
trunk/src/server/setup/ifolder-web-setup.in
trunk/src/server/setup/ifolder_mono_setup.in
trunk/src/server/setup/ifolder_shutdown
trunk/src/server/setup/ldap-cert-update.in
trunk/src/server/setup/simias-server-setup.in
trunk/src/utils/restore/ifolder-data-recovery.in
Modified: trunk/ifolder3-enterprise.sh
===================================================================
--- trunk/ifolder3-enterprise.sh 2011-01-24 12:14:43 UTC (rev 7563)
+++ trunk/ifolder3-enterprise.sh 2011-01-27 11:54:30 UTC (rev 7564)
@@ -18,7 +18,7 @@
# delivered to autobuild.
PACKAGE_DIR=../
-PACKAGE_VER=${PACKAGE_VER:="3.7.2"}
+PACKAGE_VER=${PACKAGE_VER:="3.8.4"}
PACKAGE=${PACKAGE:="ifolder3-enterprise"}
SRC_DIR=`basename \`pwd\``
TARBALL_NAME=$PACKAGE
Modified: trunk/src/server/setup/iFolder_proxy_rights_assign.in
===================================================================
--- trunk/src/server/setup/iFolder_proxy_rights_assign.in 2011-01-24 12:14:43 UTC (rev 7563)
+++ trunk/src/server/setup/iFolder_proxy_rights_assign.in 2011-01-27 11:54:30 UTC (rev 7564)
@@ -60,7 +60,7 @@
export OS_ARCH=`uname -m`
fi
-rpm -q novell-ifolder-mono > /dev/null 2>&1
+rpm -q mono-addon-core > /dev/null 2>&1
if [ $? -gt 0 ]
then
@@ -72,10 +72,10 @@
MONO_CMD=mono
else
- MONO_RUNTIME_PATH=@_bindir_@/../mono
+ MONO_RUNTIME_PATH=/opt/novell/mono
export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@
- source $MONO_RUNTIME_PATH/bin/novell-ifolder-mono-environment.sh
- export MONO_CFG_DIR=$MONO_RUNTIME_PATH/etc
+ source $MONO_RUNTIME_PATH/bin/mono-addon-environment.sh
+ export MONO_CFG_DIR=/etc
export IFOLDER_MOD_MONO_SERVER2_PATH=@_bindir_@
export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH
cd @_bindir_@
Modified: trunk/src/server/setup/iFolder_retrieve_proxy_creds.in
===================================================================
--- trunk/src/server/setup/iFolder_retrieve_proxy_creds.in 2011-01-24 12:14:43 UTC (rev 7563)
+++ trunk/src/server/setup/iFolder_retrieve_proxy_creds.in 2011-01-27 11:54:30 UTC (rev 7564)
@@ -62,7 +62,7 @@
fi
-rpm -q novell-ifolder-mono > /dev/null 2>&1
+rpm -q mono-core-addon > /dev/null 2>&1
if [ $? -gt 0 ]
then
@@ -74,10 +74,10 @@
MONO_CMD=mono
else
- MONO_RUNTIME_PATH=@_bindir_@/../mono
+ MONO_RUNTIME_PATH=/opt/novell/mono
export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@
- source $MONO_RUNTIME_PATH/bin/novell-ifolder-mono-environment.sh
- export MONO_CFG_DIR=$MONO_RUNTIME_PATH/etc
+ source $MONO_RUNTIME_PATH/bin/mono-addon-environment.sh
+ export MONO_CFG_DIR=/etc
export IFOLDER_MOD_MONO_SERVER2_PATH=@_bindir_@
export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH
cd @_bindir_@
Modified: trunk/src/server/setup/iFolder_update_proxy_cred_store.in
===================================================================
--- trunk/src/server/setup/iFolder_update_proxy_cred_store.in 2011-01-24 12:14:43 UTC (rev 7563)
+++ trunk/src/server/setup/iFolder_update_proxy_cred_store.in 2011-01-27 11:54:30 UTC (rev 7564)
@@ -59,7 +59,7 @@
export OS_ARCH=`uname -m`
fi
-rpm -q novell-ifolder-mono > /dev/null 2>&1
+rpm -q mono-addon-core > /dev/null 2>&1
if [ $? -gt 0 ]
then
@@ -71,10 +71,10 @@
MONO_CMD=mono
else
- MONO_RUNTIME_PATH=@_bindir_@/../mono
+ MONO_RUNTIME_PATH=/opt/novell/mono
export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@
- source $MONO_RUNTIME_PATH/bin/novell-ifolder-mono-environment.sh
- export MONO_CFG_DIR=$MONO_RUNTIME_PATH/etc
+ source $MONO_RUNTIME_PATH/bin/mono-addon-environment.sh
+ export MONO_CFG_DIR=/etc
export IFOLDER_MOD_MONO_SERVER2_PATH=@_bindir_@
export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH
cd @_bindir_@
Modified: trunk/src/server/setup/ifolder-admin-setup.in
===================================================================
--- trunk/src/server/setup/ifolder-admin-setup.in 2011-01-24 12:14:43 UTC (rev 7563)
+++ trunk/src/server/setup/ifolder-admin-setup.in 2011-01-27 11:54:30 UTC (rev 7564)
@@ -43,7 +43,7 @@
export OS_ARCH=`uname -m`
fi
-rpm -q novell-ifolder-mono > /dev/null 2>&1
+rpm -q mono-addon-core > /dev/null 2>&1
if [ $? -gt 0 ]
then
export MONO_PATH=@_webbindir_@:@_bindir_@
@@ -53,10 +53,10 @@
mono @_bindir_@/iFolderAdminSetup.exe "$@"
else
- MONO_RUNTIME_PATH=@_bindir_@/../mono
+ MONO_RUNTIME_PATH=/opt/novell/mono
export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@
- source $MONO_RUNTIME_PATH/bin/novell-ifolder-mono-environment.sh
- export MONO_CFG_DIR=$MONO_RUNTIME_PATH/etc
+ source $MONO_RUNTIME_PATH/bin/mono-addon-environment.sh
+ export MONO_CFG_DIR=/etc
export IFOLDER_MOD_MONO_SERVER2_PATH=@_bindir_@
export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH
cd @_bindir_@
Modified: trunk/src/server/setup/ifolder-mod-mono-server2.in
===================================================================
--- trunk/src/server/setup/ifolder-mod-mono-server2.in 2011-01-24 12:14:43 UTC (rev 7563)
+++ trunk/src/server/setup/ifolder-mod-mono-server2.in 2011-01-27 11:54:30 UTC (rev 7564)
@@ -36,7 +36,7 @@
#*
#*******************************************************************************/
-export MONO_PATH=@_bindir_@/../mono/lib/mono/2.0/:@_bindir_@/../lib:@_bindir_@/../lib/simias/web/bin:@_bindir_@/../lib/simias/admin/bin:@_bindir_@/../lib/simias/webaccess/bin
-source @_bindir_@/../mono/bin/novell-ifolder-mono-environment.sh
-export MONO_CFG_DIR=@_bindir_@/../mono/etc
-exec @_bindir_@/../mono/bin/mod-mono-server2 "$@"
+export MONO_PATH=/opt/novell/mono/lib/mono/2.0/:@_bindir_@/../lib:@_bindir_@/../lib/simias/web/bin:@_bindir_@/../lib/simias/admin/bin:@_bindir_@/../lib/simias/webaccess/bin
+source /opt/novell/mono/bin/mono-addon-environment.sh
+export MONO_CFG_DIR=/etc
+exec /opt/novell/mono/bin/mod-mono-server2 "$@"
Modified: trunk/src/server/setup/ifolder-web-setup.in
===================================================================
--- trunk/src/server/setup/ifolder-web-setup.in 2011-01-24 12:14:43 UTC (rev 7563)
+++ trunk/src/server/setup/ifolder-web-setup.in 2011-01-27 11:54:30 UTC (rev 7564)
@@ -43,7 +43,7 @@
export OS_ARCH=`uname -m`
fi
-rpm -q novell-ifolder-mono > /dev/null 2>&1
+rpm -q mono-addon-core > /dev/null 2>&1
if [ $? -gt 0 ]
then
@@ -55,10 +55,10 @@
mono @_bindir_@/iFolderWebSetup.exe "$@"
else
- MONO_RUNTIME_PATH=@_bindir_@/../mono
+ MONO_RUNTIME_PATH=/opt/novell/mono
export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@
- source $MONO_RUNTIME_PATH/bin/novell-ifolder-mono-environment.sh
- export MONO_CFG_DIR=$MONO_RUNTIME_PATH/etc
+ source $MONO_RUNTIME_PATH/bin/mono-addon-environment.sh
+ export MONO_CFG_DIR=/etc
export IFOLDER_MOD_MONO_SERVER2_PATH=@_bindir_@
export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH
cd @_bindir_@
Modified: trunk/src/server/setup/ifolder_mono_setup.in
===================================================================
--- trunk/src/server/setup/ifolder_mono_setup.in 2011-01-24 12:14:43 UTC (rev 7563)
+++ trunk/src/server/setup/ifolder_mono_setup.in 2011-01-27 11:54:30 UTC (rev 7564)
@@ -46,7 +46,7 @@
processFile(){
if [ -f $1 ]; then
- sed -e 's,'$MOD_MONO_CONF_FILE_PATH','$iFPrefix/mono/etc/apache2/conf.d/mod_mono.conf',g' -i $1
+ #sed -e 's,'$MOD_MONO_CONF_FILE_PATH','$iFPrefix/mono/etc/apache2/conf.d/mod_mono.conf',g' -i $1
if [ $OS_ARCH -gt 0 ]; then
sed -e 's,'$IFOLDER32BIT','$IFOLDER64BIT',g' -i $1
fi
@@ -105,7 +105,7 @@
}
-rpm -q novell-ifolder-mono > /dev/null 2>&1
+rpm -q mono-addon-core > /dev/null 2>&1
if [ $? -eq 0 ]
then
processFile $CONF_FILE_PATH/simias.conf
Modified: trunk/src/server/setup/ifolder_shutdown
===================================================================
--- trunk/src/server/setup/ifolder_shutdown 2011-01-24 12:14:43 UTC (rev 7563)
+++ trunk/src/server/setup/ifolder_shutdown 2011-01-27 11:54:30 UTC (rev 7564)
@@ -38,7 +38,7 @@
if [ -f /opt/novell/ifolder3/mono/bin/mod-mono-server2 ]; then
- source /opt/novell/ifolder3/mono/bin/novell-ifolder-mono-environment.sh
+ source /opt/novell/mono/bin/mono-addon-environment.sh
/opt/novell/ifolder3/mono/bin/mod-mono-server2 --filename /tmp/mod_mono_server_simias10 --terminate
Modified: trunk/src/server/setup/ldap-cert-update.in
===================================================================
--- trunk/src/server/setup/ldap-cert-update.in 2011-01-24 12:14:43 UTC (rev 7563)
+++ trunk/src/server/setup/ldap-cert-update.in 2011-01-27 11:54:30 UTC (rev 7564)
@@ -40,7 +40,7 @@
export OS_ARCH=`uname -m`
fi
-rpm -q novell-ifolder-mono > /dev/null 2>&1
+rpm -q mono-addon-core > /dev/null 2>&1
if [ $? -gt 0 ]
then
@@ -52,10 +52,10 @@
mono @_bindir_@/CertUpdate.exe "$@"
else
- MONO_RUNTIME_PATH=@_bindir_@/../mono
+ MONO_RUNTIME_PATH=/opt/novell/mono
export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@
- source $MONO_RUNTIME_PATH/bin/novell-ifolder-mono-environment.sh
- export MONO_CFG_DIR=$MONO_RUNTIME_PATH/etc
+ source $MONO_RUNTIME_PATH/bin/mono-addon-environment.sh
+ export MONO_CFG_DIR=/etc
export IFOLDER_MOD_MONO_SERVER2_PATH=@_bindir_@
export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH
cd @_bindir_@
Modified: trunk/src/server/setup/simias-server-setup.in
===================================================================
--- trunk/src/server/setup/simias-server-setup.in 2011-01-24 12:14:43 UTC (rev 7563)
+++ trunk/src/server/setup/simias-server-setup.in 2011-01-27 11:54:30 UTC (rev 7564)
@@ -42,10 +42,9 @@
export OS_ARCH=`uname -m`
fi
-rpm -q novell-ifolder-mono > /dev/null 2>&1
+rpm -q mono-addon-core > /dev/null 2>&1
if [ $? -gt 0 ]
then
-
export MONO_PATH=@_webbindir_@:@_bindir_@
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:@_webbindir_@
export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:@_webbindir_@
@@ -54,10 +53,10 @@
mono @_bindir_@/SimiasServerSetup.exe "$@"
else
- MONO_RUNTIME_PATH=@_bindir_@/../mono
+ MONO_RUNTIME_PATH=/opt/novell/mono
export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@
- source $MONO_RUNTIME_PATH/bin/novell-ifolder-mono-environment.sh
- export MONO_CFG_DIR=$MONO_RUNTIME_PATH/etc
+ source $MONO_RUNTIME_PATH/bin/mono-addon-environment.sh
+ export MONO_CFG_DIR=/etc
export IFOLDER_MOD_MONO_SERVER2_PATH=@_bindir_@
export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH
cd @_bindir_@
Modified: trunk/src/utils/restore/ifolder-data-recovery.in
===================================================================
--- trunk/src/utils/restore/ifolder-data-recovery.in 2011-01-24 12:14:43 UTC (rev 7563)
+++ trunk/src/utils/restore/ifolder-data-recovery.in 2011-01-27 11:54:30 UTC (rev 7564)
@@ -38,7 +38,7 @@
then
export OS_ARCH=`uname -m`
fi
-rpm -q novell-ifolder-mono > /dev/null 2>&1
+rpm -q mono-core-addon > /dev/null 2>&1
if [ $? -gt 0 ]
then
@@ -47,10 +47,10 @@
export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH:@_webbindir_@
cd @_bindir_@
else
- MONO_RUNTIME_PATH=@_bindir_@/../mono
+ MONO_RUNTIME_PATH=/opt/novell/bin
export MONO_PATH=$MONO_RUNTIME_PATH/lib/mono/:$MONO_RUNTIME_PATH/lib/mono/2.0:@_webbindir_@:@_bindir_@
source $MONO_RUNTIME_PATH/bin/novell-ifolder-mono-environment.sh
- export MONO_CFG_DIR=$MONO_RUNTIME_PATH/etc
+ export MONO_CFG_DIR=/etc
export IFOLDER_MOD_MONO_SERVER2_PATH=@_bindir_@
export IFOLDER_MONO_PATH=$MONO_RUNTIME_PATH
cd @_bindir_@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spr...@us...> - 2011-01-04 09:32:43
|
Revision: 7561
http://simias.svn.sourceforge.net/simias/?rev=7561&view=rev
Author: spratima
Date: 2011-01-04 09:32:36 +0000 (Tue, 04 Jan 2011)
Log Message:
-----------
version bump for ifolder updates
Modified Paths:
--------------
branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/version.config
Modified: branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/version.config
===================================================================
--- branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/version.config 2011-01-03 11:51:40 UTC (rev 7560)
+++ branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/version.config 2011-01-04 09:32:36 UTC (rev 7561)
@@ -4,15 +4,15 @@
with the one specified here by 'filename'. -->
<versioninfo>
<distribution match="windows32">
- <version>3.8.0.6</version>
+ <version>3.8.0.7</version>
<filename>ifolder3-windows.exe</filename>
</distribution>
<distribution match="windows64">
- <version>3.8.0.6</version>
+ <version>3.8.0.7</version>
<filename>ifolder3-windows-x64.exe</filename>
</distribution>
<distribution match="DEFAULT">
- <version>3.8.0.6</version>
+ <version>3.8.0.7</version>
<filename>ifolder3-windows.exe</filename>
</distribution>
</versioninfo>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2010-12-15 14:28:57
|
Revision: 7552
http://simias.svn.sourceforge.net/simias/?rev=7552&view=rev
Author: mvikash
Date: 2010-12-15 14:28:51 +0000 (Wed, 15 Dec 2010)
Log Message:
-----------
changes done for sle11 compatiblity.
Modified Paths:
--------------
trunk/package/linux/ifolder3-enterprise.spec.autobuild
Modified: trunk/package/linux/ifolder3-enterprise.spec.autobuild
===================================================================
--- trunk/package/linux/ifolder3-enterprise.spec.autobuild 2010-11-26 09:08:07 UTC (rev 7551)
+++ trunk/package/linux/ifolder3-enterprise.spec.autobuild 2010-12-15 14:28:51 UTC (rev 7552)
@@ -18,7 +18,15 @@
Name: ifolder3-enterprise
-BuildRequires: compat-libstdc++ e2fsprogs e2fsprogs-devel gcc-c++ glib2 glib2-devel libflaim libflaim-devel libstdc++ libstdc++-devel libxml2 libxml2-devel log4net novell-ifolder-mono novell-ifolder-mono-devel novell-NLDAPbase novell-NLDAPsdk-devel pkgconfig
+%if %suse_version <= 1100
+BuildRequires: compat-libstdc++ e2fsprogs e2fsprogs-devel gcc-c++ glib2 glib2-devel libflaim libflaim-devel libstdc++ libstdc++-devel libxml2 libxml2-devel log4net pkgconfig xsp ncurses ncurses-devel novell-ifolder-mono novell-ifolder-mono-devel novell-NLDAPbase novell-NLDAPsdk-devel
+%else
+%ifarch x86_64
+BuildRequires: libstdc++33-32bit libstdc++33-devel-32bit e2fsprogs e2fsprogs-devel gcc-c++ glib2 glib2-devel libflaim libflaim-devel libstdc++ libstdc++-devel libxml2 libxml2-devel log4net apache2-mod_mono pkgconfig xsp ncurses ncurses-devel novell-ifolder-mono novell-ifolder-mono-devel novell-NLDAPbase novell-NLDAPsdk-devel
+%else
+BuildRequires: libstdc++33 libstdc++33-devel e2fsprogs e2fsprogs-devel gcc-c++ glib2 glib2-devel libflaim libflaim-devel libstdc++ libstdc++-devel libxml2 libxml2-devel log4net apache2-mod_mono pkgconfig xsp ncurses ncurses-devel novell-ifolder-mono novell-ifolder-mono-devel novell-NLDAPbase novell-NLDAPsdk-devel
+%endif
+%endif
%define buildnum @@BUILDNUM@@
%define novellmandir /opt/novell/man/
@@ -48,8 +56,20 @@
to multiple machines and also enables Web-based access to files on the
server.
+%package devel
+License: GPLv2
+Summary: Development files for simias
+Group: Development/Libraries/C and C++
+Requires: %{name} = %{version}
+
+%description devel
+Development files for simias server. Simias is a technology that will allow
+various types of data to be stored and related in what is known as a
+collection. Initially Simias is the underlying data store for the
+iFolder project, although it has potential to do much more.
+
%prep
export BUILDNUM=%{buildnum}
%setup -n %{name}
@@ -128,6 +148,8 @@
#rm -rf %{prefix}/%_lib/simias/web/update/
#=============================================================================
+%postun
+
%files
%attr(755,root,root) %dir %{prefix}
%attr(755,root,root) %dir /opt/novell
@@ -144,42 +166,44 @@
%dir %{prefix}/etc/simias/apache/example.com
%dir %{prefix}/etc/simias/bill
%dir %{prefix}/etc/simias/bill/modules
-#%dir %{prefix}/%_lib/Mono
-#%dir %{prefix}/%_lib/Mono/bin
-#%dir %{prefix}/%_lib/Mono/rpms
%{prefix}/etc/simias/Simias.config
%{prefix}/etc/simias/Simias.log4net
-%dir %{prefix}/include
-%{prefix}/include/*
%dir %{prefix}/%_lib
-%{prefix}/%_lib/*
+%{prefix}/%_lib/*.so.*
+#%{prefix}/%_lib/*
%dir %{prefix}/share
%{prefix}/share/*
+%dir %{OES_LOG}
+
+#Simias admin
+%dir %{prefix}/%_lib/simias/admin
+%dir %{prefix}/%_lib/simias/admin/bin
+%dir %{prefix}/%_lib/simias/admin/css
+%dir %{prefix}/%_lib/simias/admin/help/*
+%dir %{prefix}/%_lib/simias/admin/images/*
+%{prefix}/%_lib/simias/admin/*
+
+#Simias core webservices
%dir %{prefix}/%_lib/simias/web
%dir %{prefix}/%_lib/simias/web/bin
-%dir %{OES_LOG}
-%{prefix}/%_lib/simias/web/bin/SimiasClient.dll
-%{prefix}/%_lib/simias/web/bin/Simias.Web.dll
-%{prefix}/%_lib/simias/web/bin/Simias.POBox.Web.dll
+%dir %{prefix}/%_lib/simias/web/update
+%dir %{prefix}/%_lib/simias/
+%dir %{prefix}/%_lib/simias/bin
+%{prefix}/%_lib/simias/bin/*.exe
+%{prefix}/%_lib/simias/web/bin/*.dll
%{prefix}/%_lib/simias/web/bin/SimiasLib.dll.config
%{prefix}/%_lib/simias/web/bin/ifdata
-%{prefix}/%_lib/simias/web/bin/SyncService.Web.dll
%{prefix}/%_lib/simias/web/bin/Simias.exe
-%{prefix}/%_lib/simias/web/bin/SimiasLib.dll
-%{prefix}/%_lib/simias/webaccess/bin/SimiasLib.dll
-%{prefix}/%_lib/simias/admin/bin/SimiasLib.dll
-%{prefix}/%_lib/simias/web/bin/FlaimWrapper.so
-#%{prefix}/%_lib/simias/web/bin/SimiasAPIService.Web.dll
+%{prefix}/%_lib/simias/web/*.asmx
+%{prefix}/%_lib/simias/web/*.ashx
%{prefix}/%_lib/simias/web/Global.asax
%dir %{prefix}/%_lib/simias/web/modules
%{prefix}/%_lib/simias/web/update/*
%{prefix}/%_lib/simias/web/modules/SimiasLib.conf
-%{prefix}/%_lib/simias/web/Login.ashx
-%{prefix}/%_lib/simias/web/POService.asmx
-%{prefix}/%_lib/simias/web/Simias.asmx
-%{prefix}/%_lib/simias/web/SyncHandler.ashx
%{prefix}/%_lib/simias/web/web.config
-#%{prefix}/%_lib/simias/web/SimiasAPI.asmx
+#Webaccess
+%dir %{prefix}/%_lib/simias/webaccess
+%{prefix}/%_lib/simias/webaccess/*
%config(noreplace) %{prefix}/%_lib/simias/web/web.config
%config(noreplace) %{prefix}/%_lib/simias/webaccess/Web.config
%config(noreplace) %{prefix}/%_lib/simias/admin/Web.config
@@ -195,9 +219,29 @@
%{prefix}/etc/simias/defaults.config
%{prefix}/etc/novell-ifolder3.conf
/etc/ld.so.conf.d/novell-ifolder3.conf
-%{novellmandir}/man8/ifolder-data-recovery.8
+%attr(655,root,root) %{novellmandir}/man8/ifolder-data-recovery.8.gz
%ghost %{OES_LOG}/adminweb.log
+
+%files devel
+%defattr(744,root,root)
+%{prefix}/%_lib/libsimias-manager.a
+%{prefix}/%_lib/libsimias.so
+%{prefix}/%_lib/libFlaimWrapper.so
+%dir %{prefix}/%_lib/simias/
+%dir %{prefix}/%_lib/simias/web/
+%dir %{prefix}/%_lib/simias/web/bin/
+%{prefix}/%_lib/simias/web/bin/FlaimWrapper.so
+%{prefix}/%_lib/libsimias-event.so
+%dir %{prefix}/%_lib/pkgconfig
+%{prefix}/%_lib/pkgconfig/*
+%dir %{prefix}/include/
+%dir %{prefix}/%_lib/pkgconfig
+%dir %{prefix}/include/simias/
+%{prefix}/include/simias/*
+
+
+
%changelog
* Fri May 02 2008 - sri...@no...
- #385099,385035,351303(Partial): Default value for use-ssl option is
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2010-11-10 07:13:36
|
Revision: 7549
http://simias.svn.sourceforge.net/simias/?rev=7549&view=rev
Author: mvikash
Date: 2010-11-10 07:13:29 +0000 (Wed, 10 Nov 2010)
Log Message:
-----------
Reviewer: GG
Locallization Required: String changed, Localization not planned for this release.
Documentation Required: No
Description: Time-out exception while setting group quota has been
handled.
Modified Paths:
--------------
trunk/src/admin/UserDetails.aspx.cs
trunk/src/admin/iFolderAdmin.resx
Modified: trunk/src/admin/UserDetails.aspx.cs
===================================================================
--- trunk/src/admin/UserDetails.aspx.cs 2010-11-10 06:30:29 UTC (rev 7548)
+++ trunk/src/admin/UserDetails.aspx.cs 2010-11-10 07:13:29 UTC (rev 7549)
@@ -805,7 +805,7 @@
{
limitString = "Unlimited";
}
-
+
try
{
decimal limit = Convert.ToDecimal( limitString == "Unlimited" ? "-1" : limitString );
@@ -813,11 +813,11 @@
{
// Convert from megabytes back to bytes.
GroupDiskLimit = limitString == "Unlimited" ? -1 : Convert.ToInt64( Decimal.Round( limit, 2 ) * 1048576 );
-
+
// connect to master to set member property
ConnectMaster();
+ // call webservice and pass parameters to commit.
- // call webservice and pass parameters to commit.
bool retval = web.SetAggregateDiskQuota(UserID, GroupDiskLimit);
DisconnectMaster();
web.Url = currentServerURL;
@@ -844,12 +844,20 @@
TopNav.ShowError( GetString( "ERRORINVALIDQUOTA" ) );
return;
}
- catch
+ catch(Exception ex)
{
- DisconnectMaster();
- web.Url = currentServerURL;
- TopNav.ShowError( GetString( "ERRORUNKNOWNERROR" ) );
- return;
+ if(ex.Message.IndexOf("timed out") != -1)
+ {
+ TopNav.ShowInfo(GetString("TIMEOUT"));
+ return;
+ }
+ else
+ {
+ DisconnectMaster();
+ web.Url = currentServerURL;
+ TopNav.ShowError( GetString( "ERRORUNKNOWNERROR" ));
+ return;
+ }
}
GetUserDetails();
@@ -862,7 +870,7 @@
/// <param name="sender"></param>
/// <param name="e"></param>
private void ConnectMaster ()
- {
+ {
iFolderServer[] list = web.GetServers();
foreach( iFolderServer server in list )
Modified: trunk/src/admin/iFolderAdmin.resx
===================================================================
--- trunk/src/admin/iFolderAdmin.resx 2010-11-10 06:30:29 UTC (rev 7548)
+++ trunk/src/admin/iFolderAdmin.resx 2010-11-10 07:13:29 UTC (rev 7549)
@@ -1347,5 +1347,8 @@
<data name="waiting">
<value>waiting</value>
</data>
+ <data name="TIMEOUT">
+ <value>It may take a long time to complete the request. You may perform other tasks while this request is being processed.</value>
+ </data>
</data>
</root>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2010-11-10 06:30:35
|
Revision: 7548
http://simias.svn.sourceforge.net/simias/?rev=7548&view=rev
Author: hegdegg
Date: 2010-11-10 06:30:29 +0000 (Wed, 10 Nov 2010)
Log Message:
-----------
ID: #616747
Reviewer: Vikash
Localization Required: No
Documentation Required: No
Description: Version Update
Modified Paths:
--------------
trunk/package/linux/ifolder3-enterprise.spec.autobuild
trunk/package/linux/ifolder3-enterprise.spec.in
trunk/src/server/Simias.ClientUpdate/mac-version.config
trunk/src/server/Simias.ClientUpdate/unix-version.config
trunk/src/server/Simias.ClientUpdate/version.config
Modified: trunk/package/linux/ifolder3-enterprise.spec.autobuild
===================================================================
--- trunk/package/linux/ifolder3-enterprise.spec.autobuild 2010-11-10 06:29:24 UTC (rev 7547)
+++ trunk/package/linux/ifolder3-enterprise.spec.autobuild 2010-11-10 06:30:29 UTC (rev 7548)
@@ -1,5 +1,5 @@
#
-# spec file for package ifolder3 (Version 3.8.1.@@BUILDNUM@@.1)
+# spec file for package ifolder3 (Version 3.8.4.@@BUILDNUM@@.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -34,7 +34,7 @@
Requires: log4net >= 1.2.9
Requires: novell-NLDAPbase
#Obsoletes: %{name} < %{version}
-Version: 3.8.2.@@BUILDNUM@@.1
+Version: 3.8.4.@@BUILDNUM@@.1
Release: 0.2
Summary: Novell iFolder 3 Enterprise
Source: ifolder3-enterprise.tar.gz
Modified: trunk/package/linux/ifolder3-enterprise.spec.in
===================================================================
--- trunk/package/linux/ifolder3-enterprise.spec.in 2010-11-10 06:29:24 UTC (rev 7547)
+++ trunk/package/linux/ifolder3-enterprise.spec.in 2010-11-10 06:30:29 UTC (rev 7548)
@@ -1,5 +1,5 @@
#
-# spec file for package ifolder3 (Version 3.8.1.@@BUILDNUM@@.1)
+# spec file for package ifolder3 (Version 3.8.4.@@BUILDNUM@@.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -42,7 +42,7 @@
Requires: mono-web >= 2.4.2.3
Requires: log4net >= 1.2.10
Requires: apache2-mod_mono >= 2.4
-Version: 3.8.2.@@BUILDNUM@@.1
+Version: 3.8.4.@@BUILDNUM@@.1
Release: 0.2
Summary: Novell iFolder 3 Enterprise
Source: ifolder3-enterprise.tar.gz
Modified: trunk/src/server/Simias.ClientUpdate/mac-version.config
===================================================================
--- trunk/src/server/Simias.ClientUpdate/mac-version.config 2010-11-10 06:29:24 UTC (rev 7547)
+++ trunk/src/server/Simias.ClientUpdate/mac-version.config 2010-11-10 06:30:29 UTC (rev 7548)
@@ -7,7 +7,7 @@
<!-- Put Version string here. Should be in the format of
Major Version.Minor Version.Build Version.Revision
Example: <version>1.0.1817.29628</version> -->
- <version>3.8.2.1</version>
+ <version>3.8.4.0</version>
<!-- Put name of Mac ifolder client application file
to be upgraded here. The specified file must be in
Modified: trunk/src/server/Simias.ClientUpdate/unix-version.config
===================================================================
--- trunk/src/server/Simias.ClientUpdate/unix-version.config 2010-11-10 06:29:24 UTC (rev 7547)
+++ trunk/src/server/Simias.ClientUpdate/unix-version.config 2010-11-10 06:30:29 UTC (rev 7548)
@@ -24,7 +24,7 @@
you are doing.
-->
<distribution match="DEFAULT">
- <version>3.8.2.1</version>
+ <version>3.8.4.0</version>
<download-directory>default</download-directory>
</distribution>
@@ -51,17 +51,17 @@
-->
<distribution match="SUSE Linux Enterprise Desktop 10">
- <version>3.8.2.1</version>
+ <version>3.8.4.0</version>
<download-directory>suse-linux-10.0</download-directory>
</distribution>
<distribution match="SUSE Linux Enterprise Desktop 11">
- <version>3.8.2.1</version>
+ <version>3.8.4.0</version>
<download-directory>suse-linux-11.0</download-directory>
</distribution>
<distribution match="openSUSE">
- <version>3.8.2.1</version>
+ <version>3.8.4.0</version>
<download-directory>opensuse-linux</download-directory>
</distribution>
Modified: trunk/src/server/Simias.ClientUpdate/version.config
===================================================================
--- trunk/src/server/Simias.ClientUpdate/version.config 2010-11-10 06:29:24 UTC (rev 7547)
+++ trunk/src/server/Simias.ClientUpdate/version.config 2010-11-10 06:30:29 UTC (rev 7548)
@@ -4,15 +4,15 @@
with the one specified here by 'filename'. -->
<versioninfo>
<distribution match="windows32">
- <version>3.8.2.1</version>
+ <version>3.8.4.0</version>
<filename>ifolder3-windows.exe</filename>
</distribution>
<distribution match="windows64">
- <version>3.8.2.1</version>
+ <version>3.8.4.0</version>
<filename>ifolder3-windows-x64.exe</filename>
</distribution>
<distribution match="DEFAULT">
- <version>3.8.2.1</version>
+ <version>3.8.4.0</version>
<filename>ifolder3-windows.exe</filename>
</distribution>
</versioninfo>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2010-11-10 06:29:31
|
Revision: 7547
http://simias.svn.sourceforge.net/simias/?rev=7547&view=rev
Author: hegdegg
Date: 2010-11-10 06:29:24 +0000 (Wed, 10 Nov 2010)
Log Message:
-----------
ID: #616747
Reviewer: Vikash
Locallization Required: No
Documentation Required: No
Description: Version Update
Modified Paths:
--------------
trunk/src/core/FlaimProvider/FlaimWrapper/FlaimWrapper.vcproj
trunk/src/core/POBoxWS/Properties/AssemblyInfo.cs
trunk/src/core/Properties/AssemblyInfo.cs
trunk/src/core/SimiasApp/Properties/AssemblyInfo.cs
trunk/src/core/SimiasClient/Properties/AssemblyInfo.cs
trunk/src/core/SyncService/Properties/AssemblyInfo.cs
trunk/src/core/WebService/Properties/AssemblyInfo.cs
Modified: trunk/src/core/FlaimProvider/FlaimWrapper/FlaimWrapper.vcproj
===================================================================
--- trunk/src/core/FlaimProvider/FlaimWrapper/FlaimWrapper.vcproj 2010-11-08 09:12:20 UTC (rev 7546)
+++ trunk/src/core/FlaimProvider/FlaimWrapper/FlaimWrapper.vcproj 2010-11-10 06:29:24 UTC (rev 7547)
@@ -84,7 +84,7 @@
Name="VCLinkerTool"
AdditionalDependencies="rpcrt4.lib ws2_32.lib odbc32.lib odbccp32.lib flaim.lib msvcrt.lib"
OutputFile=".\Release/FlaimWrapper.dll"
- Version="3.8.2.1"
+ Version="3.8.4.0"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""$(SolutionDir)..\..\dependencies\external\libflaim\win32""
@@ -186,7 +186,7 @@
Name="VCLinkerTool"
AdditionalDependencies="rpcrt4.lib ws2_32.lib odbc32.lib odbccp32.lib dbghelp.lib flaim.lib flaimtk.lib msvcrt.lib"
OutputFile=".\Release/FlaimWrapper.dll"
- Version="3.8.2.1"
+ Version="3.8.4.0"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""$(SolutionDir)..\..\dependencies\external\libflaim\win64""
Modified: trunk/src/core/POBoxWS/Properties/AssemblyInfo.cs
===================================================================
--- trunk/src/core/POBoxWS/Properties/AssemblyInfo.cs 2010-11-08 09:12:20 UTC (rev 7546)
+++ trunk/src/core/POBoxWS/Properties/AssemblyInfo.cs 2010-11-10 06:29:24 UTC (rev 7547)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.2.1")]
-[assembly: AssemblyFileVersion("3.8.2.1")]
+[assembly: AssemblyVersion("3.8.4.0")]
+[assembly: AssemblyFileVersion("3.8.4.0")]
Modified: trunk/src/core/Properties/AssemblyInfo.cs
===================================================================
--- trunk/src/core/Properties/AssemblyInfo.cs 2010-11-08 09:12:20 UTC (rev 7546)
+++ trunk/src/core/Properties/AssemblyInfo.cs 2010-11-10 06:29:24 UTC (rev 7547)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.2.1")]
-[assembly: AssemblyFileVersion("3.8.2.1")]
+[assembly: AssemblyVersion("3.8.4.0")]
+[assembly: AssemblyFileVersion("3.8.4.0")]
Modified: trunk/src/core/SimiasApp/Properties/AssemblyInfo.cs
===================================================================
--- trunk/src/core/SimiasApp/Properties/AssemblyInfo.cs 2010-11-08 09:12:20 UTC (rev 7546)
+++ trunk/src/core/SimiasApp/Properties/AssemblyInfo.cs 2010-11-10 06:29:24 UTC (rev 7547)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.2.1")]
-[assembly: AssemblyFileVersion("3.8.2.1")]
+[assembly: AssemblyVersion("3.8.4.0")]
+[assembly: AssemblyFileVersion("3.8.4.0")]
Modified: trunk/src/core/SimiasClient/Properties/AssemblyInfo.cs
===================================================================
--- trunk/src/core/SimiasClient/Properties/AssemblyInfo.cs 2010-11-08 09:12:20 UTC (rev 7546)
+++ trunk/src/core/SimiasClient/Properties/AssemblyInfo.cs 2010-11-10 06:29:24 UTC (rev 7547)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.2.1")]
-[assembly: AssemblyFileVersion("3.8.2.1")]
+[assembly: AssemblyVersion("3.8.4.0")]
+[assembly: AssemblyFileVersion("3.8.4.0")]
Modified: trunk/src/core/SyncService/Properties/AssemblyInfo.cs
===================================================================
--- trunk/src/core/SyncService/Properties/AssemblyInfo.cs 2010-11-08 09:12:20 UTC (rev 7546)
+++ trunk/src/core/SyncService/Properties/AssemblyInfo.cs 2010-11-10 06:29:24 UTC (rev 7547)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.2.1")]
-[assembly: AssemblyFileVersion("3.8.2.1")]
+[assembly: AssemblyVersion("3.8.4.0")]
+[assembly: AssemblyFileVersion("3.8.4.0")]
Modified: trunk/src/core/WebService/Properties/AssemblyInfo.cs
===================================================================
--- trunk/src/core/WebService/Properties/AssemblyInfo.cs 2010-11-08 09:12:20 UTC (rev 7546)
+++ trunk/src/core/WebService/Properties/AssemblyInfo.cs 2010-11-10 06:29:24 UTC (rev 7547)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.2.1")]
-[assembly: AssemblyFileVersion("3.8.2.1")]
+[assembly: AssemblyVersion("3.8.4.0")]
+[assembly: AssemblyFileVersion("3.8.4.0")]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2010-10-28 14:23:34
|
Revision: 7541
http://simias.svn.sourceforge.net/simias/?rev=7541&view=rev
Author: mvikash
Date: 2010-10-28 14:23:28 +0000 (Thu, 28 Oct 2010)
Log Message:
-----------
version bump form 3.8.0.5 to 3.8.0.6
Modified Paths:
--------------
branches/iFolder_3.8.0_updates/src/core/FlaimProvider/FlaimWrapper/FlaimWrapper.vcproj
branches/iFolder_3.8.0_updates/src/core/POBoxWS/Properties/AssemblyInfo.cs
branches/iFolder_3.8.0_updates/src/core/Properties/AssemblyInfo.cs
branches/iFolder_3.8.0_updates/src/core/SimiasApp/Properties/AssemblyInfo.cs
branches/iFolder_3.8.0_updates/src/core/SimiasClient/Properties/AssemblyInfo.cs
branches/iFolder_3.8.0_updates/src/core/SyncService/Properties/AssemblyInfo.cs
branches/iFolder_3.8.0_updates/src/core/WebService/Properties/AssemblyInfo.cs
branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/mac-version.config
branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/unix-version.config
branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/version.config
Modified: branches/iFolder_3.8.0_updates/src/core/FlaimProvider/FlaimWrapper/FlaimWrapper.vcproj
===================================================================
--- branches/iFolder_3.8.0_updates/src/core/FlaimProvider/FlaimWrapper/FlaimWrapper.vcproj 2010-10-28 13:46:11 UTC (rev 7540)
+++ branches/iFolder_3.8.0_updates/src/core/FlaimProvider/FlaimWrapper/FlaimWrapper.vcproj 2010-10-28 14:23:28 UTC (rev 7541)
@@ -84,7 +84,7 @@
Name="VCLinkerTool"
AdditionalDependencies="rpcrt4.lib ws2_32.lib odbc32.lib odbccp32.lib flaim.lib msvcrt.lib"
OutputFile=".\Release/FlaimWrapper.dll"
- Version="3.8.0.5"
+ Version="3.8.0.6"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""$(SolutionDir)..\..\dependencies\external\libflaim\win32""
@@ -186,7 +186,7 @@
Name="VCLinkerTool"
AdditionalDependencies="rpcrt4.lib ws2_32.lib odbc32.lib odbccp32.lib dbghelp.lib flaim.lib flaimtk.lib msvcrt.lib"
OutputFile=".\Release/FlaimWrapper.dll"
- Version="3.8.0.5"
+ Version="3.8.0.6"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""$(SolutionDir)..\..\dependencies\external\libflaim\win64""
Modified: branches/iFolder_3.8.0_updates/src/core/POBoxWS/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/src/core/POBoxWS/Properties/AssemblyInfo.cs 2010-10-28 13:46:11 UTC (rev 7540)
+++ branches/iFolder_3.8.0_updates/src/core/POBoxWS/Properties/AssemblyInfo.cs 2010-10-28 14:23:28 UTC (rev 7541)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.0.5")]
-[assembly: AssemblyFileVersion("3.8.0.5")]
+[assembly: AssemblyVersion("3.8.0.6")]
+[assembly: AssemblyFileVersion("3.8.0.6")]
Modified: branches/iFolder_3.8.0_updates/src/core/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/src/core/Properties/AssemblyInfo.cs 2010-10-28 13:46:11 UTC (rev 7540)
+++ branches/iFolder_3.8.0_updates/src/core/Properties/AssemblyInfo.cs 2010-10-28 14:23:28 UTC (rev 7541)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.0.5")]
-[assembly: AssemblyFileVersion("3.8.0.5")]
+[assembly: AssemblyVersion("3.8.0.6")]
+[assembly: AssemblyFileVersion("3.8.0.6")]
Modified: branches/iFolder_3.8.0_updates/src/core/SimiasApp/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/src/core/SimiasApp/Properties/AssemblyInfo.cs 2010-10-28 13:46:11 UTC (rev 7540)
+++ branches/iFolder_3.8.0_updates/src/core/SimiasApp/Properties/AssemblyInfo.cs 2010-10-28 14:23:28 UTC (rev 7541)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.0.5")]
-[assembly: AssemblyFileVersion("3.8.0.5")]
+[assembly: AssemblyVersion("3.8.0.6")]
+[assembly: AssemblyFileVersion("3.8.0.6")]
Modified: branches/iFolder_3.8.0_updates/src/core/SimiasClient/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/src/core/SimiasClient/Properties/AssemblyInfo.cs 2010-10-28 13:46:11 UTC (rev 7540)
+++ branches/iFolder_3.8.0_updates/src/core/SimiasClient/Properties/AssemblyInfo.cs 2010-10-28 14:23:28 UTC (rev 7541)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.0.5")]
-[assembly: AssemblyFileVersion("3.8.0.5")]
+[assembly: AssemblyVersion("3.8.0.6")]
+[assembly: AssemblyFileVersion("3.8.0.6")]
Modified: branches/iFolder_3.8.0_updates/src/core/SyncService/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/src/core/SyncService/Properties/AssemblyInfo.cs 2010-10-28 13:46:11 UTC (rev 7540)
+++ branches/iFolder_3.8.0_updates/src/core/SyncService/Properties/AssemblyInfo.cs 2010-10-28 14:23:28 UTC (rev 7541)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.0.5")]
-[assembly: AssemblyFileVersion("3.8.0.5")]
+[assembly: AssemblyVersion("3.8.0.6")]
+[assembly: AssemblyFileVersion("3.8.0.6")]
Modified: branches/iFolder_3.8.0_updates/src/core/WebService/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/src/core/WebService/Properties/AssemblyInfo.cs 2010-10-28 13:46:11 UTC (rev 7540)
+++ branches/iFolder_3.8.0_updates/src/core/WebService/Properties/AssemblyInfo.cs 2010-10-28 14:23:28 UTC (rev 7541)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.0.5")]
-[assembly: AssemblyFileVersion("3.8.0.5")]
+[assembly: AssemblyVersion("3.8.0.6")]
+[assembly: AssemblyFileVersion("3.8.0.6")]
Modified: branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/mac-version.config
===================================================================
--- branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/mac-version.config 2010-10-28 13:46:11 UTC (rev 7540)
+++ branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/mac-version.config 2010-10-28 14:23:28 UTC (rev 7541)
@@ -7,7 +7,7 @@
<!-- Put Version string here. Should be in the format of
Major Version.Minor Version.Build Version.Revision
Example: <version>1.0.1817.29628</version> -->
- <version>3.8.0.5</version>
+ <version>3.8.0.6</version>
<!-- Put name of Mac ifolder client application file
to be upgraded here. The specified file must be in
Modified: branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/unix-version.config
===================================================================
--- branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/unix-version.config 2010-10-28 13:46:11 UTC (rev 7540)
+++ branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/unix-version.config 2010-10-28 14:23:28 UTC (rev 7541)
@@ -24,7 +24,7 @@
you are doing.
-->
<distribution match="DEFAULT">
- <version>3.8.0.5</version>
+ <version>3.8.0.6</version>
<download-directory>default</download-directory>
</distribution>
@@ -51,17 +51,17 @@
-->
<distribution match="SUSE Linux Enterprise Desktop 10">
- <version>3.8.0.5</version>
+ <version>3.8.0.6</version>
<download-directory>suse-linux-10.0</download-directory>
</distribution>
<distribution match="SUSE Linux Enterprise Desktop 11">
- <version>3.8.0.5</version>
+ <version>3.8.0.6</version>
<download-directory>suse-linux-11.0</download-directory>
</distribution>
<distribution match="openSUSE">
- <version>3.8.0.5</version>
+ <version>3.8.0.6</version>
<download-directory>opensuse-linux</download-directory>
</distribution>
Modified: branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/version.config
===================================================================
--- branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/version.config 2010-10-28 13:46:11 UTC (rev 7540)
+++ branches/iFolder_3.8.0_updates/src/server/Simias.ClientUpdate/version.config 2010-10-28 14:23:28 UTC (rev 7541)
@@ -4,15 +4,15 @@
with the one specified here by 'filename'. -->
<versioninfo>
<distribution match="windows32">
- <version>3.8.0.5</version>
+ <version>3.8.0.6</version>
<filename>ifolder3-windows.exe</filename>
</distribution>
<distribution match="windows64">
- <version>3.8.0.5</version>
+ <version>3.8.0.6</version>
<filename>ifolder3-windows-x64.exe</filename>
</distribution>
<distribution match="DEFAULT">
- <version>3.8.0.5</version>
+ <version>3.8.0.6</version>
<filename>ifolder3-windows.exe</filename>
</distribution>
</versioninfo>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <sp...@us...> - 2010-10-28 12:41:40
|
Revision: 7539
http://simias.svn.sourceforge.net/simias/?rev=7539&view=rev
Author: spkumar
Date: 2010-10-28 12:41:34 +0000 (Thu, 28 Oct 2010)
Log Message:
-----------
ID:#587912
Reviewer: Ramesh
Localization Required: No
Documentation Required: No
Description: fixed an issue while handling renamed users during LDAP
sync
Modified Paths:
--------------
branches/iFolder_3.8.0_updates/src/server/Simias.Server/IdentitySyncService.cs
Modified: branches/iFolder_3.8.0_updates/src/server/Simias.Server/IdentitySyncService.cs
===================================================================
--- branches/iFolder_3.8.0_updates/src/server/Simias.Server/IdentitySyncService.cs 2010-10-28 11:48:49 UTC (rev 7538)
+++ branches/iFolder_3.8.0_updates/src/server/Simias.Server/IdentitySyncService.cs 2010-10-28 12:41:34 UTC (rev 7539)
@@ -385,6 +385,15 @@
try
{
member = domain.GetMemberByName( Username );
+ if (member == null && !String.IsNullOrEmpty(UserGuid)){
+ //Note: In case of renamed users teh user name will be different and the GUID will be same.
+ //Search if the user already exist with the GUID.
+ member = domain.GetMemberByID(UserGuid);
+ if (member != null){
+ //TBD:iFolder needs to handle the renamed users properly.
+ log.Info("This user is renamed on the LDAP server. Old Username = {0}, new Username= {1}", member.Name, Username);
+ }
+ }
}
catch{}
if ( member != null )
@@ -530,66 +539,12 @@
{
member.Properties.ModifyProperty( prop );
}
- // while creating member, if sum of allocated disk quota per user is equal to aggregate disk quota set on group
- // then set 0 MB as disk quota limit for this user
- {
- string [] GroupIDs = domain.GetMemberFamilyList(member.UserID);
- foreach(string GroupID in GroupIDs)
- {
- bool IsChildGroup = false;
- Member GroupAsMember = domain.GetMemberByID(GroupID);
- string ParentGroups = null;
- Property p = GroupAsMember.Properties.GetSingleProperty( "UserGroups" );
- if(p != null)
- ParentGroups = p.Value as string;
-
- if(ParentGroups != null && ParentGroups != String.Empty)
- {
- // no point in
- IsChildGroup = true;
- }
- long GroupDiskQuota = GroupAsMember.AggregateDiskQuota;
- if(GroupDiskQuota < 0)
- {
-
- if( IsChildGroup )
- continue;
- else
- {
- Simias.Policy.DiskSpaceQuota.Set(member, -1);
- log.Debug("MEMBERADD: No aggregate Disk Quota set for group, so it will set unlimited space for newly added member");
- break;
- }
-
- }
- if( domain.GroupQuotaRestrictionMethod == (int)QuotaRestriction.UI_Based )
- {
- // add the allocated disk quota per user for whole group
- long SizeAllocatedToMembers = 0;
- string [] MembersList = domain.GetGroupsMemberList( GroupID );
- foreach( string GroupMemberID in MembersList)
- {
- long MemberAllocation = Simias.Policy.DiskSpaceQuota.Get( domain.GetMemberByID(GroupMemberID)).Limit;
- if( MemberAllocation >= 0 )
- SizeAllocatedToMembers += MemberAllocation;
- }
- if( SizeAllocatedToMembers >= GroupDiskQuota )
- {
- log.Debug("MEMBERADD: Sum of Disk Quota per user for all users is equal to aggregate disk quota set for group, so committing 0 MB for newly added user");
- Simias.Policy.DiskSpaceQuota.Set(member, 0);
- break;
- }
-
- }
- }
- }
-
-
status = MemberStatus.Created;
}
catch( Exception ex )
{
+ log.Debug("Failed Creating member: "+Username + ex.Message);
this.ReportError( "Failed creating member: " + Username + ex.Message );
return;
}
@@ -628,6 +583,12 @@
public void ReportError( string ErrorMsg )
{
reportedErrors++;
+ log.Debug( "Error occured in Sync");
+ log.Debug(
+ String.Format(
+ "ERROR:{0} - {1}",
+ DateTime.Now.ToString(),
+ ErrorMsg ) );
syncMessages.Add(
String.Format(
"ERROR:{0} - {1}",
@@ -1441,6 +1402,10 @@
{
ProcessDeletedMembers( state );
}
+ else
+ {
+ log.Error("Errors occured during Identity Sync, skipping processing of user deletion");
+ }
}
catch( Exception ex )
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2010-10-20 08:59:18
|
Revision: 7533
http://simias.svn.sourceforge.net/simias/?rev=7533&view=rev
Author: mvikash
Date: 2010-10-20 08:59:12 +0000 (Wed, 20 Oct 2010)
Log Message:
-----------
updating filemonitor.scanthread status as false, when scanthread is null.
Modified Paths:
--------------
trunk/src/core/Sync/SyncClient.cs
Modified: trunk/src/core/Sync/SyncClient.cs
===================================================================
--- trunk/src/core/Sync/SyncClient.cs 2010-10-19 05:45:56 UTC (rev 7532)
+++ trunk/src/core/Sync/SyncClient.cs 2010-10-20 08:59:12 UTC (rev 7533)
@@ -1150,7 +1150,7 @@
{
if(isNewifolder == true)
{
- log.Debug("new iFolder start the scan thread");
+ log.Debug("new iFolder start the scan thread");
scanThread = new Thread(new ThreadStart(fileMonitor.CheckForFileChanges));
scanThread.IsBackground = true;
scanThread.Priority = ThreadPriority.BelowNormal;
@@ -1790,7 +1790,14 @@
// doing atomic
lock (fileMonitor)
{
- scanThreadStatus = fileMonitor.scanThreadRunning;
+
+ if (scanThread == null || scanThread.IsAlive == false)
+ {
+ fileMonitor.scanThreadRunning = false;
+ }
+
+ scanThreadStatus = fileMonitor.scanThreadRunning;
+
}
if(scanThreadStatus == false)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
