You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gn...@apache.org on 2010/07/07 10:18:02 UTC
svn commit: r961291 - in /activemq/sandbox/activemq-apollo-actor: ./
apache-activemq-apollo/ apache-activemq-apollo/src/
apache-activemq-apollo/src/main/ apache-activemq-apollo/src/main/descriptors/
apache-activemq-apollo/src/main/distribution/ apache-...
Author: gnodet
Date: Wed Jul 7 08:18:02 2010
New Revision: 961291
URL: http://svn.apache.org/viewvc?rev=961291&view=rev
Log:
[apollo] first attempt at a karaf based distribution (missing all the activemq stuff though)
Added:
activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/
activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/pom.xml
activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/
activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/
activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/descriptors/
activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/descriptors/unix-bin.xml
activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/descriptors/unix-src.xml
activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/descriptors/windows-bin.xml
activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/descriptors/windows-src.xml
activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/distribution/
activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/filtered-resources/
activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/filtered-resources/etc/
activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg
activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/filtered-resources/etc/startup.properties
activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/filtered-resources/features.xml
Modified:
activemq/sandbox/activemq-apollo-actor/pom.xml
Added: activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/pom.xml?rev=961291&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/pom.xml (added)
+++ activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/pom.xml Wed Jul 7 08:18:02 2010
@@ -0,0 +1,231 @@
+<?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.
+ -->
+<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-scala</artifactId>
+ <version>6.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>apache-activemq-apollo</artifactId>
+ <packaging>pom</packaging>
+ <version>6.0-SNAPSHOT</version>
+
+ <name>${artifactId}</name>
+
+ <properties>
+ <karaf.version>1.99.0-SNAPSHOT</karaf.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <version>${karaf.version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <version>${karaf.version}</version>
+ <type>tar.gz</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <classifier>features</classifier>
+ <version>${karaf.version}</version>
+ <type>xml</type>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${project.basedir}/src/main/filtered-resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <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.karaf</groupId>
+ <artifactId>apache-karaf</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.karaf</groupId>
+ <artifactId>apache-karaf</artifactId>
+ <type>zip</type>
+ <outputDirectory>target/dependencies/win</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>features-maven-plugin</artifactId>
+ <version>${karaf.version}</version>
+ <executions>
+ <execution>
+ <id>add-features-to-repo</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>add-features-to-repo</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>mvn:org.apache.karaf/apache-karaf/${karaf.version}/xml/features</descriptor>
+ <descriptor>file:${basedir}/target/classes/features.xml</descriptor>
+ </descriptors>
+ <features>
+ <feature>activemq</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>${project.artifactId}-${project.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>${project.artifactId}-${project.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-apollo-actor/apache-activemq-apollo/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/descriptors/unix-bin.xml?rev=961291&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/descriptors/unix-bin.xml (added)
+++ activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/descriptors/unix-bin.xml Wed Jul 7 08:18:02 2010
@@ -0,0 +1,107 @@
+<?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 Karaf -->
+ <fileSet>
+ <directory>${basedir}/target/dependencies/unix/apache-karaf-${karaf.version}</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>bin/karaf</exclude>
+ <exclude>bin/admin</exclude>
+ <exclude>demos/**</exclude>
+ <exclude>instance/**</exclude>
+ <exclude>deploy/**</exclude>
+ <exclude>system/org/apache/karaf/admin</exclude>
+ <exclude>system/org/apache/karaf/deployer</exclude>
+ <exclude>system/org/apache/aries/jmx</exclude>
+ <exclude>etc/org.apache.felix.fileinstall-deploy.cfg</exclude>
+ <exclude>etc/org.apache.karaf.features.cfg</exclude>
+ <exclude>etc/org.ops4j.pax.logging.cfg</exclude>
+ <exclude>etc/startup.properties</exclude>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ <exclude>README</exclude>
+ <exclude>RELEASE-NOTES</exclude>
+ <exclude>karaf-manual*</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Copy license and other files from root -->
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README</include>
+ <include>RELEASE*</include>
+ </includes>
+ <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>
+
+ </fileSets>
+
+ <files>
+ <file>
+ <source>${basedir}/target/dependencies/unix/apache-karaf-${karaf.version}/bin/karaf</source>
+ <outputDirectory>/bin/</outputDirectory>
+ <destName>activemq</destName>
+ <fileMode>0755</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>LICENSE</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>NOTICE</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ <file>
+ <source>${basedir}/target/classes/features.xml</source>
+ <outputDirectory>system/org/apache/activemq/${artifactId}/${version}</outputDirectory>
+ <destName>${artifactId}-${version}-features.xml</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>unix</lineEnding>
+ </file>
+ </files>
+
+</assembly>
Added: activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/descriptors/unix-src.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/descriptors/unix-src.xml?rev=961291&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/descriptors/unix-src.xml (added)
+++ activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/descriptors/unix-src.xml Wed Jul 7 08:18:02 2010
@@ -0,0 +1,121 @@
+<?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>
+ </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>**/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-apollo-actor/apache-activemq-apollo/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/descriptors/windows-bin.xml?rev=961291&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/descriptors/windows-bin.xml (added)
+++ activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/descriptors/windows-bin.xml Wed Jul 7 08:18:02 2010
@@ -0,0 +1,107 @@
+<?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 Karaf -->
+ <fileSet>
+ <directory>${basedir}/target/dependencies/win/apache-karaf-${karaf.version}</directory>
+ <outputDirectory>/</outputDirectory>
+ <excludes>
+ <exclude>bin/karaf.bat</exclude>
+ <exclude>bin/admin.bat</exclude>
+ <exclude>demos/**</exclude>
+ <exclude>instance/**</exclude>
+ <exclude>deploy/**</exclude>
+ <exclude>system/org/apache/karaf/admin</exclude>
+ <exclude>system/org/apache/karaf/deployer</exclude>
+ <exclude>system/org/apache/aries/jmx</exclude>
+ <exclude>etc/org.apache.felix.fileinstall-deploy.cfg</exclude>
+ <exclude>etc/org.apache.karaf.features.cfg</exclude>
+ <exclude>etc/org.ops4j.pax.logging.cfg</exclude>
+ <exclude>etc/startup.properties</exclude>
+ <exclude>LICENSE</exclude>
+ <exclude>NOTICE</exclude>
+ <exclude>README</exclude>
+ <exclude>RELEASE-NOTES</exclude>
+ <exclude>karaf-manual*</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Copy license and other files from root -->
+ <fileSet>
+ <directory>${basedir}/..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README</include>
+ <include>RELEASE*</include>
+ </includes>
+ <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>
+
+ </fileSets>
+
+ <files>
+ <file>
+ <source>${basedir}/target/dependencies/win/apache-karaf-${karaf.version}/bin/karaf.bat</source>
+ <outputDirectory>/bin/</outputDirectory>
+ <destName>activemq.bat</destName>
+ <fileMode>0755</fileMode>
+ <lineEnding>dos</lineEnding>
+ </file>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/LICENSE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>LICENSE</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>dos</lineEnding>
+ </file>
+ <file>
+ <source>${basedir}/target/maven-shared-archive-resources/META-INF/NOTICE</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>NOTICE</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>dos</lineEnding>
+ </file>
+ <file>
+ <source>${basedir}/target/classes/features.xml</source>
+ <outputDirectory>system/org/apache/activemq/${artifactId}/${version}</outputDirectory>
+ <destName>${artifactId}-${version}-features.xml</destName>
+ <fileMode>0644</fileMode>
+ <lineEnding>dos</lineEnding>
+ </file>
+ </files>
+
+</assembly>
Added: activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/descriptors/windows-src.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/descriptors/windows-src.xml?rev=961291&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/descriptors/windows-src.xml (added)
+++ activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/descriptors/windows-src.xml Wed Jul 7 08:18:02 2010
@@ -0,0 +1,122 @@
+<?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>
+ </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>**/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-apollo-actor/apache-activemq-apollo/src/main/filtered-resources/etc/org.apache.karaf.features.cfg
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/filtered-resources/etc/org.apache.karaf.features.cfg?rev=961291&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/filtered-resources/etc/org.apache.karaf.features.cfg (added)
+++ activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/filtered-resources/etc/org.apache.karaf.features.cfg Wed Jul 7 08:18:02 2010
@@ -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.karaf/apache-karaf/${karaf.version}/xml/features,mvn:org.apache.activemq/apache-activemq-apollo/${version}/xml/features
+
+#
+# Comma separated list of features to install at startup
+#
+featuresBoot=activemq
+
Added: activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg?rev=961291&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg (added)
+++ activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/filtered-resources/etc/org.ops4j.pax.logging.cfg Wed Jul 7 08:18:02 2010
@@ -0,0 +1,33 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+
+# Root logger
+log4j.rootLogger=INFO, out, osgi:VmLogAppender
+
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
+
+# File appender
+log4j.appender.out=org.apache.log4j.FileAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d{ABSOLUTE} | %-5.5p | %-16.16t | %-32.32c{1} | %-32.32C %4L | %m%n
+log4j.appender.out.file=${karaf.base}/data/log/activemq.log
+log4j.appender.out.append=true
Added: activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/filtered-resources/etc/startup.properties
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/filtered-resources/etc/startup.properties?rev=961291&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/filtered-resources/etc/startup.properties (added)
+++ activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/filtered-resources/etc/startup.properties Wed Jul 7 08:18:02 2010
@@ -0,0 +1,50 @@
+################################################################################
+#
+# 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.
+#
+################################################################################
+
+# This file allows you to control the start level of each bundle.
+#
+
+#
+# Startup core services like logging
+#
+org/ops4j/pax/url/pax-url-mvn/1.1.2/pax-url-mvn-1.1.2.jar=5
+org/ops4j/pax/logging/pax-logging-api/1.5.2/pax-logging-api-1.5.2.jar=8
+org/ops4j/pax/logging/pax-logging-service/1.5.2/pax-logging-service-1.5.2.jar=8
+org/apache/felix/org.apache.felix.configadmin/1.2.4/org.apache.felix.configadmin-1.2.4.jar=10
+org/apache/felix/org.apache.felix.fileinstall/3.0.0/org.apache.felix.fileinstall-3.0.0.jar=11
+
+#
+# The rest of the services..
+#
+org/apache/aries/blueprint/org.apache.aries.blueprint/0.1-incubating/org.apache.aries.blueprint-0.1-incubating.jar=20
+
+org/apache/felix/gogo/org.apache.felix.gogo.runtime/0.4.0/org.apache.felix.gogo.runtime-0.4.0.jar=30
+org/apache/karaf/shell/org.apache.karaf.shell.console/1.99.0-SNAPSHOT/org.apache.karaf.shell.console-1.99.0-SNAPSHOT.jar=30
+org/apache/karaf/shell/org.apache.karaf.shell.osgi/1.99.0-SNAPSHOT/org.apache.karaf.shell.osgi-1.99.0-SNAPSHOT.jar=30
+org/apache/karaf/shell/org.apache.karaf.shell.log/1.99.0-SNAPSHOT/org.apache.karaf.shell.log-1.99.0-SNAPSHOT.jar=30
+#org/apache/karaf/shell/org.apache.karaf.shell.config/1.99.0-SNAPSHOT/org.apache.karaf.shell.config-1.99.0-SNAPSHOT.jar=30
+#org/apache/karaf/shell/org.apache.karaf.shell.packages/1.99.0-SNAPSHOT/org.apache.karaf.shell.packages-1.99.0-SNAPSHOT.jar=30
+#org/apache/karaf/shell/org.apache.karaf.shell.commands/1.99.0-SNAPSHOT/org.apache.karaf.shell.commands-1.99.0-SNAPSHOT.jar=30
+#org/apache/karaf/shell/org.apache.karaf.shell.dev/1.99.0-SNAPSHOT/org.apache.karaf.shell.dev-1.99.0-SNAPSHOT.jar=30
+org/apache/karaf/jaas/org.apache.karaf.jaas.config/1.99.0-SNAPSHOT/org.apache.karaf.jaas.config-1.99.0-SNAPSHOT.jar=30
+org/apache/karaf/jaas/org.apache.karaf.jaas.modules/1.99.0-SNAPSHOT/org.apache.karaf.jaas.modules-1.99.0-SNAPSHOT.jar=30
+org/apache/karaf/features/org.apache.karaf.features.core/1.99.0-SNAPSHOT/org.apache.karaf.features.core-1.99.0-SNAPSHOT.jar=30
+
+org/apache/karaf/org.apache.karaf.management/1.99.0-SNAPSHOT/org.apache.karaf.management-1.99.0-SNAPSHOT.jar=30
+
Added: activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/filtered-resources/features.xml?rev=961291&view=auto
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/filtered-resources/features.xml (added)
+++ activemq/sandbox/activemq-apollo-actor/apache-activemq-apollo/src/main/filtered-resources/features.xml Wed Jul 7 08:18:02 2010
@@ -0,0 +1,26 @@
+<?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.activemq/apollo-store/6.0-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.activemq/apollo-broker/6.0-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.activemq/apollo-util/6.0-SNAPSHOT</bundle>
+ </feature>
+
+</features>
\ No newline at end of file
Modified: activemq/sandbox/activemq-apollo-actor/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-apollo-actor/pom.xml?rev=961291&r1=961290&r2=961291&view=diff
==============================================================================
--- activemq/sandbox/activemq-apollo-actor/pom.xml (original)
+++ activemq/sandbox/activemq-apollo-actor/pom.xml Wed Jul 7 08:18:02 2010
@@ -154,6 +154,7 @@
<module>apollo-dto</module>
<module>apollo-stomp</module>
<module>apollo-web</module>
+ <module>apache-activemq-apollo</module>
</modules>
<scm>