Author: olamy
Date: Tue Dec 17 07:28:16 2013
New Revision: 1551471
URL: http://svn.apache.org/r1551471
Log:
configure cron expression to merge remote indexes tru the UI
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/repository-groups.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo?rev=1551471&r1=1551470&r2=1551471&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/mdo/configuration.mdo
Tue Dec 17 07:28:16 2013
@@ -857,7 +857,7 @@
<description>The time to live of the merged index of the repository
group.</description>
</field>
<field>
- <name>mergedIndexCronExpression</name>
+ <name>cronExpression</name>
<version>1.0.0+</version>
<type>String</type>
<description>
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java?rev=1551471&r1=1551470&r2=1551471&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java
(original)
+++
archiva/trunk/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/src/main/java/org/apache/archiva/admin/model/beans/RepositoryGroup.java
Tue Dec 17 07:28:16 2013
@@ -55,7 +55,7 @@ public class RepositoryGroup
* default model value is empty so none
* @since 2.0.0
*/
- private String mergedIndexCronExpression;
+ private String cronExpression;
public RepositoryGroup()
{
@@ -166,19 +166,19 @@ public class RepositoryGroup
return this;
}
- public String getMergedIndexCronExpression()
+ public String getCronExpression()
{
- return mergedIndexCronExpression;
+ return cronExpression;
}
- public void setMergedIndexCronExpression( String mergedIndexCronExpression
)
+ public void setCronExpression( String cronExpression )
{
- this.mergedIndexCronExpression = mergedIndexCronExpression;
+ this.cronExpression = cronExpression;
}
public RepositoryGroup mergedIndexCronExpression( String
mergedIndexCronExpression )
{
- this.mergedIndexCronExpression = mergedIndexCronExpression;
+ this.cronExpression = mergedIndexCronExpression;
return this;
}
@@ -215,7 +215,7 @@ public class RepositoryGroup
sb.append( ", repositories=" ).append( repositories );
sb.append( ", mergedIndexPath='" ).append( mergedIndexPath ).append(
'\'' );
sb.append( ", mergedIndexTtl=" ).append( mergedIndexTtl );
- sb.append( ", mergedIndexCronExpression='" ).append(
mergedIndexCronExpression ).append( '\'' );
+ sb.append( ", cronExpression='" ).append( cronExpression ).append(
'\'' );
sb.append( '}' );
return sb.toString();
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties?rev=1551471&r1=1551470&r2=1551471&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
Tue Dec 17 07:28:16 2013
@@ -314,6 +314,7 @@ repository-groups.grid.tab.title=Reposit
repository.group.delete.confirm=Are you sure to delete Repository Group {0} ?
repository.group.mergedIndexPath=Merged Index Path
repository.group.mergedIndexTtl=Merged Index Time to Live (in Minutes)
+repository.group.cronExpression=Cron expression to merge remote indexes
#roles
roles.bulk.save.confirm=Are you sure to update {0} Role(s)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/repository-groups.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/repository-groups.js?rev=1551471&r1=1551470&r2=1551471&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/repository-groups.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/repository/maven2/repository-groups.js
Tue Dec 17 07:28:16 2013
@@ -20,7 +20,7 @@ define("archiva/admin/repository/maven2/
,"knockout.simpleGrid","knockout.sortable","archiva/admin/repository/maven2/repositories"],
function(jquery,jqueryUi,i18n,jqueryTmpl,bootstrap,jqueryValidate,ko) {
- RepositoryGroup=function(id,repositories,mergedIndexPath,mergedIndexTtl){
+
RepositoryGroup=function(id,repositories,mergedIndexPath,mergedIndexTtl,cronExpression){
var self=this;
@@ -44,6 +44,9 @@ function(jquery,jqueryUi,i18n,jqueryTmpl
this.managedRepositories=ko.observableArray([]);
this.managedRepositories.subscribe(function(newValue){self.modified(true)});
+ this.cronExpression = ko.observable(cronExpression);
+ this.cronExpression.subscribe(function(newValue){self.modified(true)});
+
this.modified=ko.observable(false);
}
@@ -223,7 +226,9 @@ function(jquery,jqueryUi,i18n,jqueryTmpl
var userMessages=$("#user-messages");
userMessages.html(mediumSpinnerImg());
var valid = $("#main-content").find("#repository-group-edit-form"
).valid();
-
+ if (valid==false) {
+ return;
+ }
$("#repository-group-save" ).button('loading');
$.ajax("restServices/archivaServices/repositoryGroupService/updateRepositoryGroup",
@@ -395,15 +400,22 @@ function(jquery,jqueryUi,i18n,jqueryTmpl
rules: {
id: {
required: true
- },
+ },
mergedIndexPath:{
required:true
+ },
+ cronExpression: {
+ remote: {
+ url:
"restServices/archivaServices/commonServices/validateCronExpression",
+ type: "get"
}
+ }
},
showErrors: function(validator, errorMap, errorList) {
customShowError("#main-content
#repository-group-edit-form",validator,errorMap,errorMap);
}
});
+
validator.settings.messages["cronExpression"]=$.i18n.prop("cronExpression.notvalid");
return validator;
}
@@ -418,7 +430,8 @@ function(jquery,jqueryUi,i18n,jqueryTmpl
}
mapRepositoryGroup=function(data){
- return new RepositoryGroup(data.id,
mapStringArray(data.repositories),data.mergedIndexPath,data.mergedIndexTtl);
+ return new RepositoryGroup(data.id,
mapStringArray(data.repositories),data.mergedIndexPath
+ ,data.mergedIndexTtl,data.cronExpression);
}
});
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html?rev=1551471&r1=1551470&r2=1551471&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/templates/archiva/repositories.html
Tue Dec 17 07:28:16 2013
@@ -1449,6 +1449,13 @@
data-bind="value: repositoryGroup.mergedIndexTtl"/>
</div>
</div>
+ <div class="control-group">
+ <label class="control-label"
for="cronExpression">${$.i18n.prop('repository.group.cronExpression')}</label>
+ <div class="controls">
+ <input type="text" class="input-large" id="cronExpression"
name="cronExpression"
+ data-bind="value: repositoryGroup.cronExpression"/>
+ </div>
+ </div>
<div>
<a
href="${window.archivaRuntimeInfo.baseUrl}/repository/${repositoryGroup.id()}"
target="_blank">
{{if repositoryGroup.id()}}
