You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2011/07/05 11:31:26 UTC
svn commit: r1142944 - in /karaf/cellar/branches/cellar-2.2.x: ./ assembly/
assembly/src/ assembly/src/main/ assembly/src/main/descriptors/
assembly/src/main/resources/ manual/src/main/webapp/user-guide/
src/main/resources/
Author: jbonofre
Date: Tue Jul 5 09:31:25 2011
New Revision: 1142944
URL: http://svn.apache.org/viewvc?rev=1142944&view=rev
Log:
[KARAF-701] Add Cellar source distribution.
Added:
karaf/cellar/branches/cellar-2.2.x/assembly/
karaf/cellar/branches/cellar-2.2.x/assembly/pom.xml
karaf/cellar/branches/cellar-2.2.x/assembly/src/
karaf/cellar/branches/cellar-2.2.x/assembly/src/main/
karaf/cellar/branches/cellar-2.2.x/assembly/src/main/descriptors/
karaf/cellar/branches/cellar-2.2.x/assembly/src/main/descriptors/unix-src.xml
karaf/cellar/branches/cellar-2.2.x/assembly/src/main/descriptors/windows-src.xml
karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/
karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml
- copied, changed from r1142769, karaf/cellar/branches/cellar-2.2.x/src/main/resources/feature.xml
karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/groups.cfg
- copied, changed from r1142769, karaf/cellar/branches/cellar-2.2.x/src/main/resources/groups.cfg
karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/instance.cfg
- copied, changed from r1142769, karaf/cellar/branches/cellar-2.2.x/src/main/resources/instance.cfg
karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/node.cfg
- copied, changed from r1142769, karaf/cellar/branches/cellar-2.2.x/src/main/resources/node.cfg
Removed:
karaf/cellar/branches/cellar-2.2.x/src/main/resources/feature.xml
karaf/cellar/branches/cellar-2.2.x/src/main/resources/groups.cfg
karaf/cellar/branches/cellar-2.2.x/src/main/resources/instance.cfg
karaf/cellar/branches/cellar-2.2.x/src/main/resources/node.cfg
Modified:
karaf/cellar/branches/cellar-2.2.x/BUILDING
karaf/cellar/branches/cellar-2.2.x/manual/src/main/webapp/user-guide/deploy.conf
karaf/cellar/branches/cellar-2.2.x/pom.xml
Modified: karaf/cellar/branches/cellar-2.2.x/BUILDING
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/BUILDING?rev=1142944&r1=1142943&r2=1142944&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/BUILDING (original)
+++ karaf/cellar/branches/cellar-2.2.x/BUILDING Tue Jul 5 09:31:25 2011
@@ -37,15 +37,16 @@ Initial Setup
Building
--------
-1) Checkout Apache Karaf Cellar source using subversion:
+1) Download and uncompress the Apache Karaf Cellar source distribution.
- $> svn co http://svn.apache.org/repos/asf/karaf/cellar/tags/cellar-2.2.1
+2) Change to the top level directory of Apache Karaf Cellar uncompressed source distribution.
-2) Run
+3) Run
$> mvn
This will compile Apache Karaf Cellar and run all of the tests in the
Apache Karaf source distribution.
-3) Apache Karaf Cellar is now present in your local maven repository. Read the README file
+
+4) Apache Karaf Cellar is now present in your local maven repository. Read the README file
to install Cellar into a running Apache Karaf instance.
Added: karaf/cellar/branches/cellar-2.2.x/assembly/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/assembly/pom.xml?rev=1142944&view=auto
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/assembly/pom.xml (added)
+++ karaf/cellar/branches/cellar-2.2.x/assembly/pom.xml Tue Jul 5 09:31:25 2011
@@ -0,0 +1,142 @@
+<?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/xsd/maven-4.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.karaf</groupId>
+ <artifactId>cellar</artifactId>
+ <version>2.2.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.karaf.cellar</groupId>
+ <artifactId>apache-karaf-cellar</artifactId>
+ <packaging>pom</packaging>
+ <name>Apache Karaf :: Cellar :: Assembly</name>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <useDefaultDelimiters>false</useDefaultDelimiters>
+ <delimiters>
+ <delimiter>${*}</delimiter>
+ </delimiters>
+ </configuration>
+ <executions>
+ <execution>
+ <id>filter</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>resources</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifact</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>
+ <artifact>
+ <file>target/classes/groups.cfg</file>
+ <type>cfg</type>
+ <classifier>groups</classifier>
+ </artifact>
+ <artifact>
+ <file>target/classes/node.cfg</file>
+ <type>cfg</type>
+ <classifier>node</classifier>
+ </artifact>
+ <artifact>
+ <file>target/classes/instance.cfg</file>
+ <type>cfg</type>
+ <classifier>instance</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2.1</version>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <phase>none</phase>
+ </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>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Added: karaf/cellar/branches/cellar-2.2.x/assembly/src/main/descriptors/unix-src.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/assembly/src/main/descriptors/unix-src.xml?rev=1142944&view=auto
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/assembly/src/main/descriptors/unix-src.xml (added)
+++ karaf/cellar/branches/cellar-2.2.x/assembly/src/main/descriptors/unix-src.xml Tue Jul 5 09:31:25 2011
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed 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>
+
+ <!-- Binary files -->
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>**/*.jpeg</include>
+ <include>**/*.jpg</include>
+ <include>**/*.gif</include>
+ <include>**/*.png</include>
+ <include>**/*.jar</include>
+ <include>**/*.keystore</include>
+ <include>**/*.cert</include>
+ </includes>
+ <excludes>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Text files -->
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.jpeg</exclude>
+ <exclude>**/*.jpg</exclude>
+ <exclude>**/*.gif</exclude>
+ <exclude>**/*.png</exclude>
+ <exclude>**/*.jar</exclude>
+ <exclude>**/*.keystore</exclude>
+ <exclude>**/*.cert</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/build/**</exclude>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/.*</exclude>
+ <exclude>**/.*/**</exclude>
+
+ <exclude>**/surefire*</exclude>
+ <exclude>**/svn-commit*</exclude>
+
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.iws</exclude>
+ <exclude>**/*.ipr</exclude>
+ </excludes>
+ <lineEnding>unix</lineEnding>
+ </fileSet>
+
+ </fileSets>
+
+</assembly>
\ No newline at end of file
Added: karaf/cellar/branches/cellar-2.2.x/assembly/src/main/descriptors/windows-src.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/assembly/src/main/descriptors/windows-src.xml?rev=1142944&view=auto
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/assembly/src/main/descriptors/windows-src.xml (added)
+++ karaf/cellar/branches/cellar-2.2.x/assembly/src/main/descriptors/windows-src.xml Tue Jul 5 09:31:25 2011
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed 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>
+
+ <!-- Binary files -->
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>**/*.jpeg</include>
+ <include>**/*.jpg</include>
+ <include>**/*.gif</include>
+ <include>**/*.png</include>
+ <include>**/*.jar</include>
+ <include>**/*.keystore</include>
+ <include>**/*.cert</include>
+ </includes>
+ <excludes>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/target/**</exclude>
+ </excludes>
+ </fileSet>
+
+ <!-- Text files -->
+ <fileSet>
+ <directory>..</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ <excludes>
+ <exclude>**/*.jpeg</exclude>
+ <exclude>**/*.jpg</exclude>
+ <exclude>**/*.gif</exclude>
+ <exclude>**/*.png</exclude>
+ <exclude>**/*.jar</exclude>
+ <exclude>**/*.keystore</exclude>
+ <exclude>**/*.cert</exclude>
+ <exclude>**/target/**</exclude>
+ <exclude>**/build/**</exclude>
+ <exclude>**/eclipse-classes/**</exclude>
+ <exclude>**/.*</exclude>
+ <exclude>**/.*/**</exclude>
+
+ <exclude>**/surefire*</exclude>
+ <exclude>**/svn-commit*</exclude>
+
+ <exclude>**/*.iml</exclude>
+ <exclude>**/*.iws</exclude>
+ <exclude>**/*.ipr</exclude>
+ </excludes>
+ <lineEnding>dos</lineEnding>
+ </fileSet>
+
+ </fileSets>
+
+</assembly>
\ No newline at end of file
Copied: karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml (from r1142769, karaf/cellar/branches/cellar-2.2.x/src/main/resources/feature.xml)
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml?p2=karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/features.xml&p1=karaf/cellar/branches/cellar-2.2.x/src/main/resources/feature.xml&r1=1142769&r2=1142944&rev=1142944&view=diff
==============================================================================
(empty)
Copied: karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/groups.cfg (from r1142769, karaf/cellar/branches/cellar-2.2.x/src/main/resources/groups.cfg)
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/groups.cfg?p2=karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/groups.cfg&p1=karaf/cellar/branches/cellar-2.2.x/src/main/resources/groups.cfg&r1=1142769&r2=1142944&rev=1142944&view=diff
==============================================================================
(empty)
Copied: karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/instance.cfg (from r1142769, karaf/cellar/branches/cellar-2.2.x/src/main/resources/instance.cfg)
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/instance.cfg?p2=karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/instance.cfg&p1=karaf/cellar/branches/cellar-2.2.x/src/main/resources/instance.cfg&r1=1142769&r2=1142944&rev=1142944&view=diff
==============================================================================
(empty)
Copied: karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/node.cfg (from r1142769, karaf/cellar/branches/cellar-2.2.x/src/main/resources/node.cfg)
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/node.cfg?p2=karaf/cellar/branches/cellar-2.2.x/assembly/src/main/resources/node.cfg&p1=karaf/cellar/branches/cellar-2.2.x/src/main/resources/node.cfg&r1=1142769&r2=1142944&rev=1142944&view=diff
==============================================================================
(empty)
Modified: karaf/cellar/branches/cellar-2.2.x/manual/src/main/webapp/user-guide/deploy.conf
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/manual/src/main/webapp/user-guide/deploy.conf?rev=1142944&r1=1142943&r2=1142944&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/manual/src/main/webapp/user-guide/deploy.conf (original)
+++ karaf/cellar/branches/cellar-2.2.x/manual/src/main/webapp/user-guide/deploy.conf Tue Jul 5 09:31:25 2011
@@ -9,7 +9,7 @@ Karaf Cellar is provided as a Karaf feat
Simply register Cellar feature URL in your Karaf instance:
{code}
-karaf@root> features:addurl mvn:org.apache.karaf/cellar/2.2.1/xml/features
+karaf@root> features:addurl mvn:org.apache.karaf.cellar/apache-karaf-cellar/2.2.1/xml/features
{code}
Now you have Cellar features available in your Karaf instance:
Modified: karaf/cellar/branches/cellar-2.2.x/pom.xml
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/pom.xml?rev=1142944&r1=1142943&r2=1142944&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/pom.xml (original)
+++ karaf/cellar/branches/cellar-2.2.x/pom.xml Tue Jul 5 09:31:25 2011
@@ -54,6 +54,7 @@
<module>hazelcast</module>
<module>utils</module>
<module>webconsole</module>
+ <module>assembly</module>
</modules>
<scm>
@@ -267,6 +268,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.1</version>
<configuration>
@@ -313,67 +319,6 @@
</executions>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>target/feature.xml</file>
- <type>xml</type>
- <classifier>features</classifier>
- </artifact>
- <artifact>
- <file>target/groups.cfg</file>
- <type>cfg</type>
- <classifier>groups</classifier>
- </artifact>
- <artifact>
- <file>target/node.cfg</file>
- <type>cfg</type>
- <classifier>node</classifier>
- </artifact>
- <artifact>
- <file>target/instance.cfg</file>
- <type>cfg</type>
- <classifier>instance</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>validate</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.basedir}/target</outputDirectory>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>