You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2011/11/21 21:26:23 UTC
svn commit: r1204689 - in /incubator/accumulo/trunk: README pom.xml
src/assemble/dist.xml src/assemble/docgen.sh src/assemble/pom.xml
src/assemble/target/ src/core/pom.xml
Author: vines
Date: Mon Nov 21 20:26:22 2011
New Revision: 1204689
URL: http://svn.apache.org/viewvc?rev=1204689&view=rev
Log:
Accumulo-25 - We now have an assembly module which runs last.
Accumulo-123 - assembly module will generate teh config.html file, so we no longer have the chicken/egg problem for generating the config file.
This moves some pieces into the assembly module. It's not done, but it's a start.
Added:
incubator/accumulo/trunk/src/assemble/pom.xml (with props)
incubator/accumulo/trunk/src/assemble/target/
Modified:
incubator/accumulo/trunk/README
incubator/accumulo/trunk/pom.xml
incubator/accumulo/trunk/src/assemble/dist.xml
incubator/accumulo/trunk/src/assemble/docgen.sh
incubator/accumulo/trunk/src/core/pom.xml
Modified: incubator/accumulo/trunk/README
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/README?rev=1204689&r1=1204688&r2=1204689&view=diff
==============================================================================
--- incubator/accumulo/trunk/README (original)
+++ incubator/accumulo/trunk/README Mon Nov 21 20:26:22 2011
@@ -8,7 +8,7 @@ However, if you only have source code, o
have maven configured to get Accumulo prerequisites from repositories. See
the pom.xml file for the necessary components.
-Run "mvn package && mvn assembly:single"
+Run "mvn package"
If you are running on another Unix-like operating system (OSX, etc) then
you may wish to build the native libraries. They are not strictly necessary
Modified: incubator/accumulo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/pom.xml?rev=1204689&r1=1204688&r2=1204689&view=diff
==============================================================================
--- incubator/accumulo/trunk/pom.xml (original)
+++ incubator/accumulo/trunk/pom.xml Mon Nov 21 20:26:22 2011
@@ -1,639 +1,473 @@
<?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.
--->
+<!-- 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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo</artifactId>
- <packaging>pom</packaging>
- <version>1.5.0-incubating-SNAPSHOT</version>
- <name>accumulo</name>
-
- <modules>
- <module>src/trace</module>
- <module>src/core</module>
- <module>src/server</module>
- <module>src/start</module>
- <module>src/examples</module>
- </modules>
-
- <build>
- <defaultGoal>package</defaultGoal>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-beta-1</version>
- <executions>
- <execution>
- <id>enforce-mvn</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireMavenVersion>
- <version>[2.0.9,)</version>
- </requireMavenVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>lib</directory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileset>
- <fileset>
- <directory>docs/apidocs</directory>
- </fileset>
- <fileset>
- <directory>test</directory>
- <includes>
- <include>**/*.so</include>
- </includes>
- </fileset>
- <fileset>
- <directory>./</directory>
- <includes>
- <include>**/*.pyc</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <phase>process-resources</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>../../lib</outputDirectory>
- <!-- just grab the non-provided runtime dependencies -->
- <includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api</includeArtifactIds>
- <excludeGroupIds>org.apache.accumulo</excludeGroupIds>
- <excludeTransitive>true</excludeTransitive>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <outputDirectory>../../lib</outputDirectory>
- <archive>
- <manifest>
- <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
- </manifest>
- <manifestEntries>
- <Implementation-Build>${buildNumber}</Implementation-Build>
- <Implementation-Timestamp>${timestamp}</Implementation-Timestamp>
- </manifestEntries>
- </archive>
- <includes>
- <include>cloudtrace/**</include>
- <include>org/apache/accumulo**/**</include>
- <include>web/**</include>
- <include>randomwalk/**</include>
- <include>*.*</include>
- </includes>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <encoding>UTF-8</encoding>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/assemble/dist.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <optimize>true</optimize>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <encoding>UTF-8</encoding>
- <quiet>true</quiet>
- <jarOutputDirectory>lib</jarOutputDirectory>
- <reportOutputDirectory>docs</reportOutputDirectory>
- <javadocVersion>1.6</javadocVersion>
- <additionalJOption>-J-Xmx512m</additionalJOption>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
- <configuration>
- <outputDirectory>../../lib</outputDirectory>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <environmentVariables>
- <ACCUMULO_HOME>../..</ACCUMULO_HOME>
- </environmentVariables>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rpm-maven-plugin</artifactId>
- <version>2.0-beta-2</version>
- <inherited>false</inherited>
- <configuration>
- <name>accumulo</name>
- <projversion>${project.version}</projversion>
- <summary>Accumulo BigTable clone</summary>
- <description>
- Accumulo is a large distributed structured store based on Google's
- BigTable design.
- </description>
- <copyright>2011 The Apache Software Foundation.</copyright>
- <url>http://incubator.apache.org/accumulo</url>
- <needarch>true</needarch>
- <group>Utilities</group>
- <requires>
- <require>jdk</require>
- <require>hadoop</require>
- <require>zookeeper</require>
- </requires>
- <prefix>/opt/accumulo</prefix>
- <defaultDirmode>755</defaultDirmode>
- <defaultFilemode>644</defaultFilemode>
- <defaultUsername>root</defaultUsername>
- <defaultGroupname>root</defaultGroupname>
- <mappings>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}</directory>
- <sources>
- <source>
- <location>README</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/docs</directory>
- <sources>
- <source>
- <location>docs</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/test</directory>
- <sources>
- <source>
- <location>test</location>
- <excludes>
- <exclude>**/walkers.txt</exclude>
- <exclude>**/ingesters.txt</exclude>
- <exclude>**/continuous-env.sh</exclude>
- <exclude>**/*.pyc</exclude>
- </excludes>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
- <directoryIncluded>false</directoryIncluded>
- <filemode>755</filemode>
- <username>root</username>
- <groupname>root</groupname>
- <sources>
- <source>
- <location>bin</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/conf</directory>
- <sources>
- <source>
- <location>conf</location>
- <excludes>
- <exclude>**/accumulo-site.xml</exclude>
- <exclude>**/accumulo-env.sh</exclude>
- <exclude>**/accumulo-metrics.xml</exclude>
- <exclude>**/test-*</exclude>
- <exclude>**/slaves</exclude>
- <exclude>**/masters</exclude>
- <exclude>**/tracers</exclude>
- <exclude>**/gc</exclude>
- <exclude>**/monitor</exclude>
- </excludes>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/accumulo/accumulo-${project.version}/lib</directory>
- <dependency/>
- <sources>
- <source>
- <location>lib</location>
- </source>
- </sources>
- </mapping>
- </mappings>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <inherited>false</inherited>
- <version>1.2</version>
- <configuration>
- <executable>bash</executable>
- <arguments>
- <argument>docs/src/user_manual/build.sh</argument>
- </arguments>
- </configuration>
- <executions>
- <execution>
- <id>user-manual</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <versionRange>[2.0,)</versionRange>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <versionRange>[1.1.1,)</versionRange>
- <goals>
- <goal>exec</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore></ignore>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.4</version>
- <configuration>
- <format>html</format>
- <includeTests>true</includeTests>
- <targetJdk>1.6</targetJdk>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <formats>
- <format>xml</format>
- <format>html</format>
- </formats>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.0.1</version>
- <configuration>
- <findbugsXmlOutput>true</findbugsXmlOutput>
- <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
- <xmlOutput>true</xmlOutput>
- <effort>Max</effort>
- <threshold>Medium</threshold>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- </plugins>
- </reporting>
-
- <profiles>
- <profile>
- <id>distclean</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>conf</directory>
- <includes>
- <include>gc</include>
- <include>monitor</include>
- <include>slaves</include>
- <include>masters</include>
- <include>accumulo-site.xml</include>
- <include>accumulo-env.sh</include>
- <include>accumulo-metrics.xml</include>
- <include>test-*</include>
- </includes>
- </fileset>
- <fileset>
- <directory>docs/apidocs</directory>
- </fileset>
- <fileset>
- <directory>logs</directory>
- </fileset>
- <fileset>
- <directory>walogs</directory>
- </fileset>
- <fileset>
- <directory>lib</directory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileset>
- <fileset>
- <directory>test</directory>
- <includes>
- <include>**/*.so</include>
- </includes>
- </fileset>
- <fileset>
- <directory>./</directory>
- <includes>
- <include>**/*.pyc</include>
- </includes>
- </fileset>
- <fileset>
- <directory>test/system/continuous</directory>
- <includes>
- <include>walkers.txt</include>
- <include>ingesters.txt</include>
- <include>continuous-env.sh</include>
- </includes>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
- <dependencyManagement>
- <dependencies>
- <!-- test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
-
- <!-- provided dependencies needed at runtime -->
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>0.20.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>zookeeper</artifactId>
- <version>3.3.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>[5.1,)</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- accumulo dependency jars that we will provide -->
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>cloudtrace</artifactId>
- <version>1.5.0-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-start</artifactId>
- <version>1.5.0-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-core</artifactId>
- <version>1.5.0-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-server</artifactId>
- <version>1.5.0-incubating-SNAPSHOT</version>
- </dependency>
-
- <!-- additional dependencies we need to provide -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- </dependency>
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- </dependency>
- <dependency>
- <groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
- <version>1.5</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <version>0.6.1</version>
- </dependency>
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>0.9.94</version>
- </dependency>
- <dependency>
- <groupId>jfree</groupId>
- <artifactId>jcommon</artifactId>
- <version>1.0.12</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging-api</artifactId>
- <version>1.0.4</version>
- </dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>1.4.1</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.4.3</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.4.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jci-core</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-jci-fam</artifactId>
- <version>1.0</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <!-- dependencies inherited by all sub-modules -->
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
-
- <distributionManagement>
- <repository>
- <id>${accumulo-releases-repo}</id>
- <url>${accumulo-releases-url}</url>
- </repository>
- <snapshotRepository>
- <id>${accumulo-snapshots-repo}</id>
- <url>${accumulo-snapshots-url}</url>
- </snapshotRepository>
- </distributionManagement>
-
- <scm>
- <connection>https://svn.apache.org/repos/asf/incubator/accumulo/trunk</connection>
- <developerConnection>https://svn.apache.org/repos/asf/incubator/accumulo/trunk</developerConnection>
- <url>https://svn.apache.org/repos/asf/incubator/accumulo/</url>
- </scm>
-
- <ciManagement>
- <url>https://builds.apache.org/job/Accumulo-Trunk-Nightly/</url>
- <system>Apache Jenkins</system>
- </ciManagement>
- <url>http://incubator.apache.org/accumulo/</url>
- <description>Accumulo is a sorted, distributed key/value store based on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It features a few novel improvements on the BigTable design in the form of cell-level access labels and a server-side programming mechanism that can modify key/value pairs at various points in the data management process.</description>
- <issueManagement>
- <system>Apache's JIRA issue tracker</system>
- <url>https://issues.apache.org/jira/browse/ACCUMULO</url>
- </issueManagement>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo</artifactId>
+ <packaging>pom</packaging>
+ <version>1.5.0-incubating-SNAPSHOT</version>
+ <name>accumulo</name>
+
+ <modules>
+ <module>src/trace</module>
+ <module>src/core</module>
+ <module>src/server</module>
+ <module>src/start</module>
+ <module>src/examples</module>
+ <module>src/assemble</module>
+ </modules>
+
+ <build>
+ <defaultGoal>package</defaultGoal>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <id>enforce-mvn</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireMavenVersion>
+ <version>[2.0.9,)</version>
+ </requireMavenVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.4.1</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>lib</directory>
+ <includes>
+ <include>*.jar</include>
+ </includes>
+ </fileset>
+ <fileset>
+ <directory>docs/apidocs</directory>
+ </fileset>
+ <fileset>
+ <directory>test</directory>
+ <includes>
+ <include>**/*.so</include>
+ </includes>
+ </fileset>
+ <fileset>
+ <directory>./</directory>
+ <includes>
+ <include>**/*.pyc</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>../../lib</outputDirectory>
+ <!-- just grab the non-provided runtime dependencies -->
+ <includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api</includeArtifactIds>
+ <excludeGroupIds>org.apache.accumulo</excludeGroupIds>
+ <excludeTransitive>true</excludeTransitive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <outputDirectory>../../lib</outputDirectory>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-Build>${buildNumber}</Implementation-Build>
+ <Implementation-Timestamp>${timestamp}</Implementation-Timestamp>
+ </manifestEntries>
+ </archive>
+ <includes>
+ <include>cloudtrace/**</include>
+ <include>org/apache/accumulo**/**</include>
+ <include>web/**</include>
+ <include>randomwalk/**</include>
+ <include>*.*</include>
+ </includes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ <optimize>true</optimize>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ <quiet>true</quiet>
+ <jarOutputDirectory>lib</jarOutputDirectory>
+ <reportOutputDirectory>docs</reportOutputDirectory>
+ <javadocVersion>1.6</javadocVersion>
+ <additionalJOption>-J-Xmx512m</additionalJOption>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.0.4</version>
+ <configuration>
+ <outputDirectory>../../lib</outputDirectory>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.10</version>
+ <configuration>
+ <environmentVariables>
+ <ACCUMULO_HOME>../..</ACCUMULO_HOME>
+ </environmentVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <versionRange>[2.0,)</versionRange>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <versionRange>[1.1.1,)</versionRange>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <versionRange>[1.0,)</versionRange>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rpm-maven-plugin</artifactId>
+ <version>2.1-alpha-1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <format>html</format>
+ <includeTests>true</includeTests>
+ <targetJdk>1.6</targetJdk>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <formats>
+ <format>xml</format>
+ <format>html</format>
+ </formats>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.0.1</version>
+ <configuration>
+ <findbugsXmlOutput>true</findbugsXmlOutput>
+ <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
+ <xmlOutput>true</xmlOutput>
+ <effort>Max</effort>
+ <threshold>Medium</threshold>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <profiles>
+ </profiles>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- test dependencies -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- provided dependencies needed at runtime -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-core</artifactId>
+ <version>0.20.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>zookeeper</artifactId>
+ <version>3.3.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>[5.1,)</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- accumulo dependency jars that we will provide -->
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>cloudtrace</artifactId>
+ <version>1.5.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ <version>1.5.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ <version>1.5.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-server</artifactId>
+ <version>1.5.0-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <!-- additional dependencies we need to provide -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ <version>1.5</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>0.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>0.9.94</version>
+ </dependency>
+ <dependency>
+ <groupId>jfree</groupId>
+ <artifactId>jcommon</artifactId>
+ <version>1.0.12</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jci-core</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-jci-fam</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <!-- dependencies inherited by all sub-modules -->
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ </dependencies>
+
+ <distributionManagement>
+ <repository>
+ <id>${accumulo-releases-repo}</id>
+ <url>${accumulo-releases-url}</url>
+ </repository>
+ <snapshotRepository>
+ <id>${accumulo-snapshots-repo}</id>
+ <url>${accumulo-snapshots-url}</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <scm>
+ <connection>https://svn.apache.org/repos/asf/incubator/accumulo/trunk</connection>
+ <developerConnection>https://svn.apache.org/repos/asf/incubator/accumulo/trunk</developerConnection>
+ <url>https://svn.apache.org/repos/asf/incubator/accumulo/</url>
+ </scm>
+
+ <ciManagement>
+ <url>https://builds.apache.org/job/Accumulo-Trunk-Nightly/</url>
+ <system>Apache Jenkins</system>
+ </ciManagement>
+ <url>http://incubator.apache.org/accumulo/</url>
+ <description>Accumulo is a sorted, distributed key/value store based on Google's BigTable design. It is built on top of Apache Hadoop, Zookeeper, and Thrift. It features a few novel improvements on the BigTable design in the form of cell-level access labels and a server-side programming mechanism that can modify key/value pairs at various points in the data management process.</description>
+ <issueManagement>
+ <system>Apache's JIRA issue tracker</system>
+ <url>https://issues.apache.org/jira/browse/ACCUMULO</url>
+ </issueManagement>
</project>
Modified: incubator/accumulo/trunk/src/assemble/dist.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/assemble/dist.xml?rev=1204689&r1=1204688&r2=1204689&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/assemble/dist.xml (original)
+++ incubator/accumulo/trunk/src/assemble/dist.xml Mon Nov 21 20:26:22 2011
@@ -1,90 +1,90 @@
<?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.
--->
+<!-- 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>dist</id>
- <formats>
- <format>tar.gz</format>
- </formats>
- <baseDirectory>accumulo-${project.version}</baseDirectory>
- <fileSets>
- <fileSet>
- <directory>bin</directory>
- <fileMode>0755</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- <fileSet>
- <directory>logs</directory>
- <directoryMode>0700</directoryMode>
- </fileSet>
- <fileSet>
- <directory>walogs</directory>
- <directoryMode>0700</directoryMode>
- </fileSet>
- <fileSet>
- <includes>
- <include>**/*.py</include>
- <include>**/*.pl</include>
- <include>**/*.sh</include>
- </includes>
- <excludes>
- <exclude>**/target*/**</exclude>
- <exclude>**/accumulo-env.sh</exclude>
- <exclude>**/continuous-env.sh</exclude>
- </excludes>
- <fileMode>0755</fileMode>
- </fileSet>
- <fileSet>
- <useDefaultExcludes>true</useDefaultExcludes>
- <excludes>
- <!-- the following ignored because they were included above -->
- <exclude>**/bin/**</exclude>
- <exclude>**/*.sh</exclude>
- <exclude>**/*.py</exclude>
- <exclude>**/*.pl</exclude>
+ <id>dist</id>
+ <formats>
+ <format>tar.gz</format>
+ </formats>
+ <baseDirectory>accumulo-${project.version}</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>../../bin</directory>
+ <fileMode>0755</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>../../logs</directory>
+ <directoryMode>0700</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>../../walogs</directory>
+ <directoryMode>0700</directoryMode>
+ </fileSet>
+ <fileSet>
+ <directory>../../</directory>
+ <includes>
+ <include>**/*.py</include>
+ <include>**/*.pl</include>
+ <include>**/*.sh</include>
+ </includes>
+ <excludes>
+ <exclude>**/target*/**</exclude>
+ <exclude>**/accumulo-env.sh</exclude>
+ <exclude>**/continuous-env.sh</exclude>
+ <exclude>../../bin/**</exclude>
+ <exclude>../../logs/**</exclude>
+ <exclude>../../walogs/**</exclude>
+ </excludes>
+ <fileMode>0755</fileMode>
+ </fileSet>
+ <fileSet>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <directory>../../</directory>
+ <excludes>
+ <!-- the following ignored because they were included above -->
+ <exclude>**/bin/**</exclude>
+ <exclude>**/*.sh</exclude>
+ <exclude>**/*.py</exclude>
+ <exclude>**/*.pl</exclude>
- <!-- the following directories ignored because they should not be in the tarball -->
- <exclude>**/.*/**</exclude>
- <exclude>**/logs/**</exclude>
- <exclude>**/walogs/**</exclude>
- <exclude>**/target*/**</exclude>
+ <!-- the following directories ignored because they should not be in
+ the tarball -->
+ <exclude>**/.*/**</exclude>
+ <exclude>**/logs/**</exclude>
+ <exclude>**/walogs/**</exclude>
+ <exclude>**/target*/**</exclude>
- <!-- the following files ignored because they should not be in the tarball -->
- <exclude>**/.*</exclude>
- <exclude>**/accumulo-site.xml</exclude>
- <exclude>**/accumulo-env.sh</exclude>
- <exclude>**/accumulo-metrics.xml</exclude>
- <exclude>**/test-*</exclude>
- <exclude>**/slaves</exclude>
- <exclude>**/masters</exclude>
- <exclude>**/monitor</exclude>
- <exclude>**/tracers</exclude>
- <exclude>**/gc</exclude>
- <exclude>**/walkers.txt</exclude>
- <exclude>**/ingesters.txt</exclude>
- <exclude>**/continuous-env.sh</exclude>
- <exclude>**/*.pyc</exclude>
- <exclude>**/randomwalk/conf/logger.xml</exclude>
- <exclude>**/randomwalk/conf/randomwalk.conf</exclude>
- <exclude>**/randomwalk/conf/walkers</exclude>
- <exclude>src/**/*.so</exclude>
- </excludes>
- <fileMode>0644</fileMode>
- <directoryMode>0755</directoryMode>
- </fileSet>
- </fileSets>
+ <!-- the following files ignored because they should not be in the tarball -->
+ <exclude>**/.*</exclude>
+ <exclude>**/accumulo-site.xml</exclude>
+ <exclude>**/accumulo-env.sh</exclude>
+ <exclude>**/accumulo-metrics.xml</exclude>
+ <exclude>**/test-*</exclude>
+ <exclude>**/slaves</exclude>
+ <exclude>**/masters</exclude>
+ <exclude>**/monitor</exclude>
+ <exclude>**/tracers</exclude>
+ <exclude>**/gc</exclude>
+ <exclude>**/walkers.txt</exclude>
+ <exclude>**/ingesters.txt</exclude>
+ <exclude>**/continuous-env.sh</exclude>
+ <exclude>**/*.pyc</exclude>
+ <exclude>**/randomwalk/conf/logger.xml</exclude>
+ <exclude>**/randomwalk/conf/randomwalk.conf</exclude>
+ <exclude>**/randomwalk/conf/walkers</exclude>
+ <exclude>src/**/*.so</exclude>
+ </excludes>
+ <fileMode>0644</fileMode>
+ <directoryMode>0755</directoryMode>
+ </fileSet>
+ </fileSets>
</assembly>
Modified: incubator/accumulo/trunk/src/assemble/docgen.sh
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/assemble/docgen.sh?rev=1204689&r1=1204688&r2=1204689&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/assemble/docgen.sh (original)
+++ incubator/accumulo/trunk/src/assemble/docgen.sh Mon Nov 21 20:26:22 2011
@@ -15,8 +15,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-if [ ! -z $HADOOP_HOME ]; then
-../../bin/accumulo org.apache.accumulo.core.conf.DefaultConfiguration --generate-doc | grep -v ^STANDALONE > ../../docs/config.html
-else
-echo HADOOP_HOME is not set
-fi
+java -cp ../../lib/accumulo-core-1.5.0-incubating-SNAPSHOT.jar:../../lib/log4j-1.2.16.jar org.apache.accumulo.core.conf.DefaultConfiguration --generate-doc | grep -v ^STANDALONE > ../../docs/config.html
Added: incubator/accumulo/trunk/src/assemble/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/assemble/pom.xml?rev=1204689&view=auto
==============================================================================
--- incubator/accumulo/trunk/src/assemble/pom.xml (added)
+++ incubator/accumulo/trunk/src/assemble/pom.xml Mon Nov 21 20:26:22 2011
@@ -0,0 +1,237 @@
+<?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">
+
+ <parent>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo</artifactId>
+ <version>1.5.0-incubating-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
+
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>accumulo-assemble</artifactId>
+ <name>accumulo-assemble</name>
+
+ <packaging>pom</packaging>
+
+ <!-- NOTE: These dependency declarations are only required to sort this
+ project to the end of the line in the multimodule build. Since we only include
+ the child1 module in our assembly, we only need to ensure this distribution
+ project builds AFTER that one... -->
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ <version>1.5.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-server</artifactId>
+ <version>1.5.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-start</artifactId>
+ <version>1.5.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-examples</artifactId>
+ <version>1.5.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>cloudtrace</artifactId>
+ <version>1.5.0-incubating-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>user-manual</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>bash</executable>
+ <arguments>
+ <argument>../../docs/src/user_manual/build.sh</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
+ <id>config webpage</id>
+ <phase>package</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>bash</executable>
+ <arguments>
+ <argument>docgen.sh</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assemble/dist.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ <executions>
+ <execution>
+ <id>distro-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>rpm</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rpm-maven-plugin</artifactId>
+ <version>2.1-alpha-1</version>
+ <inherited>false</inherited>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>rpm</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <name>accumulo</name>
+ <projversion>${project.version}</projversion>
+ <summary>Accumulo BigTable clone</summary>
+ <description>
+ Accumulo is a large distributed structured store based on Google's
+ BigTable design.
+ </description>
+ <copyright>2011 The Apache Software Foundation.</copyright>
+ <url>http://incubator.apache.org/accumulo</url>
+ <needarch>true</needarch>
+ <group>Utilities</group>
+ <requires>
+ <require>jdk</require>
+ <require>hadoop</require>
+ <require>zookeeper</require>
+ </requires>
+ <prefix>/opt/accumulo</prefix>
+ <defaultDirmode>755</defaultDirmode>
+ <defaultFilemode>644</defaultFilemode>
+ <defaultUsername>root</defaultUsername>
+ <defaultGroupname>root</defaultGroupname>
+ <mappings>
+ <mapping>
+ <directory>/opt/accumulo/accumulo-${project.version}</directory>
+ <sources>
+ <source>
+ <location>${project.parent.relativePath}/README</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/accumulo/accumulo-${project.version}/docs</directory>
+ <sources>
+ <source>
+ <location>${project.parent.relativePath}/docs</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/accumulo/accumulo-${project.version}/test</directory>
+ <sources>
+ <source>
+ <location>${project.parent.relativePath}/test</location>
+ <excludes>
+ <exclude>${project.parent.relativePath}/**/walkers.txt</exclude>
+ <exclude>${project.parent.relativePath}/**/ingesters.txt</exclude>
+ <exclude>${project.parent.relativePath}/**/continuous-env.sh</exclude>
+ <exclude>${project.parent.relativePath}/**/*.pyc</exclude>
+ </excludes>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
+ </mapping>
+ <mapping>
+ <directory>/opt/accumulo/accumulo-${project.version}/bin</directory>
+ <directoryIncluded>false</directoryIncluded>
+ <filemode>755</filemode>
+ <username>root</username>
+ <groupname>root</groupname>
+ <sources>
+ <source>
+ <location>${project.parent.relativePath}/bin</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/accumulo/accumulo-${project.version}/conf</directory>
+ <sources>
+ <source>
+ <location>${project.parent.relativePath}/conf</location>
+ <excludes>
+ <exclude>${project.parent.relativePath}/**/accumulo-site.xml</exclude>
+ <exclude>${project.parent.relativePath}/**/accumulo-env.sh</exclude>
+ <exclude>${project.parent.relativePath}/**/accumulo-metrics.xml</exclude>
+ <exclude>${project.parent.relativePath}/**/test-*</exclude>
+ <exclude>${project.parent.relativePath}/**/slaves</exclude>
+ <exclude>${project.parent.relativePath}/**/masters</exclude>
+ <exclude>${project.parent.relativePath}/**/tracers</exclude>
+ <exclude>${project.parent.relativePath}/**/gc</exclude>
+ <exclude>${project.parent.relativePath}/**/monitor</exclude>
+ </excludes>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/accumulo/accumulo-${project.version}/lib</directory>
+ <dependency />
+ <sources>
+ <source>
+ <location>${project.parent.relativePath}/lib</location>
+ </source>
+ </sources>
+ </mapping>
+ </mappings>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
\ No newline at end of file
Propchange: incubator/accumulo/trunk/src/assemble/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/accumulo/trunk/src/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/src/core/pom.xml?rev=1204689&r1=1204688&r2=1204689&view=diff
==============================================================================
--- incubator/accumulo/trunk/src/core/pom.xml (original)
+++ incubator/accumulo/trunk/src/core/pom.xml Mon Nov 21 20:26:22 2011
@@ -34,7 +34,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.1.1</version>
<executions>
<execution>
<id>generate-core-thrift</id>
@@ -46,16 +45,6 @@
<executable>${basedir}/src/main/thrift/thrift.sh</executable>
</configuration>
</execution>
- <execution>
- <id>generate-documentation</id>
- <phase>process-classes</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <executable>../../src/assemble/docgen.sh</executable>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>