simias-svn Mailing List for simias (Page 3)
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: <he...@us...> - 2012-04-04 12:03:43
|
Revision: 7621
http://simias.svn.sourceforge.net/simias/?rev=7621&view=rev
Author: hegdegg
Date: 2012-04-04 12:03:31 +0000 (Wed, 04 Apr 2012)
Log Message:
-----------
ID:#754666
Reviewer: Srinidhi
Localization Required:No
Documentation Required:No
Description: Enabling compilation for openSUSE 12.1
Modified Paths:
--------------
trunk/src/core/SimiasApp/Makefile.am
Modified: trunk/src/core/SimiasApp/Makefile.am
===================================================================
--- trunk/src/core/SimiasApp/Makefile.am 2012-03-29 05:02:27 UTC (rev 7620)
+++ trunk/src/core/SimiasApp/Makefile.am 2012-04-04 12:03:31 UTC (rev 7621)
@@ -16,7 +16,7 @@
Simias_INCLUDES =
Simias_RESOURCES = $(srcdir)/App$(ICON_EXT)
Simias_FLAGS = $(CSC_EXEFLAG)
-Simias_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll $(SYSTEM_INSTALLER_LIB) SimiasClient.dll $(MONO_WEBSERVER_DLL)
+Simias_LIBS = System.dll System.Web.Services.dll System.Data.dll $(SYSTEM_XML) System.Web.dll $(SYSTEM_INSTALLER_LIB) SimiasClient.dll $(MONO_WEBSERVER_DLL)
Simias_LIBPATH = ../SimiasClient $(MONO_WEBSERVER_PATH)
EXTRA_DIST = App.ico $(Simias_CSFILES) AssemblyInfo.cs.in
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2012-03-29 05:02:34
|
Revision: 7620
http://simias.svn.sourceforge.net/simias/?rev=7620&view=rev
Author: hegdegg
Date: 2012-03-29 05:02:27 +0000 (Thu, 29 Mar 2012)
Log Message:
-----------
ID:#616747
Reviewer: Srinidhi
Localization Required: No
Documentation Required: Yes
Description: Version bump.
Modified Paths:
--------------
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/package/linux/ifolder3-enterprise.spec.autobuild
===================================================================
--- trunk/package/linux/ifolder3-enterprise.spec.autobuild 2011-12-25 17:07:12 UTC (rev 7619)
+++ trunk/package/linux/ifolder3-enterprise.spec.autobuild 2012-03-29 05:02:27 UTC (rev 7620)
@@ -50,7 +50,7 @@
Requires: apache2-mod_mono-addon
Requires: novell-NLDAPbase
#Obsoletes: %{name} < %{version}
-Version: 3.9.0.@@BUILDNUM@@.0
+Version: 3.9.1.@@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-12-25 17:07:12 UTC (rev 7619)
+++ trunk/package/linux/ifolder3-enterprise.spec.in 2012-03-29 05:02:27 UTC (rev 7620)
@@ -42,7 +42,7 @@
Requires: mono-web >= 2.4.2.3
Requires: log4net >= 1.2.10
Requires: apache2-mod_mono >= 2.4
-Version: 3.9.0.@@BUILDNUM@@.0
+Version: 3.9.1.@@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-12-25 17:07:12 UTC (rev 7619)
+++ trunk/package/linux/simias.spec.autobuild 2012-03-29 05:02:27 UTC (rev 7620)
@@ -47,7 +47,7 @@
Requires: log4net >= 1.2.9
Requires: xsp >= 1.2.5
#Obsoletes: %{name} < %{version}
-Version: 1.9.0.@@BUILDNUM@@.0
+Version: 1.9.1.@@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-12-25 17:07:12 UTC (rev 7619)
+++ trunk/package/linux/simias.spec.in 2012-03-29 05:02:27 UTC (rev 7620)
@@ -38,7 +38,7 @@
Requires: log4net >= 1.2.9
Requires: xsp >= 1.2.5
#Obsoletes: %{name} < 1.8.2.@@BUILDNUM@@.1
-Version: 1.9.0.@@BUILDNUM@@.0
+Version: 1.9.1.@@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-12-25 17:07:12 UTC (rev 7619)
+++ trunk/src/core/FlaimProvider/FlaimWrapper/FlaimWrapper.vcproj 2012-03-29 05:02:27 UTC (rev 7620)
@@ -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.9.0.0"
+ Version="3.9.1.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.9.0.0"
+ Version="3.9.1.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-12-25 17:07:12 UTC (rev 7619)
+++ trunk/src/core/POBoxWS/Properties/AssemblyInfo.cs 2012-03-29 05:02:27 UTC (rev 7620)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.9.0.0")]
-[assembly: AssemblyFileVersion("3.9.0.0")]
+[assembly: AssemblyVersion("3.9.1.0")]
+[assembly: AssemblyFileVersion("3.9.1.0")]
Modified: trunk/src/core/Properties/AssemblyInfo.cs
===================================================================
--- trunk/src/core/Properties/AssemblyInfo.cs 2011-12-25 17:07:12 UTC (rev 7619)
+++ trunk/src/core/Properties/AssemblyInfo.cs 2012-03-29 05:02:27 UTC (rev 7620)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.9.0.0")]
-[assembly: AssemblyFileVersion("3.9.0.0")]
+[assembly: AssemblyVersion("3.9.1.0")]
+[assembly: AssemblyFileVersion("3.9.1.0")]
Modified: trunk/src/core/SimiasApp/Properties/AssemblyInfo.cs
===================================================================
--- trunk/src/core/SimiasApp/Properties/AssemblyInfo.cs 2011-12-25 17:07:12 UTC (rev 7619)
+++ trunk/src/core/SimiasApp/Properties/AssemblyInfo.cs 2012-03-29 05:02:27 UTC (rev 7620)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.9.0.0")]
-[assembly: AssemblyFileVersion("3.9.0.0")]
+[assembly: AssemblyVersion("3.9.1.0")]
+[assembly: AssemblyFileVersion("3.9.1.0")]
Modified: trunk/src/core/SimiasClient/Properties/AssemblyInfo.cs
===================================================================
--- trunk/src/core/SimiasClient/Properties/AssemblyInfo.cs 2011-12-25 17:07:12 UTC (rev 7619)
+++ trunk/src/core/SimiasClient/Properties/AssemblyInfo.cs 2012-03-29 05:02:27 UTC (rev 7620)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.9.0.0")]
-[assembly: AssemblyFileVersion("3.9.0.0")]
+[assembly: AssemblyVersion("3.9.1.0")]
+[assembly: AssemblyFileVersion("3.9.1.0")]
Modified: trunk/src/core/SyncService/Properties/AssemblyInfo.cs
===================================================================
--- trunk/src/core/SyncService/Properties/AssemblyInfo.cs 2011-12-25 17:07:12 UTC (rev 7619)
+++ trunk/src/core/SyncService/Properties/AssemblyInfo.cs 2012-03-29 05:02:27 UTC (rev 7620)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.9.0.0")]
-[assembly: AssemblyFileVersion("3.9.0.0")]
+[assembly: AssemblyVersion("3.9.1.0")]
+[assembly: AssemblyFileVersion("3.9.1.0")]
Modified: trunk/src/core/WebService/Properties/AssemblyInfo.cs
===================================================================
--- trunk/src/core/WebService/Properties/AssemblyInfo.cs 2011-12-25 17:07:12 UTC (rev 7619)
+++ trunk/src/core/WebService/Properties/AssemblyInfo.cs 2012-03-29 05:02:27 UTC (rev 7620)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.9.0.0")]
-[assembly: AssemblyFileVersion("3.9.0.0")]
+[assembly: AssemblyVersion("3.9.1.0")]
+[assembly: AssemblyFileVersion("3.9.1.0")]
Modified: trunk/src/server/Simias.ClientUpdate/mac-version.config
===================================================================
--- trunk/src/server/Simias.ClientUpdate/mac-version.config 2011-12-25 17:07:12 UTC (rev 7619)
+++ trunk/src/server/Simias.ClientUpdate/mac-version.config 2012-03-29 05:02:27 UTC (rev 7620)
@@ -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.9.0.0</version>
+ <version>3.9.1.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-12-25 17:07:12 UTC (rev 7619)
+++ trunk/src/server/Simias.ClientUpdate/unix-version.config 2012-03-29 05:02:27 UTC (rev 7620)
@@ -24,7 +24,7 @@
you are doing.
-->
<distribution match="DEFAULT">
- <version>3.9.0.0</version>
+ <version>3.9.1.0</version>
<download-directory>default</download-directory>
</distribution>
@@ -51,17 +51,17 @@
-->
<distribution match="SUSE Linux Enterprise Desktop 10">
- <version>3.9.0.0</version>
+ <version>3.9.1.0</version>
<download-directory>suse-linux-10.0</download-directory>
</distribution>
<distribution match="SUSE Linux Enterprise Desktop 11">
- <version>3.9.0.0</version>
+ <version>3.9.1.0</version>
<download-directory>suse-linux-11.0</download-directory>
</distribution>
<distribution match="openSUSE">
- <version>3.9.0.0</version>
+ <version>3.9.1.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-12-25 17:07:12 UTC (rev 7619)
+++ trunk/src/server/Simias.ClientUpdate/version.config 2012-03-29 05:02:27 UTC (rev 7620)
@@ -4,15 +4,15 @@
with the one specified here by 'filename'. -->
<versioninfo>
<distribution match="windows32">
- <version>3.9.0.0</version>
+ <version>3.9.1.0</version>
<filename>ifolder3-windows.exe</filename>
</distribution>
<distribution match="windows64">
- <version>3.9.0.0</version>
+ <version>3.9.1.0</version>
<filename>ifolder3-windows-x64.exe</filename>
</distribution>
<distribution match="DEFAULT">
- <version>3.9.0.0</version>
+ <version>3.9.1.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...> - 2011-09-15 11:32:40
|
Revision: 7617
http://simias.svn.sourceforge.net/simias/?rev=7617&view=rev
Author: hegdegg
Date: 2011-09-15 11:32:30 +0000 (Thu, 15 Sep 2011)
Log Message:
-----------
ID:#616747
Reviewer: Tuks
Localization Required:No
Documentation Required:No
Description: Version upgrade for simias.
Modified Paths:
--------------
branches/iFolder_3.8.4_updates/src/core/FlaimProvider/FlaimWrapper/FlaimWrapper.vcproj
branches/iFolder_3.8.4_updates/src/core/POBoxWS/Properties/AssemblyInfo.cs
branches/iFolder_3.8.4_updates/src/core/Properties/AssemblyInfo.cs
branches/iFolder_3.8.4_updates/src/core/SimiasApp/Properties/AssemblyInfo.cs
branches/iFolder_3.8.4_updates/src/core/SimiasClient/Properties/AssemblyInfo.cs
branches/iFolder_3.8.4_updates/src/core/SyncService/Properties/AssemblyInfo.cs
branches/iFolder_3.8.4_updates/src/core/WebService/Properties/AssemblyInfo.cs
branches/iFolder_3.8.4_updates/src/server/Simias.ClientUpdate/mac-version.config
branches/iFolder_3.8.4_updates/src/server/Simias.ClientUpdate/unix-version.config
branches/iFolder_3.8.4_updates/src/server/Simias.ClientUpdate/version.config
Modified: branches/iFolder_3.8.4_updates/src/core/FlaimProvider/FlaimWrapper/FlaimWrapper.vcproj
===================================================================
--- branches/iFolder_3.8.4_updates/src/core/FlaimProvider/FlaimWrapper/FlaimWrapper.vcproj 2011-09-05 13:14:12 UTC (rev 7616)
+++ branches/iFolder_3.8.4_updates/src/core/FlaimProvider/FlaimWrapper/FlaimWrapper.vcproj 2011-09-15 11:32:30 UTC (rev 7617)
@@ -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.1"
+ Version="3.8.4.2"
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.1"
+ Version="3.8.4.2"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=""$(SolutionDir)..\..\dependencies\external\libflaim\win64""
Modified: branches/iFolder_3.8.4_updates/src/core/POBoxWS/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.4_updates/src/core/POBoxWS/Properties/AssemblyInfo.cs 2011-09-05 13:14:12 UTC (rev 7616)
+++ branches/iFolder_3.8.4_updates/src/core/POBoxWS/Properties/AssemblyInfo.cs 2011-09-15 11:32:30 UTC (rev 7617)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.4.1")]
-[assembly: AssemblyFileVersion("3.8.4.1")]
+[assembly: AssemblyVersion("3.8.4.2")]
+[assembly: AssemblyFileVersion("3.8.4.2")]
Modified: branches/iFolder_3.8.4_updates/src/core/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.4_updates/src/core/Properties/AssemblyInfo.cs 2011-09-05 13:14:12 UTC (rev 7616)
+++ branches/iFolder_3.8.4_updates/src/core/Properties/AssemblyInfo.cs 2011-09-15 11:32:30 UTC (rev 7617)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.4.1")]
-[assembly: AssemblyFileVersion("3.8.4.1")]
+[assembly: AssemblyVersion("3.8.4.2")]
+[assembly: AssemblyFileVersion("3.8.4.2")]
Modified: branches/iFolder_3.8.4_updates/src/core/SimiasApp/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.4_updates/src/core/SimiasApp/Properties/AssemblyInfo.cs 2011-09-05 13:14:12 UTC (rev 7616)
+++ branches/iFolder_3.8.4_updates/src/core/SimiasApp/Properties/AssemblyInfo.cs 2011-09-15 11:32:30 UTC (rev 7617)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.4.1")]
-[assembly: AssemblyFileVersion("3.8.4.1")]
+[assembly: AssemblyVersion("3.8.4.2")]
+[assembly: AssemblyFileVersion("3.8.4.2")]
Modified: branches/iFolder_3.8.4_updates/src/core/SimiasClient/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.4_updates/src/core/SimiasClient/Properties/AssemblyInfo.cs 2011-09-05 13:14:12 UTC (rev 7616)
+++ branches/iFolder_3.8.4_updates/src/core/SimiasClient/Properties/AssemblyInfo.cs 2011-09-15 11:32:30 UTC (rev 7617)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.4.1")]
-[assembly: AssemblyFileVersion("3.8.4.1")]
+[assembly: AssemblyVersion("3.8.4.2")]
+[assembly: AssemblyFileVersion("3.8.4.2")]
Modified: branches/iFolder_3.8.4_updates/src/core/SyncService/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.4_updates/src/core/SyncService/Properties/AssemblyInfo.cs 2011-09-05 13:14:12 UTC (rev 7616)
+++ branches/iFolder_3.8.4_updates/src/core/SyncService/Properties/AssemblyInfo.cs 2011-09-15 11:32:30 UTC (rev 7617)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.4.1")]
-[assembly: AssemblyFileVersion("3.8.4.1")]
+[assembly: AssemblyVersion("3.8.4.2")]
+[assembly: AssemblyFileVersion("3.8.4.2")]
Modified: branches/iFolder_3.8.4_updates/src/core/WebService/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.4_updates/src/core/WebService/Properties/AssemblyInfo.cs 2011-09-05 13:14:12 UTC (rev 7616)
+++ branches/iFolder_3.8.4_updates/src/core/WebService/Properties/AssemblyInfo.cs 2011-09-15 11:32:30 UTC (rev 7617)
@@ -29,5 +29,5 @@
// Build Number
// Revision
//
-[assembly: AssemblyVersion("3.8.4.1")]
-[assembly: AssemblyFileVersion("3.8.4.1")]
+[assembly: AssemblyVersion("3.8.4.2")]
+[assembly: AssemblyFileVersion("3.8.4.2")]
Modified: branches/iFolder_3.8.4_updates/src/server/Simias.ClientUpdate/mac-version.config
===================================================================
--- branches/iFolder_3.8.4_updates/src/server/Simias.ClientUpdate/mac-version.config 2011-09-05 13:14:12 UTC (rev 7616)
+++ branches/iFolder_3.8.4_updates/src/server/Simias.ClientUpdate/mac-version.config 2011-09-15 11:32:30 UTC (rev 7617)
@@ -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.1</version>
+ <version>3.8.4.2</version>
<!-- Put name of Mac ifolder client application file
to be upgraded here. The specified file must be in
Modified: branches/iFolder_3.8.4_updates/src/server/Simias.ClientUpdate/unix-version.config
===================================================================
--- branches/iFolder_3.8.4_updates/src/server/Simias.ClientUpdate/unix-version.config 2011-09-05 13:14:12 UTC (rev 7616)
+++ branches/iFolder_3.8.4_updates/src/server/Simias.ClientUpdate/unix-version.config 2011-09-15 11:32:30 UTC (rev 7617)
@@ -24,7 +24,7 @@
you are doing.
-->
<distribution match="DEFAULT">
- <version>3.8.4.1</version>
+ <version>3.8.4.2</version>
<download-directory>default</download-directory>
</distribution>
@@ -51,17 +51,17 @@
-->
<distribution match="SUSE Linux Enterprise Desktop 10">
- <version>3.8.4.1</version>
+ <version>3.8.4.2</version>
<download-directory>suse-linux-10.0</download-directory>
</distribution>
<distribution match="SUSE Linux Enterprise Desktop 11">
- <version>3.8.4.1</version>
+ <version>3.8.4.2</version>
<download-directory>suse-linux-11.0</download-directory>
</distribution>
<distribution match="openSUSE">
- <version>3.8.4.1</version>
+ <version>3.8.4.2</version>
<download-directory>opensuse-linux</download-directory>
</distribution>
Modified: branches/iFolder_3.8.4_updates/src/server/Simias.ClientUpdate/version.config
===================================================================
--- branches/iFolder_3.8.4_updates/src/server/Simias.ClientUpdate/version.config 2011-09-05 13:14:12 UTC (rev 7616)
+++ branches/iFolder_3.8.4_updates/src/server/Simias.ClientUpdate/version.config 2011-09-15 11:32:30 UTC (rev 7617)
@@ -4,15 +4,15 @@
with the one specified here by 'filename'. -->
<versioninfo>
<distribution match="windows32">
- <version>3.8.4.1</version>
+ <version>3.8.4.2</version>
<filename>ifolder3-windows.exe</filename>
</distribution>
<distribution match="windows64">
- <version>3.8.4.1</version>
+ <version>3.8.4.2</version>
<filename>ifolder3-windows-x64.exe</filename>
</distribution>
<distribution match="DEFAULT">
- <version>3.8.4.1</version>
+ <version>3.8.4.2</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-08-10 17:04:37
|
Revision: 7615
http://simias.svn.sourceforge.net/simias/?rev=7615&view=rev
Author: mvikash
Date: 2011-08-10 17:04:30 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
ID: #708539
Reviewer: GG Hegdeg
Localization Required: No
Documentation Required: No
Description: Pop-up error message in case of context mis-match at Slave
Server upgrade.
Modified Paths:
--------------
trunk/src/admin/ServerDetails.aspx.cs
Modified: trunk/src/admin/ServerDetails.aspx.cs
===================================================================
--- trunk/src/admin/ServerDetails.aspx.cs 2011-08-10 16:09:24 UTC (rev 7614)
+++ trunk/src/admin/ServerDetails.aspx.cs 2011-08-10 17:04:30 UTC (rev 7615)
@@ -1266,7 +1266,7 @@
{
// TODO : get this stuff from a resource
// GetString("CONFIRMCHANGEMASTER")
- ChangeMasterButton.Attributes["onclick"] = "javascript:return confirm('The selected server will be designated as a Master Server. Do you want to continue? Click OK to continue or Cancel to quit.');";
+ ChangeMasterButton.Attributes["onclick"] = "javascript:return confirm('The selected server will be designated as a Master Server. Do you want to continue? Click OK to continue or Cancel to quit.');";
}
@@ -1486,10 +1486,12 @@
int count = 0;
bool currentMasterUpdateComplete = false,
newMasterUpdateComplete = false,
- slaveUpdateComplete = false;
+ slaveUpdateComplete = false, contextMisMatch =false;
string newServerPublicUrl = null;
iFolderServer mServer = null,
newmServer=null;
+ iFolderAdmin remoteWebServer=null;
+ LdapInfo OrigldapInfo = null, CurldapInfo = null;
log.Info("Change Master Server process Initiated");
try
@@ -1527,6 +1529,58 @@
log.Info("ServerID = {0}, master url = {1}, new master url = {2} ",
ServerID, mServer.PublicUrl, newmServer.PublicUrl);
+ //get both current Master and current Slave context
+ //save current Master LdapInfo
+ remoteWebServer = new iFolderAdmin();
+ remoteWebServer.PreAuthenticate = true;
+ remoteWebServer.Credentials = web.Credentials;
+ remoteWebServer.Url = mServer.PublicUrl+ "/iFolderAdmin.asmx";
+ OrigldapInfo = remoteWebServer.GetLdapDetails();
+
+ //Current Ldap Info
+ remoteWebServer = new iFolderAdmin();
+ remoteWebServer.PreAuthenticate = true;
+ remoteWebServer.Credentials = web.Credentials;
+ remoteWebServer.Url = newmServer.PublicUrl+ "/iFolderAdmin.asmx";
+ CurldapInfo = remoteWebServer.GetLdapDetails();
+
+ //comparing context
+ string[] Origcontexts = OrigldapInfo.SearchContexts.Split(new char[] { '#' });
+ string[] Curcontexts = CurldapInfo.SearchContexts.Split(new char[] { '#' });
+
+ if((String.IsNullOrEmpty(OrigldapInfo.SearchContexts) && !String.IsNullOrEmpty(CurldapInfo.SearchContexts) )
+ || (!String.IsNullOrEmpty(OrigldapInfo.SearchContexts) && String.IsNullOrEmpty(CurldapInfo.SearchContexts) ))
+ {
+ contextMisMatch = true;
+ }
+
+ if(Origcontexts.Length != Curcontexts.Length)
+ contextMisMatch = true;
+
+ if(!contextMisMatch)
+ {
+ foreach(string context in Origcontexts)
+ {
+ //re-Initilizing context to true
+ contextMisMatch = true;
+ foreach(string contextCur in Curcontexts)
+ {
+ if (context == contextCur)
+ {
+ contextMisMatch = false;
+ break;
+ }
+ }
+ //Break, if one of the context doesn't match
+ if(contextMisMatch)break;
+ }
+ }
+
+ if(contextMisMatch)
+ {
+ TopNav.ShowError("The LDAP context is different than the Master server. Copy LDAP context from a Master server and retry upgrading the Slave server.");
+ return;
+ }
// First Set current Master server to Slave
log.Info("Setting as Slave server...");
@@ -1591,6 +1645,7 @@
{
slaveUpdateComplete = true;
}
+
}
else
{
@@ -1604,15 +1659,17 @@
}
finally
{
- ChangeMasterButton.Enabled = false;
-
- if (currentMasterUpdateComplete && newMasterUpdateComplete &&
+ if(!contextMisMatch)
+ {
+ ChangeMasterButton.Enabled = false;
+ if (currentMasterUpdateComplete && newMasterUpdateComplete &&
slaveUpdateComplete)
- {
- TopNav.ShowInfo (String.Format (GetString ("CHANGEMASTERSUCCESSFUL"), newmServer.Name));
+ {
+ TopNav.ShowInfo (String.Format (GetString ("CHANGEMASTERSUCCESSFUL"), newmServer.Name));
+ }
+ else
+ TopNav.ShowInfo (String.Format (GetString ("CHANGEMASTERWITHWARNING"), newmServer.Name));
}
- else
- TopNav.ShowInfo (String.Format (GetString ("CHANGEMASTERWITHWARNING"), newmServer.Name));
}
return;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spr...@us...> - 2011-08-10 16:09:30
|
Revision: 7614
http://simias.svn.sourceforge.net/simias/?rev=7614&view=rev
Author: spratima
Date: 2011-08-10 16:09:24 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
changes made to kill simias process if running already , before starting restore tool
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-08-10 14:51:51 UTC (rev 7613)
+++ trunk/src/utils/restore/ifolder-data-recovery.in 2011-08-10 16:09:24 UTC (rev 7614)
@@ -103,6 +103,12 @@
@_bindir_@/simias-server-setup "${args[$path_index_number-1]}" --recover 1>$path/console.log 2>$path/console.log
echo -n "....."
@_bindir_@/ifrecovery-server --stop 1>$path/console.log 2>$path/console.log
+#kill simias if any still exists after stop
+SimiasProcess=`ps -ef | grep -c '[S]imias.exe'`
+if [ $SimiasProcess -gt 0 ]; then
+ PID=`ps -ef | grep '[S]imias.exe' | awk '{ print $2 }'`
+ kill -9 $PID
+fi
echo -n "....."
@_bindir_@/ifrecovery-server --runasserver 1>$path/console.log 2>$path/console.log
echo "..... |"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2011-08-10 14:51:57
|
Revision: 7613
http://simias.svn.sourceforge.net/simias/?rev=7613&view=rev
Author: hegdegg
Date: 2011-08-10 14:51:51 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
ID: #711509
Reviewer: GG, Pratima
Localization Required: Yes
Documentation Required: No
Description:- File upload to iFolder server times out when the server is
busy, but the timeout exception is not handled which results in invalid error page.
Modified Paths:
--------------
trunk/src/webaccess/Upload.aspx.cs
trunk/src/webaccess/iFolderWeb.resx
Modified: trunk/src/webaccess/Upload.aspx.cs
===================================================================
--- trunk/src/webaccess/Upload.aspx.cs 2011-08-03 18:19:58 UTC (rev 7612)
+++ trunk/src/webaccess/Upload.aspx.cs 2011-08-10 14:51:51 UTC (rev 7613)
@@ -309,6 +309,9 @@
Message.Text = GetString("ENTRY.IOERROR");
break;
+ case "Timeout":
+ Message.Text = GetString("ENTRY.TIMEOUT");
+ break;
default:
result = false;
break;
Modified: trunk/src/webaccess/iFolderWeb.resx
===================================================================
--- trunk/src/webaccess/iFolderWeb.resx 2011-08-03 18:19:58 UTC (rev 7612)
+++ trunk/src/webaccess/iFolderWeb.resx 2011-08-10 14:51:51 UTC (rev 7613)
@@ -201,6 +201,9 @@
<data name="ENTRY.IOERROR">
<value>Server Storage out of space</value>
</data>
+ <data name="ENTRY.TIMEOUT">
+ <value>Uploading the files to the server failed, try uploading again.</value>
+ </data>
<data name="ENTRY.NEWFOLDER">
<value>New Folder</value>
</data>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spr...@us...> - 2011-08-03 16:45:36
|
Revision: 7611
http://simias.svn.sourceforge.net/simias/?rev=7611&view=rev
Author: spratima
Date: 2011-08-03 16:45:29 +0000 (Wed, 03 Aug 2011)
Log Message:
-----------
ID: Bug #693052
Reviewers: Srinidhi
Localization Required: No
Documentation Required: No
Description: changes required to build simias for openSUSE 11.4
Modified Paths:
--------------
trunk/configure.in
trunk/package/linux/simias.spec.autobuild
trunk/src/core/SimiasApp/Makefile.am
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2011-08-03 14:17:02 UTC (rev 7610)
+++ trunk/configure.in 2011-08-03 16:45:29 UTC (rev 7611)
@@ -703,13 +703,14 @@
#
# Configure MONO_WEBSERVER
#
-MONO_WEBSERVER="no"
-if test -e "/usr/lib/mono/1.0/Mono.WebServer.dll"; then
- MONO_WEBSERVER="yes"
+MONO_WEBSERVER_DLL="Mono.WebServer.dll"
+pkg-config --atleast-version=2.8 xsp-2
+if test $? -eq 0; then
+ MONO_WEBSERVER_DLL="Mono.WebServer2.dll"
fi
-AC_SUBST(MONO_WEBSERVER)
-AM_CONDITIONAL(GACD_MONO_WEBSERVER, test "$MONO_WEBSERVER" = "yes")
+AC_SUBST(MONO_WEBSERVER_DLL)
+#AM_CONDITIONAL(GACD_MONO_WEBSERVER, test "$MONO_WEBSERVER" = "yes")
#
# Try to locate the mod_mono.conf file so we can setup our conf files
Modified: trunk/package/linux/simias.spec.autobuild
===================================================================
--- trunk/package/linux/simias.spec.autobuild 2011-08-03 14:17:02 UTC (rev 7610)
+++ trunk/package/linux/simias.spec.autobuild 2011-08-03 16:45:29 UTC (rev 7611)
@@ -41,6 +41,9 @@
Requires: mono-core >= 1.2.2
Requires: mono-data >= 1.2.2
Requires: mono-web >= 1.2.2
+%if %{suse_version} > 1130
+Requires: mono-wcf
+%endif
Requires: log4net >= 1.2.9
Requires: xsp >= 1.2.5
#Obsoletes: %{name} < %{version}
@@ -57,12 +60,28 @@
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.
-
-
-
+
+%if %{suse_version} > 1120
+
+%package devel
+License: GPLv2
+Summary: Development files for simias
+Group: Development/Libraries/C and C++
+Requires: %{name} = %{version}
+
+%description devel
+Development files for simias. 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.
+
+%endif
+
+
%prep
export BUILDNUM=%{buildnum}
%setup -n %{name}
+#%patch0
#=============================================================================
%build
@@ -87,6 +106,7 @@
#=============================================================================
%post
+/sbin/ldconfig
INSTANCES_AFTER_INSTALL=$1
if [ "$INSTANCES_AFTER_INSTALL" = "1" ]; then
if [ -d "/etc/simias" ]; then
@@ -98,6 +118,7 @@
mv {%prefix}/web/web.config {%prefix}/%_lib/simias/web/
fi
fi
+
#=============================================================================
%preun
@@ -111,28 +132,60 @@
fi
#=============================================================================
+#=============================================================================
+
%postun
+/sbin/ldconfig
#=============================================================================
+
%files
-%attr(755,root,root) %dir %{prefix}
-%attr(755,root,root) %dir /opt/novell
-%defattr(755,root,root)
+%defattr(-,root,root,0755)
+%dir /opt/novell
+%dir %{prefix}
+%dir %{prefix}/%_lib/simias
%dir %{prefix}/bin
-%{prefix}/bin/*
%dir %{prefix}/etc
-%dir %{prefix}/etc/simias
-%{prefix}/etc/simias/Simias.config
-%{prefix}/etc/simias/Simias.log4net
-%{prefix}/etc/simias/defaults.config
+%dir %{sysconfdir}/simias
+%dir %{prefix}/%_lib
+
+%attr(755,root,root) %{prefix}/bin/*
+%attr(755,root,root) %{prefix}/%_lib/simias/web/bin/*
+
+%attr(644,root,root) %config %{sysconfdir}/simias/Simias.config
+%attr(644,root,root) %config %{sysconfdir}/simias/Simias.log4net
+%attr(644,root,root) %config %{sysconfdir}/simias/defaults.config
+
+%{prefix}/%_lib/libFlaimWrapper.so
+%{prefix}/%_lib/libFlaimWrapper.so.0
+%{prefix}/%_lib/libFlaimWrapper.so.0.0.0
+%{prefix}/%_lib/libsimias-event.so
+%{prefix}/%_lib/libsimias-event.so.0
+%{prefix}/%_lib/libsimias-event.so.0.0.0
+%{prefix}/%_lib/libsimias.so
+%{prefix}/%_lib/libsimias.so.0
+%{prefix}/%_lib/libsimias.so.0.0.0
+
+%{prefix}/%_lib/simias/*
+
+%if %{suse_version} >= 1130
+%files devel
+%defattr(-,root,root)
+%dir %{prefix}
+%dir %{prefix}/%_lib
+%endif
+
+%{prefix}/%_lib/libsimias-manager.a
+%{prefix}/%_lib/libsimias-event.so
+%dir %{prefix}/%_lib/pkgconfig
+%{prefix}/%_lib/pkgconfig/*
%dir %{prefix}/include
-%{prefix}/include/*
-%dir %{prefix}/%_lib
-%{prefix}/%_lib/*
+%dir %{prefix}/include/simias/
+%{prefix}/include/simias/*
%dir %{prefix}/share
-%{prefix}/share/*
-%attr(644,root,root) %{prefix}/include/simias/*
-#%config(noreplace) %{prefix}/web/web.config
+%dir %{prefix}/share/simias/
+%{prefix}/share/simias/COPYING
+
%changelog -n simias
* Tue Feb 06 2007 - ro...@su...
- rebuild tools/gsoap utils (again)
@@ -279,3 +332,4 @@
- added libicu26 to neededforbuild
* Wed May 26 2004 - cl...@su...
- Initial import.
+
Modified: trunk/src/core/SimiasApp/Makefile.am
===================================================================
--- trunk/src/core/SimiasApp/Makefile.am 2011-08-03 14:17:02 UTC (rev 7610)
+++ trunk/src/core/SimiasApp/Makefile.am 2011-08-03 16:45:29 UTC (rev 7611)
@@ -16,7 +16,7 @@
Simias_INCLUDES =
Simias_RESOURCES = $(srcdir)/App$(ICON_EXT)
Simias_FLAGS = $(CSC_EXEFLAG)
-Simias_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll $(SYSTEM_INSTALLER_LIB) SimiasClient.dll Mono.WebServer.dll
+Simias_LIBS = System.dll System.Data.dll $(SYSTEM_XML) System.Web.dll $(SYSTEM_INSTALLER_LIB) SimiasClient.dll $(MONO_WEBSERVER_DLL)
Simias_LIBPATH = ../SimiasClient $(MONO_WEBSERVER_PATH)
EXTRA_DIST = App.ico $(Simias_CSFILES) AssemblyInfo.cs.in
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2011-08-03 14:17:08
|
Revision: 7610
http://simias.svn.sourceforge.net/simias/?rev=7610&view=rev
Author: mvikash
Date: 2011-08-03 14:17:02 +0000 (Wed, 03 Aug 2011)
Log Message:
-----------
ID: #665552
Reviewer: GG, Pratima
Localization Required: No
Documentation Required: No
Description:- iFolder with path length over 260 char has been handled.
Modified Paths:
--------------
trunk/src/core/Sync/SyncClient.cs
Modified: trunk/src/core/Sync/SyncClient.cs
===================================================================
--- trunk/src/core/Sync/SyncClient.cs 2011-07-21 22:13:31 UTC (rev 7609)
+++ trunk/src/core/Sync/SyncClient.cs 2011-08-03 14:17:02 UTC (rev 7610)
@@ -2456,13 +2456,14 @@
/// <returns>ture if successful.</returns>
private bool StoreDir(SyncNode snode, bool merge)
{
+ DirNode node = null;
try
{
if (snode.node != null && snode.node.Length != 0)
{
XmlDocument xNode = new XmlDocument();
xNode.LoadXml(snode.node);
- DirNode node = (DirNode)Node.NodeFactory(store, xNode);
+ node = (DirNode)Node.NodeFactory(store, xNode);
log.Info("Importing Directory {0} from server", node.Name);
Import(node);
@@ -2571,6 +2572,13 @@
workArray.RemoveNodeFromServer(snode.ID, merge);
return true;
}
+ catch (PathTooLongException pax)
+ {
+ if(node != null)
+ eventPublisher.RaiseEvent(new FileSyncEventArgs(collection.ID, ObjectType.File, false, node.Name, 0, 0, 0, Direction.Downloading, SyncStatus.PathTooLong));
+ log.Debug("SyncClient.cs: path too long exception for collectionid : " + snode.ID + pax.StackTrace );
+ return false;
+ }
catch
{
log.Debug("SyncClient.cs: caught exception inside StoreDir for collectionid : "+snode.ID);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2011-07-20 11:54:31
|
Revision: 7608
http://simias.svn.sourceforge.net/simias/?rev=7608&view=rev
Author: hegdegg
Date: 2011-07-20 11:54:19 +0000 (Wed, 20 Jul 2011)
Log Message:
-----------
ID:#676964
Reviewer:Pratima
Localization Required: No
Documentation Required: No
Description: correction in retrive_proxy_creds
Modified Paths:
--------------
trunk/src/server/setup/iFolder_retrieve_proxy_creds.in
Modified: trunk/src/server/setup/iFolder_retrieve_proxy_creds.in
===================================================================
--- trunk/src/server/setup/iFolder_retrieve_proxy_creds.in 2011-07-20 11:50:24 UTC (rev 7607)
+++ trunk/src/server/setup/iFolder_retrieve_proxy_creds.in 2011-07-20 11:54:19 UTC (rev 7608)
@@ -51,7 +51,8 @@
}
if [ $# -lt 2 ]; then
- echo "Usage: ./iFolder_retrieve_proxy_creds password <proxucredentialspath> <ldapport>"
+ echo "Usage: `basename $0` username <proxy credentials path> <ldapport>"
+ echo " or: `basename $0` password <proxy credentials path> <ldapport>"
exit -1
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2011-07-20 11:50:30
|
Revision: 7607
http://simias.svn.sourceforge.net/simias/?rev=7607&view=rev
Author: hegdegg
Date: 2011-07-20 11:50:24 +0000 (Wed, 20 Jul 2011)
Log Message:
-----------
ID:#702277, #702033
Reviewer: Pratima
Localization Required: No
Documentation Required: No
Description: Corrected errors for proxy user creation and for password
policy restriction.
Modified Paths:
--------------
trunk/src/server/setup/LdapUtility.cs
trunk/src/server/setup/SimiasServerSetup.cs
Modified: trunk/src/server/setup/LdapUtility.cs
===================================================================
--- trunk/src/server/setup/LdapUtility.cs 2011-06-22 14:27:47 UTC (rev 7606)
+++ trunk/src/server/setup/LdapUtility.cs 2011-07-20 11:50:24 UTC (rev 7607)
@@ -277,9 +277,10 @@
}
catch(Exception ex)
{
-
if(ex.Message.IndexOf("Constraint Violation") != -1)
- throw new Exception("Constraint Violation");
+ throw new Exception("Constraint Violation: password too short or Q not active");
+ if(ex.ToString().IndexOf("-16000") != -1)
+ throw new Exception("Constraint Violation: password is too long");
// This is applicable for both admin and proxy user.
created = false;
}
Modified: trunk/src/server/setup/SimiasServerSetup.cs
===================================================================
--- trunk/src/server/setup/SimiasServerSetup.cs 2011-06-22 14:27:47 UTC (rev 7606)
+++ trunk/src/server/setup/SimiasServerSetup.cs 2011-07-20 11:50:24 UTC (rev 7607)
@@ -2676,17 +2676,19 @@
bool created = false;
int i = 0;
string proxyDN = ldapProxyDN.Value;
+ string[] org_dnSegs = proxyDN.Split(new char[] {',', '=', '.'});
+ string org_proxy = org_dnSegs[1];
bool result = false;
while(!created)
{
Console.WriteLine("Creating {0}...", ldapProxyDN.Value);
i++;
- try{
- result = ldapUtility.CreateUser(ldapProxyDN.Value, ldapProxyPassword.Value);
+ try {
+ result = ldapUtility.CreateUser(ldapProxyDN.Value, ldapProxyPassword.Value);
}
catch (Exception ex) {
- throw new Exception( string.Format("Constraint Violation: password too short or Q not active.") );
+ throw new Exception( string.Format(ex.Message) );
}
if (result)
@@ -2798,7 +2800,7 @@
string old_proxy = dnSegs[1];
Console.WriteLine("Failed to connect using the Proxy user {0}, creating a new proxy user...", proxyDN);
Console.WriteLine("Old Proxy user {0}...", proxyDN);
- dnSegs[1] = String.Concat(dnSegs[1], i.ToString());
+ dnSegs[1] = String.Concat(org_proxy, "-", i.ToString());
proxyDN = proxyDN.Replace(old_proxy, dnSegs[1]);
Console.WriteLine("New Proxy user {0}...", proxyDN);
ldapProxyDN.Value = proxyDN;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spr...@us...> - 2011-06-22 14:27:53
|
Revision: 7606
http://simias.svn.sourceforge.net/simias/?rev=7606&view=rev
Author: spratima
Date: 2011-06-22 14:27:47 +0000 (Wed, 22 Jun 2011)
Log Message:
-----------
Changes done to handle exception at time of File Open.
Modified Paths:
--------------
branches/iFolder_3.8.4_updates/src/core/Sync/SyncFile.cs
Modified: branches/iFolder_3.8.4_updates/src/core/Sync/SyncFile.cs
===================================================================
--- branches/iFolder_3.8.4_updates/src/core/Sync/SyncFile.cs 2011-06-16 14:05:24 UTC (rev 7605)
+++ branches/iFolder_3.8.4_updates/src/core/Sync/SyncFile.cs 2011-06-22 14:27:47 UTC (rev 7606)
@@ -305,7 +305,15 @@
/// </summary>
~InFile()
{
- Close (true, false);
+ try
+ {
+ Close(true, false);
+ }
+ catch (Exception ex)
+ {
+ Log.log.Info("Exception at Infile destructor: trace {0}", ex.StackTrace);
+ }
+
}
#endregion
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2011-06-15 16:17:17
|
Revision: 7603
http://simias.svn.sourceforge.net/simias/?rev=7603&view=rev
Author: hegdegg
Date: 2011-06-15 16:17:10 +0000 (Wed, 15 Jun 2011)
Log Message:
-----------
ID: Bug #697635
Reviewers:Vikash
Localization Required: No
Documentation Required: No
Description: Fix for misbehaviour of master slave server after proxy
password change.
Modified Paths:
--------------
trunk/src/admin/LdapAdminAuth.aspx
trunk/src/admin/LdapAdminAuth.aspx.cs
trunk/src/admin/iFolderAdmin.resx
Modified: trunk/src/admin/LdapAdminAuth.aspx
===================================================================
--- trunk/src/admin/LdapAdminAuth.aspx 2011-06-15 11:43:15 UTC (rev 7602)
+++ trunk/src/admin/LdapAdminAuth.aspx 2011-06-15 16:17:10 UTC (rev 7603)
@@ -21,7 +21,7 @@
{
document.getElementById( "OkButton" ).disabled = false;
document.getElementById( "CancelButton" ).disabled = false;
- }
+ }
</script>
</head>
@@ -126,6 +126,14 @@
<tr>
<th>
+ </th>
+ <td>
+ <%= GetString( "PASSWORDCHANGEWARNING" ) %>
+ </td>
+ </tr>
+
+ <tr>
+ <th>
<%= GetString( "LDAPPROXYUSERPWD" ) %>
</th>
Modified: trunk/src/admin/LdapAdminAuth.aspx.cs
===================================================================
--- trunk/src/admin/LdapAdminAuth.aspx.cs 2011-06-15 11:43:15 UTC (rev 7602)
+++ trunk/src/admin/LdapAdminAuth.aspx.cs 2011-06-15 16:17:10 UTC (rev 7603)
@@ -49,67 +49,68 @@
/// Summary description for editing ldap details
/// </summary>
public class LdapAdminAuth : System.Web.UI.Page
- {
- #region Class Members
-
+ {
+#region Class Members
+ private static readonly iFolderWebLogger log = new iFolderWebLogger(
+ System.Reflection.MethodBase.GetCurrentMethod().DeclaringType.Name);
/// <summary>
- /// iFolder Connection
- /// </summary>
- private iFolderAdmin web;
+ /// iFolder Connection
+ /// </summary>
+ private iFolderAdmin web;
- /// <summary>
- /// iFolder Connection to the remote server
- /// </summary>
+ /// <summary>
+ /// iFolder Connection to the remote server
+ /// </summary>
private iFolderAdmin remoteweb;
- /// <summary>
- /// Resource Manager
- /// </summary>
- private ResourceManager rm;
+ /// <summary>
+ /// Resource Manager
+ /// </summary>
+ private ResourceManager rm;
/// <summary>
/// Logged in admin system rights instance
/// </summary>
UserSystemAdminRights uRights;
-
+
/// <summary>
/// Logged in user system rights value
/// </summary>
int sysAccessPolicy = 0;
- /// <summary>
- /// Top navigation panel control.
- /// </summary>
- protected TopNavigation TopNav;
+ /// <summary>
+ /// Top navigation panel control.
+ /// </summary>
+ protected TopNavigation TopNav;
/// <summary>
- /// ldap admin name edit control.
- /// </summary>
- protected TextBox LdapAdminName;
+ /// ldap admin name edit control.
+ /// </summary>
+ protected TextBox LdapAdminName;
/// <summary>
- /// ldap admin password control.
- /// </summary>
- protected TextBox LdapAdminPwd;
-
+ /// ldap admin password control.
+ /// </summary>
+ protected TextBox LdapAdminPwd;
+
/// <summary>
- /// LDAP Server name.
- /// </summary>
+ /// LDAP Server name.
+ /// </summary>
protected TextBox LdapServer;
- /// <summary>
- /// LDAP Proxy User
- /// </summary>
+ /// <summary>
+ /// LDAP Proxy User
+ /// </summary>
protected TextBox LdapProxyUser;
- /// <summary>
- /// LDAP Proxy User
- /// </summary>
+ /// <summary>
+ /// LDAP Proxy User
+ /// </summary>
protected TextBox LdapProxyUserPwd;
- /// <summary>
- /// LDAP Proxy User
- /// </summary>
+ /// <summary>
+ /// LDAP Proxy User
+ /// </summary>
protected TextBox ConfirmLdapProxyUserPwd;
/// <summary>
@@ -117,69 +118,69 @@
/// </summary>
protected DropDownList LdapSslList;
- /// <summary>
- /// Search context
- /// </summary>
+ /// <summary>
+ /// Search context
+ /// </summary>
protected TextBox LdapSearchContext;
/// <summary>
- /// OK button control.
- /// </summary>
- protected Button OkButton;
+ /// OK button control.
+ /// </summary>
+ protected Button OkButton;
/// <summary>
- /// cancel button control.
- /// </summary>
- protected Button CancelButton;
+ /// cancel button control.
+ /// </summary>
+ protected Button CancelButton;
- #endregion
-
- #region Properties
-
+#endregion
+
+#region Properties
+
/// <summary>
- /// Gets the Server ID.
- /// </summary>
- private string ServerID
- {
- get { return Request.Params[ "ServerID" ]; }
- }
+ /// Gets the Server ID.
+ /// </summary>
+ private string ServerID
+ {
+ get { return Request.Params[ "ServerID" ]; }
+ }
/// <summary>
- /// Gets the Server Name.
- /// </summary>
- private string serverName
- {
- get { return Request.Params[ "serverName" ]; }
- }
+ /// Gets the Server Name.
+ /// </summary>
+ private string serverName
+ {
+ get { return Request.Params[ "serverName" ]; }
+ }
- #endregion
-
- #region Private Methods
+#endregion
- /// <summary>
- /// Builds the breadcrumb list for this page.
- /// </summary>
- private void BuildBreadCrumbList(string ServerID,string serverName)
- {
+#region Private Methods
+
+ /// <summary>
+ /// Builds the breadcrumb list for this page.
+ /// </summary>
+ private void BuildBreadCrumbList(string ServerID,string serverName)
+ {
TopNav.AddBreadCrumb( GetString( "SERVERS" ), "Servers.aspx" );
TopNav.AddBreadCrumb( serverName, String.Format( "ServerDetails.aspx?id={0}", ServerID ) );
- TopNav.AddBreadCrumb( GetString( "LDAPDETAILS" ), null );
+ TopNav.AddBreadCrumb( GetString( "LDAPDETAILS" ), null );
// Pass this page information to create the help link
TopNav.AddHelpLink(GetString("LDAPADMINAUTH"));
- }
-
+ }
+
/// <summary>
- /// Page_Load
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void Page_Load(object sender, System.EventArgs e)
- {
- // connection
- web = Session[ "Connection" ] as iFolderAdmin;
+ /// Page_Load
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void Page_Load(object sender, System.EventArgs e)
+ {
+ // connection
+ web = Session[ "Connection" ] as iFolderAdmin;
// localization
- rm = Application[ "RM" ] as ResourceManager;
+ rm = Application[ "RM" ] as ResourceManager;
string userID = Session[ "UserID" ] as String;
if(userID != null && ServerID != null && ServerID != String.Empty)
@@ -189,45 +190,45 @@
uRights = new UserSystemAdminRights(sysAccessPolicy);
if(uRights.ServerPolicyManagementAllowed == false)
Page.Response.Redirect(String.Format("Error.aspx?ex={0}&Msg={1}",GetString( "ACCESSDENIED" ), GetString( "ACCESSDENIEDERROR" )));
-
+
if ( !IsPostBack )
{
remoteweb = new iFolderAdmin ();
-
+
OkButton.Text = GetString( "OK" );
CancelButton.Text = GetString( "CANCEL" );
}
- }
+ }
-
+
/// <summary>
- /// Page_PreRender
- /// </summary>
- /// <param name="sender"></param>
- /// <param name="e"></param>
- private void Page_PreRender(object sender, EventArgs e)
- {
+ /// Page_PreRender
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void Page_PreRender(object sender, EventArgs e)
+ {
GetLdapDetails ();
- // Set the breadcrumb list.
- BuildBreadCrumbList(ServerID,serverName);
- }
-
+ // Set the breadcrumb list.
+ BuildBreadCrumbList(ServerID,serverName);
+ }
+
/// <summary>
- /// Required method for Designer support - do not modify
- /// the contents of this method with the code editor.
- /// </summary>
- private void InitializeComponent()
- {
- if ( !Page.IsPostBack )
- {
- // Set the render event to happen only on page load.
- Page.PreRender += new EventHandler( Page_PreRender );
- }
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ if ( !Page.IsPostBack )
+ {
+ // Set the render event to happen only on page load.
+ Page.PreRender += new EventHandler( Page_PreRender );
+ }
- this.Load += new System.EventHandler(this.Page_Load);
- }
+ this.Load += new System.EventHandler(this.Page_Load);
+ }
/// <summary>
@@ -238,11 +239,11 @@
{
iFolderServer server = web.GetServer( ServerID );
- remoteweb.PreAuthenticate = true;
- remoteweb.Credentials = web.Credentials;
- remoteweb.Url = server.PublicUrl + "/iFolderAdmin.asmx";
+ remoteweb.PreAuthenticate = true;
+ remoteweb.Credentials = web.Credentials;
+ remoteweb.Url = server.PublicUrl + "/iFolderAdmin.asmx";
remoteweb.GetAuthenticatedUser();
- server = remoteweb.GetServer ( ServerID);
+ server = remoteweb.GetServer ( ServerID);
//Pick information from IdentityProvider
LdapInfo ldapInfo = remoteweb.GetLdapDetails();
@@ -262,6 +263,45 @@
LdapSslList.SelectedValue = ldapInfo.SSL ? GetString ("YES") : GetString ("NO");
}
+ private bool UpdateProxyUserInfo(string ldapAdmin, string ldapAdminPwd, string proxyDN, string ProxyDNPwd)
+ {
+ bool status = true;
+ try
+ {
+ iFolderServer[] list = web.GetServers();
+ foreach( iFolderServer server in list )
+ {
+ //check all servers other than current server.
+ if(server.ID != ServerID)
+ {
+ log.Info("Connecting to {0}", server.ID);
+ remoteweb = new iFolderAdmin ();
+ remoteweb.PreAuthenticate = true;
+ remoteweb.Credentials = web.Credentials;
+ remoteweb.Url = server.PublicUrl + "/iFolderAdmin.asmx";
+ remoteweb.GetAuthenticatedUser();
+ //Pick information from IdentityProvider
+ LdapInfo ldapInfo = remoteweb.GetLdapDetails();
+ log.Info("Proxy User = {0} on {1}", ldapInfo.ProxyDN, server.ID);
+ if(proxyDN == ldapInfo.ProxyDN)
+ {
+ //ldapInfo.ProxyDN = ProxyDN;
+ ldapInfo.ProxyPassword = ProxyDNPwd;
+ log.Info("Changing proxy user password on : {0}", server.ID);
+ remoteweb.SetLdapDetails (ldapInfo, ldapAdmin, ldapAdminPwd, server.ID);
+ }
+ }
+ }
+ }
+ catch(Exception ex)
+ {
+ status = false;
+ log.Info("Exception in UpdateProxyUserInfo : (0)", ex.Message);
+ TopNav.ShowInfo(String.Format(GetString("ALLSERVERPROXYPASSWORDCHANGEERROR")));
+ return status;
+ }
+ return status;
+ }
/// <summary>
/// To check if ldap admin name and password text boxes are empty
@@ -289,12 +329,15 @@
#region Protected Methods
/// <summary>
- /// Event handler that gets called when OK button is clicked.
- /// </summary>
- /// <param name="source"></param>
- /// <param name="e"></param>
- protected void OnOkButton_Click( object source, EventArgs e )
- {
+ /// Event handler that gets called when OK button is clicked.
+ /// </summary>
+ /// <param name="source"></param>
+ /// <param name="e"></param>
+ protected void OnOkButton_Click( object source, EventArgs e )
+ {
+ string currentServerProxyDN = null;
+ string currentServerProxyDNPwd = null;
+ bool proxychagnestatus = true;
if( ! validOK() )
{
TopNav.ShowError (GetString("ENTERLDAPDETAILS"));
@@ -308,28 +351,36 @@
if(String.Compare(LdapProxyUserPwd.Text.Trim(), ConfirmLdapProxyUserPwd.Text.Trim()) != 0)
{
TopNav.ShowError(GetString("ERRORPROXYPASSWORDSDOESNOTMATCH"));
- return;
+ return;
}
/// if ldap admin username and password is right, go ahead
- iFolderServer server = web.GetServer( ServerID );
+ iFolderServer server = web.GetServer( ServerID );
remoteweb = new iFolderAdmin ();
- remoteweb.PreAuthenticate = true;
- remoteweb.Credentials = web.Credentials;
- remoteweb.Url = server.PublicUrl + "/iFolderAdmin.asmx";
+ remoteweb.PreAuthenticate = true;
+ remoteweb.Credentials = web.Credentials;
+ remoteweb.Url = server.PublicUrl + "/iFolderAdmin.asmx";
remoteweb.GetAuthenticatedUser();
- server = remoteweb.GetServer ( ServerID);
+ server = remoteweb.GetServer ( ServerID);
LdapInfo ldapInfo = new LdapInfo ();
- ldapInfo.Host = LdapServer.Text.Trim();
- ldapInfo.SearchContexts = LdapSearchContext.Text;
+ ldapInfo.Host = LdapServer.Text.Trim();
+ ldapInfo.SearchContexts = LdapSearchContext.Text;
ldapInfo.ProxyDN = LdapProxyUser.Text;
+ currentServerProxyDN = LdapProxyUser.Text;
ldapInfo.ProxyPassword = LdapProxyUserPwd.Text;
- ldapInfo.SSL = (LdapSslList.SelectedValue == GetString("YES")) ? true : false;
+ currentServerProxyDNPwd = LdapProxyUserPwd.Text;
+ ldapInfo.SSL = (LdapSslList.SelectedValue == GetString("YES")) ? true : false;
try
{
- remoteweb.SetLdapDetails (ldapInfo, LdapAdminName.Text.Trim(), LdapAdminPwd.Text, ServerID);
-
+ remoteweb.SetLdapDetails (ldapInfo, LdapAdminName.Text.Trim(), LdapAdminPwd.Text, ServerID);
+ //now the proxy user info changed, check if the same proxy is
+ //used in any other servers.
+ if (ldapInfo.ProxyDN != null && ldapInfo.ProxyPassword != null)
+ {
+ proxychagnestatus = UpdateProxyUserInfo(LdapAdminName.Text.Trim(), LdapAdminPwd.Text,
+ currentServerProxyDN, currentServerProxyDNPwd );
+ }
}
catch(Exception ex)
{
@@ -337,7 +388,8 @@
GetLdapDetails();
return;
}
- Response.Redirect(String.Format("ServerDetails.aspx?ID={0}",ServerID));
+ if (proxychagnestatus != false)
+ Response.Redirect(String.Format("ServerDetails.aspx?ID={0}",ServerID));
}
/// <summary>
Modified: trunk/src/admin/iFolderAdmin.resx
===================================================================
--- trunk/src/admin/iFolderAdmin.resx 2011-06-15 11:43:15 UTC (rev 7602)
+++ trunk/src/admin/iFolderAdmin.resx 2011-06-15 16:17:10 UTC (rev 7603)
@@ -1350,5 +1350,13 @@
<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 name="PASSWORDCHANGEWARNING">
+ <value>If Common Proxy user is used for iFolder, do not change the
+ Proxy User's password</value>
+ </data>
+ <data name="ALLSERVERPROXYPASSWORDCHANGEERROR">
+ <value>All settings updated successfully, except Proxy user password on
+ other servers. You must change password on each server</value>
+ </data>
</data>
</root>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2011-05-11 13:57:38
|
Revision: 7599
http://simias.svn.sourceforge.net/simias/?rev=7599&view=rev
Author: mvikash
Date: 2011-05-11 13:57:31 +0000 (Wed, 11 May 2011)
Log Message:
-----------
ID: #688409
Reviewer: GG
Localization Required: No
Documentation Required: Yes
Description: Changes are done to support only long option for restore
tool.
Modified Paths:
--------------
trunk/src/utils/restore/iFolderServer.cs
Modified: trunk/src/utils/restore/iFolderServer.cs
===================================================================
--- trunk/src/utils/restore/iFolderServer.cs 2011-05-11 13:23:01 UTC (rev 7598)
+++ trunk/src/utils/restore/iFolderServer.cs 2011-05-11 13:57:31 UTC (rev 7599)
@@ -3095,13 +3095,13 @@
{
Console.WriteLine("Command For Execution: $ifolder-data-recovery <Operation> <Arguments>\n");
- Console.WriteLine("Operation:\n\t-l, --list\tLists iFolders owned by the specified user and details such as Name,\n\t\t\tiFolderID, and Path (at the time of backup)");
- Console.WriteLine("\t-r, --restore\tRestore requested data (File/Folder/iFolder) from specified backup store.");
+ Console.WriteLine("Operation:\n\t--list\tLists iFolders owned by the specified user and details such as Name,\n\t\t\tiFolderID, and Path (at the time of backup)");
+ Console.WriteLine("\t--restore\tRestore requested data (File/Folder/iFolder) from specified backup store.");
Console.WriteLine("\t--retry\t\tRetry restore operation for failed data in last run.");
- Console.WriteLine("\t-h, --help\tPrint help regarding Operation, argument and usage.");
+ Console.WriteLine("\t--help\tPrint help regarding Operation, argument and usage.");
Console.WriteLine("\t\nArguments:\n\t--path\t\t\tPath of simias directory that has the iFolder backup store, FlaimSimias.db");
- Console.WriteLine("\t-U, --backup-admin\tLogin name of iFolder administrator who performed the backup");
- Console.WriteLine("\t-u,--current-admin\tiFolder administrator login name for the current server. Use this Option if backup \n\t\t\t\tadministrator is different from current administrator.");
+ Console.WriteLine("\t--backup-admin\tLogin name of iFolder administrator who performed the backup");
+ Console.WriteLine("\t--current-admin\tiFolder administrator login name for the current server. Use this Option if backup \n\t\t\t\tadministrator is different from current administrator.");
Console.WriteLine("\t--server-url\t\tPublic URL of the iFolder server where data is to be restored");
Console.WriteLine("\t--user\t\t\tUsername of the user for whom the specified operation is to be performed");
Console.WriteLine("\t--ifolder-id\t\tID of the iFolder for which the specified operation is to be performed");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2011-05-11 13:23:12
|
Revision: 7598
http://simias.svn.sourceforge.net/simias/?rev=7598&view=rev
Author: mvikash
Date: 2011-05-11 13:23:01 +0000 (Wed, 11 May 2011)
Log Message:
-----------
ID: #672223
Reviewer: GG
Localization Required: No
Documentation Required: No
Description: Changes done to handle exception at time of File Open.
Modified Paths:
--------------
trunk/src/core/Sync/SyncFile.cs
Modified: trunk/src/core/Sync/SyncFile.cs
===================================================================
--- trunk/src/core/Sync/SyncFile.cs 2011-05-11 12:17:06 UTC (rev 7597)
+++ trunk/src/core/Sync/SyncFile.cs 2011-05-11 13:23:01 UTC (rev 7598)
@@ -314,7 +314,15 @@
/// </summary>
~InFile()
{
- Close (true, false);
+ try
+ {
+ Close(true, false);
+ }
+ catch (Exception ex)
+ {
+ Log.log.Info("Exception at Infile destructor: trace {0}", ex.StackTrace);
+ }
+
}
#endregion
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2011-05-11 12:17:12
|
Revision: 7597
http://simias.svn.sourceforge.net/simias/?rev=7597&view=rev
Author: mvikash
Date: 2011-05-11 12:17:06 +0000 (Wed, 11 May 2011)
Log Message:
-----------
ID: #611437
Reviewer: GG
Localization Required: No
Documentation Required: No
Description: changes done in webacess and admin page of ifolder to
prevent cross-site scripting.
Modified Paths:
--------------
trunk/src/admin/Footer.ascx.cs
trunk/src/admin/Login.aspx.cs
trunk/src/webaccess/Login.aspx
trunk/src/webaccess/Login.aspx.cs
trunk/src/webaccess/Settings.aspx.cs
Modified: trunk/src/admin/Footer.ascx.cs
===================================================================
--- trunk/src/admin/Footer.ascx.cs 2011-04-28 11:24:26 UTC (rev 7596)
+++ trunk/src/admin/Footer.ascx.cs 2011-05-11 12:17:06 UTC (rev 7597)
@@ -157,7 +157,7 @@
String.Format(
"Login.aspx?MessageType={0}&MessageText={1}",
Context.Server.UrlEncode( GetString( "LOGINERROR" ) ),
- Context.Server.UrlEncode( GetString( "SESSIONCLOSED" ) ) ) );
+ Context.Server.UrlEncode( "SESSIONCLOSED" ) ) );
}
if ( !IsPostBack )
Modified: trunk/src/admin/Login.aspx.cs
===================================================================
--- trunk/src/admin/Login.aspx.cs 2011-04-28 11:24:26 UTC (rev 7596)
+++ trunk/src/admin/Login.aspx.cs 2011-05-11 12:17:06 UTC (rev 7597)
@@ -153,6 +153,8 @@
{
// query message
MessageType.Text = Request.QueryString.Get("MessageType");
+
+ //retrive error code
MessageText.Text = Request.QueryString.Get("MessageText");
// basic authentication for iChain
@@ -272,6 +274,8 @@
ServerUrl.Text = simiasUrl;
}
+ //retrive msg code
+ MessageText.Text = DisplayText(MessageText.Text);
}
/// <summary>
@@ -377,7 +381,7 @@
if (testCookie == null)
{
MessageType.Text = rm.GetString("LOGINERROR");
- MessageText.Text = rm.GetString("LOGINNOCOOKIES");
+ MessageText.Text = "LOGINNOCOOKIES";
// log access
log.Info(Context, "Login Failed: Browser Cookies Disabled");
@@ -394,7 +398,7 @@
if ((noscript != null) && (noscript == "true"))
{
MessageType.Text = rm.GetString("LOGINERROR");
- MessageText.Text = rm.GetString("LOGINNOSCRIPT");
+ MessageText.Text = "LOGINNOSCRIPT";
// log access
log.Info(Context, "Login Failed: Browser Scripts Disabled");
@@ -622,26 +626,26 @@
switch(error)
{
case "InvalidCertificate":
- MessageText.Text = rm.GetString("INVALIDCERTIFICATE");
+ MessageText.Text = "INVALIDCERTIFICATE";
break;
case "InvalidCredentials":
case "UnknownUser":
case "InvalidPassword":
- MessageText.Text = rm.GetString("LOGINUNAUTHORIZED");
+ MessageText.Text = "LOGINUNAUTHORIZED";
break;
case "AccountDisabled":
case "SimiasLoginDisabled":
- MessageText.Text = rm.GetString("LOGINACCOUNTDISABLED");
+ MessageText.Text = "LOGINACCOUNTDISABLED";
break;
case "AccountLockout":
- MessageText.Text = rm.GetString("LOGINACCOUNTLOCKED");
+ MessageText.Text = "LOGINACCOUNTLOCKED";
break;
default:
- MessageText.Text = rm.GetString("LOGINCONNECTFAILED");
+ MessageText.Text = "LOGINCONNECTFAILED";
break;
}
@@ -662,7 +666,7 @@
switch(code)
{
case HttpStatusCode.Unauthorized:
- MessageText.Text = rm.GetString("LOGINUNAUTHORIZED");
+ MessageText.Text = "LOGINUNAUTHORIZED";
break;
case HttpStatusCode.Redirect:
@@ -678,12 +682,12 @@
{
// ignore
}
-
+
MessageText.Text = String.Format("{0}<br>{1}", rm.GetString("LOGINREDIRECT"), location);
break;
default:
- MessageText.Text = rm.GetString("LOGINCONNECTFAILED");
+ MessageText.Text = "LOGINCONNECTFAILED";
break;
}
}
@@ -691,22 +695,22 @@
case WebExceptionStatus.ConnectFailure:
MessageType.Text = rm.GetString("LOGINERROR");
- MessageText.Text = rm.GetString("LOGINCONNECTFAILED");
+ MessageText.Text = "LOGINCONNECTFAILED";
break;
case WebExceptionStatus.TrustFailure:
MessageType.Text = rm.GetString("LOGINERROR");
- MessageText.Text = rm.GetString("LOGINTRUSTFAILED");
+ MessageText.Text = "LOGINTRUSTFAILED";
break;
case WebExceptionStatus.SecureChannelFailure:
MessageType.Text = rm.GetString("LOGINERROR");
- MessageText.Text = rm.GetString("LOGINSECUREFAILED");
+ MessageText.Text = "LOGINSECUREFAILED";
break;
case WebExceptionStatus.SendFailure:
MessageType.Text = rm.GetString("LOGINERROR");
- MessageText.Text = rm.GetString("LOGINSENDFAILED");
+ MessageText.Text = "LOGINSENDFAILED";
break;
default:
@@ -720,6 +724,39 @@
return result;
}
+
+
+ public string DisplayText(string msgCode)
+ {
+
+ string fullstring = null ;
+
+ switch (msgCode)
+ {
+ case "LOGINSENDFAILED" :
+ case "LOGINSECUREFAILED":
+ case "LOGINTRUSTFAILED":
+ case "LOGINCONNECTFAILED":
+ case "LOGINUNAUTHORIZED":
+ case "LOGINACCOUNTLOCKED":
+ case "LOGINACCOUNTDISABLED":
+ case "INVALIDCERTIFICATE":
+ case "LOGINNOCOOKIES":
+ case "LOGINNOSCRIPT":
+ fullstring = rm.GetString(msgCode);
+ break;
+ default :
+
+ if( msgCode.Contains(rm.GetString("LOGINLOGOUT")) ||
+ msgCode.Contains(rm.GetString("LOGINREDIRECT")) ||
+ msgCode.Contains(rm.GetString("LOGINLOSTSESSION")) )
+ fullstring = msgCode;
+ break;
+ }
+
+ return fullstring;
+ }
+
}
/// <summary>
Modified: trunk/src/webaccess/Login.aspx
===================================================================
--- trunk/src/webaccess/Login.aspx 2011-04-28 11:24:26 UTC (rev 7596)
+++ trunk/src/webaccess/Login.aspx 2011-05-11 12:17:06 UTC (rev 7597)
@@ -48,7 +48,7 @@
<tr>
<td class="title" colspan="2"><asp:HyperLink ID="HelpButton" style="float:right; margin: -25px 5px 0px 0px; color:white; position: relative; text-decoration: none; font-size: 1em; font-weight: bold;" Target="ifolderHelp" NavigateUrl="help/login.html" runat="server" /></td>
</tr>
- <tr><td class="message" colspan="2"><asp:Literal ID="Message" runat="server" /></td></tr>
+ <tr><td class="message" colspan="2"><asp:Label ID="Message" runat="server" /></td></tr>
<tr>
<td class="field" style="text-align:right"><%= GetString("LOGIN.USERNAME") %></td>
<td class="field"><asp:TextBox ID="UserName" CssClass="field" runat="server" /></td>
Modified: trunk/src/webaccess/Login.aspx.cs
===================================================================
--- trunk/src/webaccess/Login.aspx.cs 2011-04-28 11:24:26 UTC (rev 7596)
+++ trunk/src/webaccess/Login.aspx.cs 2011-05-11 12:17:06 UTC (rev 7597)
@@ -65,7 +65,7 @@
/// <summary>
/// Message
/// </summary>
- protected Literal Message;
+ protected Label Message;
/// <summary>
/// Help Button
@@ -132,14 +132,14 @@
private void Page_Load(object sender, EventArgs e)
{
// clear any message
- Message.Text = "";
+ Message.Text = String.Empty;
// localization
rm = (ResourceManager) Application["RM"];
if (!IsPostBack)
{
- // query message
+ // query message, retrive error code
Message.Text = Request.QueryString.Get("Message");
// basic authentication for iChain
@@ -249,6 +249,8 @@
// check browser version
CheckBrowserVersion();
}
+ //retrive msg code
+ Message.Text = DisplayText(Message.Text);
}
/// <summary>
@@ -409,7 +411,7 @@
HttpCookie testCookie = Request.Cookies["test"];
if (testCookie == null)
{
- Message.Text = GetString("LOGIN.NOCOOKIES");
+ Message.Text = "LOGIN.NOCOOKIES";
// log access
log.Info(Context, "Login Failed: Browser Cookies Disabled");
@@ -425,7 +427,7 @@
string noscript = Request.Form.Get("noscript");
if ((noscript != null) && (noscript == "true"))
{
- Message.Text = GetString("LOGIN.NOSCRIPT");
+ Message.Text = "LOGIN.NOSCRIPT";
// log access
log.Info(Context, "Login Failed: Browser Scripts Disabled");
@@ -487,7 +489,7 @@
log.Info(Context, e, "Login Failed");
string ccode = LanguageList.SelectedValue == null ? "en" : LanguageList.SelectedValue;
Thread.CurrentThread.CurrentUICulture = CultureInfo.CreateSpecificCulture(ccode);
- Message.Text = GetString("LOGIN.UNAUTHORIZED");
+ Message.Text = "LOGIN.UNAUTHORIZED";
return;
}
@@ -533,7 +535,7 @@
{
//for now give a general message
log.Info(Context, e, "Login Failed");
- Message.Text = GetString("LOGIN.UNAUTHORIZED");
+ Message.Text = "LOGIN.UNAUTHORIZED";
return;
}
@@ -659,26 +661,26 @@
switch(error)
{
case "InvalidCertificate":
- Message.Text = GetString("LOGIN.INVALIDCERTIFICATE");
+ Message.Text = "LOGIN.INVALIDCERTIFICATE";
break;
case "InvalidCredentials":
case "UnknownUser":
case "InvalidPassword":
- Message.Text = GetString("LOGIN.UNAUTHORIZED");
+ Message.Text = "LOGIN.UNAUTHORIZED";
break;
case "AccountDisabled":
case "SimiasLoginDisabled":
- Message.Text = GetString("LOGIN.ACCOUNTDISABLED");
+ Message.Text = "LOGIN.ACCOUNTDISABLED";
break;
case "AccountLockout":
- Message.Text = GetString("LOGIN.ACCOUNTLOCKED");
+ Message.Text = "LOGIN.ACCOUNTLOCKED";
break;
default:
- Message.Text = GetString("LOGIN.CONNECTFAILED");
+ Message.Text = "LOGIN.CONNECTFAILED";
break;
}
@@ -697,7 +699,7 @@
switch(code)
{
case HttpStatusCode.Unauthorized:
- Message.Text = GetString("LOGIN.UNAUTHORIZED");
+ Message.Text = "LOGIN.UNAUTHORIZED";
break;
case HttpStatusCode.Redirect:
@@ -718,26 +720,26 @@
break;
default:
- Message.Text = GetString("LOGIN.CONNECTFAILED");
+ Message.Text = "LOGIN.CONNECTFAILED";
break;
}
}
break;
case WebExceptionStatus.ConnectFailure:
- Message.Text = GetString("LOGIN.CONNECTFAILED");
+ Message.Text = "LOGIN.CONNECTFAILED";
break;
case WebExceptionStatus.TrustFailure:
- Message.Text = GetString("LOGIN.TRUSTFAILED");
+ Message.Text = "LOGIN.TRUSTFAILED";
break;
case WebExceptionStatus.SecureChannelFailure:
- Message.Text = GetString("LOGIN.SECUREFAILED");
+ Message.Text = "LOGIN.SECUREFAILED";
break;
case WebExceptionStatus.SendFailure:
- Message.Text = GetString("LOGIN.SENDFAILED");
+ Message.Text = "LOGIN.SENDFAILED";
break;
default:
@@ -779,11 +781,43 @@
{
log.Info(Context, ex, "Culture: {0}", code);
}
- Message.Text = GetString("LOGIN.UNAUTHORIZED");
+ Message.Text = "LOGIN.UNAUTHORIZED";
}
+ Response.Redirect( String.Format("Login.aspx?Message={0}",Context.Server.UrlEncode( Message.Text )));
return result;
}
+
+ public string DisplayText(string msgCode)
+ {
+ string fullstring = null ;
+ switch (msgCode)
+ {
+ case "LOGIN.NOCOOKIES":
+ case "LOGIN.NOSCRIPT":
+ case "LOGIN.UNAUTHORIZED":
+ case "LOGIN.INVALIDCERTIFICATE":
+ case "LOGIN.ACCOUNTDISABLED":
+ case "LOGIN.ACCOUNTLOCKED":
+ case "LOGIN.CONNECTFAILED":
+ case "LOGIN.TRUSTFAILED":
+ case "LOGIN.SECUREFAILED":
+ case "LOGIN.SENDFAILED":
+ case "PASSWORDCHANGESUCCESS":
+ fullstring = rm.GetString(msgCode);
+ break;
+ default:
+ if( msgCode.Contains(rm.GetString("LOGIN.LOGOUT")) ||
+ msgCode.Contains(rm.GetString("LOGIN.LOSTSESSION")) ||
+ msgCode.Contains(rm.GetString("LOGIN.REDIRECT")) )
+ fullstring = msgCode;
+ break;
+ }
+ return fullstring;
+ }
+
+
+
}
}
Modified: trunk/src/webaccess/Settings.aspx.cs
===================================================================
--- trunk/src/webaccess/Settings.aspx.cs 2011-04-28 11:24:26 UTC (rev 7596)
+++ trunk/src/webaccess/Settings.aspx.cs 2011-05-11 12:17:06 UTC (rev 7597)
@@ -485,7 +485,7 @@
url += String.Format("?PasswordChanged={0}",PasswordChanged);
}
- Head.Logout(GetString("PASSWORDCHANGESUCCESS"));
+ Head.Logout("PASSWORDCHANGESUCCESS");
// redirect
//Response.Redirect(url);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2011-04-28 11:24:33
|
Revision: 7596
http://simias.svn.sourceforge.net/simias/?rev=7596&view=rev
Author: hegdegg
Date: 2011-04-28 11:24:26 +0000 (Thu, 28 Apr 2011)
Log Message:
-----------
ID:#689036
Reviewer: Vikas
Localization Required: No
Documentation Required: No
Description: fix for restore tool error on slave server
Modified Paths:
--------------
branches/iFolder_3.9.0_Beta1/src/utils/restore/ifolder-data-recovery.in
Modified: branches/iFolder_3.9.0_Beta1/src/utils/restore/ifolder-data-recovery.in
===================================================================
--- branches/iFolder_3.9.0_Beta1/src/utils/restore/ifolder-data-recovery.in 2011-04-28 11:11:58 UTC (rev 7595)
+++ branches/iFolder_3.9.0_Beta1/src/utils/restore/ifolder-data-recovery.in 2011-04-28 11:24:26 UTC (rev 7596)
@@ -81,6 +81,7 @@
path=${args[$path_index_number-1]#*=}
log4net="$path/simias/Simias.log4net"
simiaslog="$path/simias/log/Simias.log"
+simiasconfig="$path/simias/Simias.config"
if [ -f $log4net ]; then
newline=`grep -n Simias.log $log4net`
@@ -95,6 +96,9 @@
echo "log4net file:$log4net not found"
fi
+
+sed /MasterAddress/d -i $simiasconfig #remove MasterAddress if any
+
echo -n "| Preparing for the operation.."
@_bindir_@/simias-server-setup "${args[$path_index_number-1]}" --recover 1>$path/console.log 2>$path/console.log
echo -n "....."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <he...@us...> - 2011-04-28 11:12:04
|
Revision: 7595
http://simias.svn.sourceforge.net/simias/?rev=7595&view=rev
Author: hegdegg
Date: 2011-04-28 11:11:58 +0000 (Thu, 28 Apr 2011)
Log Message:
-----------
ID:#689036
Reviewer: Vikash
Localization Required: No
Documentation Required: No
Description: fixing restore tool error for slave server
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-04-21 17:34:32 UTC (rev 7594)
+++ trunk/src/utils/restore/ifolder-data-recovery.in 2011-04-28 11:11:58 UTC (rev 7595)
@@ -81,6 +81,7 @@
path=${args[$path_index_number-1]#*=}
log4net="$path/simias/Simias.log4net"
simiaslog="$path/simias/log/Simias.log"
+simiasconfig="$path/simias/Simias.config"
if [ -f $log4net ]; then
newline=`grep -n Simias.log $log4net`
@@ -95,6 +96,9 @@
echo "log4net file:$log4net not found"
fi
+
+sed /MasterAddress/d -i $simiasconfig #remove MasterAddress if any
+
echo -n "| Preparing for the operation.."
@_bindir_@/simias-server-setup "${args[$path_index_number-1]}" --recover 1>$path/console.log 2>$path/console.log
echo -n "....."
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spr...@us...> - 2011-04-21 17:34:38
|
Revision: 7594
http://simias.svn.sourceforge.net/simias/?rev=7594&view=rev
Author: spratima
Date: 2011-04-21 17:34:32 +0000 (Thu, 21 Apr 2011)
Log Message:
-----------
changes made to handle path in mod-mono configuration files
Modified Paths:
--------------
branches/iFolder_3.9.0_Beta1/src/server/setup/ifolder_mono_setup.in
Modified: branches/iFolder_3.9.0_Beta1/src/server/setup/ifolder_mono_setup.in
===================================================================
--- branches/iFolder_3.9.0_Beta1/src/server/setup/ifolder_mono_setup.in 2011-04-21 17:24:20 UTC (rev 7593)
+++ branches/iFolder_3.9.0_Beta1/src/server/setup/ifolder_mono_setup.in 2011-04-21 17:34:32 UTC (rev 7594)
@@ -38,15 +38,26 @@
iFPrefix=@_bindir_@/../
CONF_FILE_PATH=/etc/apache2/conf.d
-MOD_MONO_CONF_FILE_PATH="/etc/apache2/mod_mono.conf"
+MOD_MONO_CONF_PATH="/etc/apache2/mod_mono.conf"
+MOD_MONO_CONF_FILE_PATH="/etc/apache2/conf.d/mod_mono.conf"
IFOLDER32BIT="/opt/novell/ifolder3/lib/simias"
IFOLDER64BIT="/opt/novell/ifolder3/lib64/simias"
CPLOGPATH="/var/opt/novell/log/proxymgmt/pxymgmt.log"
OS_ARCH=`uname -m | grep -c x86_64`
processFile(){
+
+
+ #sed -e s,"Include '${iFPrefix}'mono/etc/apache2/conf.d/mod_mono.conf","Include '${MOD_MONO_CONF_FILE_PATH}'",g -i $1
+ #sed -e s,"Include '${iFPrefix}'mono/etc/apache2/conf.d//mod_mono.conf","Include '${MOD_MONO_CONF_FILE_PATH}'",g -i $1
+
+ sed -e s,'Include /opt/novell/ifolder3/bin/../mono/etc/apache2/conf.d//mod_mono.conf',"Include ${MOD_MONO_CONF_FILE_PATH}",g -i $1
+ sed -e s,'Include /opt/novell/ifolder3/bin/../mono/etc/apache2/conf.d/mod_mono.conf',"Include ${MOD_MONO_CONF_FILE_PATH}",g -i $1
+
+ sed -e s,'Include /opt/novell/ifolder3/mono/etc/apache2/conf.d//mod_mono.conf',"Include ${MOD_MONO_CONF_FILE_PATH}",g -i $1
+ sed -e s,'Include /opt/novell/ifolder3/mono/etc/apache2/conf.d/mod_mono.conf',"Include ${MOD_MONO_CONF_FILE_PATH}",g -i $1
+
if [ -f $1 ]; then
- #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,6 +116,7 @@
}
+
rpm -q mono-addon-core > /dev/null 2>&1
if [ $? -eq 0 ]
then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spr...@us...> - 2011-04-21 17:24:27
|
Revision: 7593
http://simias.svn.sourceforge.net/simias/?rev=7593&view=rev
Author: spratima
Date: 2011-04-21 17:24:20 +0000 (Thu, 21 Apr 2011)
Log Message:
-----------
changes made to handle path in mod-mono configuration files
Modified Paths:
--------------
trunk/src/server/setup/ifolder_mono_setup.in
Modified: trunk/src/server/setup/ifolder_mono_setup.in
===================================================================
--- trunk/src/server/setup/ifolder_mono_setup.in 2011-04-21 12:50:15 UTC (rev 7592)
+++ trunk/src/server/setup/ifolder_mono_setup.in 2011-04-21 17:24:20 UTC (rev 7593)
@@ -38,13 +38,25 @@
iFPrefix=@_bindir_@/../
CONF_FILE_PATH=/etc/apache2/conf.d
-MOD_MONO_CONF_FILE_PATH="/etc/apache2/mod_mono.conf"
+MOD_MONO_CONF_PATH="/etc/apache2/mod_mono.conf"
+MOD_MONO_CONF_FILE_PATH="/etc/apache2/conf.d/mod_mono.conf"
IFOLDER32BIT="/opt/novell/ifolder3/lib/simias"
IFOLDER64BIT="/opt/novell/ifolder3/lib64/simias"
CPLOGPATH="/var/opt/novell/log/proxymgmt/pxymgmt.log"
OS_ARCH=`uname -m | grep -c x86_64`
processFile(){
+
+
+ #sed -e s,"Include '${iFPrefix}'mono/etc/apache2/conf.d/mod_mono.conf","Include '${MOD_MONO_CONF_FILE_PATH}'",g -i $1
+ #sed -e s,"Include '${iFPrefix}'mono/etc/apache2/conf.d//mod_mono.conf","Include '${MOD_MONO_CONF_FILE_PATH}'",g -i $1
+
+ sed -e s,'Include /opt/novell/ifolder3/bin/../mono/etc/apache2/conf.d//mod_mono.conf',"Include ${MOD_MONO_CONF_FILE_PATH}",g -i $1
+ sed -e s,'Include /opt/novell/ifolder3/bin/../mono/etc/apache2/conf.d/mod_mono.conf',"Include ${MOD_MONO_CONF_FILE_PATH}",g -i $1
+
+ sed -e s,'Include /opt/novell/ifolder3/mono/etc/apache2/conf.d//mod_mono.conf',"Include ${MOD_MONO_CONF_FILE_PATH}",g -i $1
+ sed -e s,'Include /opt/novell/ifolder3/mono/etc/apache2/conf.d/mod_mono.conf',"Include ${MOD_MONO_CONF_FILE_PATH}",g -i $1
+
if [ -f $1 ]; then
if [ $OS_ARCH -gt 0 ]; then
sed -e 's,'$IFOLDER32BIT','$IFOLDER64BIT',g' -i $1
@@ -104,15 +116,7 @@
}
-sed -e s,"Include '${iFPrefix}'/mono/etc/apache2/conf.d/mod_mono.conf","Include '${MOD_MONO_CONF_FILE_PATH}'",g -i $CONF_FILE_PATH/simias.conf
-sed -e s,"Include '${iFPrefix}'/mono/etc/apache2/conf.d/mod_mono.conf","Include '${MOD_MONO_CONF_FILE_PATH}'",g -i $CONF_FILE_PATH/ifolder_admin.conf
-sed -e s,"Include '${iFPrefix}'/mono/etc/apache2/conf.d/mod_mono.conf","Include '${MOD_MONO_CONF_FILE_PATH}'",g -i $CONF_FILE_PATH/ifolder_web.conf
-
-sed -e s,'Include /opt/novell/ifolder3/bin/../mono/etc/apache2/conf.d/mod_mono.conf',"Include '${MOD_MONO_CONF_FILE_PATH}'",g -i $CONF_FILE_PATH/simias.conf
-sed -e s,'Include /opt/novell/ifolder3/bin/../mono/etc/apache2/conf.d//mod_mono.conf',"Include '${MOD_MONO_CONF_FILE_PATH}'",g -i $CONF_FILE_PATH/ifolder_admin.conf
-sed -e s,'Include /opt/novell/ifolder3/bin/../mono/etc/apache2/conf.d/mod_mono.conf',"Include '${MOD_MONO_CONF_FILE_PATH}'",g -i $CONF_FILE_PATH/ifolder_web.conf
-
rpm -q mono-addon-core > /dev/null 2>&1
if [ $? -eq 0 ]
then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2011-04-21 12:50:21
|
Revision: 7592
http://simias.svn.sourceforge.net/simias/?rev=7592&view=rev
Author: mvikash
Date: 2011-04-21 12:50:15 +0000 (Thu, 21 Apr 2011)
Log Message:
-----------
ID:#660729
Reviewer: GG
Localization Required: No
Documentation Required: No
Description: Error handling done at time of ifolder proxy creation.
Modified Paths:
--------------
branches/iFolder_3.9.0_Beta1/src/server/setup/LdapUtility.cs
branches/iFolder_3.9.0_Beta1/src/server/setup/SimiasServerSetup.cs
Modified: branches/iFolder_3.9.0_Beta1/src/server/setup/LdapUtility.cs
===================================================================
--- branches/iFolder_3.9.0_Beta1/src/server/setup/LdapUtility.cs 2011-04-21 12:25:04 UTC (rev 7591)
+++ branches/iFolder_3.9.0_Beta1/src/server/setup/LdapUtility.cs 2011-04-21 12:50:15 UTC (rev 7592)
@@ -275,8 +275,11 @@
LdapEntry entry = new LdapEntry(dn, attributeSet);
connection.Add(entry);
}
- catch(Exception)
+ catch(Exception ex)
{
+
+ if(ex.Message.IndexOf("Constraint Violation") != -1)
+ throw new Exception("Constraint Violation");
// This is applicable for both admin and proxy user.
created = false;
}
Modified: branches/iFolder_3.9.0_Beta1/src/server/setup/SimiasServerSetup.cs
===================================================================
--- branches/iFolder_3.9.0_Beta1/src/server/setup/SimiasServerSetup.cs 2011-04-21 12:25:04 UTC (rev 7591)
+++ branches/iFolder_3.9.0_Beta1/src/server/setup/SimiasServerSetup.cs 2011-04-21 12:50:15 UTC (rev 7592)
@@ -2676,11 +2676,20 @@
bool created = false;
int i = 0;
string proxyDN = ldapProxyDN.Value;
+ bool result = false;
while(!created)
{
Console.WriteLine("Creating {0}...", ldapProxyDN.Value);
i++;
- if (ldapUtility.CreateUser(ldapProxyDN.Value, ldapProxyPassword.Value))
+
+ try{
+ result = ldapUtility.CreateUser(ldapProxyDN.Value, ldapProxyPassword.Value);
+ }
+ catch (Exception ex) {
+ throw new Exception( string.Format("password too short or Q not active.") );
+ }
+
+ if (result)
{
// Console.WriteLine("Created...{0} ... {1}", ldapUtility.DirectoryType, ldapProxyPassword.Value);
created = true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2011-04-21 12:25:10
|
Revision: 7591
http://simias.svn.sourceforge.net/simias/?rev=7591&view=rev
Author: mvikash
Date: 2011-04-21 12:25:04 +0000 (Thu, 21 Apr 2011)
Log Message:
-----------
ID:#660729
Reviewer: GG
Localization Required: No
Documentation Required: No
Description: Error handling done at time of ifolder proxy creation.
Modified Paths:
--------------
trunk/src/server/setup/LdapUtility.cs
trunk/src/server/setup/SimiasServerSetup.cs
Modified: trunk/src/server/setup/LdapUtility.cs
===================================================================
--- trunk/src/server/setup/LdapUtility.cs 2011-04-21 11:56:29 UTC (rev 7590)
+++ trunk/src/server/setup/LdapUtility.cs 2011-04-21 12:25:04 UTC (rev 7591)
@@ -275,8 +275,11 @@
LdapEntry entry = new LdapEntry(dn, attributeSet);
connection.Add(entry);
}
- catch(Exception)
+ catch(Exception ex)
{
+
+ if(ex.Message.IndexOf("Constraint Violation") != -1)
+ throw new Exception("Constraint Violation");
// This is applicable for both admin and proxy user.
created = false;
}
Modified: trunk/src/server/setup/SimiasServerSetup.cs
===================================================================
--- trunk/src/server/setup/SimiasServerSetup.cs 2011-04-21 11:56:29 UTC (rev 7590)
+++ trunk/src/server/setup/SimiasServerSetup.cs 2011-04-21 12:25:04 UTC (rev 7591)
@@ -2676,11 +2676,20 @@
bool created = false;
int i = 0;
string proxyDN = ldapProxyDN.Value;
+ bool result = false;
while(!created)
{
Console.WriteLine("Creating {0}...", ldapProxyDN.Value);
i++;
- if (ldapUtility.CreateUser(ldapProxyDN.Value, ldapProxyPassword.Value))
+
+ try{
+ result = ldapUtility.CreateUser(ldapProxyDN.Value, ldapProxyPassword.Value);
+ }
+ catch (Exception ex) {
+ throw new Exception( string.Format("Constraint Violation: password too short or Q not active.") );
+ }
+
+ if (result)
{
// Console.WriteLine("Created...{0} ... {1}", ldapUtility.DirectoryType, ldapProxyPassword.Value);
created = true;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <spr...@us...> - 2011-04-20 17:18:16
|
Revision: 7589
http://simias.svn.sourceforge.net/simias/?rev=7589&view=rev
Author: spratima
Date: 2011-04-20 17:18:10 +0000 (Wed, 20 Apr 2011)
Log Message:
-----------
changes made to handle path in mod-mono configuration files
Modified Paths:
--------------
trunk/src/server/setup/ifolder_mono_setup.in
Modified: trunk/src/server/setup/ifolder_mono_setup.in
===================================================================
--- trunk/src/server/setup/ifolder_mono_setup.in 2011-04-19 04:03:28 UTC (rev 7588)
+++ trunk/src/server/setup/ifolder_mono_setup.in 2011-04-20 17:18:10 UTC (rev 7589)
@@ -46,7 +46,6 @@
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
if [ $OS_ARCH -gt 0 ]; then
sed -e 's,'$IFOLDER32BIT','$IFOLDER64BIT',g' -i $1
fi
@@ -105,6 +104,15 @@
}
+sed -e s,"Include '${iFPrefix}'/mono/etc/apache2/conf.d/mod_mono.conf","Include '${MOD_MONO_CONF_FILE_PATH}'",g -i $CONF_FILE_PATH/simias.conf
+sed -e s,"Include '${iFPrefix}'/mono/etc/apache2/conf.d/mod_mono.conf","Include '${MOD_MONO_CONF_FILE_PATH}'",g -i $CONF_FILE_PATH/ifolder_admin.conf
+sed -e s,"Include '${iFPrefix}'/mono/etc/apache2/conf.d/mod_mono.conf","Include '${MOD_MONO_CONF_FILE_PATH}'",g -i $CONF_FILE_PATH/ifolder_web.conf
+
+sed -e s,'Include /opt/novell/ifolder3/bin/../mono/etc/apache2/conf.d/mod_mono.conf',"Include '${MOD_MONO_CONF_FILE_PATH}'",g -i $CONF_FILE_PATH/simias.conf
+sed -e s,'Include /opt/novell/ifolder3/bin/../mono/etc/apache2/conf.d//mod_mono.conf',"Include '${MOD_MONO_CONF_FILE_PATH}'",g -i $CONF_FILE_PATH/ifolder_admin.conf
+sed -e s,'Include /opt/novell/ifolder3/bin/../mono/etc/apache2/conf.d/mod_mono.conf',"Include '${MOD_MONO_CONF_FILE_PATH}'",g -i $CONF_FILE_PATH/ifolder_web.conf
+
+
rpm -q mono-addon-core > /dev/null 2>&1
if [ $? -eq 0 ]
then
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <js...@us...> - 2011-04-19 04:03:35
|
Revision: 7588
http://simias.svn.sourceforge.net/simias/?rev=7588&view=rev
Author: jshaju
Date: 2011-04-19 04:03:28 +0000 (Tue, 19 Apr 2011)
Log Message:
-----------
ID:#676910
Reviewer: Vikas
Localization Required: Yes
Documentation Required: Yes
Description: Added information regarding special characters to Web access login file.
Modified Paths:
--------------
trunk/src/webaccess/help/en/login.html
Modified: trunk/src/webaccess/help/en/login.html
===================================================================
--- trunk/src/webaccess/help/en/login.html 2011-04-18 09:31:17 UTC (rev 7587)
+++ trunk/src/webaccess/help/en/login.html 2011-04-19 04:03:28 UTC (rev 7588)
@@ -58,12 +58,23 @@
the same language as the language code of the iFolder enterprise server and
your local computer. Make sure to configure your browser's Languages setting
to support the desired language. </p>
- <ol><li><p> Specify the username and password for the
-iFolder account you want to access. <br><br>
- Usernames and passwords are case sensitive. </p>
- </li><li><p>Use the Languages drop-down list
-to specify which language you want to use to access your files. <br></p></li><li><p>Click
-Log In.</p></li></ol>
+ <ol>
+ <li>
+ <p> Specify the username and password for the iFolder account you want to
+ access. <br>
+ <br>
+ Usernames and passwords are case sensitive. The administrator can improve
+ the strength of passwords, by allowing usage of special characters. </p>
+ </li>
+ <li>
+ <p>Use the Languages drop-down list to specify which language you want to
+ use to access your files. <br>
+ </p>
+ </li>
+ <li>
+ <p>Click Log In.</p>
+ </li>
+ </ol>
<A HREF="#top" TARGET="_self"><IMG SRC="../../images/goto_top.gif" WIDTH="19" HEIGHT="19" BORDER="0" ALT="Go to top"></A>
<H4 CLASS="ruleabove"><IMG SRC="../../images/xrefbtn.gif" WIDTH="16" HEIGHT="16" ALT="Related Topics" align="top">
Related Topics</H4><BLOCKQUOTE class="task1"><P ><A HREF="home.html">Accessing Your iFolders</A><BR><A HREF="browse.html">Accessing Folders and Files in Your iFolder
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2011-04-18 09:31:23
|
Revision: 7587
http://simias.svn.sourceforge.net/simias/?rev=7587&view=rev
Author: mvikash
Date: 2011-04-18 09:31:17 +0000 (Mon, 18 Apr 2011)
Log Message:
-----------
ID:#676910
Reviewer:GG
Localization Required:Yes
Documentation Required:Yes
Description: Handling special character in password.
Modified Paths:
--------------
trunk/src/webaccess/Global.asax.cs
trunk/src/webaccess/Settings.aspx.cs
Modified: trunk/src/webaccess/Global.asax.cs
===================================================================
--- trunk/src/webaccess/Global.asax.cs 2011-04-18 09:24:09 UTC (rev 7586)
+++ trunk/src/webaccess/Global.asax.cs 2011-04-18 09:31:17 UTC (rev 7587)
@@ -162,7 +162,11 @@
protected void Application_Error(Object sender, EventArgs e)
{
Exception ex = Server.GetLastError().GetBaseException();
-
+
+ if(ex is System.Web.HttpRequestValidationException)
+ {
+ Response.Redirect("Settings.aspx?Error=UNSUPPORTEDCHAR");
+ }
// pass the compile exceptions through for debugging
if (!(ex is HttpCompileException) && !(ex is InvalidCastException))
{
Modified: trunk/src/webaccess/Settings.aspx.cs
===================================================================
--- trunk/src/webaccess/Settings.aspx.cs 2011-04-18 09:24:09 UTC (rev 7586)
+++ trunk/src/webaccess/Settings.aspx.cs 2011-04-18 09:31:17 UTC (rev 7587)
@@ -225,6 +225,14 @@
ViewState["Referrer"] = Request.UrlReferrer;
Head.AddHelpLink("SETTINGS");
}
+ if( Request.QueryString.Get("Error") != "" && Request.QueryString.Get("Error") != null && Request.QueryString.Get("Error").IndexOf("UNSUPPORTEDCHAR") != -1)
+ {
+ Message.Text = rm.GetString("UNSUPPORTEDCHAR");
+ return;
+ }
+
+
+
}
/// <summary>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mv...@us...> - 2011-04-18 09:24:15
|
Revision: 7586
http://simias.svn.sourceforge.net/simias/?rev=7586&view=rev
Author: mvikash
Date: 2011-04-18 09:24:09 +0000 (Mon, 18 Apr 2011)
Log Message:
-----------
ID:#669921
Reviewer:GG
Localization Required:No
Documentation Required:No
Description: Size policy check has been done for encrypted ifolder upload.
Modified Paths:
--------------
trunk/src/webaccess/Upload.aspx.cs
Modified: trunk/src/webaccess/Upload.aspx.cs
===================================================================
--- trunk/src/webaccess/Upload.aspx.cs 2011-04-13 16:12:10 UTC (rev 7585)
+++ trunk/src/webaccess/Upload.aspx.cs 2011-04-18 09:24:09 UTC (rev 7586)
@@ -503,8 +503,7 @@
// put
UriBuilder uri = new UriBuilder(web.Url);
- uri.Path = String.Format("/simias10/Upload.ashx?iFolder={0}&Path={1}&Length={2}",
- ifolderID, path, file.ContentLength.ToString());
+ uri.Path = String.Format("/simias10/Upload.ashx?iFolder={0}&Path={1}&DontCheckPolicies=false&Length={2}", ifolderID, path, file.ContentLength.ToString());
HttpWebRequest webRequest = (HttpWebRequest) WebRequest.Create(uri.Uri);
webRequest.Method = "PUT";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
