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