Author: olamy
Date: Mon Jan 30 10:41:32 2012
New Revision: 1237595
URL: http://svn.apache.org/viewvc?rev=1237595&view=rev
Log:
fix tomcat run bad default tomcat context file
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
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/templates/proxy-connectors.html
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml?rev=1237595&r1=1237594&r2=1237595&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/pom.xml Mon Jan
30 10:41:32 2012
@@ -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>
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=1237595&r1=1237594&r2=1237595&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
Mon Jan 30 10:41:32 2012
@@ -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(":"));
}
}
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html?rev=1237595&r1=1237594&r2=1237595&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/templates/proxy-connectors.html
Mon Jan 30 10:41:32 2012
@@ -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
