Akiban Persistit

Merge lp:~nwilliams/akiban-persistit/move-core-up into lp:akiban-persistit

  1. move-core-up
  2. Merge into trunk
Proposed by Nathan Williams
Status: Merged
Approved by: Peter Beaman
Approved revision: 311
Merged at revision: 308
Proposed branch: lp:~nwilliams/akiban-persistit/move-core-up
Merge into: lp:akiban-persistit
Diff against target: 607 lines (+205/-236)
9 files modified
bench/pom.xml (+0/-10)
core/pom.xml (+0/-194)
examples/FindFile/build.xml (+4/-4)
examples/HelloWorld/build.xml (+4/-4)
examples/PersistitMapDemo/build.xml (+4/-4)
examples/SimpleBench/build.xml (+4/-4)
examples/SimpleDemo/build.xml (+4/-4)
examples/SimpleTransaction/build.xml (+4/-4)
pom.xml (+181/-8)
To merge this branch: bzr merge lp:~nwilliams/akiban-persistit/move-core-up
Reviewer Review Type Date Requested Status
Peter Beaman Approve
Review via email: mp+107852@code.launchpad.net

Description of the change

Move core up to top level directory.

Pretty much just shuffling files and combining poms:
  - Remove the legacy bench/ dir
  - Move core/src up to top level directory
  - Combine core/pom and pom, no more multi-module
  - Move a few extraneous build/test files into new src/etc directory
  - Update example build files to refer to new locations

This also changes the primary name back to just 'akiban-persistit' instead of 'akiban-persistit-core'. This will has slightly larger impact (requires updating server) but they don't have to be done in sync.

To post a comment you must log in.
Revision history for this message
Peter Beaman (pbeaman) wrote :

