Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Olivier Lamy 2012-01-30 10:41:32 +00:00
parent 0f83609027
commit 7add106d24
3 changed files with 31 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
archiva-modules/archiva-web/archiva-webapp-js/pom.xml
View File

@ -31,7 +31,7 @@
<name>Archiva Web :: Javascript Application</name> <name>Archiva Web :: Javascript Application</name>
<properties> <properties>
<tomcatContextXml>${basedir}/src/test/tomcat/tomcat-context.xml</tomcatContextXml> <tomcatContextXml>${basedir}/src/test/tomcat/tomcat-context-archiva.xml</tomcatContextXml>
<tomcatRunPort>9091</tomcatRunPort> <tomcatRunPort>9091</tomcatRunPort>
<tomcatRunPath>/archiva</tomcatRunPath> <tomcatRunPath>/archiva</tomcatRunPath>
<archiva.devMode>true</archiva.devMode> <archiva.devMode>true</archiva.devMode>

19
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/proxy-connectors.js
View File

@ -64,30 +64,33 @@ $(function() {
//sourceRepoId //sourceRepoId
for(i=0;i<self.proxyConnectors().length;i++){ for(i=0;i<self.proxyConnectors().length;i++){
var curSrcRepo=self.proxyConnectors()[i].sourceRepoId(); 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, var sourceRepo = $.grep(sourcesRepos,
function(srcRepo,idx){ function(srcRepo,idx){
$.log("grep:"+srcRepo.source); $.log("grep:"+srcRepo.source);
$.log("sourcesRepos.length:"+sourcesRepos.length); $.log("sourcesRepos.length:"+sourcesRepos.length);
for (i=0;i<sourcesRepos.length;i++){ for (j=0;j<sourcesRepos.length;j++){
if (srcRepo.source==sourcesRepos[i].source){ if (srcRepo.source==curSrcRepo){
return true; return true;
} }
} }
return false; return false;
} }
); );
if (sourceRepo!=null){ $.log("isArray:"+$.isArray(sourceRepo)+",length:"+sourceRepo.length);
$.log("sourceRepoId:"+curSrcRepo); if (sourceRepo.length>0){
sourcesRepos.push({source:curSrcRepo,targetRepos:[curTarget]}); $.log("sourceRepo!=null:"+sourceRepo[0]);
sourceRepo[0].targetRepos.push(curTarget);
} else { } else {
sourceRepo.targetRepos.push(curTarget); $.log("sourceRepo==null:"+curSrcRepo);
sourcesRepos.push({source:curSrcRepo,targetRepos:[curTarget]});
} }
} }
$.log("sourcesRepo.length:"+sourcesRepos.length); $.log("sourcesRepo.length:"+sourcesRepos.length);
for(i=0;i<sourcesRepos.length;i++){ for(i=0;i<sourcesRepos.length;i++){
$.log(sourcesRepos.targetRepos.length); $.log("sourcesRepos[i]:"+sourcesRepos[i].source+"="+sourcesRepos[i].targetRepos.join(":"));
} }
} }
} }

19
archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
View File

@ -20,4 +20,23 @@
<div class="page-header"> <div class="page-header">
<h2>${$.i18n.prop('proxy-connectors.list')}</h2> <h2>${$.i18n.prop('proxy-connectors.list')}</h2>
</div> </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> </script>