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 2012/01/11 16:44:09 UTC
svn commit: r1230099 - in /incubator/accumulo/branches/1.4: pom.xml
src/examples/pom.xml src/examples/simple/ src/examples/simple/pom.xml
src/examples/simple/src/ src/examples/src/ src/examples/wikisearch/
src/examples/wikisearch/pom.xml src/wikisearch/
Author: ecn
Date: Wed Jan 11 15:44:09 2012
New Revision: 1230099
URL: http://svn.apache.org/viewvc?rev=1230099&view=rev
Log:
ACCUMULO-285 move examples to examples/simple, move wikisearch to examples/wikisearch
Added:
incubator/accumulo/branches/1.4/src/examples/simple/ (with props)
incubator/accumulo/branches/1.4/src/examples/simple/pom.xml
- copied, changed from r1230071, incubator/accumulo/branches/1.4/src/examples/pom.xml
incubator/accumulo/branches/1.4/src/examples/simple/src/
- copied from r1230071, incubator/accumulo/branches/1.4/src/examples/src/
incubator/accumulo/branches/1.4/src/examples/wikisearch/
- copied from r1230071, incubator/accumulo/branches/1.4/src/wikisearch/
Removed:
incubator/accumulo/branches/1.4/src/examples/pom.xml
incubator/accumulo/branches/1.4/src/examples/src/
incubator/accumulo/branches/1.4/src/wikisearch/
Modified:
incubator/accumulo/branches/1.4/pom.xml
incubator/accumulo/branches/1.4/src/examples/wikisearch/pom.xml
Modified: incubator/accumulo/branches/1.4/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/pom.xml?rev=1230099&r1=1230098&r2=1230099&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/pom.xml (original)
+++ incubator/accumulo/branches/1.4/pom.xml Wed Jan 11 15:44:09 2012
@@ -36,7 +36,6 @@
<module>src/server</module>
<module>src/start</module>
<module>src/examples</module>
- <module>src/wikisearch</module>
</modules>
<build>
Propchange: incubator/accumulo/branches/1.4/src/examples/simple/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Jan 11 15:44:09 2012
@@ -0,0 +1,2 @@
+target
+.*
Copied: incubator/accumulo/branches/1.4/src/examples/simple/pom.xml (from r1230071, incubator/accumulo/branches/1.4/src/examples/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/simple/pom.xml?p2=incubator/accumulo/branches/1.4/src/examples/simple/pom.xml&p1=incubator/accumulo/branches/1.4/src/examples/pom.xml&r1=1230071&r2=1230099&rev=1230099&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/pom.xml (original)
+++ incubator/accumulo/branches/1.4/src/examples/simple/pom.xml Wed Jan 11 15:44:09 2012
@@ -20,14 +20,14 @@
<parent>
<groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo</artifactId>
+ <artifactId>accumulo-examples</artifactId>
<version>1.4.0-incubating-SNAPSHOT</version>
- <relativePath>../../</relativePath>
+ <relativePath>../</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>accumulo-examples</artifactId>
- <name>accumulo-examples</name>
+ <artifactId>examples-simple</artifactId>
+ <name>examples-simple</name>
<dependencies>
<dependency>
@@ -40,4 +40,29 @@
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <outputDirectory>../../../lib</outputDirectory>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ <manifestEntries>
+ <Implementation-Build>${buildNumber}</Implementation-Build>
+ <Implementation-Timestamp>${timestamp}</Implementation-Timestamp>
+ </manifestEntries>
+ </archive>
+ <includes>
+ <include>org/apache/accumulo**/**</include>
+ <include>**/META-INF/*</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: incubator/accumulo/branches/1.4/src/examples/wikisearch/pom.xml
URL: http://svn.apache.org/viewvc/incubator/accumulo/branches/1.4/src/examples/wikisearch/pom.xml?rev=1230099&r1=1230071&r2=1230099&view=diff
==============================================================================
--- incubator/accumulo/branches/1.4/src/examples/wikisearch/pom.xml (original)
+++ incubator/accumulo/branches/1.4/src/examples/wikisearch/pom.xml Wed Jan 11 15:44:09 2012
@@ -18,10 +18,10 @@
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>accumulo</artifactId>
+ <artifactId>accumulo-examples</artifactId>
<groupId>org.apache.accumulo</groupId>
<version>1.4.0-incubating-SNAPSHOT</version>
- <relativePath>../../</relativePath>
+ <relativePath>../</relativePath>
</parent>
<artifactId>accumulo-wikisearch</artifactId>
<packaging>pom</packaging>
@@ -75,6 +75,8 @@
<filesets>
<fileset>
<directory>lib</directory>
+ </fileset>
+ <fileset>
<directory>target</directory>
</fileset>
</filesets>