You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2009/06/17 15:59:08 UTC
svn commit: r785605 - in /activemq/sandbox/activemq-flow: ./
activemq-broker/src/main/java/org/apache/activemq/apollo/broker/ assembly/
assembly/src/main/descriptors/ assembly/src/main/distribution/
assembly/src/main/distribution/doc/ assembly/src/main...
Author: chirino
Date: Wed Jun 17 13:59:08 2009
New Revision: 785605
URL: http://svn.apache.org/viewvc?rev=785605&view=rev
Log:
started to workin in a skeleton assemebly module which uses the smx kernel as the server container system. Still needs more work like a osgi feature bundle of
activemq which is what gets installed into the system.
Added:
activemq/sandbox/activemq-flow/assembly/src/main/descriptors/
activemq/sandbox/activemq-flow/assembly/src/main/descriptors/unix-bin.xml
activemq/sandbox/activemq-flow/assembly/src/main/descriptors/unix-src.xml
activemq/sandbox/activemq-flow/assembly/src/main/descriptors/windows-bin.xml
activemq/sandbox/activemq-flow/assembly/src/main/descriptors/windows-src.xml
activemq/sandbox/activemq-flow/assembly/src/main/distribution/
activemq/sandbox/activemq-flow/assembly/src/main/distribution/doc/
activemq/sandbox/activemq-flow/assembly/src/main/filtered-resources/
activemq/sandbox/activemq-flow/assembly/src/main/filtered-resources/etc/
activemq/sandbox/activemq-flow/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg
activemq/sandbox/activemq-flow/assembly/src/main/filtered-resources/features.xml
Modified:
activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java
activemq/sandbox/activemq-flow/assembly/pom.xml
activemq/sandbox/activemq-flow/pom.xml
Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java?rev=785605&r1=785604&r2=785605&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/apollo/broker/Broker.java Wed Jun 17 13:59:08 2009
@@ -122,7 +122,8 @@
dataDirectory = new File(IOHelper.getDefaultDataDirectory());
}
- addVirtualHost(getDefaultVirtualHost());
+ // Create the default virtual host if not explicitly defined.
+ getDefaultVirtualHost();
// Don't change the state to STARTING yet as we may need to
// apply some default configuration to this broker instance before it's started.
@@ -268,6 +269,7 @@
ArrayList<AsciiBuffer> names = new ArrayList<AsciiBuffer>(1);
names.add(DEFAULT_VIRTUAL_HOST_NAME);
defaultVirtualHost.setHostNames(names);
+ addVirtualHost(defaultVirtualHost);
}
return defaultVirtualHost;
}
Modified: activemq/sandbox/activemq-flow/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/assembly/pom.xml?rev=785605&r1=785604&r2=785605&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/assembly/pom.xml (original)
+++ activemq/sandbox/activemq-flow/assembly/pom.xml Wed Jun 17 13:59:08 2009
@@ -1,5 +1,5 @@
<?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.
@@ -13,41 +13,253 @@
License for the specific language governing permissions and
limitations under the License.
-->
-<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">
-
+<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">
<modelVersion>4.0.0</modelVersion>
-
+
<parent>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-parent</artifactId>
<version>6.0-SNAPSHOT</version>
</parent>
-
+
<groupId>org.apache.activemq</groupId>
- <artifactId>assembly</artifactId>
+ <artifactId>apache-activemq</artifactId>
<packaging>pom</packaging>
<version>6.0-SNAPSHOT</version>
- <name>ActiveMQ :: Assembly</name>
+ <name>ActiveMQ :: Distribution</name>
<description>Puts together the ActiveMQ distribution</description>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.servicemix.kernel</groupId>
+ <artifactId>apache-servicemix-kernel</artifactId>
+ <type>zip</type>
</dependency>
-
<dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-broker</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.servicemix.kernel</groupId>
+ <artifactId>apache-servicemix-kernel</artifactId>
+ <type>tar.gz</type>
</dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-openwire</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
-</project>
\ No newline at end of file
+
+ <build>
+
+ <resources>
+ <resource>
+ <directory>${pom.basedir}/src/main/filtered-resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+
+ <plugins>
+
+ <plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>verify-legal-files</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <strict>false</strict>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>filter</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-unix</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.servicemix.kernel</groupId>
+ <artifactId>apache-servicemix-kernel</artifactId>
+ <type>tar.gz</type>
+ <outputDirectory>target/dependencies/unix</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unpack-win</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.servicemix.kernel</groupId>
+ <artifactId>apache-servicemix-kernel</artifactId>
+ <type>zip</type>
+ <outputDirectory>target/dependencies/win</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+
+ <!--
+ <execution>
+ <id>copy</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.servicemix.nmr</groupId>
+ <artifactId>org.apache.servicemix.nmr.branding</artifactId>
+ <outputDirectory>target/dependencies</outputDirectory>
+ <destFileName>servicemix-version.jar</destFileName>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ -->
+
+ </executions>
+ </plugin>
+
+ <!--
+ <plugin>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>features-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-features-to-repo</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>add-features-to-repo</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>file:${basedir}/target/classes/features.xml</descriptor>
+ </descriptors>
+ <features>
+ <feature>nmr</feature>
+ <feature>nmr-audit</feature>
+ <feature>jbi</feature>
+ <feature>jbi-cluster</feature>
+ </features>
+ <repository>target/features-repo</repository>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ -->
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unix-bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/descriptors/unix-bin.xml</descriptor>
+ </descriptors>
+ <finalName>${pom.artifactId}-${pom.version}</finalName>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ <execution>
+ <id>windows-bin</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/descriptors/windows-bin.xml</descriptor>
+ </descriptors>
+ <finalName>${pom.artifactId}-${pom.version}</finalName>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unix-src</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/descriptors/unix-src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ <execution>
+ <id>windows-src</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/descriptors/windows-src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/classes/features.xml</file>
+ <type>xml </type>
+ <classifier>features</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+</project>
Added: activemq/sandbox/activemq-flow/assembly/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/assembly/src/main/descriptors/unix-bin.xml?rev=785605&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/assembly/src/main/descriptors/unix-bin.xml (added)
+++ activemq/sandbox/activemq-flow/assembly/src/main/descriptors/unix-bin.xml Wed Jun 17 13:59:08 2009
@@ -0,0 +1,126 @@
+<?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></id> <!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301 -->
+
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+
+ <fileSets>
+
+ <!-- Expanded ServiceMix Runtime -->
+ <fileSet>
+ <directory>${basedir}/target/dependencies/unix/apache-servicemix-kernel-${servicemix.kernel.version}</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>bin/**</exclude>
+ <exclude>demos/**</exclude>
+ <exclude>etc/org.apache.servicemix.features.cfg</exclude>
+ <exclude>LICENSE.txt</exclude>
+ <exclude>NOTICE.txt</exclude>
+ <exclude>README.txt</exclude>
+ <exclude>RELEASE-NOTES.txt</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Copy over bin/servicemix separately to get the correct file mode -->
+ <fileSet>
+ <directory>${basedir}/target/dependencies/unix/apache-servicemix-kernel-${servicemix.kernel.version}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>bin/*</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+
+ <!-- Copy license and other files from root -->
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README.txt</include>
+ <include>RELEASE*.txt</include>
+ </includes>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+
+ <!--
+ <fileSet>
+ <directory>${basedir}/src/main/distribution/ant</directory>
+ <outputDirectory>/ant</outputDirectory>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/classes/etc</directory>
+ <outputDirectory>/etc/</outputDirectory>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/target/features-repo</directory>
+ <outputDirectory>system</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/dependencies</directory>
+ <includes>
+ <include>servicemix-version.jar</include>
+ </includes>
+ <outputDirectory>/lib/</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>../examples</directory>
+ <outputDirectory>/examples/</outputDirectory>
+ <lineEnding>unix</lineEnding>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+ -->
+
+ </fileSets>
+
+ <files>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>LICENSE.txt</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>NOTICE.txt</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>${basedir}/target/classes/features.xml</source>
+ <outputDirectory>system/org/apache/servicemix/nmr/${artifactId}/${version}</outputDirectory>
+ <destName>${artifactId}-${version}-features.xml</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+
+ </files>
+
+</assembly>
Added: activemq/sandbox/activemq-flow/assembly/src/main/descriptors/unix-src.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/assembly/src/main/descriptors/unix-src.xml?rev=785605&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/assembly/src/main/descriptors/unix-src.xml (added)
+++ activemq/sandbox/activemq-flow/assembly/src/main/descriptors/unix-src.xml Wed Jun 17 13:59:08 2009
@@ -0,0 +1,123 @@
+<?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>src</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <fileSets>
+ <!-- Copy license and other files from root -->
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>BUILDING.txt</include>
+ <include>README.txt</include>
+ <include>RELEASE*.txt</include>
+ </includes>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+
+ <!-- Binary Files -->
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <outputDirectory>src</outputDirectory>
+ <includes>
+ <include>**/*.jpeg</include>
+ <include>**/*.jpg</include>
+ <include>**/*.gif</include>
+ <include>**/*.png</include>
+ <include>**/*.exe</include>
+ <include>**/*.dll</include>
+ <include>**/*.jar</include>
+ <include>**/*.so</include>
+ <include>**/*.ks</include>
+ <include>**/*.ts</include>
+ <include>**/*.keystore</include>
+ <include>**/*.bin</include>
+ <include>**/*.jnilib</include>
+ <include>**/*.cert</include>
+ <include>apache-servicemix/src/main/release/bin/*/wrapper</include>
+ </includes>
+ <excludes>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Text Files -->
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <outputDirectory>src</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.jpeg</exclude>
+ <exclude>**/*.jpg</exclude>
+ <exclude>**/*.gif</exclude>
+ <exclude>**/*.png</exclude>
+ <exclude>**/*.exe</exclude>
+ <exclude>**/*.dll</exclude>
+ <exclude>**/*.jar</exclude>
+ <exclude>**/*.so</exclude>
+ <exclude>**/*.ks</exclude>
+ <exclude>**/*.ts</exclude>
+ <exclude>**/*.keystore</exclude>
+ <exclude>**/*.bin</exclude>
+ <exclude>**/*.jnilib</exclude>
+ <exclude>**/*.cert</exclude>
+ <exclude>apache-servicemix/src/main/release/bin/*/wrapper</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/build/**</exclude>
+ <exclude>activemq-data/**</exclude>
+ <exclude>*/activemq-data/**</exclude>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/.*</exclude>
+ <exclude>**/.*/**</exclude>
+
+ <exclude>**/surefire*</exclude>
+ <exclude>**/svn-commit*</exclude>
+
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+
+ <exclude>**/cobertura.ser</exclude>
+
+ </excludes>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>LICENSE.txt</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>NOTICE.txt</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ </files>
+</assembly>
Added: activemq/sandbox/activemq-flow/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/assembly/src/main/descriptors/windows-bin.xml?rev=785605&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/assembly/src/main/descriptors/windows-bin.xml (added)
+++ activemq/sandbox/activemq-flow/assembly/src/main/descriptors/windows-bin.xml Wed Jun 17 13:59:08 2009
@@ -0,0 +1,126 @@
+<?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></id> <!-- intentionally left blank -> http://jira.codehaus.org/browse/MASSEMBLY-301 -->
+
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+
+ <!-- Expanded ServiceMix Runtime -->
+ <fileSet>
+ <directory>${basedir}/target/dependencies/unix/apache-servicemix-kernel-${servicemix.kernel.version}</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>bin/**</exclude>
+ <exclude>demos/**</exclude>
+ <exclude>etc/org.apache.servicemix.features.cfg</exclude>
+ <exclude>LICENSE.txt</exclude>
+ <exclude>NOTICE.txt</exclude>
+ <exclude>README.txt</exclude>
+ <exclude>RELEASE-NOTES.txt</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Copy over bin/servicemix separately to get the correct file mode -->
+ <fileSet>
+ <directory>${basedir}/target/dependencies/unix/apache-servicemix-kernel-${servicemix.kernel.version}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>bin/*</include>
+ </includes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+
+ <!-- Copy license and other files from root -->
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README.txt</include>
+ <include>RELEASE*.txt</include>
+ </includes>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+
+ <!--
+ <fileSet>
+ <directory>${basedir}/src/main/distribution/ant</directory>
+ <outputDirectory>/ant</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/classes/etc</directory>
+ <outputDirectory>/etc/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/target/features-repo</directory>
+ <outputDirectory>system</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>target/dependencies</directory>
+ <includes>
+ <include>servicemix-version.jar</include>
+ </includes>
+ <outputDirectory>/lib/</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>../examples</directory>
+ <outputDirectory>/examples/</outputDirectory>
+ <lineEnding>dos</lineEnding>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+ -->
+
+ </fileSets>
+
+ <files>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>LICENSE.txt</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>dos</lineEnding>
+ </file>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>NOTICE.txt</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>dos</lineEnding>
+ </file>
+ <file>
+ <source>${basedir}/target/classes/features.xml</source>
+ <outputDirectory>system/org/apache/servicemix/nmr/${artifactId}/${version}</outputDirectory>
+ <destName>${artifactId}-${version}-features.xml</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>dos</lineEnding>
+ </file>
+ </files>
+
+
+</assembly>
Added: activemq/sandbox/activemq-flow/assembly/src/main/descriptors/windows-src.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/assembly/src/main/descriptors/windows-src.xml?rev=785605&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/assembly/src/main/descriptors/windows-src.xml (added)
+++ activemq/sandbox/activemq-flow/assembly/src/main/descriptors/windows-src.xml Wed Jun 17 13:59:08 2009
@@ -0,0 +1,124 @@
+<?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>src</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <!-- Copy license and other files from root -->
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>BUILDING.txt</include>
+ <include>README.txt</include>
+ <include>RELEASE*.txt</include>
+ </includes>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+
+ <!-- Binary Files -->
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <outputDirectory>src</outputDirectory>
+ <includes>
+ <include>**/*.jpeg</include>
+ <include>**/*.jpg</include>
+ <include>**/*.gif</include>
+ <include>**/*.png</include>
+ <include>**/*.exe</include>
+ <include>**/*.dll</include>
+ <include>**/*.jar</include>
+ <include>**/*.so</include>
+ <include>**/*.ks</include>
+ <include>**/*.ts</include>
+ <include>**/*.keystore</include>
+ <include>**/*.bin</include>
+ <include>**/*.jnilib</include>
+ <include>**/*.cert</include>
+ <include>apache-servicemix/src/main/release/bin/*/wrapper</include>
+ </includes>
+ <excludes>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Text Files -->
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <outputDirectory>src</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.jpeg</exclude>
+ <exclude>**/*.jpg</exclude>
+ <exclude>**/*.gif</exclude>
+ <exclude>**/*.png</exclude>
+ <exclude>**/*.exe</exclude>
+ <exclude>**/*.dll</exclude>
+ <exclude>**/*.jar</exclude>
+ <exclude>**/*.so</exclude>
+ <exclude>**/*.ks</exclude>
+ <exclude>**/*.ts</exclude>
+ <exclude>**/*.keystore</exclude>
+ <exclude>**/*.bin</exclude>
+ <exclude>**/*.jnilib</exclude>
+ <exclude>**/*.cert</exclude>
+ <exclude>apache-servicemix/src/main/release/bin/*/wrapper</exclude>
+
+ <exclude>**/target/**</exclude>
+ <exclude>**/build/**</exclude>
+ <exclude>activemq-data/**</exclude>
+ <exclude>*/activemq-data/**</exclude>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/.*</exclude>
+ <exclude>**/.*/**</exclude>
+
+ <exclude>**/surefire*</exclude>
+ <exclude>**/svn-commit*</exclude>
+
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.ipr</exclude>
+ <exclude>**/*.iws</exclude>
+
+ <exclude>**/cobertura.ser</exclude>
+
+ </excludes>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>LICENSE.txt</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>NOTICE.txt</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ </files>
+</assembly>
Added: activemq/sandbox/activemq-flow/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg?rev=785605&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg (added)
+++ activemq/sandbox/activemq-flow/assembly/src/main/filtered-resources/etc/org.apache.servicemix.features.cfg Wed Jun 17 13:59:08 2009
@@ -0,0 +1,29 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+
+#
+# Comma separated list of features repositories to register by default
+#
+featuresRepositories=mvn:org.apache.servicemix.kernel/apache-servicemix-kernel/${servicemix.kernel.version}/xml/features,mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${version}/xml/features
+
+#
+# Comma separated list of features to install at startup
+#
+#featuresBoot=jbi
+
Added: activemq/sandbox/activemq-flow/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/assembly/src/main/filtered-resources/features.xml?rev=785605&view=auto
==============================================================================
--- activemq/sandbox/activemq-flow/assembly/src/main/filtered-resources/features.xml (added)
+++ activemq/sandbox/activemq-flow/assembly/src/main/filtered-resources/features.xml Wed Jun 17 13:59:08 2009
@@ -0,0 +1,24 @@
+<?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.
+-->
+<features>
+ <feature name="activemq" version="${version}">
+ <bundle>mvn:org.apache.xbean/xbean-naming/${xbean.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.naming/org.apache.servicemix.naming/${pom.version}</bundle>
+ </feature>
+</features>
Modified: activemq/sandbox/activemq-flow/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/pom.xml?rev=785605&r1=785604&r2=785605&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/pom.xml (original)
+++ activemq/sandbox/activemq-flow/pom.xml Wed Jun 17 13:59:08 2009
@@ -34,6 +34,7 @@
<projectName>Apache ActiveMQ</projectName>
<!-- base url for site deployment. See distribution management for full url. Override this in settings.xml for staging -->
<staging.siteURL>scp://people.apache.org/x1/www/activemq.apache.org</staging.siteURL>
+ <servicemix.kernel.version>1.1.0</servicemix.kernel.version>
<spring-version>2.5.5</spring-version>
<activesoap-version>1.3</activesoap-version>
<annogen-version>0.1.0</annogen-version>
@@ -804,6 +805,20 @@
<version>2.1</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.kernel</groupId>
+ <artifactId>apache-servicemix-kernel</artifactId>
+ <version>${servicemix.kernel.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.kernel</groupId>
+ <artifactId>apache-servicemix-kernel</artifactId>
+ <version>${servicemix.kernel.version}</version>
+ <type>tar.gz</type>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -821,6 +836,11 @@
<version>1.7</version>
</plugin>
<plugin>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>features-maven-plugin</artifactId>
+ <version>1.0</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.activemq.protobuf</groupId>
<artifactId>activemq-protobuf</artifactId>
<version>1.1-SNAPSHOT</version>