Modified: accumulo/branches/1.5/start/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/start/pom.xml?rev=1464817&r1=1464816&r2=1464817&view=diff ============================================================================== --- accumulo/branches/1.5/start/pom.xml (original) +++ accumulo/branches/1.5/start/pom.xml Fri Apr 5 02:54:02 2013 @@ -16,51 +16,83 @@ 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.accumulo</groupId> <artifactId>accumulo</artifactId> <version>1.5.0-SNAPSHOT</version> </parent> - - <modelVersion>4.0.0</modelVersion> <artifactId>accumulo-start</artifactId> <name>Start</name> - + <dependencies> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-vfs2</artifactId> + </dependency> + <dependency> + <groupId>javax.ws.rs</groupId> + <artifactId>jsr311-api</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-api-easymock</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-module-junit4</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.powermock</groupId> + <artifactId>powermock-reflect</artifactId> + <scope>test</scope> + </dependency> + </dependencies> <build> <pluginManagement> <plugins> <plugin> - <artifactId>maven-jar-plugin</artifactId> + <artifactId>maven-surefire-plugin</artifactId> <configuration> - <outputDirectory>../lib</outputDirectory> - <archive> - <manifestSections> - <manifestSection> - <name>accumulo/start/</name> - <manifestEntries> - <Sealed>true</Sealed> - </manifestEntries> - </manifestSection> - </manifestSections> - </archive> + <forkMode>always</forkMode> </configuration> </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <forkMode>always</forkMode> - </configuration> - </plugin> - </plugins> </pluginManagement> </build> - <profiles> - <!-- profile for building against Hadoop 1.0.x - Activate by not specifying hadoop.profile --> <profile> + <!-- profile for building against Hadoop 1.0.x + Activate by not specifying hadoop.profile --> <id>hadoop-1.0</id> <activation> <property> @@ -71,18 +103,18 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-core</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-test</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> </dependencies> </profile> - <!-- profile for building against Hadoop 2.0.x - Activate using: mvn -Dhadoop.profile=2.0 --> <profile> + <!-- profile for building against Hadoop 2.0.x + Activate using: mvn -Dhadoop.profile=2.0 --> <id>hadoop-2.0</id> <activation> <property> @@ -94,71 +126,30 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + <type>test-jar</type> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> - <version>${hadoop.version}</version> <scope>test</scope> </dependency> </dependencies> </profile> </profiles> - - <dependencies> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-vfs2</artifactId> - <version>2.0</version> - </dependency> - <!-- TEST DEPENDENCIES --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>jsr311-api</artifactId> - <version>1.0</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-nop</artifactId> - <version>1.7.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-module-junit4</artifactId> - <version>1.4.12</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.powermock</groupId> - <artifactId>powermock-api-easymock</artifactId> - <version>1.4.12</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>3.1</version> - <scope>test</scope> - </dependency> - </dependencies> - </project>
Modified: accumulo/branches/1.5/start/src/test/resources/log4j.properties URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/start/src/test/resources/log4j.properties?rev=1464817&r1=1464816&r2=1464817&view=diff ============================================================================== --- accumulo/branches/1.5/start/src/test/resources/log4j.properties (original) +++ accumulo/branches/1.5/start/src/test/resources/log4j.properties Fri Apr 5 02:54:02 2013 @@ -1,3 +1,18 @@ +# 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. + log4j.rootLogger=INFO, CA log4j.appender.CA=org.apache.log4j.ConsoleAppender log4j.appender.CA.layout=org.apache.log4j.PatternLayout Modified: accumulo/branches/1.5/test/compat/japi-compliance/japi-accumulo-1.4.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/compat/japi-compliance/japi-accumulo-1.4.xml?rev=1464817&r1=1464816&r2=1464817&view=diff ============================================================================== --- accumulo/branches/1.5/test/compat/japi-compliance/japi-accumulo-1.4.xml (original) +++ accumulo/branches/1.5/test/compat/japi-compliance/japi-accumulo-1.4.xml Fri Apr 5 02:54:02 2013 @@ -1,3 +1,19 @@ +<!-- + 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. +--> <version> 1.4.2-SNAPSHOT </version> Modified: accumulo/branches/1.5/test/compat/japi-compliance/japi-accumulo-1.5.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/compat/japi-compliance/japi-accumulo-1.5.xml?rev=1464817&r1=1464816&r2=1464817&view=diff ============================================================================== --- accumulo/branches/1.5/test/compat/japi-compliance/japi-accumulo-1.5.xml (original) +++ accumulo/branches/1.5/test/compat/japi-compliance/japi-accumulo-1.5.xml Fri Apr 5 02:54:02 2013 @@ -1,3 +1,19 @@ +<!-- + 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. +--> <version> 1.5.0-SNAPSHOT </version> Modified: accumulo/branches/1.5/test/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/pom.xml?rev=1464817&r1=1464816&r2=1464817&view=diff ============================================================================== --- accumulo/branches/1.5/test/pom.xml (original) +++ accumulo/branches/1.5/test/pom.xml Fri Apr 5 02:54:02 2013 @@ -16,52 +16,93 @@ 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.accumulo</groupId> <artifactId>accumulo</artifactId> <version>1.5.0-SNAPSHOT</version> </parent> - - <modelVersion>4.0.0</modelVersion> <artifactId>accumulo-test</artifactId> <name>Testing</name> - + <dependencies> + <dependency> + <groupId>com.beust</groupId> + <artifactId>jcommander</artifactId> + </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>jline</groupId> + <artifactId>jline</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-fate</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-server</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-start</artifactId> + </dependency> + <dependency> + <groupId>org.apache.accumulo</groupId> + <artifactId>accumulo-trace</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-math</artifactId> + </dependency> + <dependency> + <groupId>org.apache.thrift</groupId> + <artifactId>libthrift</artifactId> + </dependency> + <dependency> + <groupId>org.apache.zookeeper</groupId> + <artifactId>zookeeper</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + </dependencies> <build> <pluginManagement> <plugins> <plugin> - <artifactId>maven-jar-plugin</artifactId> + <groupId>org.apache.rat</groupId> + <artifactId>apache-rat-plugin</artifactId> <configuration> - <outputDirectory>../lib</outputDirectory> + <excludes> + <exclude>system/bench/lib/*splits</exclude> + </excludes> </configuration> </plugin> </plugins> </pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestSections> - <manifestSection> - <name>accumulo/test/</name> - <manifestEntries> - <Sealed>true</Sealed> - </manifestEntries> - </manifestSection> - </manifestSections> - </archive> - </configuration> - </plugin> - </plugins> </build> - <profiles> - <!-- profile for building against Hadoop 1.0.x - Activate by not specifying hadoop.profile --> <profile> + <!-- profile for building against Hadoop 1.0.x + Activate by not specifying hadoop.profile --> <id>hadoop-1.0</id> <activation> <property> @@ -72,16 +113,18 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-core</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-tools</artifactId> + <scope>test</scope> </dependency> </dependencies> </profile> - <!-- profile for building against Hadoop 2.0.x - Activate using: mvn -Dhadoop.profile=2.0 --> <profile> + <!-- profile for building against Hadoop 2.0.x + Activate using: mvn -Dhadoop.profile=2.0 --> <id>hadoop-2.0</id> <activation> <property> @@ -93,32 +136,24 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-common</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-mapreduce-client-core</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-distcp</artifactId> + <scope>test</scope> </dependency> </dependencies> </profile> </profiles> - - <dependencies> - <dependency> - <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.accumulo</groupId> - <artifactId>accumulo-server</artifactId> - </dependency> - <dependency> - <groupId>org.apache.zookeeper</groupId> - <artifactId>zookeeper</artifactId> - </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-math</artifactId> - </dependency> - </dependencies> - </project> Modified: accumulo/branches/1.5/test/src/main/resources/log4j.properties URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/resources/log4j.properties?rev=1464817&r1=1464816&r2=1464817&view=diff ============================================================================== --- accumulo/branches/1.5/test/src/main/resources/log4j.properties (original) +++ accumulo/branches/1.5/test/src/main/resources/log4j.properties Fri Apr 5 02:54:02 2013 @@ -1,3 +1,18 @@ +# 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. + log4j.rootLogger=DEBUG,A1 log4j.logger.org.apache.accumulo.core.util.shell.Shell.audit=WARN,A1 log4j.appender.A1=org.apache.log4j.ConsoleAppender Modified: accumulo/branches/1.5/test/src/test/resources/log4j.properties URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/test/resources/log4j.properties?rev=1464817&r1=1464816&r2=1464817&view=diff ============================================================================== --- accumulo/branches/1.5/test/src/test/resources/log4j.properties (original) +++ accumulo/branches/1.5/test/src/test/resources/log4j.properties Fri Apr 5 02:54:02 2013 @@ -1,3 +1,18 @@ +# 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. + log4j.rootLogger=INFO, CA log4j.appender.CA=org.apache.log4j.ConsoleAppender log4j.appender.CA.layout=org.apache.log4j.PatternLayout Modified: accumulo/branches/1.5/test/system/auto/simple/__init__.py URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/auto/simple/__init__.py?rev=1464817&r1=1464816&r2=1464817&view=diff ============================================================================== --- accumulo/branches/1.5/test/system/auto/simple/__init__.py (original) +++ accumulo/branches/1.5/test/system/auto/simple/__init__.py Fri Apr 5 02:54:02 2013 @@ -0,0 +1,15 @@ +# 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. + Modified: accumulo/branches/1.5/test/system/auto/stress/__init__.py URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/auto/stress/__init__.py?rev=1464817&r1=1464816&r2=1464817&view=diff ============================================================================== --- accumulo/branches/1.5/test/system/auto/stress/__init__.py (original) +++ accumulo/branches/1.5/test/system/auto/stress/__init__.py Fri Apr 5 02:54:02 2013 @@ -0,0 +1,15 @@ +# 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. + Modified: accumulo/branches/1.5/test/system/continuous/batch_walkers.txt.example URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/continuous/batch_walkers.txt.example?rev=1464817&r1=1464816&r2=1464817&view=diff ============================================================================== --- accumulo/branches/1.5/test/system/continuous/batch_walkers.txt.example (original) +++ accumulo/branches/1.5/test/system/continuous/batch_walkers.txt.example Fri Apr 5 02:54:02 2013 @@ -1 +1,16 @@ +# 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. + localhost Modified: accumulo/branches/1.5/test/system/continuous/ingesters.txt.example URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/continuous/ingesters.txt.example?rev=1464817&r1=1464816&r2=1464817&view=diff ============================================================================== --- accumulo/branches/1.5/test/system/continuous/ingesters.txt.example (original) +++ accumulo/branches/1.5/test/system/continuous/ingesters.txt.example Fri Apr 5 02:54:02 2013 @@ -1,2 +1,17 @@ +# 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. + host1 host2 Modified: accumulo/branches/1.5/test/system/continuous/scanners.txt.example URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/continuous/scanners.txt.example?rev=1464817&r1=1464816&r2=1464817&view=diff ============================================================================== --- accumulo/branches/1.5/test/system/continuous/scanners.txt.example (original) +++ accumulo/branches/1.5/test/system/continuous/scanners.txt.example Fri Apr 5 02:54:02 2013 @@ -1 +1,16 @@ +# 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. + localhost Modified: accumulo/branches/1.5/test/system/continuous/walkers.txt.example URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/continuous/walkers.txt.example?rev=1464817&r1=1464816&r2=1464817&view=diff ============================================================================== --- accumulo/branches/1.5/test/system/continuous/walkers.txt.example (original) +++ accumulo/branches/1.5/test/system/continuous/walkers.txt.example Fri Apr 5 02:54:02 2013 @@ -1,2 +1,17 @@ +# 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. + host3 host4 Modified: accumulo/branches/1.5/test/system/randomwalk/conf/walkers.example URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/randomwalk/conf/walkers.example?rev=1464817&r1=1464816&r2=1464817&view=diff ============================================================================== --- accumulo/branches/1.5/test/system/randomwalk/conf/walkers.example (original) +++ accumulo/branches/1.5/test/system/randomwalk/conf/walkers.example Fri Apr 5 02:54:02 2013 @@ -1 +1,16 @@ +# 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. + localhost Modified: accumulo/branches/1.5/trace/pom.xml URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/trace/pom.xml?rev=1464817&r1=1464816&r2=1464817&view=diff ============================================================================== --- accumulo/branches/1.5/trace/pom.xml (original) +++ accumulo/branches/1.5/trace/pom.xml Fri Apr 5 02:54:02 2013 @@ -16,71 +16,66 @@ 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.accumulo</groupId> <artifactId>accumulo</artifactId> <version>1.5.0-SNAPSHOT</version> </parent> - - <modelVersion>4.0.0</modelVersion> <artifactId>accumulo-trace</artifactId> <name>Trace</name> - <build> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <outputDirectory>../lib</outputDirectory> - </configuration> - </plugin> - </plugins> - </pluginManagement> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-thrift</id> - <phase>generate-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>${basedir}/src/main/scripts/generate-thrift.sh</executable> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <dependencies> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> - <dependency> <groupId>org.apache.thrift</groupId> <artifactId>libthrift</artifactId> </dependency> - - + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> + <scope>provided</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>runtime</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> </dependency> </dependencies> - + <profiles> + <profile> + <id>thrift</id> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-thrift</id> + <goals> + <goal>exec</goal> + </goals> + <phase>generate-sources</phase> + <configuration> + <executable>${basedir}/src/main/scripts/generate-thrift.sh</executable> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> </project>