Commit for version 2.1.0

ChangeLog

@@ -1,3 +1,49 @@
+Changes for 2.1.0 (Rev:6777) GA
+
+2014-12-19  Financial System Products Dept.
+
+	* Job Arranger : ジョブの実行ユーザー指定機能を追加。
+	* Job Arranger : オブジェクトの有効化・無効化、および削除時の関連データエラー画面を追加。
+	* Job Arranger : 実行ジョブ管理画面のジョブネット一覧リストに実行中ジョブIDを追加。
+	* Job Arranger : ジョブアイコンに処理継続オプションを追加。
+	* Job Arranger : リブートアイコンにタイムアウト警告オプションを追加。
+	* Job Arranger : 終了アイコンの終了コードにジョブコントローラ変数の指定を追加。
+	* Job Arranger : 稼働日フィルター画面を追加。
+	* Job Arranger : 一般設定画面を追加。
+	* Job Arranger : ジョブサーバ再起動時の拡張ジョブアイコン処理継続に対応。
+	* Job Arranger : Zabbixエラー通知失敗時のリトライ機能を追加。
+	* Job Arranger : 実行待ち（予約状態）ジョブネットの開始予定時刻変更機能を追加。
+	* Job Arranger : 実行待ち（予約状態）ジョブネットの起動保留と起動保留解除機能を追加。
+	* Job Arranger : アイコンのバルーン表示内容を詳細化。
+	* Job Arranger : ジョブマネージャの内部時刻同期機能を追加。
+	* Job Arranger : 新規ファイル作成時のファイル作成ダイアログ表示を廃止。
+	* Job Arranger : 実行ジョブ管理画面の状況欄色を文字単位から項目単位に変更。
+	* Job Arranger : オブジェクト一覧画面のリスト行コンテキストメニューに「即時実行」、
+	「保留実行」、「テスト実行」を追加。
+	* Job Arranger : ジョブネットのコピー新規でコピー元ジョブネットをサブジョブネットとして
+	利用可能に変更。
+	* Job Arranger : ジョブ編集画面での複数アイコン選択時に「フロー削除」、「保留」、
+	「保留解除」、「スキップ」、「スキップ解除」を利用可能に変更。
+	* Job Arranger : アイコン設定画面の背景色の不備に対応。
+	* Job Arranger : ジョブマネージャーにおいてDB復旧後の自動再接続に対応。
+	* Job Arranger : ジョブエージェントの対応OSに Windows Server 2012 R2 を追加。
+	* Job Arranger : AIX 5.3（64bit）版ジョブエージェントを公開。
+	* Job Arranger : HP-UX 11i v2（64bit）版ジョブエージェントを公開。
+	* Job Arranger : json-c のソースバージョン v0.10、v0.11、v0.12 に対応。
+	* Job Arranger : 最新のODBCドライバである、MySQL Connector/ODBC 5.3.4 および
+	PostgreSQL ODBC Driver 9.3.4 に対応。
+	* Job Arranger : ジョブマネージャー、およびWindows版ジョブエージェントのアップデート
+	インストールに対応。
+	* Job Arranger : ジョブアイコンとエージェントレスアイコンで取得可能な標準出力と
+	標準エラーの最大データ長を64000バイトに変更。
+	* Job Arranger : コンフィグファイルのテンポラリディレクトリ（TmpDir）の初期値を
+	「/var/lib/jobarranger/tmp」に変更。
+	* Job Arranger : ジョブサーバとジョブモニターの一括起動シェル（jobarg-all）を追加。
+	* Job Arranger : エージェントレスアイコンのログインID、パスワードで「$」文字の
+	エスケープ処理を追加。
+	* jajobfile.c : ジョブエージェントでファイル書込み遅延発生時にジョブがエラーとなる
+	不具合に対応。
+
 Changes for 2.0.1 (Rev:6308) GA
 
 2014-07-16  Financial System Products Dept.

INSTALL

@@ -1 +1 @@
-Please see https://ftf-support.fitechforce.com/redmine/projects/job-arranger-for-zabbix/repository for installation instructions.
+Please see http://job-scheduler.fitechforce.com/ for installation instructions.

Makefile.in

@@ -44,7 +44,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_mysql.m4 \
 	$(top_srcdir)/m4/ax_lib_postgresql.m4 \
 	$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/libjson.m4 \
 	$(top_srcdir)/m4/libsqlite3.m4 $(top_srcdir)/m4/libssh2.m4 \
-	$(top_srcdir)/m4/resolv.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/libtar.m4 $(top_srcdir)/m4/resolv.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -145,6 +146,9 @@ JSON_LIBS = @JSON_LIBS@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBTAR_CPPFLAGS = @LIBTAR_CPPFLAGS@
+LIBTAR_LDFLAGS = @LIBTAR_LDFLAGS@
+LIBTAR_LIBS = @LIBTAR_LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@

README

@@ -1,2 +1,2 @@
-Please see https://ftf-support.fitechforce.com for detailed information about Job Arranger.
-On-line Job Arranger documentation is available at https://ftf-support.fitechforce.com/ .
+Please see http://job-scheduler.fitechforce.com/ for detailed information about Job Arranger.
+On-line Job Arranger documentation is available at http://job-scheduler.fitechforce.com/ .

aclocal.m4

