diff options
| author | Brett Porter <brett@apache.org> | 2014-07-30 13:33:12 +1000 |
|---|---|---|
| committer | Brett Porter <brett@apache.org> | 2014-07-30 13:33:12 +1000 |
| commit | 30db1698eac8e866870c8d0e179477c802d2c471 (patch) | |
| tree | 7b147af113bd9da1cc27d144dcd6aaf533b4d6ad | |
| parent | c1e27fbd05c81b92b2ed78cc2792d8359f9b362c (diff) | |
| download | archiva-30db1698eac8e866870c8d0e179477c802d2c471.tar.gz archiva-30db1698eac8e866870c8d0e179477c802d2c471.zip | |
ensure spring context is added to archetype
| -rw-r--r-- | archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml | 3 | ||||
| -rw-r--r-- | archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/spring-context.xml (renamed from archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/resources/spring-context.xml) | 0 | ||||
| -rw-r--r-- | archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml index f31f85663..10c82acb7 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -26,6 +26,9 @@ <fileSet filtered="true" packaged="true"> <directory>src/main/java</directory> </fileSet> + <fileSet filtered="true" packaged="false"> + <directory>src/main/resources</directory> + </fileSet> <fileSet filtered="true" packaged="true"> <directory>src/test/java</directory> </fileSet> diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/spring-context.xml index 0a7c14036..0a7c14036 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/resources/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/spring-context.xml diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml index 785adeea4..cacaeeabd 100644 --- a/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml +++ b/archiva-modules/archiva-base/archiva-consumers/archiva-consumer-archetype/src/main/resources/archetype-resources/src/test/resources/spring-context.xml @@ -26,8 +26,6 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd" 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"> <constructor-arg value="${appserver.base}/conf/foo.xml"/> |