You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/05/22 22:50:33 UTC
svn commit: r1485416 - in /accumulo/trunk: ./ assemble/ contrib/ core/
examples/ fate/src/main/java/org/apache/accumulo/fate/
fate/src/main/java/org/apache/accumulo/fate/zookeeper/ proxy/ server/ src/
test/src/main/java/org/apache/accumulo/test/randomw...
Author: ecn
Date: Wed May 22 20:50:32 2013
New Revision: 1485416
URL: http://svn.apache.org/r1485416
Log:
ACCUMULO-970 simplify the hunt for the correct jars
Modified:
accumulo/trunk/ (props changed)
accumulo/trunk/assemble/ (props changed)
accumulo/trunk/contrib/findbugs_build.xml
accumulo/trunk/core/ (props changed)
accumulo/trunk/examples/ (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java (props changed)
accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java (props changed)
accumulo/trunk/pom.xml (props changed)
accumulo/trunk/proxy/README (props changed)
accumulo/trunk/server/ (props changed)
accumulo/trunk/src/ (props changed)
accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
Propchange: accumulo/trunk/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5:r1485412,1485415
Propchange: accumulo/trunk/assemble/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/assemble:r1485412,1485415
Modified: accumulo/trunk/contrib/findbugs_build.xml
URL: http://svn.apache.org/viewvc/accumulo/trunk/contrib/findbugs_build.xml?rev=1485416&r1=1485415&r2=1485416&view=diff
==============================================================================
--- accumulo/trunk/contrib/findbugs_build.xml (original)
+++ accumulo/trunk/contrib/findbugs_build.xml Wed May 22 20:50:32 2013
@@ -63,9 +63,9 @@
<pathElement location="${repository}/org/slf4j/slf4j-api/1.4.3/slf4j-api-1.4.3.jar" />
<pathElement location="${repository}/org/slf4j/slf4j-log4j12/1.4.3/slf4j-log4j12-1.4.3.jar" />
<!--pathElement location="${basedir}/../lib/jackson-0.9.2.jar" /-->
- <pathElement location="${basedir}/../lib/accumulo-fate-1.6.0-SNAPSHOT.jar" />
- <pathElement location="${basedir}/../lib/accumulo-start-1.6.0-SNAPSHOT.jar" />
- <pathElement location="${basedir}/../lib/accumulo-trace-1.6.0-SNAPSHOT.jar" />
+ <pathElement location="${basedir}/../lib/accumulo-fate.jar" />
+ <pathElement location="${basedir}/../lib/accumulo-start.jar" />
+ <pathElement location="${basedir}/../lib/accumulo-trace.jar" />
</auxClasspath>
<sourcePath>
<pathElement location="${basedir}/core/src/main/java" />
@@ -83,13 +83,13 @@
<pathElement location="${basedir}/examples/simple/src/main/java" />
<pathElement location="${basedir}/examples/simple/src/test/java" />
</sourcePath>
- <class location="${basedir}/../lib/accumulo-core-1.6.0-SNAPSHOT.jar" />
- <class location="${basedir}/../lib/accumulo-fate-1.6.0-SNAPSHOT.jar" />
- <class location="${basedir}/../lib/accumulo-server-1.6.0-SNAPSHOT.jar" />
- <class location="${basedir}/../lib/accumulo-start-1.6.0-SNAPSHOT.jar" />
- <class location="${basedir}/../lib/accumulo-test-1.6.0-SNAPSHOT.jar" />
- <class location="${basedir}/../lib/accumulo-trace-1.6.0-SNAPSHOT.jar" />
- <class location="${basedir}/../lib/examples-simple-1.6.0-SNAPSHOT.jar" />
+ <class location="${basedir}/../lib/accumulo-core.jar" />
+ <class location="${basedir}/../lib/accumulo-fate.jar" />
+ <class location="${basedir}/../lib/accumulo-server.jar" />
+ <class location="${basedir}/../lib/accumulo-start.jar" />
+ <class location="${basedir}/../lib/accumulo-test.jar" />
+ <class location="${basedir}/../lib/accumulo-trace.jar" />
+ <class location="${basedir}/../lib/examples-simple.jar" />
</findbugs>
</target>
Propchange: accumulo/trunk/core/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/core:r1485412,1485415
Propchange: accumulo/trunk/examples/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/examples:r1485412,1485415
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1485412,1485415
Propchange: accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1485412,1485415
Propchange: accumulo/trunk/pom.xml
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/pom.xml:r1485412,1485415
Propchange: accumulo/trunk/proxy/README
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/proxy/README:r1485412,1485415
Propchange: accumulo/trunk/server/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/server:r1485412,1485415
Propchange: accumulo/trunk/src/
------------------------------------------------------------------------------
Merged /accumulo/branches/1.5/src:r1485412,1485415
Modified: accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java?rev=1485416&r1=1485415&r2=1485416&view=diff
==============================================================================
--- accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java (original)
+++ accumulo/trunk/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java Wed May 22 20:50:32 2013
@@ -168,17 +168,8 @@ public class State {
}
File libdir = new File(acuHome + "/lib");
- files = libdir.list();
- for (int i = 0; i < files.length; i++) {
- String f = files[i];
- if (f.matches("^accumulo-core-.+jar$") || f.matches("^accumulo-server-.+jar$") || f.matches("^accumulo-fate-.+jar$")
- || f.matches("^accumulo-trace-.+jar$") || f.matches("^libthrift-.+jar$")) {
- if (retval == null) {
- retval = String.format("%s/%s", libdir.getAbsolutePath(), f);
- } else {
- retval += String.format(",%s/%s", libdir.getAbsolutePath(), f);
- }
- }
+ for (String jar : "accumulo-core accumulo-server accumulo-fate accumulo-trace libthrift".split(" ")) {
+ retval += String.format(",%s/%s.jar", libdir.getAbsolutePath(), jar);
}
return retval;