Author: billie
Date: Tue Oct 4 18:47:44 2011
New Revision: 1178901
URL: http://svn.apache.org/viewvc?rev=1178901&view=rev
Log:
ACCUMULO-2 moved cloudtrace for 1.3 branch, fixed poms
Added:
incubator/accumulo/branches/1.3/src/trace/ (props changed)
- copied from r1178851,
incubator/accumulo/branches/1.3/contrib/cloudtrace-0.1.3/
Removed:
incubator/accumulo/branches/1.3/contrib/cloudtrace-0.1.3/
Modified:
incubator/accumulo/branches/1.3/ (props changed)
incubator/accumulo/branches/1.3/conf/ (props changed)
incubator/accumulo/branches/1.3/pom.xml
incubator/accumulo/branches/1.3/src/core/ (props changed)
incubator/accumulo/branches/1.3/src/core/pom.xml
incubator/accumulo/branches/1.3/src/examples/ (props changed)
incubator/accumulo/branches/1.3/src/server/ (props changed)
incubator/accumulo/branches/1.3/src/server/pom.xml
incubator/accumulo/branches/1.3/src/start/ (props changed)
incubator/accumulo/branches/1.3/src/trace/pom.xml
Propchange: incubator/accumulo/branches/1.3/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 4 18:47:44 2011
@@ -0,0 +1,2 @@
+logs
+walogs
Propchange: incubator/accumulo/branches/1.3/conf/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 4 18:47:44 2011
@@ -0,0 +1,4 @@
+accumulo-metrics.xml
+masters
+slaves
+tracers
Modified: incubator/accumulo/branches/1.3/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/pom.xml?rev=1178901&r1=1178900&r2=1178901&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/pom.xml (original)
+++ incubator/accumulo/branches/1.3/pom.xml Tue Oct 4 18:47:44 2011
@@ -10,6 +10,7 @@
<name>accumulo</name>
<modules>
+ <module>src/trace</module>
<module>src/core</module>
<module>src/server</module>
<module>src/start</module>
@@ -80,7 +81,7 @@
<configuration>
<outputDirectory>../../lib</outputDirectory>
<!-- just grab the
non-provided runtime dependencies -->
-
<includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,jfreechart,jcommon,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api,cloudtrace</includeArtifactIds>
+
<includeArtifactIds>commons-collections,commons-configuration,commons-io,commons-lang,jline,log4j,libthrift,jfreechart,jcommon,commons-jci-core,commons-jci-fam,commons-logging,commons-logging-api</includeArtifactIds>
<excludeGroupIds>org.apache.accumulo</excludeGroupIds>
<excludeTransitive>true</excludeTransitive>
</configuration>
@@ -101,6 +102,7 @@
</manifestEntries>
</archive>
<includes>
+ <include>cloudtrace/**</include>
<include>org/apache/accumulo**/**</include>
<include>web/**</include>
<include>randomwalk/**</include>
@@ -461,6 +463,11 @@
</dependency>
<!-- accumulo dependency jars that we will provide -->
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>cloudtrace</artifactId>
+ <version>1.3.5-incubating-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-start</artifactId>
@@ -563,11 +570,6 @@
<artifactId>commons-jci-fam</artifactId>
<version>1.0</version>
</dependency>
- <dependency>
- <groupId>cloudtrace</groupId>
- <artifactId>cloudtrace</artifactId>
- <version>0.1.3</version>
- </dependency>
</dependencies>
</dependencyManagement>
Propchange: incubator/accumulo/branches/1.3/src/core/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 4 18:47:44 2011
@@ -0,0 +1 @@
+target
Modified: incubator/accumulo/branches/1.3/src/core/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/core/pom.xml?rev=1178901&r1=1178900&r2=1178901&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/core/pom.xml (original)
+++ incubator/accumulo/branches/1.3/src/core/pom.xml Tue Oct 4 18:47:44 2011
@@ -80,7 +80,7 @@
<artifactId>accumulo-start</artifactId>
</dependency>
<dependency>
- <groupId>cloudtrace</groupId>
+ <groupId>org.apache.accumulo</groupId>
<artifactId>cloudtrace</artifactId>
</dependency>
<dependency>
Propchange: incubator/accumulo/branches/1.3/src/examples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 4 18:47:44 2011
@@ -0,0 +1 @@
+target
Propchange: incubator/accumulo/branches/1.3/src/server/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 4 18:47:44 2011
@@ -0,0 +1 @@
+target
Modified: incubator/accumulo/branches/1.3/src/server/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/server/pom.xml?rev=1178901&r1=1178900&r2=1178901&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/server/pom.xml (original)
+++ incubator/accumulo/branches/1.3/src/server/pom.xml Tue Oct 4 18:47:44 2011
@@ -24,6 +24,10 @@
<artifactId>zookeeper</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>cloudtrace</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.accumulo</groupId>
<artifactId>accumulo-core</artifactId>
</dependency>
@@ -67,10 +71,6 @@
<groupId>jfree</groupId>
<artifactId>jcommon</artifactId>
</dependency>
- <dependency>
- <groupId>cloudtrace</groupId>
- <artifactId>cloudtrace</artifactId>
- </dependency>
</dependencies>
</project>
Propchange: incubator/accumulo/branches/1.3/src/start/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 4 18:47:44 2011
@@ -0,0 +1 @@
+target
Propchange: incubator/accumulo/branches/1.3/src/trace/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Oct 4 18:47:44 2011
@@ -0,0 +1 @@
+target
Modified: incubator/accumulo/branches/1.3/src/trace/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/accumulo/branches/1.3/src/trace/pom.xml?rev=1178901&r1=1178851&r2=1178901&view=diff
==============================================================================
--- incubator/accumulo/branches/1.3/src/trace/pom.xml (original)
+++ incubator/accumulo/branches/1.3/src/trace/pom.xml Tue Oct 4 18:47:44 2011
@@ -1,77 +1,34 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ <parent>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo</artifactId>
+ <version>1.3.5-incubating-SNAPSHOT</version>
+ <relativePath>../../</relativePath>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
- <groupId>cloudtrace</groupId>
+ <groupId>org.apache.accumulo</groupId>
<artifactId>cloudtrace</artifactId>
<name>cloudtrace</name>
- <version>0.1.3</version>
-
- <build>
- <defaultGoal>package</defaultGoal>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <optimize>true</optimize>
- </configuration>
- </plugin>
- </plugins>
- </build>
<dependencies>
- <!-- test dependencies -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
- </dependency>
-
- <!-- runtime dependencies -->
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- </dependency>
-
-
-
-
-
- <dependency>
- <groupId>org.apache.zookeeper</groupId>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.3.2</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.thrift</groupId>
<artifactId>libthrift</artifactId>
- <version>0.3</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.1</version>
- <type>jar</type>
- <scope>compile</scope>
</dependency>
</dependencies>
- <distributionManagement>
- <repository>
- <id>${cloudtrace-releases-repo}</id>
- <url>${cloudtrace-releases-url}</url>
- </repository>
- <snapshotRepository>
- <id>${cloudtrace-snapshots-repo}</id>
- <url>${cloudtrace-snapshots-url}</url>
- </snapshotRepository>
- </distributionManagement>
-
</project>
