You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by ge...@apache.org on 2008/09/23 20:44:37 UTC
svn commit: r698278 - in /servicemix/smx4/features/trunk: ./
camel/camel-features/ camel/camel-features/src/
camel/camel-features/src/main/ camel/camel-features/src/main/resources/
Author: gertv
Date: Tue Sep 23 11:44:37 2008
New Revision: 698278
URL: http://svn.apache.org/viewvc?rev=698278&view=rev
Log:
SMX4-49: Camel features generation now uses replacement file and base kernel release
Added:
servicemix/smx4/features/trunk/camel/camel-features/src/
servicemix/smx4/features/trunk/camel/camel-features/src/main/
servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/
servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/replacements.properties
Modified:
servicemix/smx4/features/trunk/camel/camel-features/pom.xml
servicemix/smx4/features/trunk/pom.xml
Modified: servicemix/smx4/features/trunk/camel/camel-features/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/camel-features/pom.xml?rev=698278&r1=698277&r2=698278&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/camel/camel-features/pom.xml (original)
+++ servicemix/smx4/features/trunk/camel/camel-features/pom.xml Tue Sep 23 11:44:37 2008
@@ -34,22 +34,38 @@
<name>Apache ServiceMix Camel Features</name>
<build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>features-maven-plugin</artifactId>
<version>${features.maven.plugin.version}</version>
<executions>
<execution>
- <phase>generate-resources</phase>
+ <phase>compile</phase>
<goals>
<goal>generate-features-file</goal>
</goals>
<configuration>
- <includeProject>false</includeProject>
- <includeDependencies>true</includeDependencies>
- <attachmentArtifactType>xml</attachmentArtifactType>
- <attachmentArtifactClassifier>features</attachmentArtifactClassifier>
+ <kernelVersion>${servicemix.kernel.version}</kernelVersion>
+ <translation>target/classes/replacements.properties</translation>
</configuration>
</execution>
</executions>
@@ -58,86 +74,6 @@
</build>
<dependencies>
- <!-- these bundles are always provided at runtime and will not be added to the generated features.xml -->
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>${commons.logging.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>${commons.pool.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- <version>1.3</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-core</artifactId>
- <version>${spring.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-beans</artifactId>
- <version>${spring.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-tx</artifactId>
- <version>${spring.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-io</artifactId>
- <version>${spring.osgi.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-core</artifactId>
- <version>${spring.osgi.version}</version>
- <scope>provided</scope>
- </dependency>
-
<!-- these will be added to the generated features.xml -->
<dependency>
<groupId>org.apache.camel</groupId>
Added: servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/replacements.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/replacements.properties?rev=698278&view=auto
==============================================================================
--- servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/replacements.properties (added)
+++ servicemix/smx4/features/trunk/camel/camel-features/src/main/resources/replacements.properties Tue Sep 23 11:44:37 2008
@@ -0,0 +1,35 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+
+#specs
+javax.xml.bind/jaxb-api/2.1=org.apache.servicemix.specs/org.apache.servicemix.specs.jaxb-api-2.1/${servicemix.specs.version}
+javax.xml.stream/stax-api/[1.0,2.0)=org.apache.servicemix.specs/org.apache.servicemix.specs.stax-api-1.0/${servicemix.specs.version}
+javax.activation/activation/1.1=org.apache.geronimo.specs/geronimo-activation_1.1_spec/${geronimo.activation.version}
+
+#replace non-osgi versions of the geronimo specs
+!org.apache.geronimo.specs/geronimo-activation_1.0.2_spec/(,1.1]=org.apache.geronimo.specs/geronimo-activation_1.0.2_spec/${geronimo.activation.version}
+org.apache.geronimo.specs/geronimo-jms_1.1_spec/(,1.1]=org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms.version}
+
+#bundles
+junit/junit/[3.8,4.0)=org.apache.servicemix.bundles/org.apache.servicemix.bundles.junit/${junit.version}_1
+
+#commons
+commons-logging/commons-logging/[1.0,)=org.ops4j.pax.logging/pax-logging-service/1.1.1
+commons-logging/commons-logging-api/[1.0,)=org.ops4j.pax.logging/pax-logging-api/1.1.1
+commons-pool/commons-pool/(,1.3]=commons-pool/commons-pool/1.4
Modified: servicemix/smx4/features/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/pom.xml?rev=698278&r1=698277&r2=698278&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/pom.xml (original)
+++ servicemix/smx4/features/trunk/pom.xml Tue Sep 23 11:44:37 2008
@@ -75,6 +75,7 @@
<camel.version>1.4.0</camel.version>
<commons.httpclient.version>3.1_1</commons.httpclient.version>
<commons-io.version>1.3.2_1</commons-io.version>
+ <commons-codec.version>1.2_1-SNAPSHOT</commons-codec.version>
<commons-jxpath.version>1.2_1-SNAPSHOT</commons-jxpath.version>
<commons.logging.version>1.1</commons.logging.version>
<commons.net.version>1.4.1_1</commons.net.version>