diff options
| author | Olivier Lamy <olamy@apache.org> | 2014-02-08 11:59:46 +0000 |
|---|---|---|
| committer | Olivier Lamy <olamy@apache.org> | 2014-02-08 11:59:46 +0000 |
| commit | b3824aab052f125284d1155c381bd85fcb7dc0f3 (patch) | |
| tree | 30b5f49ef8b207e73837a3a91cf83f989f106c5b | |
| parent | 43572e18914b4e73f5113666e9498de2d37e311c (diff) | |
| download | archiva-b3824aab052f125284d1155c381bd85fcb7dc0f3.tar.gz archiva-b3824aab052f125284d1155c381bd85fcb7dc0f3.zip | |
sirona integration to be reviewed later
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1565979 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/pom.xml | 7 | ||||
| -rw-r--r-- | archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml index e2bd47e86..f878a196f 100644 --- a/archiva-modules/archiva-web/archiva-webapp/pom.xml +++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml @@ -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> diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js index b0c9208e4..8d3269ee1 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js @@ -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();}}); |