You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@servicemix.apache.org by "Nolan, Edell" <Ed...@iona.com> on 2008/07/10 13:36:47 UTC
RE: svn commit: r675496 - in /servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly: kit_camel_example_pom.xml src.xml
Hi Freeman,
Did you also apply these changes to 3.3 trunk as that is where the smx4
kits will pick these changes up ?
Edell.
-----Original Message-----
From: ffang@apache.org [mailto:ffang@apache.org]
Sent: 10 July 2008 11:16
To: commits@servicemix.apache.org
Subject: svn commit: r675496 - in
/servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly
: kit_camel_example_pom.xml src.xml
Author: ffang
Date: Thu Jul 10 03:15:28 2008
New Revision: 675496
URL: http://svn.apache.org/viewvc?rev=675496&view=rev
Log:
[SM-1452]remove camel-itests from camel example in kit
Added:
servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/
kit_camel_example_pom.xml (with props)
Modified:
servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/
src.xml
Added:
servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/
kit_camel_example_pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/sam
ples/camel/src/main/assembly/kit_camel_example_pom.xml?rev=675496&view=a
uto
========================================================================
======
---
servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/
kit_camel_example_pom.xml (added)
+++
servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/
kit_camel_example_pom.xml Thu Jul 10 03:15:28 2008
@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
+
+<!--
+
+ 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.
+-->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>samples</artifactId>
+ <version>3.2.2-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.samples</groupId>
+ <artifactId>camel</artifactId>
+ <name>ServiceMix :: Samples :: Camel</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>camel-simple-su</module>
+ <module>camel-sa</module>
+ </modules>
+
+ <!-- Add ServiceMix repositories for snaphots and releases -->
+ <pluginRepositories>
+ <pluginRepository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshots Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ <pluginRepository>
+ <id>apache.incubating</id>
+ <name>Apache Incubating Repository</name>
+
<url>http://people.apache.org/repo/m2-incubating-repository</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+ <repositories>
+ <repository>
+ <id>apache.snapshots</id>
+ <name>Apache Snapshots Repository</name>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ <repository>
+ <id>apache.incubating</id>
+ <name>Apache Incubating Repository</name>
+
<url>http://people.apache.org/repo/m2-incubating-repository</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-camel</artifactId>
+ <version>3.2.2-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-core</artifactId>
+ <version>3.2.2-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.1</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <id>src</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>jbi-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
Propchange:
servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/
kit_camel_example_pom.xml
------------------------------------------------------------------------
------
svn:eol-style = native
Propchange:
servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/
kit_camel_example_pom.xml
------------------------------------------------------------------------
------
svn:keywords = Rev Date
Propchange:
servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/
kit_camel_example_pom.xml
------------------------------------------------------------------------
------
svn:mime-type = text/xml
Modified:
servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/
src.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/sam
ples/camel/src/main/assembly/src.xml?rev=675496&r1=675495&r2=675496&view
=diff
========================================================================
======
---
servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/
src.xml (original)
+++
servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/
src.xml Thu Jul 10 03:15:28 2008
@@ -29,16 +29,27 @@
<include>README*</include>
<include>LICENSE*</include>
<include>NOTICE*</include>
- <include>pom.xml</include>
<include>*.html</include>
<include>*/pom.xml</include>
- <include>camel-sa/*</include>
- <include>camel-simple-su/*</include>
- <include>camel-sa-itest/*</include>
+ <include>camel-sa/**/*</include>
+ <include>camel-simple-su/**/*</include>
+ <include>src/**/*</include>
</includes>
- <excludes>
+ <excludes>
+ <exclude>camel-sa-itest/*</exclude>
<exclude>*/target/**</exclude>
+ <exclude>*/.classpath</exclude>
+ <exclude>*/.project</exclude>
+ <exclude>.settings/*</exclude>
</excludes>
</fileSet>
</fileSets>
+ <files>
+ <file>
+
<source>${basedir}/src/main/assembly/kit_camel_example_pom.xml</source>
+ <outputDirectory>./</outputDirectory>
+ <destName>pom.xml</destName>
+ <fileMode>0777</fileMode>
+ </file>
+ </files>
</assembly>
----------------------------
IONA Technologies PLC (registered in Ireland)
Registered Number: 171387
Registered Address: The IONA Building, Shelbourne Road, Dublin 4, Ireland
Re: svn commit: r675496 - in /servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly: kit_camel_example_pom.xml src.xml
Posted by Edell Nolan <ed...@gmail.com>.
Sorry Ignore it - I just got your commit now.
On Thu, Jul 10, 2008 at 12:36 PM, Nolan, Edell <Ed...@iona.com> wrote:
>
> Hi Freeman,
>
> Did you also apply these changes to 3.3 trunk as that is where the smx4
> kits will pick these changes up ?
>
> Edell.
>
> -----Original Message-----
> From: ffang@apache.org [mailto:ffang@apache.org]
> Sent: 10 July 2008 11:16
> To: commits@servicemix.apache.org
> Subject: svn commit: r675496 - in
> /servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly
> : kit_camel_example_pom.xml src.xml
>
> Author: ffang
> Date: Thu Jul 10 03:15:28 2008
> New Revision: 675496
>
> URL: http://svn.apache.org/viewvc?rev=675496&view=rev
> Log:
> [SM-1452]remove camel-itests from camel example in kit
>
> Added:
>
> servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/
> kit_camel_example_pom.xml (with props)
> Modified:
>
> servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/
> src.xml
>
> Added:
> servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/
> kit_camel_example_pom.xml
> URL:
> http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/sam
> ples/camel/src/main/assembly/kit_camel_example_pom.xml?rev=675496&view=a<http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/kit_camel_example_pom.xml?rev=675496&view=a>
> uto
> ========================================================================
> ======
> ---
> servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/
> kit_camel_example_pom.xml (added)
> +++
> servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/
> kit_camel_example_pom.xml Thu Jul 10 03:15:28 2008
> @@ -0,0 +1,136 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<project xmlns="http://maven.apache.org/POM/4.0.0"
> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
> http://maven.apache.org/maven-v4_0_0.xsd">
> +
> +<!--
> +
> + 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.
> +-->
> +
> + <modelVersion>4.0.0</modelVersion>
> +
> + <parent>
> + <groupId>org.apache.servicemix</groupId>
> + <artifactId>samples</artifactId>
> + <version>3.2.2-SNAPSHOT</version>
> + </parent>
> +
> + <groupId>org.apache.servicemix.samples</groupId>
> + <artifactId>camel</artifactId>
> + <name>ServiceMix :: Samples :: Camel</name>
> + <packaging>pom</packaging>
> +
> + <modules>
> + <module>camel-simple-su</module>
> + <module>camel-sa</module>
> + </modules>
> +
> + <!-- Add ServiceMix repositories for snaphots and releases -->
> + <pluginRepositories>
> + <pluginRepository>
> + <id>apache.snapshots</id>
> + <name>Apache Snapshots Repository</name>
> + <url>http://people.apache.org/repo/m2-snapshot-repository</url>
> + <snapshots>
> + <enabled>true</enabled>
> + </snapshots>
> + <releases>
> + <enabled>false</enabled>
> + </releases>
> + </pluginRepository>
> + <pluginRepository>
> + <id>apache.incubating</id>
> + <name>Apache Incubating Repository</name>
> +
> <url>http://people.apache.org/repo/m2-incubating-repository</url>
> + <snapshots>
> + <enabled>false</enabled>
> + </snapshots>
> + <releases>
> + <enabled>true</enabled>
> + </releases>
> + </pluginRepository>
> + </pluginRepositories>
> + <repositories>
> + <repository>
> + <id>apache.snapshots</id>
> + <name>Apache Snapshots Repository</name>
> + <url>http://people.apache.org/repo/m2-snapshot-repository</url>
> + <snapshots>
> + <enabled>true</enabled>
> + </snapshots>
> + <releases>
> + <enabled>false</enabled>
> + </releases>
> + </repository>
> + <repository>
> + <id>apache.incubating</id>
> + <name>Apache Incubating Repository</name>
> +
> <url>http://people.apache.org/repo/m2-incubating-repository</url>
> + <snapshots>
> + <enabled>false</enabled>
> + </snapshots>
> + <releases>
> + <enabled>true</enabled>
> + </releases>
> + </repository>
> + </repositories>
> +
> + <dependencyManagement>
> + <dependencies>
> + <dependency>
> + <groupId>org.apache.servicemix</groupId>
> + <artifactId>servicemix-camel</artifactId>
> + <version>3.2.2-SNAPSHOT</version>
> + </dependency>
> +
> + <dependency>
> + <groupId>org.apache.servicemix</groupId>
> + <artifactId>servicemix-core</artifactId>
> + <version>3.2.2-SNAPSHOT</version>
> + </dependency>
> + </dependencies>
> + </dependencyManagement>
> +
> + <build>
> + <plugins>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-assembly-plugin</artifactId>
> + <version>2.1</version>
> + <inherited>false</inherited>
> + <executions>
> + <execution>
> + <id>src</id>
> + <phase>package</phase>
> + <goals>
> + <goal>single</goal>
> + </goals>
> + <configuration>
> + <descriptors>
> +
> <descriptor>src/main/assembly/src.xml</descriptor>
> + </descriptors>
> + </configuration>
> + </execution>
> + </executions>
> + </plugin>
> + <plugin>
> + <groupId>org.apache.servicemix.tooling</groupId>
> + <artifactId>jbi-maven-plugin</artifactId>
> + <extensions>true</extensions>
> + </plugin>
> + </plugins>
> + </build>
> +</project>
> +
>
> Propchange:
> servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/
> kit_camel_example_pom.xml
> ------------------------------------------------------------------------
> ------
> svn:eol-style = native
>
> Propchange:
> servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/
> kit_camel_example_pom.xml
> ------------------------------------------------------------------------
> ------
> svn:keywords = Rev Date
>
> Propchange:
> servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/
> kit_camel_example_pom.xml
> ------------------------------------------------------------------------
> ------
> svn:mime-type = text/xml
>
> Modified:
> servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/
> src.xml
> URL:
> http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/sam
> ples/camel/src/main/assembly/src.xml?rev=675496&r1=675495&r2=675496&view
> =diff<http://svn.apache.org/viewvc/servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/src.xml?rev=675496&r1=675495&r2=675496&view=diff>
> ========================================================================
> ======
> ---
> servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/
> src.xml (original)
> +++
> servicemix/smx3/branches/servicemix-3.2/samples/camel/src/main/assembly/
> src.xml Thu Jul 10 03:15:28 2008
> @@ -29,16 +29,27 @@
> <include>README*</include>
> <include>LICENSE*</include>
> <include>NOTICE*</include>
> - <include>pom.xml</include>
> <include>*.html</include>
> <include>*/pom.xml</include>
> - <include>camel-sa/*</include>
> - <include>camel-simple-su/*</include>
> - <include>camel-sa-itest/*</include>
> + <include>camel-sa/**/*</include>
> + <include>camel-simple-su/**/*</include>
> + <include>src/**/*</include>
> </includes>
> - <excludes>
> + <excludes>
> + <exclude>camel-sa-itest/*</exclude>
> <exclude>*/target/**</exclude>
> + <exclude>*/.classpath</exclude>
> + <exclude>*/.project</exclude>
> + <exclude>.settings/*</exclude>
> </excludes>
> </fileSet>
> </fileSets>
> + <files>
> + <file>
> +
> <source>${basedir}/src/main/assembly/kit_camel_example_pom.xml</source>
> + <outputDirectory>./</outputDirectory>
> + <destName>pom.xml</destName>
> + <fileMode>0777</fileMode>
> + </file>
> + </files>
> </assembly>
>
> ----------------------------
> IONA Technologies PLC (registered in Ireland)
> Registered Number: 171387
> Registered Address: The IONA Building, Shelbourne Road, Dublin 4, Ireland
>