You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2012/03/01 11:29:25 UTC
svn commit: r1295500 - in
/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva:
main.js network-proxies.js proxy-connectors.js repositories.js
repository-groups.js search.js templates/search.html
Author: olamy
Date: Thu Mar 1 10:29:25 2012
New Revision: 1295500
URL: http://svn.apache.org/viewvc?rev=1295500&view=rev
Log:
[MRM-1610] Use Jackson as jaxrs provider for cxf for performance reasons
fix some javascript mapping for archiva part.
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js?rev=1295500&r1=1295499&r2=1295500&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/main.js Thu Mar 1 10:29:25 2012
@@ -178,7 +178,7 @@ $(function() {
source: function(request, response){
$.get("restServices/archivaServices/searchService/quickSearch?queryString="+encodeURIComponent(request.term),
function(data) {
- var res = $.map(data.artifact,function(item){
+ var res = $.map(data,function(item){
return item.artifactId;
});
var uniqId = [];
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js?rev=1295500&r1=1295499&r2=1295500&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/network-proxies.js Thu Mar 1 10:29:25 2012
@@ -71,7 +71,7 @@ $(function() {
{
type: "POST",
contentType: 'application/json',
- data: "{\"networkProxy\": " + ko.toJSON(networkProxy)+"}",
+ data: ko.toJSON(networkProxy),
dataType: 'json',
success: function(data) {
$.log("update proxy id:"+self.networkProxy.id());
@@ -94,7 +94,7 @@ $(function() {
{
type: "POST",
contentType: 'application/json',
- data: "{\"networkProxy\": " + ko.toJSON(networkProxy)+"}",
+ data: ko.toJSON(networkProxy),
dataType: 'json',
success: function(data) {
self.networkProxy.modified(false);
@@ -313,7 +313,7 @@ $(function() {
}
mapNetworkProxies=function(data){
- var mappedNetworkProxies = $.map(data.networkProxy, function(item) {
+ var mappedNetworkProxies = $.map(data, function(item) {
return mapNetworkProxy(item);
});
return mappedNetworkProxies;
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js?rev=1295500&r1=1295499&r2=1295500&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js Thu Mar 1 10:29:25 2012
@@ -189,7 +189,7 @@ $(function() {
$.ajax("restServices/archivaServices/proxyConnectorService/updateProxyConnector",
{
type: "POST",
- data: "{\"proxyConnector\": " + ko.toJSON(self.proxyConnector)+"}",
+ data: ko.toJSON(self.proxyConnector),
contentType: 'application/json',
dataType: 'json',
success: function(data) {
@@ -208,7 +208,7 @@ $(function() {
$.ajax("restServices/archivaServices/proxyConnectorService/addProxyConnector",
{
type: "POST",
- data: "{\"proxyConnector\": " + ko.toJSON(self.proxyConnector)+"}",
+ data: ko.toJSON(self.proxyConnector),
contentType: 'application/json',
dataType: 'json',
success: function(data) {
@@ -608,7 +608,7 @@ $(function() {
}
mapProxyConnectors=function(data){
- var mappedProxyConnectors = $.map(data.proxyConnector, function(item) {
+ var mappedProxyConnectors = $.map(data, function(item) {
return mapProxyConnector(item);
});
return mappedProxyConnectors;
@@ -622,7 +622,7 @@ $(function() {
}
mapPolicyInformations=function(data){
- return $.map(data.policyInformation, function(item) {
+ return $.map(data, function(item) {
return mapPolicyInformation(item);
});
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js?rev=1295500&r1=1295499&r2=1295500&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repositories.js Thu Mar 1 10:29:25 2012
@@ -140,7 +140,7 @@ $(function() {
}
mapManagedRepositories=function(data){
- var mappedManagedRepositories = $.map(data.managedRepository, function(item) {
+ var mappedManagedRepositories = $.map(data, function(item) {
return mapManagedRepository(item);
});
return mappedManagedRepositories;
@@ -149,11 +149,11 @@ $(function() {
if (data==null){
return null;
}
- return new ManagedRepository(data.id,data.name,data.layout,data.indexDirectory,data.location,data.snapshots=='true'
- ,data.releases=='true',
- data.blockRedeployments=='true',data.cronExpression,
- data.scanned=='true',data.daysOlder,data.retentionCount,data.deleteReleasedSnapshots=='true',
- data.stageRepoNeeded=='true');
+ return new ManagedRepository(data.id,data.name,data.layout,data.indexDirectory,data.location,data.snapshots
+ ,data.releases,
+ data.blockRedeployments,data.cronExpression,
+ data.scanned,data.daysOlder,data.retentionCount,data.deleteReleasedSnapshots,
+ data.stageRepoNeeded);
}
mapArchivaRepositoryStatistics=function(data){
@@ -185,7 +185,7 @@ $(function() {
$.ajax("restServices/archivaServices/managedRepositoriesService/updateManagedRepository",
{
type: "POST",
- data: "{\"managedRepository\": " + ko.toJSON(this.managedRepository)+"}",
+ data: ko.toJSON(this.managedRepository),
contentType: 'application/json',
dataType: 'json',
success: function(data) {
@@ -229,7 +229,7 @@ $(function() {
{
type: "POST",
contentType: 'application/json',
- data: "{\"managedRepository\": " + ko.toJSON(managedRepository)+"}",
+ data: ko.toJSON(managedRepository),
dataType: 'json',
success: function(data) {
curManagedRepository.location(data.managedRepository.location);
@@ -426,10 +426,10 @@ $(function() {
type: "GET",
dataType: 'json',
success: function(data) {
- if (data.archivaRepositoryStatistics==null){
+ if (data==null){
return;
}
- var archivaRepositoryStatistics=mapArchivaRepositoryStatistics(data.archivaRepositoryStatistics);
+ var archivaRepositoryStatistics=mapArchivaRepositoryStatistics(data);
archivaRepositoryStatistics.managedRepository=curRepo;
var mainContent = $("#main-content");
mainContent.find("#managedrepository-stats-"+curRepo.id()).append($("#managed-repository-stats-tmpl").tmpl(archivaRepositoryStatistics));
@@ -593,12 +593,12 @@ $(function() {
return null;
}
return new RemoteRepository(data.id,data.name,data.layout,data.indexDirectory,data.url,data.userName,data.password,
- data.timeout,data.downloadRemoteIndex=='true',data.remoteIndexUrl,data.remoteDownloadNetworkProxyId,
- data.cronExpression,data.remoteDownloadTimeout,data.downloadRemoteIndexOnStartup=='true');
+ data.timeout,data.downloadRemoteIndex,data.remoteIndexUrl,data.remoteDownloadNetworkProxyId,
+ data.cronExpression,data.remoteDownloadTimeout,data.downloadRemoteIndexOnStartup);
}
mapRemoteRepositories=function(data){
- var mappedRemoteRepositories = $.map(data.remoteRepository, function(item) {
+ var mappedRemoteRepositories = $.map(data, function(item) {
return mapRemoteRepository(item);
});
return mappedRemoteRepositories;
@@ -624,7 +624,7 @@ $(function() {
$.ajax("restServices/archivaServices/remoteRepositoriesService/updateRemoteRepository",
{
type: "POST",
- data: "{\"remoteRepository\": " + ko.toJSON(this.remoteRepository)+"}",
+ data: ko.toJSON(this.remoteRepository),
contentType: 'application/json',
dataType: 'json',
success: function(data) {
@@ -642,7 +642,7 @@ $(function() {
$.ajax("restServices/archivaServices/remoteRepositoriesService/addRemoteRepository",
{
type: "POST",
- data: "{\"remoteRepository\": " + ko.toJSON(this.remoteRepository)+"}",
+ data: ko.toJSON(this.remoteRepository),
contentType: 'application/json',
dataType: 'json',
success: function(data) {
@@ -691,7 +691,7 @@ $(function() {
removeRemoteRepository=function(remoteRepository){
clearUserMessages();
openDialogConfirm(
- function(){$.ajax("restServices/archivaServices/remoteRepositoriesService/deleteRemoteRepository/"+remoteRepository.id(),
+ function(){$.ajax("restServices/archivaServices/remoteRepositoriesService/deleteRemoteRepository/"+encodeURIComponent(remoteRepository.id()),
{
type: "GET",
success: function(data) {
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js?rev=1295500&r1=1295499&r2=1295500&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/repository-groups.js Thu Mar 1 10:29:25 2012
@@ -119,7 +119,7 @@ $(function() {
{
type: "POST",
contentType: 'application/json',
- data: "{\"repositoryGroup\": " + ko.toJSON(repositoryGroup)+"}",
+ data:ko.toJSON(repositoryGroup),
dataType: 'json',
success: function(data) {
$.log("update repositoryGroup id:"+repositoryGroup.id());
@@ -142,7 +142,7 @@ $(function() {
{
type: "POST",
contentType: 'application/json',
- data: "{\"repositoryGroup\": " + ko.toJSON(repositoryGroup)+"}",
+ data: ko.toJSON(repositoryGroup),
dataType: 'json',
success: function(data) {
$.log("update repositoryGroup id:"+repositoryGroup.id());
@@ -258,7 +258,7 @@ $(function() {
if (data == null){
return new Array();
}
- var mappedRepositoryGroups = $.map(data.repositoryGroup, function(item) {
+ var mappedRepositoryGroups = $.map(data, function(item) {
return mapRepositoryGroup(item);
});
return mappedRepositoryGroups;
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js?rev=1295500&r1=1295499&r2=1295500&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/search.js Thu Mar 1 10:29:25 2012
@@ -238,7 +238,7 @@ $(function() {
},
select: function( event, ui ) {
$.log("ui.item.label:"+ui.item.name);
- if (ui.item.project=='true'){
+ if (ui.item.project){
// value org.apache.maven/maven-archiver
// split this org.apache.maven and maven-archiver
var id=ui.item.name;
@@ -583,8 +583,8 @@ $(function() {
}
mapArtifacts=function(data){
- if (data.artifact){
- return $.isArray(data.artifact )? $.map(data.artifact,function(item){return mapArtifact(item)}) : [data.artifact];
+ if (data){
+ return $.isArray(data )? $.map(data.artifact,function(item){return mapArtifact(item)}) : [data];
}
return [];
}
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html?rev=1295500&r1=1295499&r2=1295500&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/search.html Thu Mar 1 10:29:25 2012
@@ -49,7 +49,7 @@
</li>
{{/if}}
{{each(i,browseResultEntry) browseResultEntries}}
- {{if browseResultEntry.project=='true'}}
+ {{if browseResultEntry.project}}
<li class="browse-list-project" title="artifact" data-bind="click:function(){displayProjectEntry(browseResultEntry.name)}">
{{else}}
<li class="browse-list" data-bind="click:function(){displayGroupId(browseResultEntry.name)}">