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

sirona integration to be reviewed later 

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1565979 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2014-02-08 11:59:46 +00:00
parent 43572e1891
commit b3824aab05
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
archiva-modules/archiva-web/archiva-webapp/pom.xml
View File

@ -591,6 +591,8 @@
<!-- sirona -->
<!--
FIXME for some reasons doesn't work with the jetty app see MRM-1792
<dependency>
<groupId>org.apache.sirona</groupId>
<artifactId>sirona-core</artifactId>
@ -612,18 +614,19 @@
<artifactId>sirona-reporting</artifactId>
<classifier>classes</classifier>
</dependency>
-->
<!--
<dependency>
<groupId>org.apache.sirona</groupId>
<artifactId>sirona-ehcache-agent</artifactId>
</dependency>
-->
<dependency>
<groupId>org.apache.sirona</groupId>
<artifactId>sirona-cassandra</artifactId>
</dependency>
-->
<dependency>
<groupId>cglib</groupId>

2
archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js
View File

@ -24,7 +24,7 @@ define("archiva/admin/features/generaladmin/main",["jquery","jquery.ui","i18n","
administrationMenuItems.push({ text : $.i18n.prop('menu.repository-scanning') , order:2000, id: "menu-repository-scanning-list-a" , href: "#scanningList" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayRepositoryScanning();}});
administrationMenuItems.push({ text : $.i18n.prop('menu.runtime-configuration') , order:2010, id: "menu-runtime-configuration-list-a" , href: "#runtimeconfig" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayRuntimeConfiguration();}});
administrationMenuItems.push({ text : $.i18n.prop('menu.system-status') , order:2020, id: "menu-system-status-list-a" , href: "#status" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displaySystemStatus();}});
administrationMenuItems.push({ text : $.i18n.prop('menu.sirona') , order:2030, id: "menu-system-sirona-list-a" , href: "#sirona" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displaySirona();}});
//administrationMenuItems.push({ text : $.i18n.prop('menu.sirona') , order:2030, id: "menu-system-sirona-list-a" , href: "#sirona" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displaySirona();}});
administrationMenuItems.push({ text : $.i18n.prop('menu.ui-configuration') , order:2040, id: "menu-ui-configuration-list-a" , href: "#uiconfig" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayUiConfiguration();}});
administrationMenuItems.push({ text : $.i18n.prop('menu.reports') , order:2050, id: "menu-report-list-a" , href: "#reports" , redback: "{permissions: ['archiva-manage-configuration']}", func: function(){displayReportsPage();}});