From 7add106d241c18dfe279ab38446e5c682737c5b3 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Mon, 30 Jan 2012 10:41:32 +0000 Subject: [PATCH] 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 --- .../archiva-web/archiva-webapp-js/pom.xml | 2 +- .../webapp/js/archiva/proxy-connectors.js | 19 +++++++++++-------- .../archiva/templates/proxy-connectors.html | 19 +++++++++++++++++++ 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 @@ Archiva Web :: Javascript Application - ${basedir}/src/test/tomcat/tomcat-context.xml + ${basedir}/src/test/tomcat/tomcat-context-archiva.xml 9091 /archiva true 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;i0){ + $.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

${$.i18n.prop('proxy-connectors.list')}

+ + +
+
+ +
+
+
+
+
+ \ No newline at end of file -- 2.39.5