You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2017/06/23 23:06:50 UTC
[01/13] archiva git commit: remove all references to sirona [Forced
Update!]
Repository: archiva
Updated Branches:
refs/heads/feature/jcr_oak ec6344198 -> ddbb6cdaf (forced update)
remove all references to sirona
Signed-off-by: olivier lamy <ol...@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 <ol...@apache.org>
Authored: Fri Jun 16 16:27:02 2017 +1000
Committer: olivier lamy <ol...@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>
[06/13] archiva git commit: [MRM-1956] Replace tomcat-jdbc pool with
HikariCP
Posted by ol...@apache.org.
[MRM-1956] Replace tomcat-jdbc pool with HikariCP
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/8d3f82a4
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/8d3f82a4
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/8d3f82a4
Branch: refs/heads/feature/jcr_oak
Commit: 8d3f82a479b6eb2bf709b1831351e20309735683
Parents: c6d882d
Author: olivier lamy <ol...@apache.org>
Authored: Tue Jun 20 21:49:28 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Tue Jun 20 21:49:28 2017 +1000
----------------------------------------------------------------------
archiva-jetty/pom.xml | 16 +--
archiva-jetty/src/main/conf/jetty.xml | 20 ++-
.../scanner/DefaultRepositoryScanner.java | 2 +-
...chivaRepositoryScanningTaskExecutorTest.java | 139 +++++++++++++++++++
...ositoryScanningTaskExecutorAbstractTest.java | 138 ------------------
...epositoryScanningTaskExecutorPhase1Test.java | 2 +-
...epositoryScanningTaskExecutorPhase2Test.java | 38 ++---
.../src/test/resources/log4j2-test.xml | 38 +++++
pom.xml | 21 ++-
9 files changed, 215 insertions(+), 199 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/8d3f82a4/archiva-jetty/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml
index 33b0048..36b95ae 100644
--- a/archiva-jetty/pom.xml
+++ b/archiva-jetty/pom.xml
@@ -65,7 +65,11 @@
<version>${jettyVersion}</version>
<scope>runtime</scope>
</dependency>
-
+ <dependency>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP</artifactId>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
@@ -81,16 +85,6 @@
<artifactId>ant</artifactId>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jdbc</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-juli</artifactId>
- <scope>runtime</scope>
- </dependency>
</dependencies>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/archiva/blob/8d3f82a4/archiva-jetty/src/main/conf/jetty.xml
----------------------------------------------------------------------
diff --git a/archiva-jetty/src/main/conf/jetty.xml b/archiva-jetty/src/main/conf/jetty.xml
index b7e66d4..31c8182 100644
--- a/archiva-jetty/src/main/conf/jetty.xml
+++ b/archiva-jetty/src/main/conf/jetty.xml
@@ -157,31 +157,29 @@
<New id="users" class="org.eclipse.jetty.plus.jndi.Resource">
<Arg>jdbc/users</Arg>
<Arg>
- <New class="org.apache.tomcat.jdbc.pool.DataSource">
+ <New class="com.zaxxer.hikari.HikariDataSource">
<Set name="driverClassName">org.apache.derby.jdbc.EmbeddedDriver</Set>
- <Set name="url">jdbc:derby:<SystemProperty name="appserver.base" default=".."/>/data/databases/users;create=true</Set>
+ <Set name="jdbcUrl">jdbc:derby:<SystemProperty name="appserver.base" default=".."/>/data/databases/users;create=true</Set>
<Set name="username">sa</Set>
- <Set name="maxActive">20</Set>
- <Set name="removeAbandoned">true</Set>
- <Set name="logAbandoned">true</Set>
- <Set name="initialSize">5</Set>
- <Set name="testOnBorrow">true</Set>
+ <Set name="maximumPoolSize">20</Set>
+ <Set name="minimumIdle">5</Set>
<!-- very rigourous sql query validation -->
- <Set name="validationQuery">select 1</Set>
+ <!--Set name="connectionTestQuery">select 1</Set-->
</New>
</Arg>
</New>
+ <!--
<New id="usersShutdown" class="org.eclipse.jetty.plus.jndi.Resource">
<Arg>jdbc/usersShutdown</Arg>
<Arg>
- <New class="org.apache.tomcat.jdbc.pool.DataSource">
+ <New class="com.zaxxer.hikari.HikariDataSource">
<Set name="driverClassName">org.apache.derby.jdbc.EmbeddedDriver</Set>
- <Set name="url">jdbc:derby:<SystemProperty name="appserver.base" default=".."/>/data/databases/users</Set>
+ <Set name="jdbcUrl">jdbc:derby:<SystemProperty name="appserver.base" default=".."/>/data/databases/users</Set>
<Set name="username">sa</Set>
</New>
</Arg>
</New>
-
+ -->
</Configure>
http://git-wip-us.apache.org/repos/asf/archiva/blob/8d3f82a4/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
index 56ef2fd..6257880 100644
--- a/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/src/main/java/org/apache/archiva/repository/scanner/DefaultRepositoryScanner.java
@@ -53,7 +53,7 @@ public class DefaultRepositoryScanner
@Inject
private RepositoryContentConsumers repositoryContentConsumers;
- private Set<RepositoryScannerInstance> inProgressScans = new LinkedHashSet<RepositoryScannerInstance>();
+ private Set<RepositoryScannerInstance> inProgressScans = new LinkedHashSet<>();
@Override
public RepositoryScanStatistics scan( ManagedRepository repository, long changesSince )
http://git-wip-us.apache.org/repos/asf/archiva/blob/8d3f82a4/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/AbstractArchivaRepositoryScanningTaskExecutorTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/AbstractArchivaRepositoryScanningTaskExecutorTest.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/AbstractArchivaRepositoryScanningTaskExecutorTest.java
new file mode 100644
index 0000000..dcddb71
--- /dev/null
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/AbstractArchivaRepositoryScanningTaskExecutorTest.java
@@ -0,0 +1,139 @@
+package org.apache.archiva.scheduler.repository;
+
+/*
+ * 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.
+ */
+
+import junit.framework.TestCase;
+import org.apache.archiva.configuration.ArchivaConfiguration;
+import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
+import org.apache.archiva.metadata.repository.MetadataRepository;
+import org.apache.archiva.metadata.repository.stats.RepositoryStatisticsManager;
+import org.apache.archiva.mock.MockRepositorySessionFactory;
+import org.apache.archiva.redback.components.taskqueue.execution.TaskExecutor;
+import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
+import org.apache.commons.lang.StringUtils;
+import org.codehaus.plexus.util.FileUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.runner.RunWith;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+import java.io.File;
+import java.util.Calendar;
+import java.util.List;
+
+import static org.mockito.Mockito.mock;
+
+/**
+ * ArchivaRepositoryScanningTaskExecutorPhase1Test
+ */
+@RunWith( ArchivaSpringJUnit4ClassRunner.class )
+@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
+@DirtiesContext( classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD )
+public abstract class AbstractArchivaRepositoryScanningTaskExecutorTest
+ extends TestCase
+{
+ @Inject
+ @Named( value = "taskExecutor#test-repository-scanning" )
+ protected TaskExecutor taskExecutor;
+
+ @Inject
+ @Named( value = "archivaConfiguration#test-repository-scanning" )
+ protected ArchivaConfiguration archivaConfig;
+
+ @Inject
+ @Named( value = "repositoryStatisticsManager#test" )
+ protected RepositoryStatisticsManager repositoryStatisticsManager;
+
+ @Inject
+ @Named( value = "knownRepositoryContentConsumer#test-consumer" )
+ protected TestConsumer testConsumer;
+
+ @Inject
+ @Named( value = "repositorySessionFactory#mock" )
+ private MockRepositorySessionFactory factory;
+
+ protected File repoDir;
+
+ protected static final String TEST_REPO_ID = "testRepo";
+
+ protected MetadataRepository metadataRepository;
+
+ @Before
+ @Override
+ public void setUp()
+ throws Exception
+ {
+ super.setUp();
+
+ File sourceRepoDir = new File( "./src/test/repositories/default-repository" );
+ repoDir = new File( "./target/default-repository" );
+
+ FileUtils.deleteDirectory( repoDir );
+ assertFalse( "Default Test Repository should not exist.", repoDir.exists() );
+
+ repoDir.mkdir();
+
+ FileUtils.copyDirectoryStructure( sourceRepoDir, repoDir );
+ // set the timestamps to a time well in the past
+ Calendar cal = Calendar.getInstance();
+ cal.add( Calendar.YEAR, -1 );
+ FileUtils.getFiles( repoDir, "**", null ) //
+ .stream().forEach( file -> file.setLastModified( cal.getTimeInMillis() ) );
+
+ // TODO: test they are excluded instead
+ for ( String dir : FileUtils.getDirectoryNames( repoDir, "**/.svn", null, false ) )
+ {
+ FileUtils.deleteDirectory( new File( repoDir, dir ) );
+ }
+
+ assertTrue( "Default Test Repository should exist.", repoDir.exists() && repoDir.isDirectory() );
+
+ assertNotNull( archivaConfig );
+
+ // Create it
+ ManagedRepositoryConfiguration repositoryConfiguration = new ManagedRepositoryConfiguration();
+ repositoryConfiguration.setId( TEST_REPO_ID );
+ repositoryConfiguration.setName( "Test Repository" );
+ repositoryConfiguration.setLocation( repoDir.getAbsolutePath() );
+ archivaConfig.getConfiguration().getManagedRepositories().clear();
+ archivaConfig.getConfiguration().addManagedRepository( repositoryConfiguration );
+
+ metadataRepository = mock( MetadataRepository.class );
+
+ factory.setRepository( metadataRepository );
+ }
+
+ @After
+ @Override
+ public void tearDown()
+ throws Exception
+ {
+ FileUtils.deleteDirectory( repoDir );
+
+ assertFalse( repoDir.exists() );
+
+ super.tearDown();
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/archiva/blob/8d3f82a4/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorAbstractTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorAbstractTest.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorAbstractTest.java
deleted file mode 100644
index 1698f07..0000000
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorAbstractTest.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package org.apache.archiva.scheduler.repository;
-
-/*
- * 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.
- */
-
-import junit.framework.TestCase;
-import org.apache.archiva.configuration.ArchivaConfiguration;
-import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
-import org.apache.archiva.metadata.repository.MetadataRepository;
-import org.apache.archiva.metadata.repository.stats.RepositoryStatisticsManager;
-import org.apache.archiva.mock.MockRepositorySessionFactory;
-import org.apache.archiva.redback.components.taskqueue.execution.TaskExecutor;
-import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
-import org.codehaus.plexus.util.FileUtils;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.runner.RunWith;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import java.io.File;
-import java.util.Calendar;
-import java.util.List;
-
-import static org.mockito.Mockito.mock;
-
-/**
- * ArchivaRepositoryScanningTaskExecutorPhase1Test
- */
-@RunWith( ArchivaSpringJUnit4ClassRunner.class )
-@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
-@DirtiesContext( classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD )
-public abstract class ArchivaRepositoryScanningTaskExecutorAbstractTest
- extends TestCase
-{
- @Inject
- @Named( value = "taskExecutor#test-repository-scanning" )
- protected TaskExecutor taskExecutor;
-
- @Inject
- @Named( value = "archivaConfiguration#test-repository-scanning" )
- protected ArchivaConfiguration archivaConfig;
-
- @Inject
- @Named( value = "repositoryStatisticsManager#test" )
- protected RepositoryStatisticsManager repositoryStatisticsManager;
-
- @Inject
- @Named( value = "knownRepositoryContentConsumer#test-consumer" )
- protected TestConsumer testConsumer;
-
- @Inject
- @Named( value = "repositorySessionFactory#mock" )
- private MockRepositorySessionFactory factory;
-
- protected File repoDir;
-
- protected static final String TEST_REPO_ID = "testRepo";
-
- protected MetadataRepository metadataRepository;
-
- @Before
- @Override
- public void setUp()
- throws Exception
- {
- super.setUp();
-
- File sourceRepoDir = new File( "./src/test/repositories/default-repository" );
- repoDir = new File( "./target/default-repository" );
-
- FileUtils.deleteDirectory( repoDir );
- assertFalse( "Default Test Repository should not exist.", repoDir.exists() );
-
- repoDir.mkdir();
-
- FileUtils.copyDirectoryStructure( sourceRepoDir, repoDir );
- // set the timestamps to a time well in the past
- Calendar cal = Calendar.getInstance();
- cal.add( Calendar.YEAR, -1 );
- for ( File f : (List<File>) FileUtils.getFiles( repoDir, "**", null ) )
- {
- f.setLastModified( cal.getTimeInMillis() );
- }
- // TODO: test they are excluded instead
- for ( String dir : (List<String>) FileUtils.getDirectoryNames( repoDir, "**/.svn", null, false ) )
- {
- FileUtils.deleteDirectory( new File( repoDir, dir ) );
- }
-
- assertTrue( "Default Test Repository should exist.", repoDir.exists() && repoDir.isDirectory() );
-
- assertNotNull( archivaConfig );
-
- // Create it
- ManagedRepositoryConfiguration repositoryConfiguration = new ManagedRepositoryConfiguration();
- repositoryConfiguration.setId( TEST_REPO_ID );
- repositoryConfiguration.setName( "Test Repository" );
- repositoryConfiguration.setLocation( repoDir.getAbsolutePath() );
- archivaConfig.getConfiguration().getManagedRepositories().clear();
- archivaConfig.getConfiguration().addManagedRepository( repositoryConfiguration );
-
- metadataRepository = mock( MetadataRepository.class );
-
- factory.setRepository( metadataRepository );
- }
-
- @After
- @Override
- public void tearDown()
- throws Exception
- {
- FileUtils.deleteDirectory( repoDir );
-
- assertFalse( repoDir.exists() );
-
- super.tearDown();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/archiva/blob/8d3f82a4/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase1Test.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase1Test.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase1Test.java
index 200ebde..6d6383a 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase1Test.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase1Test.java
@@ -33,7 +33,7 @@ import java.util.Collection;
*/
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
public class ArchivaRepositoryScanningTaskExecutorPhase1Test
- extends ArchivaRepositoryScanningTaskExecutorAbstractTest
+ extends AbstractArchivaRepositoryScanningTaskExecutorTest
{
// Split of ArchivaRepositoryScanningTaskExecutorTest should be executed first
// to avoid testConsumer in unknown state if member of Phase2 all ready executed
http://git-wip-us.apache.org/repos/asf/archiva/blob/8d3f82a4/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java
index e346945..4a53723 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java
@@ -34,26 +34,23 @@ import java.util.Date;
/**
* ArchivaRepositoryScanningTaskExecutorPhase2Test
- *
- *
*/
@ContextConfiguration( locations = { "classpath*:/META-INF/spring-context.xml", "classpath:/spring-context.xml" } )
public class ArchivaRepositoryScanningTaskExecutorPhase2Test
- extends ArchivaRepositoryScanningTaskExecutorAbstractTest
+ extends AbstractArchivaRepositoryScanningTaskExecutorTest
{
@Test
public void testExecutorScanOnlyNewArtifacts()
throws Exception
{
+ createAndSaveTestStats();
+
RepositoryTask repoTask = new RepositoryTask();
repoTask.setRepositoryId( TEST_REPO_ID );
repoTask.setScanAll( false );
-
- createAndSaveTestStats();
-
taskExecutor.executeTask( repoTask );
// check no artifacts processed
@@ -67,7 +64,7 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test
RepositoryStatistics newStats =
repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID );
assertEquals( 0, newStats.getNewFileCount() );
- assertEquals( 31, newStats.getTotalFileCount() );
+ assertEquals( 41, newStats.getTotalFileCount() );
// FIXME: can't test these as they weren't stored in the database, move to tests for RepositoryStatisticsManager implementation
// assertEquals( 8, newStats.getTotalArtifactCount() );
// assertEquals( 3, newStats.getTotalGroupCount() );
@@ -100,7 +97,7 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test
RepositoryStatistics updatedStats =
repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID );
assertEquals( 2, updatedStats.getNewFileCount() );
- assertEquals( 33, updatedStats.getTotalFileCount() );
+ assertEquals( 43, updatedStats.getTotalFileCount() );
// FIXME: can't test these as they weren't stored in the database, move to tests for RepositoryStatisticsManager implementation
// assertEquals( 8, newStats.getTotalArtifactCount() );
// assertEquals( 3, newStats.getTotalGroupCount() );
@@ -147,7 +144,7 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test
RepositoryStatistics newStats =
repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID );
assertEquals( 2, newStats.getNewFileCount() );
- assertEquals( 33, newStats.getTotalFileCount() );
+ assertEquals( 43, newStats.getTotalFileCount() );
// FIXME: can't test these as they weren't stored in the database, move to tests for RepositoryStatisticsManager implementation
// assertEquals( 8, newStats.getTotalArtifactCount() );
// assertEquals( 3, newStats.getTotalGroupCount() );
@@ -194,7 +191,7 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test
RepositoryStatistics newStats =
repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID );
assertEquals( 2, newStats.getNewFileCount() );
- assertEquals( 33, newStats.getTotalFileCount() );
+ assertEquals( 43, newStats.getTotalFileCount() );
// FIXME: can't test these as they weren't stored in the database, move to tests for RepositoryStatisticsManager implementation
// assertEquals( 8, newStats.getTotalArtifactCount() );
// assertEquals( 3, newStats.getTotalGroupCount() );
@@ -212,8 +209,9 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test
repoTask.setScanAll( true );
Date date = Calendar.getInstance().getTime();
- repositoryStatisticsManager.addStatisticsAfterScan( metadataRepository, TEST_REPO_ID,
- new Date( date.getTime() - 1234567 ), date, 8, 8 );
+ repositoryStatisticsManager.addStatisticsAfterScan( metadataRepository, TEST_REPO_ID, //
+ new Date( date.getTime() - 1234567 ), //
+ date, 8, 8 ); //
taskExecutor.executeTask( repoTask );
@@ -227,17 +225,9 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test
throws MetadataRepositoryException
{
Date date = Calendar.getInstance().getTime();
- RepositoryStatistics stats = new RepositoryStatistics();
- stats.setScanStartTime( new Date( date.getTime() - 1234567 ) );
- stats.setScanEndTime( date );
- stats.setNewFileCount( 31 );
- stats.setTotalArtifactCount( 8 );
- stats.setTotalFileCount( 31 );
- stats.setTotalGroupCount( 3 );
- stats.setTotalProjectCount( 5 );
- stats.setTotalArtifactFileSize( 38545 );
-
- repositoryStatisticsManager.addStatisticsAfterScan( metadataRepository, TEST_REPO_ID,
- new Date( date.getTime() - 1234567 ), date, 31, 31 );
+
+ repositoryStatisticsManager.addStatisticsAfterScan( metadataRepository, TEST_REPO_ID, //
+ new Date( date.getTime() - 1234567 ), date, //
+ 41, 41 );
}
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/8d3f82a4/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/log4j2-test.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/log4j2-test.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/log4j2-test.xml
new file mode 100644
index 0000000..fdc40af
--- /dev/null
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/resources/log4j2-test.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ ~ 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.
+ -->
+
+
+<configuration>
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <PatternLayout pattern="%d [%t] %-5p %c %x - %m%n"/>
+ </Console>
+ </appenders>
+ <loggers>
+
+ <logger name="org.springframework" level="error"/>
+ <logger name="org.apache.archiva" level="debug"/>
+ <root level="info">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
+</configuration>
+
+
http://git-wip-us.apache.org/repos/asf/archiva/blob/8d3f82a4/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b78f61e..8e12a4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,7 +79,7 @@
<jackrabbit.version>2.14.1</jackrabbit.version>
<cxf.version>3.0.3</cxf.version>
- <derbyVersion>10.10.1.1</derbyVersion>
+ <derbyVersion>10.13.1.1</derbyVersion>
<httpclient.version>4.5.2</httpclient.version>
<httpclient.core.version>4.4.4</httpclient.core.version>
<javaxMailVersion>1.4</javaxMailVersion>
@@ -95,7 +95,6 @@
<plexus-digest.version>1.1</plexus-digest.version>
<plexus-expression-evaluator.version>2.1</plexus-expression-evaluator.version>
<plexus-utils.version>3.0.15</plexus-utils.version>
- <tomcat7Version>7.0.54</tomcat7Version>
<htmlUnitVersion>2.27</htmlUnitVersion>
<release.preparationGoals>clean install</release.preparationGoals>
@@ -460,7 +459,13 @@
<dependency>
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
- <version>3.2.1</version>
+ <version>3.3.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP</artifactId>
+ <version>2.6.3</version>
</dependency>
<!--
@@ -645,16 +650,6 @@
<version>${commons-lang.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jdbc</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-juli</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.2</version>
[10/13] archiva git commit: Fixing tests and path for jcr oak
Posted by ol...@apache.org.
Fixing tests and path for jcr oak
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/96843bd4
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/96843bd4
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/96843bd4
Branch: refs/heads/feature/jcr_oak
Commit: 96843bd488656a61a2ab374cc404fadf2819737d
Parents: 7d2cc26
Author: Martin Stockhammer <ma...@apache.org>
Authored: Thu Jun 22 00:37:51 2017 +0200
Committer: olivier lamy <ol...@apache.org>
Committed: Sat Jun 24 09:05:49 2017 +1000
----------------------------------------------------------------------
.../repository/jcr/RepositoryFactory.java | 31 ++++++++++++--------
.../META-INF/spring-context.xml | 6 ----
.../jcr/JcrMetadataRepositoryTest.java | 27 ++++++++++++-----
.../plugins/repository-statistics/pom.xml | 10 +++++++
.../JcrRepositoryStatisticsGatheringTest.java | 19 ++++++------
5 files changed, 59 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/96843bd4/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/RepositoryFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/RepositoryFactory.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/RepositoryFactory.java
index 65e1ace..0978380 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/RepositoryFactory.java
+++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/RepositoryFactory.java
@@ -1,14 +1,29 @@
package org.apache.archiva.metadata.repository.jcr;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
+/*
+ * 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.
+ */
+
import com.google.common.collect.ImmutableSet;
-import com.google.common.util.concurrent.MoreExecutors;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.jcr.Jcr;
-import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
import org.apache.jackrabbit.oak.plugins.index.IndexUtils;
import org.apache.jackrabbit.oak.plugins.index.lucene.ExtractedTextCache;
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexCopier;
@@ -16,12 +31,9 @@ import org.apache.jackrabbit.oak.plugins.index.lucene.IndexTracker;
import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorProvider;
import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProvider;
import org.apache.jackrabbit.oak.plugins.index.lucene.hybrid.DocumentQueue;
-import org.apache.jackrabbit.oak.plugins.index.lucene.hybrid.ExternalObserverBuilder;
import org.apache.jackrabbit.oak.plugins.index.lucene.hybrid.LocalIndexObserver;
import org.apache.jackrabbit.oak.plugins.index.lucene.hybrid.NRTIndexFactory;
import org.apache.jackrabbit.oak.plugins.index.lucene.reader.DefaultIndexReaderFactory;
-import org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneInitializerHelper;
-import org.apache.jackrabbit.oak.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders;
import org.apache.jackrabbit.oak.segment.file.FileStore;
import org.apache.jackrabbit.oak.segment.file.FileStoreBuilder;
@@ -44,18 +56,13 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
-import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INCLUDE_PROPERTY_TYPES;
/**
http://git-wip-us.apache.org/repos/asf/archiva/blob/96843bd4/archiva-modules/plugins/metadata-store-jcr/src/test/filtered-resources/META-INF/spring-context.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/test/filtered-resources/META-INF/spring-context.xml b/archiva-modules/plugins/metadata-store-jcr/src/test/filtered-resources/META-INF/spring-context.xml
index f98b79b..e3fa80b 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/test/filtered-resources/META-INF/spring-context.xml
+++ b/archiva-modules/plugins/metadata-store-jcr/src/test/filtered-resources/META-INF/spring-context.xml
@@ -22,11 +22,5 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
- <bean id="repositoryFactory" class="org.apache.archiva.metadata.repository.jcr.RepositoryFactory" >
- <property name="storeType" value="oak-segment-tar" />
- </bean>
- <bean id="repository" class="org.apache.archiva.metadata.repository.jcr.RepositoryFactory" factory-method="createRepository"
- factory-bean="repositoryFactory">
- </bean>
</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/archiva/blob/96843bd4/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java b/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java
index 5efabdf..c364efe 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java
+++ b/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java
@@ -22,12 +22,15 @@ package org.apache.archiva.metadata.repository.jcr;
import org.apache.archiva.metadata.model.MetadataFacetFactory;
import org.apache.archiva.metadata.repository.AbstractMetadataRepositoryTest;
import org.apache.commons.io.FileUtils;
+import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException;
import org.junit.After;
import org.junit.Before;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.springframework.context.ApplicationContext;
import java.io.File;
+import java.io.IOException;
import java.util.Map;
import javax.inject.Inject;
import javax.jcr.Repository;
@@ -42,6 +45,22 @@ public class JcrMetadataRepositoryTest
@Inject
private ApplicationContext applicationContext;
+ private static Repository jcrRepository;
+
+ @BeforeClass
+ public static void setupSpec() throws IOException, InvalidFileStoreVersionException
+ {
+ File directory = new File( "target/test-repositories" );
+ if ( directory.exists() )
+ {
+ FileUtils.deleteDirectory( directory );
+ }
+ RepositoryFactory factory = new RepositoryFactory();
+ factory.setRepositoryPath( directory.getPath() );
+ jcrRepository = factory.createRepository();
+
+ }
+
@Before
@Override
public void setUp()
@@ -49,17 +68,11 @@ public class JcrMetadataRepositoryTest
{
super.setUp();
- File directory = new File( "target/test-repositories" );
- if ( directory.exists() )
- {
- FileUtils.deleteDirectory( directory );
- }
Map<String, MetadataFacetFactory> factories = createTestMetadataFacetFactories();
// TODO: probably don't need to use Spring for this
- Repository repository = applicationContext.getBean( Repository.class );
- jcrMetadataRepository = new JcrMetadataRepository( factories, repository );
+ jcrMetadataRepository = new JcrMetadataRepository( factories, jcrRepository );
try
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/96843bd4/archiva-modules/plugins/repository-statistics/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/repository-statistics/pom.xml b/archiva-modules/plugins/repository-statistics/pom.xml
index ccbdbfc..23cc847 100644
--- a/archiva-modules/plugins/repository-statistics/pom.xml
+++ b/archiva-modules/plugins/repository-statistics/pom.xml
@@ -65,6 +65,16 @@
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-commons</artifactId>
+ <version>2.15.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.archiva</groupId>
+ <artifactId>metadata-store-jcr</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/archiva/blob/96843bd4/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java b/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java
index 1a46b87..6094a63 100644
--- a/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java
+++ b/archiva-modules/plugins/repository-statistics/src/test/java/org/apache/archiva/metadata/repository/stats/JcrRepositoryStatisticsGatheringTest.java
@@ -22,9 +22,14 @@ package org.apache.archiva.metadata.repository.stats;
import junit.framework.TestCase;
import org.apache.archiva.metadata.repository.MetadataRepository;
import org.apache.archiva.metadata.repository.RepositorySessionFactory;
+import org.apache.archiva.metadata.repository.jcr.RepositoryFactory;
+import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.commons.JcrUtils;
-import org.apache.jackrabbit.core.TransientRepository;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
import javax.inject.Inject;
import javax.jcr.ImportUUIDBehavior;
@@ -42,12 +47,6 @@ import java.util.Calendar;
import java.util.Date;
import java.util.zip.GZIPInputStream;
-import org.apache.archiva.test.utils.ArchivaBlockJUnit4ClassRunner;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
import static org.mockito.Mockito.*;
@RunWith( ArchivaBlockJUnit4ClassRunner.class )
@@ -83,8 +82,10 @@ public class JcrRepositoryStatisticsGatheringTest
assertTrue( confFile.exists() );
assertFalse( dir.exists() );
- TransientRepository repository = new TransientRepository( confFile, dir );
- session = repository.login( new SimpleCredentials( "username", "password".toCharArray() ) );
+ RepositoryFactory repositoryFactory = new RepositoryFactory();
+ repositoryFactory.setRepositoryPath( dir.getPath() );
+ session = repositoryFactory.createRepository().login(new SimpleCredentials( "admin", "admin".toCharArray()));
+
// TODO: perhaps have an archiva-jcr-utils module shared by these plugins that does this and can contain
// structure information
[09/13] archiva git commit: do not ignore .indexer so we can find the
reason of unit failure :-)
Posted by ol...@apache.org.
do not ignore .indexer so we can find the reason of unit failure :-)
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/42df217c
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/42df217c
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/42df217c
Branch: refs/heads/feature/jcr_oak
Commit: 42df217cd095a98ab935885a1c6e6e4f10a37954
Parents: 7fc559d
Author: olivier lamy <ol...@apache.org>
Authored: Wed Jun 21 16:54:41 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Wed Jun 21 16:54:41 2017 +1000
----------------------------------------------------------------------
.gitignore | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/42df217c/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 4799988..d5addeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,6 @@ build
*.ipr
*.iws
out/
-.indexer
#jenv
.java-version
[07/13] archiva git commit: cleanup comments
Posted by ol...@apache.org.
cleanup comments
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/4e410521
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/4e410521
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/4e410521
Branch: refs/heads/feature/jcr_oak
Commit: 4e410521352eb569070f740d4cc400832ea68e0b
Parents: 8d3f82a
Author: olivier lamy <ol...@apache.org>
Authored: Tue Jun 20 21:54:14 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Tue Jun 20 21:54:14 2017 +1000
----------------------------------------------------------------------
archiva-jetty/src/main/conf/jetty.xml | 15 ---------------
1 file changed, 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/4e410521/archiva-jetty/src/main/conf/jetty.xml
----------------------------------------------------------------------
diff --git a/archiva-jetty/src/main/conf/jetty.xml b/archiva-jetty/src/main/conf/jetty.xml
index 31c8182..8d60247 100644
--- a/archiva-jetty/src/main/conf/jetty.xml
+++ b/archiva-jetty/src/main/conf/jetty.xml
@@ -163,23 +163,8 @@
<Set name="username">sa</Set>
<Set name="maximumPoolSize">20</Set>
<Set name="minimumIdle">5</Set>
- <!-- very rigourous sql query validation -->
- <!--Set name="connectionTestQuery">select 1</Set-->
</New>
</Arg>
</New>
- <!--
- <New id="usersShutdown" class="org.eclipse.jetty.plus.jndi.Resource">
- <Arg>jdbc/usersShutdown</Arg>
- <Arg>
- <New class="com.zaxxer.hikari.HikariDataSource">
- <Set name="driverClassName">org.apache.derby.jdbc.EmbeddedDriver</Set>
- <Set name="jdbcUrl">jdbc:derby:<SystemProperty name="appserver.base" default=".."/>/data/databases/users</Set>
- <Set name="username">sa</Set>
- </New>
- </Arg>
- </New>
- -->
-
</Configure>
[08/13] archiva git commit: revert previous changes for this test as
it fail on jenkins but not locally... It Works On My Machine is back :-)
Posted by ol...@apache.org.
revert previous changes for this test as it fail on jenkins but not locally... It Works On My Machine is back :-)
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/7fc559dc
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/7fc559dc
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/7fc559dc
Branch: refs/heads/feature/jcr_oak
Commit: 7fc559dce1681f6fde673267754ca74d7aff4417
Parents: 4e41052
Author: olivier lamy <ol...@apache.org>
Authored: Wed Jun 21 16:34:03 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Wed Jun 21 16:34:03 2017 +1000
----------------------------------------------------------------------
...epositoryScanningTaskExecutorPhase2Test.java | 23 ++++++++++++++------
1 file changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/7fc559dc/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java
index 4a53723..6631339 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/src/test/java/org/apache/archiva/scheduler/repository/ArchivaRepositoryScanningTaskExecutorPhase2Test.java
@@ -45,12 +45,12 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test
public void testExecutorScanOnlyNewArtifacts()
throws Exception
{
- createAndSaveTestStats();
RepositoryTask repoTask = new RepositoryTask();
repoTask.setRepositoryId( TEST_REPO_ID );
repoTask.setScanAll( false );
+ createAndSaveTestStats();
taskExecutor.executeTask( repoTask );
// check no artifacts processed
@@ -64,7 +64,7 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test
RepositoryStatistics newStats =
repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID );
assertEquals( 0, newStats.getNewFileCount() );
- assertEquals( 41, newStats.getTotalFileCount() );
+ assertEquals( 31, newStats.getTotalFileCount() );
// FIXME: can't test these as they weren't stored in the database, move to tests for RepositoryStatisticsManager implementation
// assertEquals( 8, newStats.getTotalArtifactCount() );
// assertEquals( 3, newStats.getTotalGroupCount() );
@@ -97,7 +97,7 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test
RepositoryStatistics updatedStats =
repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID );
assertEquals( 2, updatedStats.getNewFileCount() );
- assertEquals( 43, updatedStats.getTotalFileCount() );
+ assertEquals( 33, updatedStats.getTotalFileCount() );
// FIXME: can't test these as they weren't stored in the database, move to tests for RepositoryStatisticsManager implementation
// assertEquals( 8, newStats.getTotalArtifactCount() );
// assertEquals( 3, newStats.getTotalGroupCount() );
@@ -144,7 +144,7 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test
RepositoryStatistics newStats =
repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID );
assertEquals( 2, newStats.getNewFileCount() );
- assertEquals( 43, newStats.getTotalFileCount() );
+ assertEquals( 33, newStats.getTotalFileCount() );
// FIXME: can't test these as they weren't stored in the database, move to tests for RepositoryStatisticsManager implementation
// assertEquals( 8, newStats.getTotalArtifactCount() );
// assertEquals( 3, newStats.getTotalGroupCount() );
@@ -191,7 +191,7 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test
RepositoryStatistics newStats =
repositoryStatisticsManager.getLastStatistics( metadataRepository, TEST_REPO_ID );
assertEquals( 2, newStats.getNewFileCount() );
- assertEquals( 43, newStats.getTotalFileCount() );
+ assertEquals( 33, newStats.getTotalFileCount() );
// FIXME: can't test these as they weren't stored in the database, move to tests for RepositoryStatisticsManager implementation
// assertEquals( 8, newStats.getTotalArtifactCount() );
// assertEquals( 3, newStats.getTotalGroupCount() );
@@ -225,9 +225,18 @@ public class ArchivaRepositoryScanningTaskExecutorPhase2Test
throws MetadataRepositoryException
{
Date date = Calendar.getInstance().getTime();
+ RepositoryStatistics stats = new RepositoryStatistics();
+ stats.setScanStartTime( new Date( date.getTime() - 1234567 ) );
+ stats.setScanEndTime( date );
+ stats.setNewFileCount( 31 );
+ stats.setTotalArtifactCount( 8 );
+ stats.setTotalFileCount( 31 );
+ stats.setTotalGroupCount( 3 );
+ stats.setTotalProjectCount( 5 );
+ stats.setTotalArtifactFileSize( 38545 );
repositoryStatisticsManager.addStatisticsAfterScan( metadataRepository, TEST_REPO_ID, //
- new Date( date.getTime() - 1234567 ), date, //
- 41, 41 );
+ new Date( date.getTime() - 1234567 ), //
+ date, 31, 31 );
}
}
[02/13] archiva git commit: start work using jetty maven plugin
Posted by ol...@apache.org.
start work using jetty maven plugin
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/c8fd32bb
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/c8fd32bb
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/c8fd32bb
Branch: refs/heads/feature/jcr_oak
Commit: c8fd32bbb7e1ad8d390d2bb478b9317480903588
Parents: 63827f4
Author: olivier lamy <ol...@apache.org>
Authored: Fri Jun 16 15:38:50 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Fri Jun 16 16:30:26 2017 +1000
----------------------------------------------------------------------
.../DefaultArchivaConfiguration.java | 1 -
.../archiva-web/archiva-webapp/pom.xml | 117 ++++---------------
.../plugins/metadata-store-cassandra/pom.xml | 2 +-
pom.xml | 8 +-
4 files changed, 30 insertions(+), 98 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/c8fd32bb/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
index 44f2521..4547787 100644
--- a/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
+++ b/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/DefaultArchivaConfiguration.java
@@ -698,7 +698,6 @@ public class DefaultArchivaConfiguration
return false;
}
}
-
FileUtils.writeStringToFile( file, contents, "UTF-8" );
return true;
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/c8fd32bb/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 ce7b826..1b203dd 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -31,12 +31,11 @@
<properties>
<tomcatContextXml>${basedir}/src/test/tomcat/tomcat-context-archiva.xml</tomcatContextXml>
- <tomcatRunPort>9091</tomcatRunPort>
- <tomcatRunPath>/archiva</tomcatRunPath>
<archiva.devMode>true</archiva.devMode>
<archiva.javascriptLog>true</archiva.javascriptLog>
<archiva.logMissingI18n>true</archiva.logMissingI18n>
<archivaAppServerBase>${project.build.directory}/appserver-base</archivaAppServerBase>
+ <jettyDumpOnStart>false</jettyDumpOnStart>
<archiva.baseRestUrl />
<rest.admin.pwd />
<test.useTomcat>false</test.useTomcat>
@@ -925,8 +924,8 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
- <version>9.4.5.v20170502</version>
<configuration>
+ <dumpOnStart>${jettyDumpOnStart}</dumpOnStart>
<scanIntervalSeconds>10</scanIntervalSeconds>
<webApp>
<contextPath>/archiva</contextPath>
@@ -997,98 +996,6 @@
</systemProperties>
</configuration>
- <dependencies>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derbyVersion}</version>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- <version>${javaxMailVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openjpaVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.serp</groupId>
- <artifactId>serp</artifactId>
- <version>1.15.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-io</artifactId>
- <version>9.4.5.v20170502</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>9.4.5.v20170502</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-client</artifactId>
- <version>9.4.5.v20170502</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-client</artifactId>
- <version>9.4.5.v20170502</version>
- </dependency>
-
- </dependencies>
-
- </plugin>
-
-
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <configuration>
- <port>${tomcatRunPort}</port>
- <path>${tomcatRunPath}</path>
- <contextFile>${tomcatContextXml}</contextFile>
- <useTestClasspath>false</useTestClasspath>
-
- <systemProperties>
- <plexus.home>${archivaAppServerBase}</plexus.home>
- <appserver.base>${archivaAppServerBase}</appserver.base>
- <appserver.home>${archivaAppServerBase}</appserver.home>
- <derby.system.home>${archivaAppServerBase}/logs</derby.system.home>
- <!-- remove admin auto creation that must be tested too -->
- <!--redback.admin.creation.file>${basedir}/target/auto-admin-creation.properties</redback.admin.creation.file-->
- <java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
- <archiva.user.configFileName>${archivaAppServerBase}/conf/archiva.xml</archiva.user.configFileName>
- <archiva.devMode>${archiva.devMode}</archiva.devMode>
- <archiva.javascriptLog>${archiva.javascriptLog}</archiva.javascriptLog>
- <archiva.logMissingI18n>${archiva.logMissingI18n}</archiva.logMissingI18n>
- <cassandra.host>${cassandra.host}</cassandra.host>
- <cassandra.port>${cassandra.port}</cassandra.port>
- <archiva.repositorySessionFactory.id>${archiva.repositorySessionFactory.id}</archiva.repositorySessionFactory.id>
- <AsyncLoggerConfig.WaitStrategy>Block</AsyncLoggerConfig.WaitStrategy>
- <AsyncLogger.WaitStrategy>Block</AsyncLogger.WaitStrategy>
- <openjpa.Log>${openjpa.Log}</openjpa.Log>
- </systemProperties>
- <additionalClasspathDirs>
- <additionalClasspathDir>${basedir}/src/test/tomcat</additionalClasspathDir>
- </additionalClasspathDirs>
-
-
- </configuration>
<dependencies>
<dependency>
<groupId>org.apache.derby</groupId>
@@ -1121,6 +1028,26 @@
<version>1.15.1</version>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ <version>${jettyVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jettyVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ <version>${jettyVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>websocket-client</artifactId>
+ <version>${jettyVersion}</version>
+ </dependency>
</dependencies>
</plugin>
http://git-wip-us.apache.org/repos/asf/archiva/blob/c8fd32bb/archiva-modules/plugins/metadata-store-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-cassandra/pom.xml b/archiva-modules/plugins/metadata-store-cassandra/pom.xml
index 3e32549..5253ab0 100644
--- a/archiva-modules/plugins/metadata-store-cassandra/pom.xml
+++ b/archiva-modules/plugins/metadata-store-cassandra/pom.xml
@@ -239,7 +239,7 @@
<executions>
<execution>
<id>start-cassandra</id>
- <phase>test-compile</phase>
+ <phase>process-test-classes</phase>
<goals>
<goal>start</goal>
</goals>
http://git-wip-us.apache.org/repos/asf/archiva/blob/c8fd32bb/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c5ef325..ae60174 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,8 @@
<httpclient.version>4.5.2</httpclient.version>
<httpclient.core.version>4.4.4</httpclient.core.version>
<javaxMailVersion>1.4</javaxMailVersion>
- <jettyVersion>9.4.5.v20170502</jettyVersion>
+ <!--jettyVersion>9.4.5.v20170502</jettyVersion-->
+ <jettyVersion>9.4.7-SNAPSHOT</jettyVersion>
<guava.version>22.0</guava.version>
<openjpaVersion>2.4.1</openjpaVersion>
@@ -1751,6 +1752,11 @@
<version>${asfTomcatMavenPluginVersion}</version>
</plugin>
<plugin>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>${jettyVersion}</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
[13/13] archiva git commit: cosmetic change :-)
Posted by ol...@apache.org.
cosmetic change :-)
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/ddbb6cda
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/ddbb6cda
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/ddbb6cda
Branch: refs/heads/feature/jcr_oak
Commit: ddbb6cdaf499915affabe440ab4c0da1fc482202
Parents: f0ba11a
Author: olivier lamy <ol...@apache.org>
Authored: Sat Jun 24 09:06:22 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Sat Jun 24 09:06:22 2017 +1000
----------------------------------------------------------------------
.../metadata/repository/AbstractMetadataRepositoryTest.java | 9 +--------
.../metadata/repository/jcr/JcrMetadataRepositoryTest.java | 1 -
2 files changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/ddbb6cda/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java b/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
index 75c961f..4700d5a 100644
--- a/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
+++ b/archiva-modules/metadata/metadata-repository-api/src/test/java/org/apache/archiva/metadata/repository/AbstractMetadataRepositoryTest.java
@@ -827,14 +827,7 @@ public abstract class AbstractMetadataRepositoryTest
Collection<ArtifactMetadata> artifacts =
repository.getArtifacts( TEST_REPO_ID, TEST_NAMESPACE, TEST_PROJECT, TEST_PROJECT_VERSION );
ArrayList<ArtifactMetadata> actual = new ArrayList<>( artifacts );
- Collections.sort( actual, new Comparator<ArtifactMetadata>()
- {
- @Override
- public int compare( ArtifactMetadata o1, ArtifactMetadata o2 )
- {
- return o1.getId().compareTo( o2.getId() );
- }
- } );
+ Collections.sort( actual,( o1, o2 ) -> o1.getId().compareTo( o2.getId() ) );
assertEquals( Arrays.asList( artifact1, artifact2 ), actual );
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/ddbb6cda/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java b/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java
index c364efe..debf5c9 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java
+++ b/archiva-modules/plugins/metadata-store-jcr/src/test/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepositoryTest.java
@@ -26,7 +26,6 @@ import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
-import org.junit.Test;
import org.springframework.context.ApplicationContext;
import java.io.File;
[11/13] archiva git commit: Adding jcr oak implementation
Posted by ol...@apache.org.
Adding jcr oak implementation
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/7d2cc26b
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/7d2cc26b
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/7d2cc26b
Branch: refs/heads/feature/jcr_oak
Commit: 7d2cc26b4bf41a5e9429aba3a54665669cf6cf79
Parents: 42df217
Author: Martin Stockhammer <ma...@apache.org>
Authored: Wed Jun 21 23:52:17 2017 +0200
Committer: olivier lamy <ol...@apache.org>
Committed: Sat Jun 24 09:05:49 2017 +1000
----------------------------------------------------------------------
.../archiva-lucene-consumers/pom.xml | 35 ++-
.../src/test/resources/spring-context.xml | 3 +-
.../archiva-base/archiva-indexer/pom.xml | 10 +
.../archiva-base/archiva-plexus-bridge/pom.xml | 10 +
.../archiva-repository-admin-api/pom.xml | 8 +
.../archiva-scheduler-indexing/pom.xml | 10 +
.../archiva-rest/archiva-rest-services/pom.xml | 16 --
.../archiva-web/archiva-web-common/pom.xml | 15 -
.../archiva-web/archiva-webapp/pom.xml | 23 --
.../main/resources/META-INF/spring-context.xml | 3 +-
.../archiva-web/archiva-webdav/pom.xml | 12 -
.../plugins/metadata-store-jcr/pom.xml | 85 +++++-
.../jcr/ArchivaJcrRepositoryConfig.java | 64 -----
.../repository/jcr/JcrMetadataRepository.java | 22 +-
.../repository/jcr/RepositoryFactory.java | 285 +++++++++++++++++++
.../src/main/resources/log4j2-test.xml | 42 +++
.../META-INF/spring-context.xml | 14 +-
.../src/test/resources/log4j2-test.xml | 42 +++
.../plugins/repository-statistics/pom.xml | 16 --
pom.xml | 31 +-
20 files changed, 537 insertions(+), 209 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/7d2cc26b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
index 6eed0b8..e8b970b 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
@@ -66,10 +66,30 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-common</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.indexer</groupId>
<artifactId>indexer-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-common</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
@@ -111,21 +131,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/archiva/blob/7d2cc26b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml
index db01db7..a891372 100644
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/src/test/resources/spring-context.xml
@@ -59,6 +59,7 @@
<alias name="roleManager#test" alias="roleManager"/>
+ <!--
<bean id="jcr-config" class="org.apache.archiva.metadata.repository.jcr.ArchivaJcrRepositoryConfig" factory-method="create">
<constructor-arg value="${appserver.base}/conf/repository.xml"/>
<constructor-arg value="${appserver.base}/data/jcr"/>
@@ -67,7 +68,7 @@
<bean id="jcr-repository" class="org.apache.jackrabbit.core.RepositoryImpl" destroy-method="shutdown" lazy-init="true">
<constructor-arg ref="jcr-config"/>
</bean>
-
+ -->
</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/archiva/blob/7d2cc26b/archiva-modules/archiva-base/archiva-indexer/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml
index 5695593..eae5642 100644
--- a/archiva-modules/archiva-base/archiva-indexer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml
@@ -85,6 +85,16 @@
<dependency>
<groupId>org.apache.maven.indexer</groupId>
<artifactId>indexer-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-common</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
http://git-wip-us.apache.org/repos/asf/archiva/blob/7d2cc26b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
index fe40f62..d8b477e 100644
--- a/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
+++ b/archiva-modules/archiva-base/archiva-plexus-bridge/pom.xml
@@ -58,6 +58,16 @@
<dependency>
<groupId>org.apache.maven.indexer</groupId>
<artifactId>indexer-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-common</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
http://git-wip-us.apache.org/repos/asf/archiva/blob/7d2cc26b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
index a57c21f..d1ca7d7 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-api/pom.xml
@@ -73,6 +73,14 @@
<groupId>com.google.code.atinject</groupId>
<artifactId>atinject</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-common</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/archiva/blob/7d2cc26b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
index 5aca8e1..58a5f5b 100644
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
@@ -44,6 +44,16 @@
<dependency>
<groupId>org.apache.maven.indexer</groupId>
<artifactId>indexer-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-common</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
http://git-wip-us.apache.org/repos/asf/archiva/blob/7d2cc26b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
index 882cd6f..56c3cde 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
@@ -329,22 +329,6 @@
</dependency>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/archiva/blob/7d2cc26b/archiva-modules/archiva-web/archiva-web-common/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index 71ac238..645419f 100644
--- a/archiva-modules/archiva-web/archiva-web-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml
@@ -369,21 +369,6 @@
</dependency>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/archiva/blob/7d2cc26b/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 1d3c53e..bdb0b6b 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -131,29 +131,6 @@
</dependency>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-commons</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-dbcp</groupId>
- <artifactId>commons-dbcp</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<exclusions>
http://git-wip-us.apache.org/repos/asf/archiva/blob/7d2cc26b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
index b0b3840..a66c925 100755
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
@@ -37,6 +37,7 @@
<util:properties id="archivaRuntimeProperties" location="classpath:application.properties" />
+ <!--
<bean id="jcr-repository" class="org.apache.jackrabbit.core.RepositoryImpl" destroy-method="shutdown" lazy-init="true">
<constructor-arg ref="jcr-config"/>
</bean>
@@ -46,7 +47,7 @@
<constructor-arg value="${appserver.base}/conf/repository.xml"/>
<constructor-arg value="${appserver.base}/data/jcr"/>
</bean>
-
+ -->
<jee:jndi-lookup id="dataSource" jndi-name="java:/comp/env/jdbc/users" />
http://git-wip-us.apache.org/repos/asf/archiva/blob/7d2cc26b/archiva-modules/archiva-web/archiva-webdav/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml
index 2b08b3f..044b964 100644
--- a/archiva-modules/archiva-web/archiva-webdav/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml
@@ -95,16 +95,6 @@
<artifactId>archiva-filelock</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-webdav</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
@@ -298,8 +288,6 @@
org.apache.archiva.metadata.repository.storage;version=${project.version},
org.apache.commons.io;version="[1.4,2)",
org.apache.commons.lang;version="[2.4,3)",
- org.apache.jackrabbit.util;version="[1,3)",
- org.apache.jackrabbit.webdav*;version="[1,3)",
org.joda.time*;version="[1.5,2)",
org.springframework*;version="[3,4)",
org.apache.maven.index*,
http://git-wip-us.apache.org/repos/asf/archiva/blob/7d2cc26b/archiva-modules/plugins/metadata-store-jcr/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml
index 8fa3086..831b639 100644
--- a/archiva-modules/plugins/metadata-store-jcr/pom.xml
+++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml
@@ -28,6 +28,9 @@
<artifactId>metadata-store-jcr</artifactId>
<packaging>bundle</packaging>
<name>Archiva Core Plugins :: JCR Storage for Metadata</name>
+ <properties>
+ <jcr-oak.version>1.7.1</jcr-oak.version>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.archiva</groupId>
@@ -48,6 +51,12 @@
<artifactId>archiva-test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>javax.jcr</groupId>
@@ -55,25 +64,42 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-commons</artifactId>
+ <artifactId>oak-jcr</artifactId>
+ <version>${jcr-oak.version}</version>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <scope>provided</scope>
- <!-- could trim more, but since it's just for test we don't need to worry -->
+ <artifactId>oak-segment-tar</artifactId>
+ <version>${jcr-oak.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-lucene</artifactId>
+ <version>${jcr-oak.version}</version>
<exclusions>
<exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-misc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-facet</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
<scope>test</scope>
@@ -98,6 +124,51 @@
<artifactId>xercesImpl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-misc</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-facet</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-codecs</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-sandbox</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-highlighter</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-memory</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-common</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
</dependencies>
<build>
<testResources>
@@ -126,8 +197,6 @@
org.apache.archiva.metadata.model;version=${project.version},
org.apache.archiva.metadata.repository;version=${project.version},
org.apache.commons.lang;version="[2.4,3)",
- org.apache.jackrabbit.commons;version="[2.3,3)",
- org.apache.jackrabbit.core.config,
org.springframework*;version="[3,4)",
org.slf4j;resolution:=optional,
org.apache.commons.lang.time
http://git-wip-us.apache.org/repos/asf/archiva/blob/7d2cc26b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java
deleted file mode 100644
index 8271e2b..0000000
--- a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/ArchivaJcrRepositoryConfig.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.apache.archiva.metadata.repository.jcr;
-/*
- * 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.
- */
-
-import org.apache.jackrabbit.core.config.ConfigurationException;
-import org.apache.jackrabbit.core.config.RepositoryConfig;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-
-/**
- * @author Olivier Lamy
- * @since 1.4-M1
- */
-public class ArchivaJcrRepositoryConfig
-{
- // Recommended to avoid inconsistencies caused by race conditions.
- static
- {
- if ( !System.getProperties( ).containsKey( "org.apache.jackrabbit.core.state.validatehierarchy" ) )
- {
- System.setProperty( "org.apache.jackrabbit.core.state.validatehierarchy", "true" );
- }
- }
-
- public static RepositoryConfig create( String file, String home )
- throws ConfigurationException
- {
- File homeFile = new File( home );
- if ( !homeFile.exists( ) )
- {
- homeFile.mkdirs( );
- }
-
- File configurationFile = new File( file );
- if ( !configurationFile.exists( ) )
- {
- String resourcePath = "org/apache/archiva/metadata/repository/jcr/repository.xml";
- LoggerFactory.getLogger( ArchivaJcrRepositoryConfig.class ).info(
- "no repository.xml file in path {} so use default from resources path {}", file, resourcePath );
- // use bundled repository.xml
- return RepositoryConfig.create(
- Thread.currentThread( ).getContextClassLoader( ).getResourceAsStream( resourcePath ), home );
- }
-
- return RepositoryConfig.create( file, home );
- }
-}
http://git-wip-us.apache.org/repos/asf/archiva/blob/7d2cc26b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
index 3649309..2bf9406 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
+++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/JcrMetadataRepository.java
@@ -37,6 +37,8 @@ import org.apache.archiva.metadata.repository.MetadataRepositoryException;
import org.apache.archiva.metadata.repository.MetadataResolutionException;
import org.apache.commons.lang.StringUtils;
import org.apache.jackrabbit.commons.JcrUtils;
+import org.apache.jackrabbit.oak.plugins.index.IndexUtils;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -139,6 +141,8 @@ public class JcrMetadataRepository
registerMixinNodeType( nodeTypeManager, JcrMetadataRepository.FACET_NODE_TYPE );
registerMixinNodeType( nodeTypeManager, JcrMetadataRepository.DEPENDENCY_NODE_TYPE );
+
+
}
private static void registerMixinNodeType( NodeTypeManager nodeTypeManager, String name )
@@ -156,6 +160,8 @@ public class JcrMetadataRepository
}
}
+
+
@Override
public void updateProject( String repositoryId, ProjectMetadata project )
throws MetadataRepositoryException
@@ -755,6 +761,10 @@ public class JcrMetadataRepository
{
throw new MetadataRepositoryException( e.getMessage(), e );
}
+ log.info("Artifacts found {}", artifacts.size());
+ for (ArtifactMetadata meta : artifacts) {
+ log.info("Artifact: "+meta.getVersion()+" "+meta.getFacetList());
+ }
return artifacts;
}
@@ -1418,11 +1428,9 @@ public class JcrMetadataRepository
}
@Override
- public List<ArtifactMetadata> searchArtifacts( String key, String text, String repositoryId, boolean exact )
+ public List<ArtifactMetadata> searchArtifacts( String key, String text, String repositoryId, boolean e )
throws MetadataRepositoryException
{
- // we can't do exact search in any property (*), we need a key
- boolean e = exact && key != null;
String theKey = key == null ? "*" : "[" + key + "]";
String projectVersionCondition =
e ? "(projectVersion." + theKey + " = $value)" : "contains([projectVersion]." + theKey + ", $value)";
@@ -1432,7 +1440,6 @@ public class JcrMetadataRepository
+ ARTIFACT_NODE_TYPE + "] AS artifact ON ISCHILDNODE(artifact, projectVersion) LEFT OUTER JOIN ["
+ FACET_NODE_TYPE + "] AS facet ON ISCHILDNODE(facet, projectVersion) WHERE ("
+ projectVersionCondition + " OR " + facetCondition + ")";
-
return runJcrQuery( repositoryId, q, ImmutableMap.of( "value", text ) );
}
@@ -1555,7 +1562,7 @@ public class JcrMetadataRepository
private static String getRepositoryContentPath( String repositoryId )
{
- return getRepositoryPath( repositoryId ) + "/content/";
+ return getRepositoryPath( repositoryId ) + "/content";
}
private static String getFacetPath( String repositoryId, String facetId )
@@ -1565,7 +1572,7 @@ public class JcrMetadataRepository
private static String getNamespacePath( String repositoryId, String namespace )
{
- return getRepositoryContentPath( repositoryId ) + namespace.replace( '.', '/' );
+ return getRepositoryContentPath( repositoryId ) + "/" + namespace.replace( '.', '/' );
}
private static String getProjectPath( String repositoryId, String namespace, String projectId )
@@ -1594,6 +1601,7 @@ public class JcrMetadataRepository
private Node getOrAddNodeByPath( Node baseNode, String name, String nodeType )
throws RepositoryException
{
+ log.debug("getOrAddNodeByPath"+baseNode+" "+name+" "+nodeType);
Node node = baseNode;
for ( String n : name.split( "/" ) )
{
@@ -1614,8 +1622,10 @@ public class JcrMetadataRepository
private Node getOrAddRepositoryNode( String repositoryId )
throws RepositoryException
{
+ log.debug("getOrAddRepositoryNode "+repositoryId);
Node root = getJcrSession().getRootNode();
Node node = JcrUtils.getOrAddNode( root, "repositories" );
+ log.debug("Repositories "+node);
node = JcrUtils.getOrAddNode( node, repositoryId );
return node;
}
http://git-wip-us.apache.org/repos/asf/archiva/blob/7d2cc26b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/RepositoryFactory.java
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/RepositoryFactory.java b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/RepositoryFactory.java
new file mode 100644
index 0000000..65e1ace
--- /dev/null
+++ b/archiva-modules/plugins/metadata-store-jcr/src/main/java/org/apache/archiva/metadata/repository/jcr/RepositoryFactory.java
@@ -0,0 +1,285 @@
+package org.apache.archiva.metadata.repository.jcr;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.util.concurrent.MoreExecutors;
+import org.apache.jackrabbit.JcrConstants;
+import org.apache.jackrabbit.oak.Oak;
+import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.jcr.Jcr;
+import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
+import org.apache.jackrabbit.oak.plugins.index.IndexUtils;
+import org.apache.jackrabbit.oak.plugins.index.lucene.ExtractedTextCache;
+import org.apache.jackrabbit.oak.plugins.index.lucene.IndexCopier;
+import org.apache.jackrabbit.oak.plugins.index.lucene.IndexTracker;
+import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexEditorProvider;
+import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexProvider;
+import org.apache.jackrabbit.oak.plugins.index.lucene.hybrid.DocumentQueue;
+import org.apache.jackrabbit.oak.plugins.index.lucene.hybrid.ExternalObserverBuilder;
+import org.apache.jackrabbit.oak.plugins.index.lucene.hybrid.LocalIndexObserver;
+import org.apache.jackrabbit.oak.plugins.index.lucene.hybrid.NRTIndexFactory;
+import org.apache.jackrabbit.oak.plugins.index.lucene.reader.DefaultIndexReaderFactory;
+import org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneInitializerHelper;
+import org.apache.jackrabbit.oak.segment.SegmentNodeStore;
+import org.apache.jackrabbit.oak.segment.SegmentNodeStoreBuilders;
+import org.apache.jackrabbit.oak.segment.file.FileStore;
+import org.apache.jackrabbit.oak.segment.file.FileStoreBuilder;
+import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException;
+import org.apache.jackrabbit.oak.spi.commit.Observer;
+import org.apache.jackrabbit.oak.spi.lifecycle.RepositoryInitializer;
+import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider;
+import org.apache.jackrabbit.oak.spi.mount.Mounts;
+import org.apache.jackrabbit.oak.spi.query.QueryIndexProvider;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+import org.apache.jackrabbit.oak.spi.state.NodeStore;
+import org.apache.jackrabbit.oak.stats.StatisticsProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.annotation.Nonnull;
+import javax.jcr.Repository;
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
+import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INCLUDE_PROPERTY_TYPES;
+
+/**
+ * Created by martin on 14.06.17.
+ *
+ * @author Martin Stockhammer
+ * @since 3.0.0
+ */
+public class RepositoryFactory
+{
+
+ Logger log = LoggerFactory.getLogger( RepositoryFactory.class );
+
+ public static final String SEGMENT_FILE_TYPE = "oak-segment-tar";
+ public static final String IN_MEMORY_TYPE = "oak-memory";
+
+ String storeType = SEGMENT_FILE_TYPE;
+
+ Path repositoryPath = Paths.get( "repository" );
+
+ public Repository createRepository( ) throws IOException, InvalidFileStoreVersionException
+ {
+ NodeStore nodeStore;
+ if ( SEGMENT_FILE_TYPE.equals( storeType ) )
+ {
+ FileStore fs = FileStoreBuilder.fileStoreBuilder( repositoryPath.toFile( ) ).build( );
+ nodeStore = SegmentNodeStoreBuilders.builder( fs ).build( );
+ } else if (IN_MEMORY_TYPE.equals(storeType)) {
+ nodeStore = null;
+ } else {
+ throw new IllegalArgumentException( "Store type "+storeType+" not recognized" );
+ }
+
+ Oak oak = nodeStore==null ? new Oak() : new Oak(nodeStore);
+ oak.with( new RepositoryInitializer( )
+ {
+ @Override
+ public void initialize( @Nonnull NodeBuilder root )
+ {
+ log.info("Creating index ");
+
+ NodeBuilder lucene = IndexUtils.getOrCreateOakIndex( root ).child("lucene");
+ lucene.setProperty( JcrConstants.JCR_PRIMARYTYPE, "oak:QueryIndexDefinition", Type.NAME);
+
+ lucene.setProperty("compatVersion", 2);
+ lucene.setProperty("type", "lucene");
+ // lucene.setProperty("async", "async");
+ lucene.setProperty(INCLUDE_PROPERTY_TYPES,
+ ImmutableSet.of("String"), Type.STRINGS);
+ // lucene.setProperty("refresh",true);
+ lucene.setProperty("async",ImmutableSet.of("async", "sync"), Type.STRINGS);
+ NodeBuilder rules = lucene.child("indexRules").
+ setProperty(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_UNSTRUCTURED, Type.NAME);
+ rules.setProperty(":childOrder",ImmutableSet.of("archiva:projectVersion","archiva:artifact",
+ "archiva:facet","archiva:namespace", "archiva:project"), Type.STRINGS);
+ NodeBuilder allProps = rules.child("archiva:projectVersion")
+ .child("properties").setProperty( JcrConstants.JCR_PRIMARYTYPE,
+ "nt:unstructured", Type.NAME)
+ .setProperty( ":childOrder", ImmutableSet.of("allProps"), Type.STRINGS )
+ .setProperty("indexNodeName",true)
+ .child("allProps").setProperty(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_UNSTRUCTURED, Type.NAME);
+ allProps.setProperty("name", ".*");
+ allProps.setProperty("isRegexp", true);
+ allProps.setProperty("nodeScopeIndex", true);
+ allProps.setProperty("index",true);
+ allProps.setProperty("analyzed",true);
+ // allProps.setProperty("propertyIndex",true);
+ allProps = rules.child("archiva:artifact")
+ .child("properties").setProperty( JcrConstants.JCR_PRIMARYTYPE,
+ "nt:unstructured", Type.NAME)
+ .setProperty( ":childOrder", ImmutableSet.of("allProps"), Type.STRINGS )
+ .setProperty("indexNodeName",true)
+ .child("allProps").setProperty(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_UNSTRUCTURED, Type.NAME);
+ allProps.setProperty("name", ".*");
+ allProps.setProperty("isRegexp", true);
+ allProps.setProperty("nodeScopeIndex", true);
+ allProps.setProperty("index",true);
+ allProps.setProperty("analyzed",true);
+ allProps = rules.child("archiva:facet")
+ .child("properties").setProperty( JcrConstants.JCR_PRIMARYTYPE,
+ "nt:unstructured", Type.NAME)
+ .setProperty( ":childOrder", ImmutableSet.of("allProps"), Type.STRINGS )
+ .setProperty("indexNodeName",true)
+ .child("allProps").setProperty(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_UNSTRUCTURED, Type.NAME);
+ allProps.setProperty("name", ".*");
+ allProps.setProperty("isRegexp", true);
+ allProps.setProperty("nodeScopeIndex", true);
+ allProps.setProperty("index",true);
+ allProps.setProperty("analyzed",true);
+ allProps = rules.child("archiva:namespace")
+ .child("properties").setProperty( JcrConstants.JCR_PRIMARYTYPE,
+ "nt:unstructured", Type.NAME)
+ .setProperty( ":childOrder", ImmutableSet.of("allProps"), Type.STRINGS )
+ .setProperty("indexNodeName",true)
+ .child("allProps").setProperty(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_UNSTRUCTURED, Type.NAME);
+ allProps.setProperty("name", ".*");
+ allProps.setProperty("isRegexp", true);
+ allProps.setProperty("nodeScopeIndex", true);
+ allProps.setProperty("index",true);
+ allProps.setProperty("analyzed",true);
+ allProps = rules.child("archiva:project")
+ .child("properties").setProperty( JcrConstants.JCR_PRIMARYTYPE,
+ "nt:unstructured", Type.NAME)
+ .setProperty( ":childOrder", ImmutableSet.of("allProps"), Type.STRINGS )
+ .setProperty("indexNodeName",true)
+ .child("allProps").setProperty(JcrConstants.JCR_PRIMARYTYPE, JcrConstants.NT_UNSTRUCTURED, Type.NAME);
+ allProps.setProperty("name", ".*");
+ allProps.setProperty("isRegexp", true);
+ allProps.setProperty("nodeScopeIndex", true);
+ allProps.setProperty("index",true);
+ allProps.setProperty("analyzed",true);
+
+ log.info("Index: "+lucene+" myIndex "+lucene.getChildNode( "myIndex" ));
+ log.info("myIndex "+lucene.getChildNode( "myIndex" ).getProperties());
+ // IndexUtils.createIndexDefinition( )
+
+ }
+ } );
+
+ ExecutorService executorService = createExecutor();
+ StatisticsProvider statsProvider = StatisticsProvider.NOOP;
+ int queueSize = Integer.getInteger("queueSize", 10000);
+ File indexDir = Files.createTempDirectory( "archiva_index" ).toFile();
+ log.info("Queue Index "+indexDir.toString());
+ IndexCopier indexCopier = new IndexCopier( executorService, indexDir, true );
+ NRTIndexFactory nrtIndexFactory = new NRTIndexFactory( indexCopier, statsProvider);
+ MountInfoProvider mountInfoProvider = Mounts.defaultMountInfoProvider( );
+ IndexTracker tracker = new IndexTracker(new DefaultIndexReaderFactory( mountInfoProvider, indexCopier ), nrtIndexFactory);
+ DocumentQueue queue = new DocumentQueue(queueSize, tracker, executorService, statsProvider);
+ LocalIndexObserver localIndexObserver = new LocalIndexObserver( queue, statsProvider);
+ LuceneIndexProvider provider = new LuceneIndexProvider(tracker);
+
+ // ExternalObserverBuilder builder = new ExternalObserverBuilder(queue, tracker, statsProvider,
+// executorService, queueSize);
+// Observer observer = builder.build();
+// builder.getBackgroundObserver();
+
+ LuceneIndexEditorProvider editorProvider = new LuceneIndexEditorProvider(null,
+ tracker, new ExtractedTextCache(0, 0), null, mountInfoProvider);
+ editorProvider.setIndexingQueue(queue);
+
+
+ log.info("Oak: "+oak+" with nodeStore "+nodeStore);
+ Jcr jcr = new Jcr(oak).with( editorProvider ).with( (Observer) provider )
+ .with(localIndexObserver)
+ // .with(observer)
+ .with( ( QueryIndexProvider) provider )
+ .withAsyncIndexing("async",5 );
+ Repository r = jcr.createRepository();
+ try
+ {
+ Thread.currentThread().sleep(1000);
+ }
+ catch ( InterruptedException e )
+ {
+ e.printStackTrace( );
+ }
+ return r;
+
+
+ }
+
+ public String getStoreType( )
+ {
+ return storeType;
+ }
+
+ public void setStoreType( String storeType )
+ {
+ this.storeType = storeType;
+ }
+
+ public Path getRepositoryPath( )
+ {
+ return repositoryPath;
+ }
+
+ public void setRepositoryPath( Path repositoryPath )
+ {
+ this.repositoryPath = repositoryPath;
+ }
+
+ public void setRepositoryPath( String repositoryPath )
+ {
+ this.repositoryPath = Paths.get( repositoryPath );
+ if ( !Files.exists( this.repositoryPath ) )
+ {
+ try
+ {
+ Files.createDirectories( this.repositoryPath );
+ }
+ catch ( IOException e )
+ {
+ e.printStackTrace( );
+ }
+ }
+ }
+
+ private ExecutorService createExecutor() {
+ ThreadPoolExecutor executor = new ThreadPoolExecutor(0, 5, 60L, TimeUnit.SECONDS,
+ new LinkedBlockingQueue<Runnable>(), new ThreadFactory() {
+ private final AtomicInteger counter = new AtomicInteger();
+ private final Thread.UncaughtExceptionHandler handler = new Thread.UncaughtExceptionHandler() {
+ @Override
+ public void uncaughtException(Thread t, Throwable e) {
+ log.warn("Error occurred in asynchronous processing ", e);
+ }
+ };
+ @Override
+ public Thread newThread(@Nonnull Runnable r) {
+ Thread thread = new Thread(r, createName());
+ thread.setDaemon(true);
+ thread.setPriority(Thread.MIN_PRIORITY);
+ thread.setUncaughtExceptionHandler(handler);
+ return thread;
+ }
+
+ private String createName() {
+ return "oak-lucene-" + counter.getAndIncrement();
+ }
+ });
+ executor.setKeepAliveTime(1, TimeUnit.MINUTES);
+ executor.allowCoreThreadTimeOut(true);
+ return executor;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/archiva/blob/7d2cc26b/archiva-modules/plugins/metadata-store-jcr/src/main/resources/log4j2-test.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/main/resources/log4j2-test.xml b/archiva-modules/plugins/metadata-store-jcr/src/main/resources/log4j2-test.xml
new file mode 100644
index 0000000..74dd077
--- /dev/null
+++ b/archiva-modules/plugins/metadata-store-jcr/src/main/resources/log4j2-test.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ ~ 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.
+ -->
+
+
+<configuration status="debug">
+
+
+
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <!--PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/-->
+ <PatternLayout pattern="%highlight{%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n}" />
+ </Console>
+
+ </appenders>
+ <loggers>
+
+
+ <logger name="org.apache.jackrabbit" level="trace"/>
+
+ <root level="debug" includeLocation="true">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/archiva/blob/7d2cc26b/archiva-modules/plugins/metadata-store-jcr/src/test/filtered-resources/META-INF/spring-context.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/test/filtered-resources/META-INF/spring-context.xml b/archiva-modules/plugins/metadata-store-jcr/src/test/filtered-resources/META-INF/spring-context.xml
index 43f6d08..f98b79b 100644
--- a/archiva-modules/plugins/metadata-store-jcr/src/test/filtered-resources/META-INF/spring-context.xml
+++ b/archiva-modules/plugins/metadata-store-jcr/src/test/filtered-resources/META-INF/spring-context.xml
@@ -19,14 +19,14 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
+ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
- <bean id="repository" class="org.apache.jackrabbit.core.RepositoryImpl" destroy-method="shutdown">
- <constructor-arg ref="config"/>
+ <bean id="repositoryFactory" class="org.apache.archiva.metadata.repository.jcr.RepositoryFactory" >
+ <property name="storeType" value="oak-segment-tar" />
</bean>
- <bean id="config" class="org.apache.jackrabbit.core.config.RepositoryConfig" factory-method="create">
- <constructor-arg value="${basedir}/src/test/repository.xml"/>
- <constructor-arg value="${project.build.directory}/jcr"/>
+
+ <bean id="repository" class="org.apache.archiva.metadata.repository.jcr.RepositoryFactory" factory-method="createRepository"
+ factory-bean="repositoryFactory">
</bean>
</beans>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/archiva/blob/7d2cc26b/archiva-modules/plugins/metadata-store-jcr/src/test/resources/log4j2-test.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/metadata-store-jcr/src/test/resources/log4j2-test.xml b/archiva-modules/plugins/metadata-store-jcr/src/test/resources/log4j2-test.xml
new file mode 100644
index 0000000..74dd077
--- /dev/null
+++ b/archiva-modules/plugins/metadata-store-jcr/src/test/resources/log4j2-test.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ ~ 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.
+ -->
+
+
+<configuration status="debug">
+
+
+
+ <appenders>
+ <Console name="console" target="SYSTEM_OUT">
+ <!--PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/-->
+ <PatternLayout pattern="%highlight{%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n}" />
+ </Console>
+
+ </appenders>
+ <loggers>
+
+
+ <logger name="org.apache.jackrabbit" level="trace"/>
+
+ <root level="debug" includeLocation="true">
+ <appender-ref ref="console"/>
+ </root>
+ </loggers>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/archiva/blob/7d2cc26b/archiva-modules/plugins/repository-statistics/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/plugins/repository-statistics/pom.xml b/archiva-modules/plugins/repository-statistics/pom.xml
index 2d20aca..ccbdbfc 100644
--- a/archiva-modules/plugins/repository-statistics/pom.xml
+++ b/archiva-modules/plugins/repository-statistics/pom.xml
@@ -45,10 +45,6 @@
<artifactId>jcr</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-commons</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-test-utils</artifactId>
<version>${project.version}</version>
@@ -60,17 +56,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<scope>test</scope>
@@ -96,7 +81,6 @@
<Import-Package>
javax.jcr,
javax.jcr.query,
- org.apache.jackrabbit.commons;version="[2.3,3)",
org.apache.archiva.metadata.model;version=${project.version},
org.apache.archiva.metadata.repository;version=${project.version},
org.apache.archiva.metadata.repository.storage.maven2;version=${project.version},
http://git-wip-us.apache.org/repos/asf/archiva/blob/7d2cc26b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8e12a4c..f335da7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,7 +51,7 @@
<commons-codec.version>1.6</commons-codec.version>
<commons-collections.version>3.2.1</commons-collections.version>
<commons-fileupload.version>1.2.2</commons-fileupload.version>
- <commons-io.version>2.4</commons-io.version>
+ <commons-io.version>2.5</commons-io.version>
<commons-lang.version>2.6</commons-lang.version>
<maven3x.version>3.0.5</maven3x.version>
@@ -59,7 +59,8 @@
<aether.version>1.13.1</aether.version>
<maven-model-converter.version>2.1</maven-model-converter.version>
- <maven.indexer.version>5.1.1</maven.indexer.version>
+ <!-- TODO: Before Release 3.0 check, if stable version will be released -->
+ <maven.indexer.version>6.0-SNAPSHOT</maven.indexer.version>
<wagon.version>2.9</wagon.version>
<redback.version>3.0.0-SNAPSHOT</redback.version>
<redback.cache.version>2.2</redback.cache.version>
@@ -75,7 +76,7 @@
<javax.jcr.version>2.0</javax.jcr.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
- <lucene.version>3.6.2</lucene.version>
+ <lucene.version>4.10.4</lucene.version>
<jackrabbit.version>2.14.1</jackrabbit.version>
<cxf.version>3.0.3</cxf.version>
@@ -127,17 +128,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-webdav</artifactId>
- <version>${jackrabbit.version}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>2.11.0</version>
@@ -1317,16 +1307,7 @@
<artifactId>jcr</artifactId>
<version>${javax.jcr.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-jcr-commons</artifactId>
- <version>${jackrabbit.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-core</artifactId>
- <version>${jackrabbit.version}</version>
- </dependency>
+
<!-- Transitive versions to manage -->
<dependency>
@@ -1623,7 +1604,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>@{jacocoproperty}</argLine>
+ <argLine></argLine>
<redirectTestOutputToFile>${surefire.redirectTestOutputToFile}</redirectTestOutputToFile>
<runOrder>alphabetical</runOrder>
<systemPropertyVariables>
[03/13] archiva git commit: [MRM-1952] add jetty snapshot repositories
Posted by ol...@apache.org.
[MRM-1952] add jetty snapshot repositories
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/01431332
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/01431332
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/01431332
Branch: refs/heads/feature/jcr_oak
Commit: 014313320f16943a5be10248b101e01090b1d25e
Parents: c8fd32b
Author: olivier lamy <ol...@apache.org>
Authored: Sat Jun 17 09:20:02 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Sat Jun 17 09:20:02 2017 +1000
----------------------------------------------------------------------
pom.xml | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/01431332/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ae60174..7fc5386 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1901,6 +1901,17 @@
<enabled>true</enabled>
</snapshots>
</repository>
+ <repository>
+ <id>jetty.snapshots</id>
+ <name>Jetty Snapshots</name>
+ <url>https://oss.sonatype.org/content/repositories/jetty-snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
<pluginRepositories>
<pluginRepository>
@@ -1914,5 +1925,16 @@
<enabled>true</enabled>
</snapshots>
</pluginRepository>
+ <pluginRepository>
+ <id>jetty.snapshots</id>
+ <name>Jetty Snapshots</name>
+ <url>https://oss.sonatype.org/content/repositories/jetty-snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
</pluginRepositories>
</project>
[12/13] archiva git commit: indexer is not using plexus bridge anymore
Posted by ol...@apache.org.
indexer is not using plexus bridge anymore
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/f0ba11a2
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/f0ba11a2
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/f0ba11a2
Branch: refs/heads/feature/jcr_oak
Commit: f0ba11a2f8f3505dc5550d213c63270b25e29d94
Parents: 96843bd
Author: olivier lamy <ol...@apache.org>
Authored: Sat Jun 24 08:42:26 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Sat Jun 24 09:05:49 2017 +1000
----------------------------------------------------------------------
.../archiva-repository-admin-default/pom.xml | 20 ++++++++++++++--
.../managed/DefaultManagedRepositoryAdmin.java | 24 +++++++++++---------
.../main/resources/META-INF/spring-context.xml | 2 +-
pom.xml | 5 ++++
4 files changed, 37 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/f0ba11a2/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
index 06fe2e4..4b164e7 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
@@ -38,6 +38,24 @@
<artifactId>archiva-security-common</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.maven.indexer</groupId>
+ <artifactId>indexer-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-guava</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.sonatype.sisu</groupId>
+ <artifactId>sisu-guice</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-common</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.archiva</groupId>
<artifactId>archiva-scheduler-repository-api</artifactId>
</dependency>
@@ -109,7 +127,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
- <version>${spring.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -120,7 +137,6 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
http://git-wip-us.apache.org/repos/asf/archiva/blob/f0ba11a2/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
index f398bca..7d23575 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/managed/DefaultManagedRepositoryAdmin.java
@@ -109,23 +109,25 @@ public class DefaultManagedRepositoryAdmin
private Cache<String, Collection<String>> namespacesCache;
// fields
- List<? extends IndexCreator> indexCreators;
+ @Inject
+ private List<? extends IndexCreator> indexCreators;
- NexusIndexer indexer;
+ @Inject
+ private NexusIndexer indexer;
@PostConstruct
public void initialize()
throws RepositoryAdminException, RoleManagerException
{
- try
- {
- indexCreators = mavenIndexerUtils.getAllIndexCreators();
- indexer = plexusSisuBridge.lookup( NexusIndexer.class );
- }
- catch ( PlexusSisuBridgeException e )
- {
- throw new RepositoryAdminException( e.getMessage(), e );
- }
+// try
+// {
+// indexCreators = mavenIndexerUtils.getAllIndexCreators();
+// indexer = plexusSisuBridge.lookup( NexusIndexer.class );
+// }
+// catch ( PlexusSisuBridgeException e )
+// {
+// throw new RepositoryAdminException( e.getMessage(), e );
+// }
// initialize index context on start and check roles here
for ( ManagedRepository managedRepository : getManagedRepositories() )
{
http://git-wip-us.apache.org/repos/asf/archiva/blob/f0ba11a2/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/resources/META-INF/spring-context.xml
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/resources/META-INF/spring-context.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/resources/META-INF/spring-context.xml
index aa4743c..04e14fb 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/resources/META-INF/spring-context.xml
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/resources/META-INF/spring-context.xml
@@ -29,7 +29,7 @@
<context:annotation-config />
<context:component-scan
- base-package="org.apache.archiva.admin.repository"/>
+ base-package="org.apache.archiva.admin.repository,org.apache.maven.index"/>
<alias name="redbackRuntimeConfigurationAdmin#default" alias="userConfiguration#archiva"/>
http://git-wip-us.apache.org/repos/asf/archiva/blob/f0ba11a2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f335da7..bbaf7f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -320,6 +320,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.archetype</groupId>
+ <artifactId>archetype-common</artifactId>
+ <version>3.0.1</version>
+ </dependency>
<dependency>
<groupId>org.apache.archiva</groupId>
[05/13] archiva git commit: add save fingers jetty scripts
Posted by ol...@apache.org.
add save fingers jetty scripts
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/c6d882df
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/c6d882df
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/c6d882df
Branch: refs/heads/feature/jcr_oak
Commit: c6d882dfdc373010380f6aff3c36cc6404b2e942
Parents: 41f6912
Author: olivier lamy <ol...@apache.org>
Authored: Sat Jun 17 09:36:51 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Sat Jun 17 09:36:51 2017 +1000
----------------------------------------------------------------------
jetty-debug.sh | 1 +
jetty.sh | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/c6d882df/jetty-debug.sh
----------------------------------------------------------------------
diff --git a/jetty-debug.sh b/jetty-debug.sh
new file mode 100644
index 0000000..62c3af4
--- /dev/null
+++ b/jetty-debug.sh
@@ -0,0 +1 @@
+mvnDebug jetty:run -pl :archiva-webapp -am
http://git-wip-us.apache.org/repos/asf/archiva/blob/c6d882df/jetty.sh
----------------------------------------------------------------------
diff --git a/jetty.sh b/jetty.sh
new file mode 100644
index 0000000..9bad796
--- /dev/null
+++ b/jetty.sh
@@ -0,0 +1 @@
+mvn jetty:run -pl :archiva-webapp -am
[04/13] archiva git commit: get rid of tomcat plugin
Posted by ol...@apache.org.
get rid of tomcat plugin
Signed-off-by: olivier lamy <ol...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/41f69128
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/41f69128
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/41f69128
Branch: refs/heads/feature/jcr_oak
Commit: 41f6912814506bf2f44f900023af498bd8fa0ae7
Parents: 0143133
Author: olivier lamy <ol...@apache.org>
Authored: Sat Jun 17 09:36:31 2017 +1000
Committer: olivier lamy <ol...@apache.org>
Committed: Sat Jun 17 09:36:31 2017 +1000
----------------------------------------------------------------------
README.md | 4 +-
.../archiva-web/archiva-webapp/pom.xml | 3 -
pom.xml | 115 -------------------
t7-debug.sh | 2 -
t7.sh | 2 -
5 files changed, 2 insertions(+), 124 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/41f69128/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 6343e38..e7ac245 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ Running from Source Code
========================
As webapp js is in dev and won't probably be released soon, the module is not activated by default and it's included only in a profile
-mvn tomcat7:run -pl :archiva-webapp -am (to save fingers :-) use sh ./t7.sh ) (debug with sh ./t7-debug.sh port 8000)
+mvn jetty:run -pl :archiva-webapp -am (to save fingers :-) use sh ./jetty.sh ) (debug with sh ./jetty-debug.sh debug port 8000)
hit your browser: http://localhost:9091/archiva/index.html
@@ -49,7 +49,7 @@ This file must contains:
Using with cassandra as metadata storage
========================
You can run the application using cassandra as storage.
-sh ./t7.sh -Pcassandra
+sh ./jetty.sh -Pcassandra
Default cassandra host is localhost and port 9160
http://git-wip-us.apache.org/repos/asf/archiva/blob/41f69128/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 1b203dd..1d3c53e 100644
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -30,7 +30,6 @@
<name>Archiva Web :: Javascript Application</name>
<properties>
- <tomcatContextXml>${basedir}/src/test/tomcat/tomcat-context-archiva.xml</tomcatContextXml>
<archiva.devMode>true</archiva.devMode>
<archiva.javascriptLog>true</archiva.javascriptLog>
<archiva.logMissingI18n>true</archiva.logMissingI18n>
@@ -38,7 +37,6 @@
<jettyDumpOnStart>false</jettyDumpOnStart>
<archiva.baseRestUrl />
<rest.admin.pwd />
- <test.useTomcat>false</test.useTomcat>
<archiva.groupIndexTtl>30</archiva.groupIndexTtl>
<archiva.repositorySessionFactory.id>jcr</archiva.repositorySessionFactory.id>
<cassandra.host>localhost</cassandra.host>
@@ -1079,7 +1077,6 @@
<derby.system.home>${project.build.directory}/appserver-base</derby.system.home>
<archiva.baseRestUrl>${archiva.baseRestUrl}</archiva.baseRestUrl>
<rest.admin.pwd>${rest.admin.pwd}</rest.admin.pwd>
- <test.useTomcat>${test.useTomcat}</test.useTomcat>
<redback.jdbc.url>${redbackTestJdbcUrl}</redback.jdbc.url>
<redback.jdbc.driver.name>${redbackTestJdbcDriver}</redback.jdbc.driver.name>
</systemPropertyVariables>
http://git-wip-us.apache.org/repos/asf/archiva/blob/41f69128/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7fc5386..b78f61e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -95,7 +95,6 @@
<plexus-digest.version>1.1</plexus-digest.version>
<plexus-expression-evaluator.version>2.1</plexus-expression-evaluator.version>
<plexus-utils.version>3.0.15</plexus-utils.version>
- <asfTomcatMavenPluginVersion>2.2</asfTomcatMavenPluginVersion>
<tomcat7Version>7.0.54</tomcat7Version>
<htmlUnitVersion>2.27</htmlUnitVersion>
@@ -1583,115 +1582,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-core</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-util</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-coyote</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-api</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jdbc</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-dbcp</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-servlet-api</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jsp-api</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jasper</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-jasper-el</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-el-api</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-tribes</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-catalina-ha</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-annotations-api</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat</groupId>
- <artifactId>tomcat-juli</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-juli</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tomcat.embed</groupId>
- <artifactId>tomcat-embed-logging-log4j</artifactId>
- <version>${tomcat7Version}</version>
- </dependency>
- </dependencies>
- </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -1747,11 +1637,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.tomcat.maven</groupId>
- <artifactId>tomcat7-maven-plugin</artifactId>
- <version>${asfTomcatMavenPluginVersion}</version>
- </plugin>
- <plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jettyVersion}</version>
http://git-wip-us.apache.org/repos/asf/archiva/blob/41f69128/t7-debug.sh
----------------------------------------------------------------------
diff --git a/t7-debug.sh b/t7-debug.sh
deleted file mode 100644
index 40e3972..0000000
--- a/t7-debug.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-set -x
-mvnDebug tomcat7:run -pl :archiva-webapp -am $@
http://git-wip-us.apache.org/repos/asf/archiva/blob/41f69128/t7.sh
----------------------------------------------------------------------
diff --git a/t7.sh b/t7.sh
deleted file mode 100644
index de6224b..0000000
--- a/t7.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-set -x
-mvn tomcat7:run -pl :archiva-webapp -am $@