Looks good. Let's see what happens!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed directory 'bench'
2=== removed file 'bench/pom.xml'
3--- bench/pom.xml 2011-02-01 16:48:36 +0000
4+++ bench/pom.xml 1970-01-01 00:00:00 +0000
5@@ -1,10 +0,0 @@
6-<?xml version="1.0"?>
7-<project>
8- <modelVersion>4.0.0</modelVersion>
9- <groupId>com.akiban</groupId>
10- <artifactId>akiban-persistit-bench</artifactId>
11- <packaging>jar</packaging>
12- <name>akiban-persistit-bench</name>
13- <version>0.0-SNAPSHOT</version>
14-</project>
15-
16
17=== removed directory 'core'
18=== removed file 'core/pom.xml'
19--- core/pom.xml 2012-05-29 14:05:18 +0000
20+++ core/pom.xml 1970-01-01 00:00:00 +0000
21@@ -1,194 +0,0 @@
22-<?xml version="1.0"?>
23-<project>
24- <modelVersion>4.0.0</modelVersion>
25- <parent>
26- <groupId>com.akiban</groupId>
27- <artifactId>akiban-persistit</artifactId>
28- <version>3.1.1-SNAPSHOT</version>
29- </parent>
30- <artifactId>akiban-persistit-core</artifactId>
31- <packaging>jar</packaging>
32- <name>akiban-persistit-core</name>
33- <version>3.1.1-SNAPSHOT</version>
34- <dependencies>
35- <dependency>
36- <groupId>junit</groupId>
37- <artifactId>junit</artifactId>
38- <version>4.8.1</version>
39- <scope>test</scope>
40- </dependency>
41- <dependency>
42- <groupId>org.slf4j</groupId>
43- <artifactId>slf4j-api</artifactId>
44- <version>1.6.1</version>
45- </dependency>
46- <dependency>
47- <groupId>commons-logging</groupId>
48- <artifactId>commons-logging</artifactId>
49- <version>1.1</version>
50- <exclusions>
51- <exclusion>
52- <groupId>logkit</groupId>
53- <artifactId>logkit</artifactId>
54- </exclusion>
55- <exclusion>
56- <groupId>avalon-framework</groupId>
57- <artifactId>avalon-framework</artifactId>
58- </exclusion>
59- <exclusion>
60- <groupId>javax.servlet</groupId>
61- <artifactId>servlet-api</artifactId>
62- </exclusion>
63- </exclusions>
64- </dependency>
65- </dependencies>
66- <build>
67- <finalName>${project.artifactId}-${project.version}${BZR_REVISION}</finalName>
68- <resources>
69- <resource>
70- <directory>src/main/resources</directory>
71- <filtering>true</filtering>
72- <includes>
73- <include>com/persistit/persistit_version</include>
74- </includes>
75- </resource>
76- <resource>
77- <directory>src/main/resources</directory>
78- <filtering>false</filtering>
79- <excludes>
80- <exclude>com/persistit/persistit_version</exclude>
81- </excludes>
82- </resource>
83- </resources>
84- <plugins>
85- <plugin>
86- <groupId>org.apache.maven.plugins</groupId>
87- <artifactId>maven-resources-plugin</artifactId>
88- <version>2.4.3</version>
89- </plugin>
90- <plugin>
91- <groupId>org.codehaus.mojo</groupId>
92- <artifactId>build-helper-maven-plugin</artifactId>
93- <version>1.5</version>
94- <executions>
95- <execution>
96- <id>reserve-network-port</id>
97- <goals>
98- <goal>reserve-network-port</goal>
99- </goals>
100- <phase>process-resources</phase>
101- <configuration>
102- <portNames>
103- <portName>rmiport</portName>
104- </portNames>
105- </configuration>
106- </execution>
107- </executions>
108- </plugin>
109- <plugin>
110- <groupId>org.apache.maven.plugins</groupId>
111- <artifactId>maven-compiler-plugin</artifactId>
112- <version>2.0.2</version>
113- <configuration>
114- <source>1.6</source>
115- <target>1.6</target>
116- </configuration>
117- </plugin>
118- <plugin>
119- <groupId>org.apache.maven.plugins</groupId>
120- <artifactId>maven-source-plugin</artifactId>
121- <version>2.0.4</version>
122- <executions>
123- <execution>
124- <id>attach-sources</id>
125- <phase>package</phase>
126- <goals>
127- <goal>jar</goal>
128- </goals>
129- </execution>
130- </executions>
131- </plugin>
132- <plugin>
133- <groupId>org.apache.maven.plugins</groupId>
134- <artifactId>maven-surefire-plugin</artifactId>
135- <version>2.4.1</version>
136- <configuration>
137- <argLine>-Xmx640m -Xms128m -Drmiport=${rmiport} -Xrunjdwp:transport=dt_socket,address=8000,suspend=n,server=y</argLine>
138- <includes>
139- <include>**/*Test.java</include>
140- <include>**/*Test?.java</include>
141- </includes>
142- </configuration>
143- </plugin>
144- <plugin>
145- <groupId>org.codehaus.mojo</groupId>
146- <artifactId>rmic-maven-plugin</artifactId>
147- <version>1.0</version>
148- <configuration>
149- <outputDirectory>target/classes/</outputDirectory>
150- </configuration>
151- <executions>
152- <execution>
153- <id>rmi compilation</id>
154- <goals>
155- <goal>rmic</goal>
156- </goals>
157- </execution>
158- </executions>
159- </plugin>
160- <plugin>
161- <artifactId>maven-assembly-plugin</artifactId>
162- <configuration>
163- <descriptors>
164- <descriptor>src/main/resources/assembly_descriptor.xml</descriptor>
165- </descriptors>
166- </configuration>
167- <executions>
168- <execution>
169- <id>make-assembly</id> <!-- This is used for inheritance merges ?? -->
170- <phase>install</phase> <!-- Append to the install phase -->
171- <goals>
172- <goal>single</goal>
173- </goals>
174- </execution>
175- </executions>
176- </plugin>
177- <plugin>
178- <groupId>org.codehaus.mojo</groupId>
179- <artifactId>findbugs-maven-plugin</artifactId>
180- <version>1.2</version>
181- <configuration>
182- <findbugsXmlOutput>true</findbugsXmlOutput>
183- <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
184- <xmlOutput>true</xmlOutput>
185- <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
186- </configuration>
187- </plugin>
188- <plugin>
189- <groupId>com.atlassian.maven.plugins</groupId>
190- <artifactId>maven-clover2-plugin</artifactId>
191- <version>3.0.1</version>
192- <configuration>
193- <generateHistorical>true</generateHistorical>
194- <historyDir>/clover/history</historyDir>
195- <license>${clover.license}</license>
196- <generateXml>true</generateXml>
197- </configuration>
198- </plugin>
199- </plugins>
200- </build>
201- <reporting>
202- <plugins>
203- <plugin>
204- <groupId>org.apache.maven.plugins</groupId>
205- <artifactId>maven-surefire-report-plugin</artifactId>
206- <version>2.4.2</version>
207- </plugin>
208- <plugin>
209- <groupId>org.apache.maven.plugins</groupId>
210- <artifactId>maven-javadoc-plugin</artifactId>
211- <version>2.8</version>
212- </plugin>
213- </plugins>
214- </reporting>
215-</project>
216
217=== modified file 'examples/FindFile/build.xml'
218--- examples/FindFile/build.xml 2012-05-25 18:50:59 +0000
219+++ examples/FindFile/build.xml 2012-05-29 19:10:29 +0000
220@@ -31,8 +31,8 @@
221 srcdir="."
222 destdir=".">
223 <classpath>
224- <fileset dir="../../core/target">
225- <include name="akiban-persistit-core-*-with-dependencies-and-tests.jar"/>
226+ <fileset dir="../../target">
227+ <include name="akiban-persistit*-with-dependencies-and-tests.jar"/>
228 </fileset>
229 </classpath>
230 </javac>
231@@ -40,8 +40,8 @@
232 <target name="run" depends="compile">
233 <java fork="true" classname="FindFile">
234 <classpath>
235- <fileset dir="../../core/target">
236- <include name="akiban-persistit-core-*-with-dependencies-and-tests.jar"/>
237+ <fileset dir="../../target">
238+ <include name="akiban-persistit*-with-dependencies-and-tests.jar"/>
239 </fileset>
240 <pathelement location="." />
241 </classpath>
242
243=== modified file 'examples/HelloWorld/build.xml'
244--- examples/HelloWorld/build.xml 2012-05-25 18:50:59 +0000
245+++ examples/HelloWorld/build.xml 2012-05-29 19:10:29 +0000
246@@ -29,8 +29,8 @@
247 srcdir="."
248 destdir=".">
249 <classpath>
250- <fileset dir="../../core/target">
251- <include name="akiban-persistit-core-*-with-dependencies-and-tests.jar"/>
252+ <fileset dir="../../target">
253+ <include name="akiban-persistit*-with-dependencies-and-tests.jar"/>
254 </fileset>
255 <pathelement location="." />
256 </classpath>
257@@ -40,8 +40,8 @@
258 <target name="run" depends="compile">
259 <java classname="HelloWorld" fork="true">
260 <classpath>
261- <fileset dir="../../core/target">
262- <include name="akiban-persistit-core-*-with-dependencies-and-tests.jar"/>
263+ <fileset dir="../../target">
264+ <include name="akiban-persistit*-with-dependencies-and-tests.jar"/>
265 </fileset>
266 <pathelement location="." />
267 </classpath>
268
269=== modified file 'examples/PersistitMapDemo/build.xml'
270--- examples/PersistitMapDemo/build.xml 2012-05-25 18:50:59 +0000
271+++ examples/PersistitMapDemo/build.xml 2012-05-29 19:10:29 +0000
272@@ -29,8 +29,8 @@
273 srcdir="."
274 destdir=".">
275 <classpath>
276- <fileset dir="../../core/target">
277- <include name="akiban-persistit-core-*-with-dependencies-and-tests.jar"/>
278+ <fileset dir="../../target">
279+ <include name="akiban-persistit*-with-dependencies-and-tests.jar"/>
280 </fileset>
281 <pathelement location="." />
282 </classpath>
283@@ -40,8 +40,8 @@
284 <target name="run" depends="compile">
285 <java classname="PersistitMapDemo" fork="true" >
286 <classpath>
287- <fileset dir="../../core/target">
288- <include name="akiban-persistit-core-*-with-dependencies-and-tests.jar"/>
289+ <fileset dir="../../target">
290+ <include name="akiban-persistit*-with-dependencies-and-tests.jar"/>
291 </fileset>
292 <pathelement location="." />
293 </classpath>
294
295=== modified file 'examples/SimpleBench/build.xml'
296--- examples/SimpleBench/build.xml 2012-05-25 18:50:59 +0000
297+++ examples/SimpleBench/build.xml 2012-05-29 19:10:29 +0000
298@@ -29,8 +29,8 @@
299 srcdir="."
300 destdir=".">
301 <classpath>
302- <fileset dir="../../core/target">
303- <include name="akiban-persistit-core-*-with-dependencies-and-tests.jar"/>
304+ <fileset dir="../../target">
305+ <include name="akiban-persistit*-with-dependencies-and-tests.jar"/>
306 </fileset>
307 </classpath>
308 </javac>
309@@ -40,8 +40,8 @@
310 <target name="run" depends="compile">
311 <java classname="SimpleBench" fork="true">
312 <classpath>
313- <fileset dir="../../core/target">
314- <include name="akiban-persistit-core-*-with-dependencies-and-tests.jar"/>
315+ <fileset dir="../../target">
316+ <include name="akiban-persistit*-with-dependencies-and-tests.jar"/>
317 </fileset>
318 <pathelement location="." />
319 </classpath>
320
321=== modified file 'examples/SimpleDemo/build.xml'
322--- examples/SimpleDemo/build.xml 2012-05-25 18:50:59 +0000
323+++ examples/SimpleDemo/build.xml 2012-05-29 19:10:29 +0000
324@@ -29,8 +29,8 @@
325 srcdir="."
326 destdir=".">
327 <classpath>
328- <fileset dir="../../core/target">
329- <include name="akiban-persistit-core-*-with-dependencies-and-tests.jar"/>
330+ <fileset dir="../../target">
331+ <include name="akiban-persistit*-with-dependencies-and-tests.jar"/>
332 </fileset>
333 </classpath>
334 </javac>
335@@ -39,8 +39,8 @@
336 <target name="run" depends="compile">
337 <java classname="SimpleDemo" fork="true">
338 <classpath>
339- <fileset dir="../../core/target">
340- <include name="akiban-persistit-core-*-with-dependencies-and-tests.jar"/>
341+ <fileset dir="../../target">
342+ <include name="akiban-persistit*-with-dependencies-and-tests.jar"/>
343 </fileset>
344 <pathelement location="." />
345 </classpath>
346
347=== modified file 'examples/SimpleTransaction/build.xml'
348--- examples/SimpleTransaction/build.xml 2012-05-25 18:50:59 +0000
349+++ examples/SimpleTransaction/build.xml 2012-05-29 19:10:29 +0000
350@@ -29,8 +29,8 @@
351 srcdir="."
352 destdir=".">
353 <classpath>
354- <fileset dir="../../core/target">
355- <include name="akiban-persistit-core-*-with-dependencies-and-tests.jar"/>
356+ <fileset dir="../../target">
357+ <include name="akiban-persistit-*-with-dependencies-and-tests.jar"/>
358 </fileset>
359 </classpath>
360 </javac>
361@@ -39,8 +39,8 @@
362 <target name="run" depends="compile">
363 <java classname="SimpleTransaction" fork="true">
364 <classpath>
365- <fileset dir="../../core/target">
366- <include name="akiban-persistit-core-*-with-dependencies-and-tests.jar"/>
367+ <fileset dir="../../target">
368+ <include name="akiban-persistit*-with-dependencies-and-tests.jar"/>
369 </fileset>
370 <pathelement location="." />
371 </classpath>
372
373=== modified file 'pom.xml'
374--- pom.xml 2012-05-29 18:51:35 +0000
375+++ pom.xml 2012-05-29 19:10:29 +0000
376@@ -3,9 +3,9 @@
377 <modelVersion>4.0.0</modelVersion>
378 <groupId>com.akiban</groupId>
379 <artifactId>akiban-persistit</artifactId>
380- <packaging>pom</packaging>
381 <name>akiban-persistit</name>
382 <version>3.1.1-SNAPSHOT</version>
383+ <packaging>jar</packaging>
384 <properties>
385 <!-- this is the default version number, Jenkins job sets this to the official number -->
386 <BZR_REVISION></BZR_REVISION>
387@@ -24,20 +24,179 @@
388 <url>http://akiban.artifactoryonline.com/akiban/libs-releases-local</url>
389 </repository>
390 </distributionManagement>
391- <modules>
392- <module>core</module>
393- <module>bench</module>
394- </modules>
395+ <dependencies>
396+ <dependency>
397+ <groupId>junit</groupId>
398+ <artifactId>junit</artifactId>
399+ <version>4.8.1</version>
400+ <scope>test</scope>
401+ </dependency>
402+ <dependency>
403+ <groupId>org.slf4j</groupId>
404+ <artifactId>slf4j-api</artifactId>
405+ <version>1.6.1</version>
406+ </dependency>
407+ <dependency>
408+ <groupId>commons-logging</groupId>
409+ <artifactId>commons-logging</artifactId>
410+ <version>1.1</version>
411+ <exclusions>
412+ <exclusion>
413+ <groupId>logkit</groupId>
414+ <artifactId>logkit</artifactId>
415+ </exclusion>
416+ <exclusion>
417+ <groupId>avalon-framework</groupId>
418+ <artifactId>avalon-framework</artifactId>
419+ </exclusion>
420+ <exclusion>
421+ <groupId>javax.servlet</groupId>
422+ <artifactId>servlet-api</artifactId>
423+ </exclusion>
424+ </exclusions>
425+ </dependency>
426+ </dependencies>
427 <build>
428+ <finalName>${project.artifactId}-${project.version}${BZR_REVISION}</finalName>
429+ <resources>
430+ <resource>
431+ <directory>src/main/resources</directory>
432+ <filtering>true</filtering>
433+ <includes>
434+ <include>com/persistit/persistit_version</include>
435+ </includes>
436+ </resource>
437+ <resource>
438+ <directory>src/main/resources</directory>
439+ <filtering>false</filtering>
440+ <excludes>
441+ <exclude>com/persistit/persistit_version</exclude>
442+ </excludes>
443+ </resource>
444+ </resources>
445 <plugins>
446 <plugin>
447+ <groupId>org.apache.maven.plugins</groupId>
448+ <artifactId>maven-resources-plugin</artifactId>
449+ <version>2.4.3</version>
450+ </plugin>
451+ <plugin>
452+ <groupId>org.codehaus.mojo</groupId>
453+ <artifactId>build-helper-maven-plugin</artifactId>
454+ <version>1.5</version>
455+ <executions>
456+ <execution>
457+ <id>reserve-network-port</id>
458+ <goals>
459+ <goal>reserve-network-port</goal>
460+ </goals>
461+ <phase>process-resources</phase>
462+ <configuration>
463+ <portNames>
464+ <portName>rmiport</portName>
465+ </portNames>
466+ </configuration>
467+ </execution>
468+ </executions>
469+ </plugin>
470+ <plugin>
471+ <groupId>org.apache.maven.plugins</groupId>
472+ <artifactId>maven-compiler-plugin</artifactId>
473+ <version>2.0.2</version>
474+ <configuration>
475+ <source>1.6</source>
476+ <target>1.6</target>
477+ </configuration>
478+ </plugin>
479+ <plugin>
480+ <groupId>org.apache.maven.plugins</groupId>
481+ <artifactId>maven-source-plugin</artifactId>
482+ <version>2.0.4</version>
483+ <executions>
484+ <execution>
485+ <id>attach-sources</id>
486+ <phase>package</phase>
487+ <goals>
488+ <goal>jar</goal>
489+ </goals>
490+ </execution>
491+ </executions>
492+ </plugin>
493+ <plugin>
494+ <groupId>org.apache.maven.plugins</groupId>
495+ <artifactId>maven-surefire-plugin</artifactId>
496+ <version>2.4.1</version>
497+ <configuration>
498+ <argLine>-Xmx640m -Xms128m -Drmiport=${rmiport} -Xrunjdwp:transport=dt_socket,address=8000,suspend=n,server=y</argLine>
499+ <includes>
500+ <include>**/*Test.java</include>
501+ <include>**/*Test?.java</include>
502+ </includes>
503+ </configuration>
504+ </plugin>
505+ <plugin>
506+ <groupId>org.codehaus.mojo</groupId>
507+ <artifactId>rmic-maven-plugin</artifactId>
508+ <version>1.0</version>
509+ <configuration>
510+ <outputDirectory>target/classes/</outputDirectory>
511+ </configuration>
512+ <executions>
513+ <execution>
514+ <id>rmi compilation</id>
515+ <goals>
516+ <goal>rmic</goal>
517+ </goals>
518+ </execution>
519+ </executions>
520+ </plugin>
521+ <plugin>
522+ <artifactId>maven-assembly-plugin</artifactId>
523+ <configuration>
524+ <descriptors>
525+ <descriptor>src/main/resources/assembly_descriptor.xml</descriptor>
526+ </descriptors>
527+ </configuration>
528+ <executions>
529+ <execution>
530+ <id>make-assembly</id> <!-- This is used for inheritance merges ?? -->
531+ <phase>install</phase> <!-- Append to the install phase -->
532+ <goals>
533+ <goal>single</goal>
534+ </goals>
535+ </execution>
536+ </executions>
537+ </plugin>
538+ <plugin>
539+ <groupId>org.codehaus.mojo</groupId>
540+ <artifactId>findbugs-maven-plugin</artifactId>
541+ <version>1.2</version>
542+ <configuration>
543+ <findbugsXmlOutput>true</findbugsXmlOutput>
544+ <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
545+ <xmlOutput>true</xmlOutput>
546+ <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
547+ </configuration>
548+ </plugin>
549+ <plugin>
550+ <groupId>com.atlassian.maven.plugins</groupId>
551+ <artifactId>maven-clover2-plugin</artifactId>
552+ <version>3.0.1</version>
553+ <configuration>
554+ <generateHistorical>true</generateHistorical>
555+ <historyDir>/clover/history</historyDir>
556+ <license>${clover.license}</license>
557+ <generateXml>true</generateXml>
558+ </configuration>
559+ </plugin>
560+ <plugin>
561 <inherited>false</inherited>
562 <groupId>com.mycila.maven-license-plugin</groupId>
563 <artifactId>maven-license-plugin</artifactId>
564 <version>1.10.b1</version>
565 <configuration>
566 <!-- Note plugin WARNs header wasn't specified but still works as desired (multi-module bug?) -->
567- <header>HEADER.txt</header>
568+ <header>src/etc/HEADER.txt</header>
569 <headerSections>
570 <headerSection>
571 <key>__YEAR_SECTION__</key>
572@@ -54,8 +213,8 @@
573 <exclude>bench/**</exclude>
574 <!-- Docs -->
575 <exclude>doc/**</exclude>
576- <exclude>core/src/main/resources/**</exclude>
577- <exclude>core/src/test/resources/**</exclude>
578+ <exclude>src/main/resources/**</exclude>
579+ <exclude>src/test/resources/**</exclude>
580 <!-- IDE files -->
581 <exclude>.idea/**</exclude>
582 <exclude>.settings/**</exclude>
583@@ -81,4 +240,18 @@
584 </plugin>
585 </plugins>
586 </build>
587+ <reporting>
588+ <plugins>
589+ <plugin>
590+ <groupId>org.apache.maven.plugins</groupId>
591+ <artifactId>maven-surefire-report-plugin</artifactId>
592+ <version>2.4.2</version>
593+ </plugin>
594+ <plugin>
595+ <groupId>org.apache.maven.plugins</groupId>
596+ <artifactId>maven-javadoc-plugin</artifactId>
597+ <version>2.8</version>
598+ </plugin>
599+ </plugins>
600+ </reporting>
601 </project>
602
603=== renamed directory 'core/src' => 'src'
604=== added directory 'src/etc'
605=== renamed file 'HEADER.txt' => 'src/etc/HEADER.txt'
606=== renamed file 'core/findbugs-exclude.xml' => 'src/etc/findbugs-exclude.xml'
607=== renamed file 'core/run_stress_tests.py' => 'src/etc/run_stress_tests.py'

Subscribers

People subscribed via source and target branches