You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/12/22 20:48:16 UTC
svn commit: r1425336 - in
/karaf/eik/trunk/archetypes/eik-camel-archetype/src/main/resources:
META-INF/maven/ archetype-resources/ archetype-resources/META-INF/spring/
archetype-resources/src/main/resources/META-INF/spring/
Author: jbonofre
Date: Sat Dec 22 19:48:15 2012
New Revision: 1425336
URL: http://svn.apache.org/viewvc?rev=1425336&view=rev
Log:
Fix EIK archetype
Added:
karaf/eik/trunk/archetypes/eik-camel-archetype/src/main/resources/archetype-resources/META-INF/spring/
karaf/eik/trunk/archetypes/eik-camel-archetype/src/main/resources/archetype-resources/META-INF/spring/beans.xml
- copied, changed from r1424900, karaf/eik/trunk/archetypes/eik-camel-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/beans.xml
Removed:
karaf/eik/trunk/archetypes/eik-camel-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/beans.xml
Modified:
karaf/eik/trunk/archetypes/eik-camel-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
karaf/eik/trunk/archetypes/eik-camel-archetype/src/main/resources/archetype-resources/pom.xml
Modified: karaf/eik/trunk/archetypes/eik-camel-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/archetypes/eik-camel-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml?rev=1425336&r1=1425335&r2=1425336&view=diff
==============================================================================
--- karaf/eik/trunk/archetypes/eik-camel-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml (original)
+++ karaf/eik/trunk/archetypes/eik-camel-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml Sat Dec 22 19:48:15 2012
@@ -35,22 +35,17 @@
<include>**/*.java</include>
</includes>
</fileSet>
- <fileSet filtered="true" encoding="UTF-8">
- <directory>src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </fileSet>
<fileSet filtered="true" packaged="true" encoding="UTF-8">
<directory>src/test/java</directory>
<includes>
<include>**/*.java</include>
</includes>
</fileSet>
- <fileSet encoding="UTF-8">
+ <fileSet filtered="true" encoding="UTF-8">
<directory>META-INF</directory>
<includes>
<include>**/*.MF</include>
+ <include>**/spring/*.xml</include>
</includes>
</fileSet>
<fileSet encoding="UTF-8">
Copied: karaf/eik/trunk/archetypes/eik-camel-archetype/src/main/resources/archetype-resources/META-INF/spring/beans.xml (from r1424900, karaf/eik/trunk/archetypes/eik-camel-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/beans.xml)
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/archetypes/eik-camel-archetype/src/main/resources/archetype-resources/META-INF/spring/beans.xml?p2=karaf/eik/trunk/archetypes/eik-camel-archetype/src/main/resources/archetype-resources/META-INF/spring/beans.xml&p1=karaf/eik/trunk/archetypes/eik-camel-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/beans.xml&r1=1424900&r2=1425336&rev=1425336&view=diff
==============================================================================
--- karaf/eik/trunk/archetypes/eik-camel-archetype/src/main/resources/archetype-resources/src/main/resources/META-INF/spring/beans.xml (original)
+++ karaf/eik/trunk/archetypes/eik-camel-archetype/src/main/resources/archetype-resources/META-INF/spring/beans.xml Sat Dec 22 19:48:15 2012
@@ -5,10 +5,10 @@
xmlns:camel="http://camel.apache.org/schema/spring"
xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
- http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
- http://www.springframework.org/schema/osgi-compendium http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd">
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ http://www.springframework.org/schema/osgi-compendium http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd">
<camel:camelContext xmlns="http://camel.apache.org/schema/spring">
<!-- install the Java DSL route builder -->
@@ -29,6 +29,6 @@
<prop key="prefix">MyTransform</prop>
</osgix:cm-properties>
- <ctx:property-placeholder properties-ref="preProps" />
+ <ctx:property-placeholder properties-ref="preProps"/>
</beans>
\ No newline at end of file
Modified: karaf/eik/trunk/archetypes/eik-camel-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/karaf/eik/trunk/archetypes/eik-camel-archetype/src/main/resources/archetype-resources/pom.xml?rev=1425336&r1=1425335&r2=1425336&view=diff
==============================================================================
--- karaf/eik/trunk/archetypes/eik-camel-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ karaf/eik/trunk/archetypes/eik-camel-archetype/src/main/resources/archetype-resources/pom.xml Sat Dec 22 19:48:15 2012
@@ -25,6 +25,12 @@
</dependencies>
<build>
+ <resources>
+ <resource>
+ <targetPath>META-INF/spring</targetPath>
+ <directory>META-INF/spring</directory>
+ </resource>
+ </resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>