Author: olamy
Date: Wed Oct 5 14:49:22 2011
New Revision: 1179245
URL: http://svn.apache.org/viewvc?rev=1179245&view=rev
Log:
[MRM-1327] implement alternative or improve repository metadata storage: if no
repository.xml found in ${appserver.base}/conf/repository.xml revert to the
default found in resources.
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaJcrRepositoryConfig.java
(with props)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/repository.xml
(contents, props changed)
- copied, changed from r1179244,
archiva/trunk/archiva-jetty/src/main/conf/repository.xml
Removed:
archiva/trunk/archiva-jetty/src/main/conf/repository.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/appserver-base/conf/repository.xml
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=1179245&r1=1179244&r2=1179245&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Wed Oct 5
14:49:22 2011
@@ -465,7 +465,6 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
- <scope>runtime</scope>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaJcrRepositoryConfig.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaJcrRepositoryConfig.java?rev=1179245&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaJcrRepositoryConfig.java
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaJcrRepositoryConfig.java
Wed Oct 5 14:49:22 2011
@@ -0,0 +1,55 @@
+package org.apache.archiva.web.startup;
+/*
+ * 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
+ */
+public class ArchivaJcrRepositoryConfig
+{
+ 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/repository.xml";
+ LoggerFactory.getLogger( ArchivaJcrRepositoryConfig.class ).info(
+ "now 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 );
+ }
+}
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaJcrRepositoryConfig.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/archiva/web/startup/ArchivaJcrRepositoryConfig.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml?rev=1179245&r1=1179244&r2=1179245&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/META-INF/spring-context.xml
Wed Oct 5 14:49:22 2011
@@ -38,7 +38,7 @@
<bean id="jcr-repository" class="org.apache.jackrabbit.core.RepositoryImpl"
destroy-method="shutdown" lazy-init="true">
<constructor-arg ref="jcr-config"/>
</bean>
- <bean id="jcr-config"
class="org.apache.jackrabbit.core.config.RepositoryConfig"
factory-method="create">
+ <bean id="jcr-config"
class="org.apache.archiva.web.startup.ArchivaJcrRepositoryConfig"
factory-method="create">
<constructor-arg value="${appserver.base}/conf/repository.xml"/>
<constructor-arg value="${appserver.base}/jcr"/>
</bean>
Copied:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/repository.xml
(from r1179244, archiva/trunk/archiva-jetty/src/main/conf/repository.xml)
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/repository.xml?p2=archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/repository.xml&p1=archiva/trunk/archiva-jetty/src/main/conf/repository.xml&r1=1179244&r2=1179245&rev=1179245&view=diff
==============================================================================
(empty)
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/repository.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/main/resources/org/apache/archiva/repository.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
