Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ensure spring context is added to archetype

This commit is contained in:
Brett Porter 2014-07-30 13:33:12 +10:00
parent c1e27fbd05
commit 30db1698ea
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
View File

@ -26,6 +26,9 @@
<fileSet filtered="true" packaged="true"> <fileSet filtered="true" packaged="true">
<directory>src/main/java</directory> <directory>src/main/java</directory>
</fileSet> </fileSet>
<fileSet filtered="true" packaged="false">
<directory>src/main/resources</directory>
</fileSet>
<fileSet filtered="true" packaged="true"> <fileSet filtered="true" packaged="true">
<directory>src/test/java</directory> <directory>src/test/java</directory>
</fileSet> </fileSet>

0
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/resources/spring-context.xml → archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/spring-context.xml
View File

2
archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml
View File

@ -26,8 +26,6 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.0.xsd" http://www.springframework.org/schema/context/spring-context-3.0.xsd"
default-lazy-init="true"> default-lazy-init="true">
<context:annotation-config/>
<context:component-scan base-package="$package"/>
<bean id="jcr-config" class="org.apache.archiva.metadata.repository.jcr.ArchivaJcrRepositoryConfig" factory-method="create"> <bean id="jcr-config" class="org.apache.archiva.metadata.repository.jcr.ArchivaJcrRepositoryConfig" factory-method="create">
<constructor-arg value="${appserver.base}/conf/foo.xml"/> <constructor-arg value="${appserver.base}/conf/foo.xml"/>