accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bil...@apache.org
Subject svn commit: r1300676 - in /incubator/accumulo/trunk: assemble/ examples/simple/ examples/wikisearch/ examples/wikisearch/ingest/ examples/wikisearch/query/ server/src/main/c++/mlock/ server/src/main/c++/nativeMap/
Date Wed, 14 Mar 2012 18:26:04 GMT
Author: billie
Date: Wed Mar 14 18:26:04 2012
New Revision: 1300676

URL: http://svn.apache.org/viewvc?rev=1300676&view=rev
Log:
ACCUMULO-464 ACCUMULO-465 cleaned up a few relative directories related to the removal of
src

Modified:
    incubator/accumulo/trunk/assemble/pom.xml
    incubator/accumulo/trunk/examples/simple/pom.xml
    incubator/accumulo/trunk/examples/wikisearch/ingest/pom.xml
    incubator/accumulo/trunk/examples/wikisearch/pom.xml
    incubator/accumulo/trunk/examples/wikisearch/query/pom.xml
    incubator/accumulo/trunk/server/src/main/c++/mlock/Makefile
    incubator/accumulo/trunk/server/src/main/c++/nativeMap/Makefile

Modified: incubator/accumulo/trunk/assemble/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/assemble/pom.xml?rev=1300676&r1=1300675&r2=1300676&view=diff
==============================================================================
--- incubator/accumulo/trunk/assemble/pom.xml (original)
+++ incubator/accumulo/trunk/assemble/pom.xml Wed Mar 14 18:26:04 2012
@@ -268,7 +268,7 @@
                 <configuration>
                   <deb>${project.build.directory}/${project.artifactId}_${project.version}.deb</deb>
                   <attach>false</attach>
-                  <controlDir>src/packages/deb/accumulo</controlDir>
+                  <controlDir>packages/deb/accumulo</controlDir>
                   <installDir>/usr/lib/accumulo</installDir>
                   <dataSet>
                     <data>
@@ -359,33 +359,33 @@
                 </goals>
                 <configuration>
                   <attach>false</attach>
-                  <controlDir>src/packages/deb/accumulo-native</controlDir>
+                  <controlDir>packages/deb/accumulo-native</controlDir>
                   <installDir>/usr/lib/accumulo</installDir>
                   <deb>${project.build.directory}/${project.artifactId}-native_${project.version}-${os.arch}.deb</deb>
                   <dataSet>
                     <data>
-                      <src>${accumulo-top}/src/server/src/main/c++</src>
+                      <src>${accumulo-top}/server/src/main/c++</src>
                       <type>directory</type>
                       <mapper>
                         <type>perm</type>
