Author: ctubbsii
Date: Tue Jun 4 16:11:47 2013
New Revision: 1489495
URL: http://svn.apache.org/r1489495
Log:
ACCUMULO-935 use assembly plugin to generate dev directory that mirrors what
would be put in tarball
Added:
accumulo/trunk/assemble/src/main/assemblies/component.xml
accumulo/trunk/assemble/src/main/assemblies/dev-directory.xml
Modified:
accumulo/trunk/assemble/pom.xml
accumulo/trunk/assemble/src/main/assemblies/binary-release.xml
accumulo/trunk/pom.xml
Modified: accumulo/trunk/assemble/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/assemble/pom.xml?rev=1489495&r1=1489494&r2=1489495&view=diff
==============================================================================
--- accumulo/trunk/assemble/pom.xml (original)
+++ accumulo/trunk/assemble/pom.xml Tue Jun 4 16:11:47 2013
@@ -147,6 +147,40 @@
</build>
</profile>
<profile>
+ <id>make-accumulo-home</id>
+ <activation>
+ <property>
+ <name>DEV_ACCUMULO_HOME</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>directory-assembly</id>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <phase>package</phase>
+ <configuration>
+ <outputDirectory>${DEV_ACCUMULO_HOME}</outputDirectory>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <descriptors>
+
<descriptor>src/main/assemblies/dev-directory.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
<id>rpm</id>
<build>
<plugins>
Modified: accumulo/trunk/assemble/src/main/assemblies/binary-release.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/assemble/src/main/assemblies/binary-release.xml?rev=1489495&r1=1489494&r2=1489495&view=diff
==============================================================================
--- accumulo/trunk/assemble/src/main/assemblies/binary-release.xml (original)
+++ accumulo/trunk/assemble/src/main/assemblies/binary-release.xml Tue Jun 4
16:11:47 2013
@@ -21,204 +21,7 @@
<formats>
<format>tar.gz</format>
</formats>
- <dependencySets>
- <dependencySet>
- <outputDirectory>lib</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
-
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <useTransitiveDependencies>false</useTransitiveDependencies>
- <includes>
- <include>${groupId}:${artifactId}-*</include>
- <include>org.apache.commons:commons-vfs2</include>
- <include>com.beust:jcommander</include>
- <include>com.google.code.gson:gson</include>
- <include>com.google.guava:guava</include>
- <include>jline:jline</include>
- <include>org.apache.thrift:libthrift</include>
- </includes>
- </dependencySet>
- </dependencySets>
- <fileSets>
- <fileSet>
- <directory>../bin</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <directory>../examples/simple</directory>
- <outputDirectory>/examples/simple</outputDirectory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <includes>
- <include>src/main/**</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../lib/native</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <includes>
- <include>**/*.so</include>
- <include>**/*.jnilib</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../server/src/main/c++</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <excludes>
- <exclude>**/*.so</exclude>
- <exclude>**/*.jnilib</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../lib/ext</directory>
- <outputDirectory>/lib/ext</outputDirectory>
- <directoryMode>0755</directoryMode>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../logs</directory>
- <outputDirectory>/logs</outputDirectory>
- <directoryMode>0700</directoryMode>
- <excludes>
- <exclude>*/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../docs</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <excludes>
- <exclude>src/**</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../conf</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0755</fileMode>
- <includes>
- <include>examples/**/*.sh</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../conf</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <includes>
- <include>accumulo.policy.example</include>
- <include>examples/**</include>
- </includes>
- <excludes>
- <exclude>examples/**/*.sh</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../test</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0755</fileMode>
- <includes>
- <include>**/*.sh</include>
- <include>**/*.py</include>
- <include>**/*.pl</include>
- </includes>
- <excludes>
- <exclude>src/**</exclude>
- <exclude>target/**</exclude>
- <exclude>**/continuous-env.sh</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../test</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <excludes>
- <exclude>**/.*/**</exclude>
- <exclude>pom.xml</exclude>
- <exclude>src/**</exclude>
- <exclude>target/**</exclude>
- <exclude>**/*.sh</exclude>
- <exclude>**/*.py</exclude>
- <exclude>**/*.pl</exclude>
- <exclude>**/*.pyc</exclude>
- <exclude>**/*.pyo</exclude>
- <exclude>**/walkers.txt</exclude>
- <exclude>**/ingesters.txt</exclude>
- <exclude>**/randomwalk/conf/logger.xml</exclude>
- <exclude>**/randomwalk/conf/randomwalk.conf</exclude>
- <exclude>**/randomwalk/conf/walkers</exclude>
- </excludes>
- </fileSet>
- <!-- Lift generated thrift proxy code into its own directory -->
- <fileSet>
- <directory>../proxy/target</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <outputDirectory>proxy/thrift</outputDirectory>
- <includes>
- <include>gen-cpp/**</include>
- <include>gen-py/**</include>
- <include>gen-rb/**</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../proxy</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <includes>
- <include>README</include>
- <include>proxy.properties</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../proxy/examples</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0755</fileMode>
- <includes>
- <include>**/*.py</include>
- <include>**/*.rb</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>../proxy/examples</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <excludes>
- <exclude>**/*.py</exclude>
- <exclude>**/*.rb</exclude>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>../proxy/src/main/thrift</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0644</fileMode>
- <outputDirectory>proxy/thrift</outputDirectory>
- <includes>
- <include>*.thrift</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>scripts</directory>
- <directoryMode>0755</directoryMode>
- <fileMode>0755</fileMode>
- </fileSet>
- </fileSets>
- <files>
- <file>
- <source>../CHANGES</source>
- </file>
- <file>
- <source>../LICENSE</source>
- </file>
- <file>
- <source>../NOTICE</source>
- </file>
- <file>
- <source>../README</source>
- </file>
- </files>
+ <componentDescriptors>
+
<componentDescriptor>src/main/assemblies/component.xml</componentDescriptor>
+ </componentDescriptors>
</assembly>
Added: accumulo/trunk/assemble/src/main/assemblies/component.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/assemble/src/main/assemblies/component.xml?rev=1489495&view=auto
==============================================================================
--- accumulo/trunk/assemble/src/main/assemblies/component.xml (added)
+++ accumulo/trunk/assemble/src/main/assemblies/component.xml Tue Jun 4
16:11:47 2013
@@ -0,0 +1,221 @@
+<?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.
+-->
+<component
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/component/1.1.2
http://maven.apache.org/xsd/component-1.1.2.xsd";>
+ <dependencySets>
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ <useProjectArtifact>false</useProjectArtifact>
+
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <useTransitiveDependencies>false</useTransitiveDependencies>
+ <includes>
+ <include>${groupId}:${artifactId}-*</include>
+ <include>org.apache.commons:commons-vfs2</include>
+ <include>com.beust:jcommander</include>
+ <include>com.google.code.gson:gson</include>
+ <include>com.google.guava:guava</include>
+ <include>jline:jline</include>
+ <include>org.apache.thrift:libthrift</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+ <fileSets>
+ <fileSet>
+ <directory>../bin</directory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>../examples/simple</directory>
+ <outputDirectory>/examples/simple</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ <includes>
+ <include>src/main/**</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../lib/native</directory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ <includes>
+ <include>**/*.so</include>
+ <include>**/*.jnilib</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../server/src/main/c++</directory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ <excludes>
+ <exclude>**/*.so</exclude>
+ <exclude>**/*.jnilib</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../lib/ext</directory>
+ <outputDirectory>/lib/ext</outputDirectory>
+ <directoryMode>0755</directoryMode>
+ <excludes>
+ <exclude>*/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../logs</directory>
+ <outputDirectory>/logs</outputDirectory>
+ <directoryMode>0700</directoryMode>
+ <excludes>
+ <exclude>*/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../docs</directory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ <excludes>
+ <exclude>src/**</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../conf</directory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0755</fileMode>
+ <includes>
+ <include>examples/**/*.sh</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../conf</directory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ <includes>
+ <include>accumulo.policy.example</include>
+ <include>examples/**</include>
+ </includes>
+ <excludes>
+ <exclude>examples/**/*.sh</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../test</directory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0755</fileMode>
+ <includes>
+ <include>**/*.sh</include>
+ <include>**/*.py</include>
+ <include>**/*.pl</include>
+ </includes>
+ <excludes>
+ <exclude>src/**</exclude>
+ <exclude>target/**</exclude>
+ <exclude>**/continuous-env.sh</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../test</directory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ <excludes>
+ <exclude>**/.*/**</exclude>
+ <exclude>pom.xml</exclude>
+ <exclude>src/**</exclude>
+ <exclude>target/**</exclude>
+ <exclude>**/*.sh</exclude>
+ <exclude>**/*.py</exclude>
+ <exclude>**/*.pl</exclude>
+ <exclude>**/*.pyc</exclude>
+ <exclude>**/*.pyo</exclude>
+ <exclude>**/walkers.txt</exclude>
+ <exclude>**/ingesters.txt</exclude>
+ <exclude>**/randomwalk/conf/logger.xml</exclude>
+ <exclude>**/randomwalk/conf/randomwalk.conf</exclude>
+ <exclude>**/randomwalk/conf/walkers</exclude>
+ </excludes>
+ </fileSet>
+ <!-- Lift generated thrift proxy code into its own directory -->
+ <fileSet>
+ <directory>../proxy/target</directory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ <outputDirectory>proxy/thrift</outputDirectory>
+ <includes>
+ <include>gen-cpp/**</include>
+ <include>gen-py/**</include>
+ <include>gen-rb/**</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../proxy</directory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ <includes>
+ <include>README</include>
+ <include>proxy.properties</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../proxy/examples</directory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0755</fileMode>
+ <includes>
+ <include>**/*.py</include>
+ <include>**/*.rb</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>../proxy/examples</directory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ <excludes>
+ <exclude>**/*.py</exclude>
+ <exclude>**/*.rb</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>../proxy/src/main/thrift</directory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0644</fileMode>
+ <outputDirectory>proxy/thrift</outputDirectory>
+ <includes>
+ <include>*.thrift</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>scripts</directory>
+ <directoryMode>0755</directoryMode>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ </fileSets>
+ <files>
+ <file>
+ <source>../CHANGES</source>
+ </file>
+ <file>
+ <source>../LICENSE</source>
+ </file>
+ <file>
+ <source>../NOTICE</source>
+ </file>
+ <file>
+ <source>../README</source>
+ </file>
+ </files>
+</component>
Added: accumulo/trunk/assemble/src/main/assemblies/dev-directory.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/assemble/src/main/assemblies/dev-directory.xml?rev=1489495&view=auto
==============================================================================
--- accumulo/trunk/assemble/src/main/assemblies/dev-directory.xml (added)
+++ accumulo/trunk/assemble/src/main/assemblies/dev-directory.xml Tue Jun 4
16:11:47 2013
@@ -0,0 +1,27 @@
+<?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
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
http://maven.apache.org/xsd/assembly-1.1.2.xsd";>
+ <id>dev</id>
+ <formats>
+ <format>dir</format>
+ </formats>
+ <componentDescriptors>
+
<componentDescriptor>src/main/assemblies/component.xml</componentDescriptor>
+ </componentDescriptors>
+</assembly>
Modified: accumulo/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/accumulo/trunk/pom.xml?rev=1489495&r1=1489494&r2=1489495&view=diff
==============================================================================
--- accumulo/trunk/pom.xml (original)
+++ accumulo/trunk/pom.xml Tue Jun 4 16:11:47 2013
@@ -741,75 +741,6 @@
</reporting>
<profiles>
<profile>
- <id>make-accumulo-home</id>
- <activation>
- <property>
- <name>DEV_ACCUMULO_HOME</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <phase>prepare-package</phase>
- <configuration>
- <outputDirectory>${DEV_ACCUMULO_HOME}/lib</outputDirectory>
- <!-- just grab the non-provided runtime dependencies -->
- <stripVersion>true</stripVersion>
- <includeScope>runtime</includeScope>
- <excludeTransitive>true</excludeTransitive>
- <excludeClassifiers>sources,test-sources</excludeClassifiers>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-scripts</id>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <phase>process-resources</phase>
- <configuration>
- <outputDirectory>${DEV_ACCUMULO_HOME}/bin</outputDirectory>
- <resources>
- <resource>
- <directory>bin</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-configuration</id>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <phase>process-resources</phase>
- <configuration>
- <outputDirectory>${DEV_ACCUMULO_HOME}/conf</outputDirectory>
- <resources>
- <resource>
- <directory>conf</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- <profile>
<id>apache-release</id>
<build>
<plugins>
