Finish CONNECTORS-1131 work.
git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/CONNECTORS-1131@1689228 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/crawler-ui/src/main/webapp/execute.jsp b/framework/crawler-ui/src/main/webapp/execute.jsp
index ac7ebab..d1e7ff9 100644
--- a/framework/crawler-ui/src/main/webapp/execute.jsp
+++ b/framework/crawler-ui/src/main/webapp/execute.jsp
@@ -165,6 +165,14 @@
}
else if (op.equals("Save"))
{
+ // Check if authorized
+ if (!adminprofile.checkAllowed(threadContext,IAuthorizer.CAPABILITY_EDIT_CONNECTIONS))
+ {
+ variableContext.setParameter("target","listconnections.jsp");
+%>
+ <jsp:forward page="unauthorized.jsp"/>
+<%
+ }
connManager.save(connection);
variableContext.setParameter("connname",connectionName);
%>
@@ -280,11 +288,20 @@
{
threadContext.save("GroupObject",group);
%>
- <jsp:forward page="editgroup.jsp"/>
+ <jsp:forward page="editgroup.jsp"/>
<%
}
else if (op.equals("Save"))
{
+ // Check if authorized
+ if (!adminprofile.checkAllowed(threadContext,IAuthorizer.CAPABILITY_EDIT_CONNECTIONS))
+ {
+ variableContext.setParameter("target","listgroups.jsp");
+%>
+ <jsp:forward page="unauthorized.jsp"/>
+<%
+ }
+
authGroupManager.save(group);
variableContext.setParameter("groupname",groupName);
%>
@@ -415,6 +432,15 @@
}
else if (op.equals("Save"))
{
+ // Check if authorized
+ if (!adminprofile.checkAllowed(threadContext,IAuthorizer.CAPABILITY_EDIT_CONNECTIONS))
+ {
+ variableContext.setParameter("target","listauthorities.jsp");
+%>
+ <jsp:forward page="unauthorized.jsp"/>
+<%
+ }
+
authConnManager.save(connection);
variableContext.setParameter("connname",connectionName);
%>
@@ -538,6 +564,15 @@
}
else if (op.equals("Save"))
{
+ // Check if authorized
+ if (!adminprofile.checkAllowed(threadContext,IAuthorizer.CAPABILITY_EDIT_CONNECTIONS))
+ {
+ variableContext.setParameter("target","listmappers.jsp");
+%>
+ <jsp:forward page="unauthorized.jsp"/>
+<%
+ }
+
mappingConnManager.save(connection);
variableContext.setParameter("connname",connectionName);
%>
@@ -653,6 +688,15 @@
}
else if (op.equals("Save"))
{
+ // Check if authorized
+ if (!adminprofile.checkAllowed(threadContext,IAuthorizer.CAPABILITY_EDIT_CONNECTIONS))
+ {
+ variableContext.setParameter("target","listoutputs.jsp");
+%>
+ <jsp:forward page="unauthorized.jsp"/>
+<%
+ }
+
outputManager.save(connection);
variableContext.setParameter("connname",connectionName);
%>
@@ -812,6 +856,15 @@
}
else if (op.equals("Save"))
{
+ // Check if authorized
+ if (!adminprofile.checkAllowed(threadContext,IAuthorizer.CAPABILITY_EDIT_CONNECTIONS))
+ {
+ variableContext.setParameter("target","listtransformations.jsp");
+%>
+ <jsp:forward page="unauthorized.jsp"/>
+<%
+ }
+
transformationManager.save(connection);
variableContext.setParameter("connname",connectionName);
%>
@@ -927,6 +980,15 @@
}
else if (op.equals("Save"))
{
+ // Check if authorized
+ if (!adminprofile.checkAllowed(threadContext,IAuthorizer.CAPABILITY_EDIT_CONNECTIONS))
+ {
+ variableContext.setParameter("target","listnotifications.jsp");
+%>
+ <jsp:forward page="unauthorized.jsp"/>
+<%
+ }
+
notificationManager.save(connection);
variableContext.setParameter("connname",connectionName);
%>
@@ -1470,6 +1532,15 @@
}
else if (op.equals("Save"))
{
+ // Check if authorized
+ if (!adminprofile.checkAllowed(threadContext,IAuthorizer.CAPABILITY_EDIT_JOBS))
+ {
+ variableContext.setParameter("target","listjobs.jsp");
+%>
+ <jsp:forward page="unauthorized.jsp"/>
+<%
+ }
+
manager.save(job);
// Reset the job schedule. We may want to make this explicit at some point; having
// this happen all the time seems wrong.
diff --git a/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties b/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
index b97c706..a2e5a8c 100644
--- a/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
+++ b/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_en_US.properties
@@ -574,7 +574,6 @@
documentstatus.Continue=Continue
documentstatus.PleaseSelectAtLeastOneJob=Please select at least one job
documentstatus.PleaseSelectaConnection=Please select a connection
-documentstatus.PleaseTryAgainLater=This page is unavailable due to maintenance operations. Please try again later.
documentstatus.Previous=Previous
documentstatus.Next=Next
documentstatus.Rows=Rows:
@@ -619,7 +618,6 @@
queuestatus.Continue=Continue
queuestatus.PleaseSelectAtLeastOneJob=Please select at least one job
queuestatus.PleaseSelectaConnection=Please select a connection
-queuestatus.PleaseTryAgainLater=This page is unavailable due to maintenance operations. Please try again later.
queuestatus.DocumentsThatHaveNeverBeenProcessed=Documents that have never been processed
queuestatus.DocumentsProcessedAtLeastOnce=Documents processed at least once
queuestatus.DocumentsOutOfScope=Documents that are out of scope
@@ -695,7 +693,6 @@
simplereport.Rows=Rows:
simplereport.RowsPerPage=Rows per page:
simplereport.PleaseSelectAConnection=Please select a connection
-simplereport.PleaseTryAgainLater=This page is unavailable due to maintenance operations. Please try again later.
simplereport.EnterALegalNumberForRowsPerPage=Enter a legal number for rows per page
simplereport.EntityMatchMustBeAValidRegularExpression=Entity match must be a valid regular expression
simplereport.ResultCodeMatchMustBeAValidRegularExpression=Result code match must be a valid regular expression
@@ -737,7 +734,6 @@
maxactivityreport.Rows=Rows:
maxactivityreport.RowsPerPage=Rows per page:
maxactivityreport.PleaseSelectAConnection=Please select a connection
-maxactivityreport.PleaseTryAgainLater=This page is unavailable due to maintenance operations. Please try again later.
maxactivityreport.EnterALegalNumberForRowsPerPage=Enter a legal number for rows per page
maxactivityreport.EnterALegalIntervalSizeInMinutes=Enter a legal interval size, in minutes
maxactivityreport.IdentifierClassDescriptionCannotBeEmpty=Identifier class description cannot be empty
@@ -782,7 +778,6 @@
maxbandwidthreport.Next=Next
maxbandwidthreport.RowsPerPage=Rows per page:
maxbandwidthreport.PleaseSelectAConnection=Please select a connection
-maxbandwidthreport.PleaseTryAgainLater=This page is unavailable due to maintenance operations. Please try again later.
maxbandwidthreport.HighestBandwidth2=Highest Bandwith
maxbandwidthreport.Rows=Rows:
maxbandwidthreport.Next=Next
@@ -828,7 +823,6 @@
resultreport.Rows=Rows:
resultreport.RowsPerPage=Rows per page:
resultreport.PleaseSelectAConnection=Please select a connection
-resultreport.PleaseTryAgainLater=This page is unavailable due to maintenance operations. Please try again later.
resultreport.IdentifierClass=Identifier Class
resultreport.ResultClass=Result Class
resultreport.EventCount=Event Count
diff --git a/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties b/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
index 71933fc..6f57581 100644
--- a/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
+++ b/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_ja_JP.properties
@@ -574,7 +574,6 @@
documentstatus.Continue=次へ
documentstatus.PleaseSelectAtLeastOneJob=ジョブを一つ以上選択してください
documentstatus.PleaseSelectaConnection=コネクションを選択してください
-documentstatus.PleaseTryAgainLater=保守処理中です。少々お待ちください。
documentstatus.Previous=前へ
documentstatus.Next=次へ
documentstatus.Rows=行:
@@ -619,7 +618,6 @@
queuestatus.Continue=次へ
queuestatus.PleaseSelectAtLeastOneJob=ジョブを一つ以上選択してください
queuestatus.PleaseSelectaConnection=コネクションを選択してください
-queuestatus.PleaseTryAgainLater=保守処理中です。少々お待ちください。
queuestatus.DocumentsThatHaveNeverBeenProcessed=処理が一度もされていないコンテンツ
queuestatus.DocumentsProcessedAtLeastOnce=1回以上処理されたコンテンツ
queuestatus.DocumentsOutOfScope=範囲外である文書
@@ -695,7 +693,6 @@
simplereport.Rows=Rows:
simplereport.RowsPerPage=行/ページ:
simplereport.PleaseSelectAConnection=コネクションを選択してください
-simplereport.PleaseTryAgainLater=保守処理中です。少々お待ちください。
simplereport.EnterALegalNumberForRowsPerPage=正しいページ毎の行数を入力してください
simplereport.EntityMatchMustBeAValidRegularExpression=エンティティパターンは正規表現式に一致する必要があります
simplereport.ResultCodeMatchMustBeAValidRegularExpression=結果コードは正規表現式に一致する必要があります
@@ -737,7 +734,6 @@
maxactivityreport.Rows=Rows:
maxactivityreport.RowsPerPage=行/ページ:
maxactivityreport.PleaseSelectAConnection=コネクションを選択してください
-maxactivityreport.PleaseTryAgainLater=保守処理中です。少々お待ちください。
maxactivityreport.EnterALegalNumberForRowsPerPage=正しいページ毎の行数を入力してください
maxactivityreport.EnterALegalIntervalSizeInMinutes=正しい間隔値を入力してください(分)
maxactivityreport.IdentifierClassDescriptionCannotBeEmpty=IDクラスパターンを入力してください
@@ -783,7 +779,6 @@
maxbandwidthreport.Next=次へ
maxbandwidthreport.RowsPerPage=行/ページ:
maxbandwidthreport.PleaseSelectAConnection=コネクションを選択してください
-maxbandwidthreport.PleaseTryAgainLater=保守処理中です。少々お待ちください。
maxbandwidthreport.HighestBandwidth2=最大バンド幅
maxbandwidthreport.Rows=行:
maxbandwidthreport.Next=次へ
@@ -829,7 +824,6 @@
resultreport.Rows=行:
resultreport.RowsPerPage=行/ページ:
resultreport.PleaseSelectAConnection=コネクションを選択してください
-resultreport.PleaseTryAgainLater=保守処理中です。少々お待ちください。
resultreport.IdentifierClass=IDクラス
resultreport.ResultClass=結果クラス
resultreport.EventCount=イベント数
diff --git a/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties b/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties
index 8f50eae..31f1546 100644
--- a/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties
+++ b/framework/ui-core/src/main/native2ascii/org/apache/manifoldcf/ui/i18n/common_zh_CN.properties
@@ -574,7 +574,6 @@
documentstatus.Continue=下一个
documentstatus.PleaseSelectAtLeastOneJob=请选择至少一个作业
documentstatus.PleaseSelectaConnection=请选择一个连接
-documentstatus.PleaseTryAgainLater=维护中。请稍等。
documentstatus.Previous=上一个
documentstatus.Next=下一个
documentstatus.Rows=行:
@@ -619,7 +618,6 @@
queuestatus.Continue=下一个
queuestatus.PleaseSelectAtLeastOneJob=请选择至少一个作业
queuestatus.PleaseSelectaConnection=请选择一个连接
-queuestatus.PleaseTryAgainLater=维护中。请稍等。
queuestatus.DocumentsThatHaveNeverBeenProcessed=从未处理过的文档
queuestatus.DocumentsProcessedAtLeastOnce=至少处理过一次的文档
queuestatus.DocumentsOutOfScope=范围之外的文档
@@ -695,7 +693,6 @@
simplereport.Rows=Rows:
simplereport.RowsPerPage=行/页:
simplereport.PleaseSelectAConnection=请选择连接
-simplereport.PleaseTryAgainLater=维护中。请稍等。
simplereport.EnterALegalNumberForRowsPerPage=请正确输入每页的行数
simplereport.EntityMatchMustBeAValidRegularExpression=实体匹配需为有效正则表达式
simplereport.ResultCodeMatchMustBeAValidRegularExpression=结果代码需为有效正则表达式
@@ -737,7 +734,6 @@
maxactivityreport.Rows=Rows:
maxactivityreport.RowsPerPage=行/页:
maxactivityreport.PleaseSelectAConnection=请选择连接
-maxactivityreport.PleaseTryAgainLater=维护中。请稍等。
maxactivityreport.EnterALegalNumberForRowsPerPage=请正确输入每页的行数
maxactivityreport.EnterALegalIntervalSizeInMinutes=请正确输入间隔(分)
maxactivityreport.IdentifierClassDescriptionCannotBeEmpty=请输入标识符类说明
@@ -783,7 +779,6 @@
maxbandwidthreport.Next=下一个
maxbandwidthreport.RowsPerPage=行/页:
maxbandwidthreport.PleaseSelectAConnection=请选择连接
-maxbandwidthreport.PleaseTryAgainLater=维护中。请稍等。
maxbandwidthreport.HighestBandwidth2=最大带宽
maxbandwidthreport.Rows=行:
maxbandwidthreport.Next=下一页
@@ -829,7 +824,6 @@
resultreport.Rows=行:
resultreport.RowsPerPage=行/页:
resultreport.PleaseSelectAConnection=请选择连接
-resultreport.PleaseTryAgainLater=维护中。请稍等。
resultreport.IdentifierClass=标识符类
resultreport.ResultClass=结果类
resultreport.EventCount=事件数