summaryrefslogtreecommitdiffstats
path: root/archiva-modules/archiva-web
diff options
context:
space:
mode:
authorOlivier Lamy <olamy@apache.org>2012-01-30 10:41:32 +0000
committerOlivier Lamy <olamy@apache.org>2012-01-30 10:41:32 +0000
commit7add106d241c18dfe279ab38446e5c682737c5b3 (patch)
tree30dd4e4a3531086b4f1fcdbd265bcb557fc7d222 /archiva-modules/archiva-web
parent0f83609027298a0c2f62cbe6aba14a5c74d27a52 (diff)
downloadarchiva-7add106d241c18dfe279ab38446e5c682737c5b3.tar.gz
archiva-7add106d241c18dfe279ab38446e5c682737c5b3.zip
fix tomcat run bad default tomcat context file
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1237595 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-modules/archiva-web')
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/pom.xml2
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js19
-rw-r--r--archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html19
3 files changed, 31 insertions, 9 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
index 377b188cd..f76175eae 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
@@ -31,7 +31,7 @@
<name>Archiva Web :: Javascript Application</name>
<properties>
- <tomcatContextXml>${basedir}/src/test/tomcat/tomcat-context.xml</tomcatContextXml>
+ <tomcatContextXml>${basedir}/src/test/tomcat/tomcat-context-archiva.xml</tomcatContextXml>
<tomcatRunPort>9091</tomcatRunPort>
<tomcatRunPath>/archiva</tomcatRunPath>
<archiva.devMode>true</archiva.devMode>
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
index cc489b8d8..1ed843822 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
@@ -64,30 +64,33 @@ $(function() {
//sourceRepoId
for(i=0;i<self.proxyConnectors().length;i++){
var curSrcRepo=self.proxyConnectors()[i].sourceRepoId();
- var curTarget=self.proxyConnectors()[i].targetRepoId;
+ var curTarget=self.proxyConnectors()[i].targetRepoId();
+ $.log("curSrcRepo:"+curSrcRepo+",curTarget:"+curTarget);
var sourceRepo = $.grep(sourcesRepos,
function(srcRepo,idx){
$.log("grep:"+srcRepo.source);
$.log("sourcesRepos.length:"+sourcesRepos.length);
- for (i=0;i<sourcesRepos.length;i++){
- if (srcRepo.source==sourcesRepos[i].source){
+ for (j=0;j<sourcesRepos.length;j++){
+ if (srcRepo.source==curSrcRepo){
return true;
}
}
return false;
}
);
- if (sourceRepo!=null){
- $.log("sourceRepoId:"+curSrcRepo);
- sourcesRepos.push({source:curSrcRepo,targetRepos:[curTarget]});
+ $.log("isArray:"+$.isArray(sourceRepo)+",length:"+sourceRepo.length);
+ if (sourceRepo.length>0){
+ $.log("sourceRepo!=null:"+sourceRepo[0]);
+ sourceRepo[0].targetRepos.push(curTarget);
} else {
- sourceRepo.targetRepos.push(curTarget);
+ $.log("sourceRepo==null:"+curSrcRepo);
+ sourcesRepos.push({source:curSrcRepo,targetRepos:[curTarget]});
}
}
$.log("sourcesRepo.length:"+sourcesRepos.length);
for(i=0;i<sourcesRepos.length;i++){
- $.log(sourcesRepos.targetRepos.length);
+ $.log("sourcesRepos[i]:"+sourcesRepos[i].source+"="+sourcesRepos[i].targetRepos.join(":"));
}
}
}
diff --git a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
index e8fc03fda..0fde2ad4d 100644
--- a/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
+++ b/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
@@ -20,4 +20,23 @@
<div class="page-header">
<h2>${$.i18n.prop('proxy-connectors.list')}</h2>
</div>
+
+ <ul id="proxy-connector-view-tabs" class="tabs">
+ <li id="network-proxies-view-tabs-li-grid" class="active">
+ <a href="#network-proxies-view" id="network-proxies-view-tabs-a-network-proxies-grid">${$.i18n.prop('network-proxies.grid.tab.title')}</a>
+ </li>
+ <li id="network-proxies-view-tabs-li-edit">
+ <a href="#network-proxies-edit">${$.i18n.prop('add')}</a>
+ </li>
+ </ul>
+ <div id="network-proxies-view-tabs-content" class="tab-content">
+ <div id="network-proxies-view" class="active">
+ <table class="bordered-table zebra-striped" id="networkProxiesTable>
+ data-bind="simpleGrid: gridViewModel,simpleGridTemplate:'ko-network-proxies-grid',pageLinksId:'network-proxiesPagination'">
+ </table>
+ <div id="network-proxiesPagination"></div>
+ </div>
+ <div id="network-proxies-edit" data-bind='template: {name:"network-proxy-edit-tmpl"}'></div>
+ </div>
+
</script> \ No newline at end of file