You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2008/09/10 19:43:22 UTC
svn commit: r693908 - in
/activemq/camel/trunk/apache-camel/src/main/descriptors: common-bin.xml
unix-bin.xml windows-bin.xml
Author: janstey
Date: Wed Sep 10 10:43:21 2008
New Revision: 693908
URL: http://svn.apache.org/viewvc?rev=693908&view=rev
Log:
CAMEL-889 - Pulling out non platform specific descriptor elements into a common descriptor.
Added:
activemq/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (with props)
Modified:
activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
Added: activemq/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml?rev=693908&view=auto
==============================================================================
--- activemq/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml (added)
+++ activemq/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml Wed Sep 10 10:43:21 2008
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<assembly>
+ <id>common-bin</id>
+ <fileSets>
+
+ <!-- copy the manual docs -->
+ <fileSet>
+ <directory>${basedir}/../tooling/camel-manual/target/site/manual/</directory>
+ <outputDirectory>/doc/manual</outputDirectory>
+ <includes>
+ <include>*.pdf</include>
+ <include>*.html</include>
+ </includes>
+ </fileSet>
+
+ <!-- copy the java docs -->
+ <fileSet>
+ <directory>${basedir}/target/javadoc/</directory>
+ <outputDirectory>/doc/javadoc</outputDirectory>
+ <includes>
+ <include>**/**</include>
+ </includes>
+ </fileSet>
+
+ <!-- copy the website docs
+ <fileSet>
+ <directory>${basedir}/target/website</directory>
+ <outputDirectory>/doc/website</outputDirectory>
+ </fileSet>
+ -->
+ </fileSets>
+
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>org.apache.camel:camel-amqp</include>
+ <include>org.apache.camel:camel-atom</include>
+ <include>org.apache.camel:camel-bam</include>
+ <include>org.apache.camel:camel-core</include>
+ <include>org.apache.camel:camel-csv</include>
+ <include>org.apache.camel:camel-cxf</include>
+ <include>org.apache.camel:camel-flatpack</include>
+ <include>org.apache.camel:camel-ftp</include>
+ <include>org.apache.camel:camel-groovy</include>
+ <include>org.apache.camel:camel-guice</include>
+ <include>org.apache.camel:camel-hamcrest</include>
+ <include>org.apache.camel:camel-hl7</include>
+ <include>org.apache.camel:camel-http</include>
+ <include>org.apache.camel:camel-ibatis</include>
+ <include>org.apache.camel:camel-irc</include>
+ <include>org.apache.camel:camel-jaxb</include>
+ <include>org.apache.camel:camel-jcr</include>
+ <include>org.apache.camel:camel-jdbc</include>
+ <include>org.apache.camel:camel-jetty</include>
+ <include>org.apache.camel:camel-jhc</include>
+ <include>org.apache.camel:camel-jing</include>
+ <include>org.apache.camel:camel-jms</include>
+ <include>org.apache.camel:camel-josql</include>
+ <include>org.apache.camel:camel-jpa</include>
+ <include>org.apache.camel:camel-juel</include>
+ <include>org.apache.camel:camel-jxpath</include>
+ <include>org.apache.camel:camel-mail</include>
+ <include>org.apache.camel:camel-mina</include>
+ <include>org.apache.camel:camel-msv</include>
+ <include>org.apache.camel:camel-ognl</include>
+ <include>org.apache.camel:camel-osgi</include>
+ <include>org.apache.camel:camel-quartz</include>
+ <include>org.apache.camel:camel-rest:classes</include>
+ <include>org.apache.camel:camel-rmi</include>
+ <include>org.apache.camel:camel-saxon</include>
+ <include>org.apache.camel:camel-scala</include>
+ <include>org.apache.camel:camel-script</include>
+ <include>org.apache.camel:camel-spring</include>
+ <include>org.apache.camel:camel-spring-integration</include>
+ <include>org.apache.camel:camel-sql</include>
+ <include>org.apache.camel:camel-stream</include>
+ <include>org.apache.camel:camel-stringtemplate</include>
+ <include>org.apache.camel:camel-swing</include>
+ <include>org.apache.camel:camel-uface</include>
+ <include>org.apache.camel:camel-velocity</include>
+ <include>org.apache.camel:camel-xmlbeans</include>
+ <include>org.apache.camel:camel-xmpp</include>
+ <include>org.apache.camel:camel-xstream</include>
+ <include>commons-logging:commons-logging</include>
+ <include>javax.xml.bind:jaxb-api</include>
+ <include>javax.activation:activation</include>
+ <include>javax.xml.stream:stax-api</include>
+ <include>com.sun.xml.bind:jaxb-impl</include>
+ <!--<include>stax:stax-api</include>-->
+ <include>org.springframework:spring-aop</include>
+ <include>org.springframework:spring-beans</include>
+ <include>org.springframework:spring-context</include>
+ <include>org.springframework:spring-core</include>
+ <include>org.springframework:spring-test</include>
+ <include>org.springframework:spring-web</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <outputDirectory>/lib/optional</outputDirectory>
+ <unpack>false</unpack>
+ <scope>runtime</scope>
+ <includes>
+ <include>${pom.groupId}:apache-activemq</include>
+ <include>commons-beanutils:commons-beanutils</include>
+ <include>commons-collections:commons-collections</include>
+ <include>commons-httpclient:commons-httpclient</include>
+ <include>commons-dbcp:commons-dbcp</include>
+ <include>commons-pool:commons-pool</include>
+ <include>log4j:log4j</include>
+ <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
+ <include>org.apache.xbean:xbean-spring</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+</assembly>
Propchange: activemq/camel/trunk/apache-camel/src/main/descriptors/common-bin.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml?rev=693908&r1=693907&r2=693908&view=diff
==============================================================================
--- activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml (original)
+++ activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml Wed Sep 10 10:43:21 2008
@@ -20,7 +20,18 @@
<formats>
<format>tar.gz</format>
</formats>
+
<fileSets>
+ <!-- Copy over the bundle jar.
+ Needed to do this here because the maven-assembly-plugin
+ did not recognize ${pom.version} in common-bin.xml -->
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>${pom.artifactId}-${pom.version}.jar</include>
+ </includes>
+ </fileSet>
<!-- Copy over everything that needs to get unix line endings -->
<fileSet>
@@ -37,7 +48,7 @@
<directory>../examples</directory>
<outputDirectory>/examples</outputDirectory>
<excludes>
- <!-- disable build, IDEA and Eclipsefiles -->
+ <!-- disable build, IDEA and Eclipse files -->
<exclude>**/*.i*</exclude>
<exclude>**/eclipse-classes/**</exclude>
<exclude>**/.project</exclude>
@@ -49,131 +60,10 @@
</excludes>
<lineEnding>unix</lineEnding>
</fileSet>
-
- <!-- copy the manual docs -->
- <fileSet>
- <directory>${basedir}/../tooling/camel-manual/target/site/manual/</directory>
- <outputDirectory>/doc/manual</outputDirectory>
- <includes>
- <include>*.pdf</include>
- <include>*.html</include>
- </includes>
- </fileSet>
-
- <!-- copy the java docs -->
- <fileSet>
- <directory>${basedir}/target/javadoc/</directory>
- <outputDirectory>/doc/javadoc</outputDirectory>
- <includes>
- <include>**/**</include>
- </includes>
- </fileSet>
-
- <!-- copy the website docs
- <fileSet>
- <directory>${basedir}/target/website</directory>
- <outputDirectory>/doc/website</outputDirectory>
- </fileSet>
- -->
-
- <!-- Copy over jar files -->
- <fileSet>
- <directory>target</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>${pom.artifactId}-${pom.version}.jar</include>
- </includes>
- </fileSet>
-
</fileSets>
- <dependencySets>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.camel:camel-amqp</include>
- <include>org.apache.camel:camel-atom</include>
- <include>org.apache.camel:camel-bam</include>
- <include>org.apache.camel:camel-core</include>
- <include>org.apache.camel:camel-csv</include>
- <include>org.apache.camel:camel-cxf</include>
- <include>org.apache.camel:camel-flatpack</include>
- <include>org.apache.camel:camel-ftp</include>
- <include>org.apache.camel:camel-groovy</include>
- <include>org.apache.camel:camel-guice</include>
- <include>org.apache.camel:camel-hamcrest</include>
- <include>org.apache.camel:camel-hl7</include>
- <include>org.apache.camel:camel-http</include>
- <include>org.apache.camel:camel-ibatis</include>
- <include>org.apache.camel:camel-irc</include>
- <include>org.apache.camel:camel-jaxb</include>
- <include>org.apache.camel:camel-jcr</include>
- <include>org.apache.camel:camel-jdbc</include>
- <include>org.apache.camel:camel-jetty</include>
- <include>org.apache.camel:camel-jhc</include>
- <include>org.apache.camel:camel-jing</include>
- <include>org.apache.camel:camel-jms</include>
- <include>org.apache.camel:camel-josql</include>
- <include>org.apache.camel:camel-jpa</include>
- <include>org.apache.camel:camel-juel</include>
- <include>org.apache.camel:camel-jxpath</include>
- <include>org.apache.camel:camel-mail</include>
- <include>org.apache.camel:camel-mina</include>
- <include>org.apache.camel:camel-msv</include>
- <include>org.apache.camel:camel-ognl</include>
- <include>org.apache.camel:camel-osgi</include>
- <include>org.apache.camel:camel-quartz</include>
- <include>org.apache.camel:camel-rest:classes</include>
- <include>org.apache.camel:camel-rmi</include>
- <include>org.apache.camel:camel-saxon</include>
- <include>org.apache.camel:camel-scala</include>
- <include>org.apache.camel:camel-script</include>
- <include>org.apache.camel:camel-spring</include>
- <include>org.apache.camel:camel-spring-integration</include>
- <include>org.apache.camel:camel-sql</include>
- <include>org.apache.camel:camel-stream</include>
- <include>org.apache.camel:camel-stringtemplate</include>
- <include>org.apache.camel:camel-swing</include>
- <include>org.apache.camel:camel-uface</include>
- <include>org.apache.camel:camel-velocity</include>
- <include>org.apache.camel:camel-xmlbeans</include>
- <include>org.apache.camel:camel-xmpp</include>
- <include>org.apache.camel:camel-xstream</include>
- <include>commons-logging:commons-logging</include>
- <include>javax.xml.bind:jaxb-api</include>
- <include>javax.activation:activation</include>
- <include>javax.xml.stream:stax-api</include>
- <include>com.sun.xml.bind:jaxb-impl</include>
- <!--<include>stax:stax-api</include>-->
- <include>org.springframework:spring-aop</include>
- <include>org.springframework:spring-beans</include>
- <include>org.springframework:spring-context</include>
- <include>org.springframework:spring-core</include>
- <include>org.springframework:spring-test</include>
- <include>org.springframework:spring-web</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/lib/optional</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>${pom.groupId}:apache-activemq</include>
- <include>commons-beanutils:commons-beanutils</include>
- <include>commons-collections:commons-collections</include>
- <include>commons-httpclient:commons-httpclient</include>
- <include>commons-dbcp:commons-dbcp</include>
- <include>commons-pool:commons-pool</include>
- <include>log4j:log4j</include>
- <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
- <include>org.apache.xbean:xbean-spring</include>
- </includes>
- </dependencySet>
- </dependencySets>
+ <componentDescriptors>
+ <componentDescriptor>src/main/descriptors/common-bin.xml</componentDescriptor>
+ </componentDescriptors>
</assembly>
Modified: activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml?rev=693908&r1=693907&r2=693908&view=diff
==============================================================================
--- activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml (original)
+++ activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml Wed Sep 10 10:43:21 2008
@@ -20,7 +20,18 @@
<formats>
<format>zip</format>
</formats>
+
<fileSets>
+ <!-- Copy over the bundle jar.
+ Needed to do this here because the maven-assembly-plugin
+ did not recognize ${pom.version} in common-bin.xml -->
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>${pom.artifactId}-${pom.version}.jar</include>
+ </includes>
+ </fileSet>
<!-- Copy over everything that needs to get dos line endings -->
<fileSet>
@@ -32,32 +43,6 @@
<lineEnding>dos</lineEnding>
</fileSet>
- <!-- copy the website docs
- <fileSet>
- <directory>${basedir}/target/website</directory>
- <outputDirectory>/doc/website</outputDirectory>
- </fileSet>
- -->
-
- <!-- copy the manual docs -->
- <fileSet>
- <directory>${basedir}/../tooling/camel-manual/target/site/manual/</directory>
- <outputDirectory>/doc/manual</outputDirectory>
- <includes>
- <include>*.pdf</include>
- <include>*.html</include>
- </includes>
- </fileSet>
-
- <!-- copy the java docs -->
- <fileSet>
- <directory>${basedir}/target/javadoc/</directory>
- <outputDirectory>/doc/javadoc</outputDirectory>
- <includes>
- <include>**/**</include>
- </includes>
- </fileSet>
-
<!-- copy the examples -->
<fileSet>
<directory>../examples</directory>
@@ -75,110 +60,10 @@
</excludes>
<lineEnding>dos</lineEnding>
</fileSet>
-
- <!-- Copy over jar files -->
- <fileSet>
- <directory>target</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>${pom.artifactId}-${pom.version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>/bin</outputDirectory>
- <includes>
- <include>run.jar</include>
- </includes>
- </fileSet>
</fileSets>
- <dependencySets>
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>org.apache.camel:camel-amqp</include>
- <include>org.apache.camel:camel-atom</include>
- <include>org.apache.camel:camel-bam</include>
- <include>org.apache.camel:camel-core</include>
- <include>org.apache.camel:camel-csv</include>
- <include>org.apache.camel:camel-cxf</include>
- <include>org.apache.camel:camel-flatpack</include>
- <include>org.apache.camel:camel-ftp</include>
- <include>org.apache.camel:camel-groovy</include>
- <include>org.apache.camel:camel-guice</include>
- <include>org.apache.camel:camel-hamcrest</include>
- <include>org.apache.camel:camel-hl7</include>
- <include>org.apache.camel:camel-http</include>
- <include>org.apache.camel:camel-ibatis</include>
- <include>org.apache.camel:camel-irc</include>
- <include>org.apache.camel:camel-jaxb</include>
- <include>org.apache.camel:camel-jcr</include>
- <include>org.apache.camel:camel-jdbc</include>
- <include>org.apache.camel:camel-jetty</include>
- <include>org.apache.camel:camel-jhc</include>
- <include>org.apache.camel:camel-jing</include>
- <include>org.apache.camel:camel-jms</include>
- <include>org.apache.camel:camel-josql</include>
- <include>org.apache.camel:camel-jpa</include>
- <include>org.apache.camel:camel-juel</include>
- <include>org.apache.camel:camel-jxpath</include>
- <include>org.apache.camel:camel-mail</include>
- <include>org.apache.camel:camel-mina</include>
- <include>org.apache.camel:camel-msv</include>
- <include>org.apache.camel:camel-ognl</include>
- <include>org.apache.camel:camel-osgi</include>
- <include>org.apache.camel:camel-quartz</include>
- <include>org.apache.camel:camel-rest</include>
- <include>org.apache.camel:camel-rmi</include>
- <include>org.apache.camel:camel-saxon</include>
- <include>org.apache.camel:camel-scala</include>
- <include>org.apache.camel:camel-script</include>
- <include>org.apache.camel:camel-spring</include>
- <include>org.apache.camel:camel-spring-integration</include>
- <include>org.apache.camel:camel-sql</include>
- <include>org.apache.camel:camel-stream</include>
- <include>org.apache.camel:camel-stringtemplate</include>
- <include>org.apache.camel:camel-swing</include>
- <include>org.apache.camel:camel-uface</include>
- <include>org.apache.camel:camel-velocity</include>
- <include>org.apache.camel:camel-xmlbeans</include>
- <include>org.apache.camel:camel-xmpp</include>
- <include>org.apache.camel:camel-xstream</include>
- <include>commons-logging:commons-logging</include>
- <include>javax.xml.bind:jaxb-api</include>
- <include>javax.activation:activation</include>
- <include>javax.xml.stream:stax-api</include>
- <include>com.sun.xml.bind:jaxb-impl</include>
- <!--<include>stax:stax-api</include>-->
- <include>org.springframework:spring-aop</include>
- <include>org.springframework:spring-beans</include>
- <include>org.springframework:spring-context</include>
- <include>org.springframework:spring-core</include>
- <include>org.springframework:spring-test</include>
- <include>org.springframework:spring-web</include>
- </includes>
- </dependencySet>
- <dependencySet>
- <outputDirectory>/lib/optional</outputDirectory>
- <unpack>false</unpack>
- <scope>runtime</scope>
- <includes>
- <include>${pom.groupId}:apache-activemq</include>
- <include>commons-beanutils:commons-beanutils</include>
- <include>commons-collections:commons-collections</include>
- <include>commons-httpclient:commons-httpclient</include>
- <include>commons-dbcp:commons-dbcp</include>
- <include>commons-pool:commons-pool</include>
- <include>log4j:log4j</include>
- <include>org.apache.geronimo.specs:geronimo-j2ee-management_1.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
- <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
- <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
- <include>org.apache.xbean:xbean-spring</include>
- </includes>
- </dependencySet>
- </dependencySets>
+ <componentDescriptors>
+ <componentDescriptor>src/main/descriptors/common-bin.xml</componentDescriptor>
+ </componentDescriptors>
+
</assembly>