-                        <prefix>/usr/lib/accumulo/src/server/src/main/c++</prefix>
+                        <prefix>/usr/lib/accumulo/server/src/main/c++</prefix>
                       </mapper>
                       <excludes>**/.svn/**</excludes>
                     </data>
                     <data>
-                      <src>${accumulo-top}/src/server/src/main/java/org/apache/accumulo/server/tabletserver/MLock.java</src>
+                      <src>${accumulo-top}/server/src/main/java/org/apache/accumulo/server/tabletserver/MLock.java</src>
                       <type>file</type>
                       <mapper>
                         <type>perm</type>
-                        <prefix>/usr/lib/accumulo/src/server/src/main/java/org/apache/accumulo/server/tabletserver/MLock.java</prefix>
+                        <prefix>/usr/lib/accumulo/server/src/main/java/org/apache/accumulo/server/tabletserver/MLock.java</prefix>
                       </mapper>
                     </data>
                     <data>
-                      <src>${accumulo-top}/src/server/src/main/java/org/apache/accumulo/server/tabletserver/NativeMap.java</src>
+                      <src>${accumulo-top}/server/src/main/java/org/apache/accumulo/server/tabletserver/NativeMap.java</src>
                       <type>file</type>
                       <mapper>
                         <type>perm</type>
-                        <prefix>/usr/lib/accumulo/src/server/src/main/java/org/apache/accumulo/server/tabletserver/NativeMap.java</prefix>
+                        <prefix>/usr/lib/accumulo/server/src/main/java/org/apache/accumulo/server/tabletserver/NativeMap.java</prefix>
                       </mapper>
                     </data>
                   </dataSet>
@@ -399,7 +399,7 @@
                 </goals>
                 <configuration>
                   <attach>false</attach>
-                  <controlDir>src/packages/deb/accumulo-test</controlDir>
+                  <controlDir>packages/deb/accumulo-test</controlDir>
                   <installDir>/usr/lib/accumulo</installDir>
                   <deb>${project.build.directory}/${project.artifactId}-test_${project.version}-${os.arch}.deb</deb>
                   <dataSet>

Modified: incubator/accumulo/trunk/examples/simple/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/examples/simple/pom.xml?rev=1300676&r1=1300675&r2=1300676&view=diff
==============================================================================
--- incubator/accumulo/trunk/examples/simple/pom.xml (original)
+++ incubator/accumulo/trunk/examples/simple/pom.xml Wed Mar 14 18:26:04 2012
@@ -22,7 +22,6 @@
     <groupId>org.apache.accumulo</groupId>
     <artifactId>accumulo-examples</artifactId>
     <version>1.5.0-incubating-SNAPSHOT</version>
-    <relativePath>../</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -45,7 +44,7 @@
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
-          <outputDirectory>../../../lib</outputDirectory>
+          <outputDirectory>../../lib</outputDirectory>
           <archive>
             <manifest>
               <addDefaultImplementationEntries>true</addDefaultImplementationEntries>

Modified: incubator/accumulo/trunk/examples/wikisearch/ingest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/examples/wikisearch/ingest/pom.xml?rev=1300676&r1=1300675&r2=1300676&view=diff
==============================================================================
--- incubator/accumulo/trunk/examples/wikisearch/ingest/pom.xml (original)
+++ incubator/accumulo/trunk/examples/wikisearch/ingest/pom.xml Wed Mar 14 18:26:04 2012
@@ -21,7 +21,6 @@
     <artifactId>accumulo-wikisearch</artifactId>
     <groupId>org.apache.accumulo</groupId>
     <version>1.5.0-incubating-SNAPSHOT</version>
-    <relativePath>../</relativePath>
   </parent>
 
   <artifactId>wikisearch-ingest</artifactId>

Modified: incubator/accumulo/trunk/examples/wikisearch/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/examples/wikisearch/pom.xml?rev=1300676&r1=1300675&r2=1300676&view=diff
==============================================================================
--- incubator/accumulo/trunk/examples/wikisearch/pom.xml (original)
+++ incubator/accumulo/trunk/examples/wikisearch/pom.xml Wed Mar 14 18:26:04 2012
@@ -21,7 +21,6 @@
         <artifactId>accumulo-examples</artifactId>
         <groupId>org.apache.accumulo</groupId>
         <version>1.5.0-incubating-SNAPSHOT</version>
-        <relativePath>../</relativePath>
   </parent>
   <artifactId>accumulo-wikisearch</artifactId>
   <packaging>pom</packaging>

Modified: incubator/accumulo/trunk/examples/wikisearch/query/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/examples/wikisearch/query/pom.xml?rev=1300676&r1=1300675&r2=1300676&view=diff
==============================================================================
--- incubator/accumulo/trunk/examples/wikisearch/query/pom.xml (original)
+++ incubator/accumulo/trunk/examples/wikisearch/query/pom.xml Wed Mar 14 18:26:04 2012
@@ -20,7 +20,6 @@
     <artifactId>accumulo-wikisearch</artifactId>
     <groupId>org.apache.accumulo</groupId>
     <version>1.5.0-incubating-SNAPSHOT</version>
-    <relativePath>../</relativePath>
   </parent>
 
   <artifactId>wikisearch-query</artifactId>

Modified: incubator/accumulo/trunk/server/src/main/c++/mlock/Makefile
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/server/src/main/c%2B%2B/mlock/Makefile?rev=1300676&r1=1300675&r2=1300676&view=diff
==============================================================================
--- incubator/accumulo/trunk/server/src/main/c++/mlock/Makefile (original)
+++ incubator/accumulo/trunk/server/src/main/c++/mlock/Makefile Wed Mar 14 18:26:04 2012
@@ -28,7 +28,7 @@ LIBS:= lib$(LIB)-Mac_OS_X-x86_64-64.jnil
 CXXFLAGS=-m64 -dynamiclib -O3 -I/System/Library/Frameworks/JavaVM.framework/Headers
 endif
 
-INSTALL_DIR=../../../../../../lib/native/mlock
+INSTALL_DIR=../../../../../lib/native/mlock
 INSTALLED_LIBS=$(patsubst %,$(INSTALL_DIR)/%,$(LIBS))
 
 all : $(INSTALLED_LIBS)
@@ -37,7 +37,7 @@ clean:
 	rm -f $(INSTALLED_LIBS) $(LIBS)
 
 org_apache_accumulo_server_tabletserver_$(LIB).h : ../../java/org/apache/accumulo/server/tabletserver/$(LIB).java
-	javah -classpath ../../../../../../lib/accumulo-server-1.5.0-incubating-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.$(LIB)
+	javah -classpath ../../../../../lib/accumulo-server-1.5.0-incubating-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.$(LIB)
 
 $(INSTALLED_LIBS) : $(INSTALL_DIR) $(LIBS)
 	cp $(LIBS) $(INSTALL_DIR)

Modified: incubator/accumulo/trunk/server/src/main/c++/nativeMap/Makefile
URL: http://svn.apache.org/viewvc/incubator/accumulo/trunk/server/src/main/c%2B%2B/nativeMap/Makefile?rev=1300676&r1=1300675&r2=1300676&view=diff
==============================================================================
--- incubator/accumulo/trunk/server/src/main/c++/nativeMap/Makefile (original)
+++ incubator/accumulo/trunk/server/src/main/c++/nativeMap/Makefile Wed Mar 14 18:26:04 2012
@@ -27,7 +27,7 @@ LIBS:= libNativeMap-Mac_OS_X-x86_64-64.j
 CXXFLAGS=-m64 -dynamiclib -O3 -I/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers
 endif
 
-INSTALL_DIR=../../../../../../lib/native/map
+INSTALL_DIR=../../../../../lib/native/map
 INSTALLED_LIBS=$(patsubst %,$(INSTALL_DIR)/%,$(LIBS))
 
 all : $(INSTALLED_LIBS)
@@ -36,7 +36,7 @@ clean:
 	rm -f $(INSTALLED_LIBS) $(LIBS)
 
 org_apache_accumulo_server_tabletserver_NativeMap.h : ../../java/org/apache/accumulo/server/tabletserver/NativeMap.java
-	javah -classpath ../../../../../../lib/accumulo-server-1.5.0-incubating-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.NativeMap
+	javah -classpath ../../../../../lib/accumulo-server-1.5.0-incubating-SNAPSHOT.jar org.apache.accumulo.server.tabletserver.NativeMap
 
 $(INSTALLED_LIBS) : $(INSTALL_DIR) $(LIBS)
 	cp $(LIBS) $(INSTALL_DIR)



Mime
View raw message