Author: olamy
Date: Sat Feb 8 11:59:46 2014
New Revision: 1565979
URL: http://svn.apache.org/r1565979
Log:
sirona integration to be reviewed later
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1565979&r1=1565978&r2=1565979&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Sat Feb 8
11:59:46 2014
@@ -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>
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js?rev=1565979&r1=1565978&r2=1565979&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js
Sat Feb 8 11:59:46 2014
@@ -24,7 +24,7 @@ define("archiva/admin/features/generalad
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();}});
