archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject [01/13] archiva git commit: remove all references to sirona [Forced Update!]
Date Fri, 23 Jun 2017 23:06:50 GMT
Repository: archiva
Updated Branches:
  refs/heads/feature/jcr_oak ec6344198 -> ddbb6cdaf (forced update)


remove all references to sirona

Signed-off-by: olivier lamy <olamy@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/63827f48
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/63827f48
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/63827f48

Branch: refs/heads/feature/jcr_oak
Commit: 63827f482b89a5d3af0af25472508f1d01ac643c
Parents: 65c0d01
Author: olivier lamy <olamy@apache.org>
Authored: Fri Jun 16 16:27:02 2017 +1000
Committer: olivier lamy <olamy@apache.org>
Committed: Fri Jun 16 16:27:02 2017 +1000

----------------------------------------------------------------------
 .../org/apache/archiva/i18n/default.properties  |  1 -
 .../archiva-web/archiva-webapp/pom.xml          | 45 --------------------
 .../src/main/resources/sirona.properties        | 28 ------------
 .../main/webapp/WEB-INF/applicationContext.xml  | 13 ------
 .../src/main/webapp/WEB-INF/web.xml             | 11 -----
 .../archiva/admin/features/generaladmin/main.js |  6 ---
 pom.xml                                         | 43 -------------------
 7 files changed, 147 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/archiva/blob/63827f48/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
index eb4dc03..6974977 100644
--- a/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
+++ b/archiva-modules/archiva-web/archiva-web-common/src/main/resources/org/apache/archiva/i18n/default.properties
@@ -234,7 +234,6 @@ menu.topbar.quicksearch=Quick Search
 menu.legacy-artifact-support=Legacy Support
 menu.repository-scanning=Repository Scanning
 menu.system-status=System Status
-menu.sirona=Apache Sirona report
 menu.appearance-configuration=Appearance
 menu.ui-configuration=UI Configuration
 menu.reports=Reports

http://git-wip-us.apache.org/repos/asf/archiva/blob/63827f48/archiva-modules/archiva-web/archiva-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index 0ebd605..ce7b826 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -41,7 +41,6 @@
     <rest.admin.pwd />
     <test.useTomcat>false</test.useTomcat>
     <archiva.groupIndexTtl>30</archiva.groupIndexTtl>
-    <archiva.sirona.configuration />
     <archiva.repositorySessionFactory.id>jcr</archiva.repositorySessionFactory.id>
     <cassandra.host>localhost</cassandra.host>
     <cassandra.port>9160</cassandra.port>
@@ -592,45 +591,6 @@
       </exclusions>
     </dependency>
 
-
-    <!-- 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>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-jdbc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-web</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <artifactId>sirona-spring</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.sirona</groupId>
-      <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>
       <artifactId>cglib</artifactId>
@@ -1023,10 +983,6 @@
               <value>${archiva.repositorySessionFactory.id}</value>
             </systemProperty>
             <systemProperty>
-              <name>org.apache.sirona.configuration.sirona.properties</name>
-              <value>${archiva.sirona.configuration}</value>
-            </systemProperty>
-            <systemProperty>
               <name>AsyncLoggerConfig.WaitStrategy</name>
               <value>Block</value>
             </systemProperty>
@@ -1123,7 +1079,6 @@
             <cassandra.host>${cassandra.host}</cassandra.host>
             <cassandra.port>${cassandra.port}</cassandra.port>
             <archiva.repositorySessionFactory.id>${archiva.repositorySessionFactory.id}</archiva.repositorySessionFactory.id>
-            <org.apache.sirona.configuration.sirona.properties>${archiva.sirona.configuration}</org.apache.sirona.configuration.sirona.properties>
             <AsyncLoggerConfig.WaitStrategy>Block</AsyncLoggerConfig.WaitStrategy>
             <AsyncLogger.WaitStrategy>Block</AsyncLogger.WaitStrategy>
             <openjpa.Log>${openjpa.Log}</openjpa.Log>