@@ -1019,4 +1019,5 @@ m4_include([m4/iconv.m4])
 m4_include([m4/libjson.m4])
 m4_include([m4/libsqlite3.m4])
 m4_include([m4/libssh2.m4])
+m4_include([m4/libtar.m4])
 m4_include([m4/resolv.m4])

build/project/jobarg_agent/jobarg_agent.vcxproj

@@ -177,7 +177,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;ZABBIX_SERVICE;_WINDOWS;WITH_COMMON_METRICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\tools;$(SolutionDir)..\..\tools\sqlite3;$(SolutionDir)..\..\tools\libtar\libtar\lib;$(SolutionDir)..\..\tools\libtar\libtar\listhash;$(SolutionDir)..\..\tools\libtar\libtar\win32;$(SolutionDir)..\win32\include;$(SolutionDir)..\..\include;$(SolutionDir)..\..\jainclude;$(SolutionDir)..\..\src\jobarg_agent;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\tools;$(SolutionDir)..\..\tools\sqlite3;$(SolutionDir)..\..\tools\libtar\libtar\lib;$(SolutionDir)..\..\tools\libtar\libtar\listhash;$(SolutionDir)..\..\tools\libtar\libtar\win32;$(SolutionDir)..\win32\include;$(SolutionDir)..\..\include;$(SolutionDir)..\..\jainclude;$(SolutionDir)..\..\src\jobarg_agent;$(SolutionDir)..\..\tools\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ObjectFileName>%(Directory)</ObjectFileName>
     </ClCompile>
     <Link>
@@ -213,7 +213,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;ZABBIX_SERVICE;_WINDOWS;WITH_COMMON_METRICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\tools;$(SolutionDir)..\..\tools\sqlite3;$(SolutionDir)..\..\tools\libtar\libtar\lib;$(SolutionDir)..\..\tools\libtar\libtar\listhash;$(SolutionDir)..\..\tools\libtar\libtar\win32;$(SolutionDir)..\win32\include;$(SolutionDir)..\..\include;$(SolutionDir)..\..\jainclude;$(SolutionDir)..\..\src\jobarg_agent;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\tools;$(SolutionDir)..\..\tools\sqlite3;$(SolutionDir)..\..\tools\libtar\libtar\lib;$(SolutionDir)..\..\tools\libtar\libtar\listhash;$(SolutionDir)..\..\tools\libtar\libtar\win32;$(SolutionDir)..\win32\include;$(SolutionDir)..\..\include;$(SolutionDir)..\..\jainclude;$(SolutionDir)..\..\src\jobarg_agent;$(SolutionDir)..\..\tools\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ObjectFileName>%(Directory)</ObjectFileName>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>
@@ -236,7 +236,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;ZABBIX_SERVICE;_WINDOWS;WITH_COMMON_METRICS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)..\..\tools;$(SolutionDir)..\..\tools\sqlite3;$(SolutionDir)..\..\tools\libtar\libtar\lib;$(SolutionDir)..\..\tools\libtar\libtar\listhash;$(SolutionDir)..\..\tools\libtar\libtar\win32;$(SolutionDir)..\win32\include;$(SolutionDir)..\..\include;$(SolutionDir)..\..\jainclude;$(SolutionDir)..\..\src\jobarg_agent;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\tools;$(SolutionDir)..\..\tools\sqlite3;$(SolutionDir)..\..\tools\libtar\libtar\lib;$(SolutionDir)..\..\tools\libtar\libtar\listhash;$(SolutionDir)..\..\tools\libtar\libtar\win32;$(SolutionDir)..\win32\include;$(SolutionDir)..\..\include;$(SolutionDir)..\..\jainclude;$(SolutionDir)..\..\src\jobarg_agent;$(SolutionDir)..\..\tools\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ObjectFileName>%(Directory)</ObjectFileName>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
     </ClCompile>

build/project/jobarg_command/jobarg_command.vcxproj

@@ -101,6 +101,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>userenv.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -132,6 +133,7 @@
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>userenv.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -144,12 +146,15 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>$(FrameworkSDKDir)\include</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <ShowProgress>NotSet</ShowProgress>
+      <AdditionalDependencies>userenv.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

build/project/jobarg_exec/jobarg_exec.vcxproj

@@ -5,10 +5,18 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{37AF215C-B955-404B-920E-249FF1154127}</ProjectGuid>
@@ -21,30 +29,55 @@
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)..\..\bin\jobarg_exec\$(Platform)\</OutDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)..\..\bin\jobarg_exec\$(Platform)\</OutDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <OutDir>$(SolutionDir)..\..\bin\jobarg_exec\$(Platform)\</OutDir>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)..\..\bin\jobarg_exec\$(Platform)\</OutDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>
@@ -62,6 +95,23 @@
       <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\include;$(SolutionDir)..\..\include;$(SolutionDir)..\..\jainclude</AdditionalIncludeDirectories>
+      <ObjectFileName>%(Directory)</ObjectFileName>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -84,6 +134,28 @@
       <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\win32\include;$(SolutionDir)..\..\include;$(SolutionDir)..\..\jainclude</AdditionalIncludeDirectories>
+      <ObjectFileName>%(Directory)</ObjectFileName>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+      <AdditionalDependencies>Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\jalibs\jastr.c" />
     <ClCompile Include="..\..\..\src\jobarg_exec\jobarg_exec.c" />