http://git-wip-us.apache.org/repos/asf/archiva/blob/63827f48/archiva-modules/archiva-web/archiva-webapp/src/main/resources/sirona.properties
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/sirona.properties
b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/sirona.properties
deleted file mode 100644
index 12002c8..0000000
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/sirona.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-# sirona config should be in the same classloader as sirona-core
-# here to monitor DataSource we put it in common.loader so we put
-# the config in lib/ to get it in common.loader too
-
-org.apache.sirona.cdi.performance = prefix:org.apache.archiva
-org.apache.sirona.cdi.jta = prefix:org.apache.archiva
-
-
-

http://git-wip-us.apache.org/repos/asf/archiva/blob/63827f48/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
index d6edfc8..4c8a608 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/applicationContext.xml
@@ -282,19 +282,6 @@
   -->
   <!-- END SNIPPET: jcr-location -->
 
-  <!--
-
-  <bean class="org.apache.sirona.spring.BeanNameMonitoringAutoProxyCreator">
-    <property name="beanNames">
-      <list>
-        <value>Default**</value>
-        <value>**#rest</value>
-        <value>**#default</value>
-      </list>
-    </property>
-  </bean>
-  -->
-
   <bean name="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
     <property name="jpaVendorAdapter" >
       <bean class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter" />

http://git-wip-us.apache.org/repos/asf/archiva/blob/63827f48/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
index 72d2deb..e715277 100644
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/WEB-INF/web.xml
@@ -31,17 +31,6 @@
     </param-value>
   </context-param>
 
-  <!-- to activate sirona -->
-  <context-param>
-    <param-name>org.apache.sirona.reporting.activated</param-name>
-    <param-value>true</param-value>
-  </context-param>
-
-  <context-param>
-    <param-name>org.apache.sirona.reporting.mapping</param-name>
-    <param-value>/sirona-monitoring</param-value>
-  </context-param>
-
   <filter>
     <filter-name>encodingFilter</filter-name>
     <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>

http://git-wip-us.apache.org/repos/asf/archiva/blob/63827f48/archiva-modules/archiva-web/archiva-webapp/src/main/webapp/js/archiva/admin/features/generaladmin/main.js
----------------------------------------------------------------------
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 95ed9f3..c3fb51b 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,6 @@ 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.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();}});
  
@@ -712,11 +711,6 @@ define("archiva/admin/features/generaladmin/main",["jquery","jquery.ui","i18n","
     displayCacheEntries();
   }
 
-  displaySirona=function(){
-    window.open("sirona-monitoring/", '_blank');
-    window.focus();
-  }
-
   refreshSystemStatus=function(){
     displayCacheEntries();
     displayScanningStats();

http://git-wip-us.apache.org/repos/asf/archiva/blob/63827f48/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4e61888..c5ef325 100644
--- a/pom.xml
+++ b/pom.xml
@@ -78,8 +78,6 @@
     <lucene.version>3.6.2</lucene.version>
     <jackrabbit.version>2.14.1</jackrabbit.version>
 
-    <sirona.version>0.1-incubating</sirona.version>
-
     <cxf.version>3.0.3</cxf.version>
     <derbyVersion>10.10.1.1</derbyVersion>
     <httpclient.version>4.5.2</httpclient.version>
@@ -885,47 +883,6 @@
         <artifactId>ant</artifactId>
         <version>1.8.3</version>
       </dependency>
-
-
-      <!-- sirona -->
-      <dependency>
-        <groupId>org.apache.sirona</groupId>
-        <artifactId>sirona-core</artifactId>
-        <version>${sirona.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.sirona</groupId>
-        <artifactId>sirona-jdbc</artifactId>
-        <version>${sirona.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.sirona</groupId>
-        <artifactId>sirona-spring</artifactId>
-        <version>${sirona.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.sirona</groupId>
-        <artifactId>sirona-web</artifactId>
-        <version>${sirona.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.sirona</groupId>
-        <artifactId>sirona-reporting</artifactId>
-        <version>${sirona.version}</version>
-        <classifier>classes</classifier>
-      </dependency>
-
-      <dependency>
-        <groupId>org.apache.sirona</groupId>
-        <artifactId>sirona-cassandra</artifactId>
-        <version>${sirona.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.sirona</groupId>
-        <artifactId>sirona-ehcache-agent</artifactId>
-        <version>${sirona.version}</version>
-      </dependency>
-
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>


Mime
View raw message