summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian S. O'Neill <bronee@gmail.com>2006-08-30 14:31:44 +0000
committerBrian S. O'Neill <bronee@gmail.com>2006-08-30 14:31:44 +0000
commit86514754acf1ee9096a602edd7f7e104921c77b6 (patch)
treec6b9d694ceab43d398e15d0164e25129e8bf637b
parent5a2aeb3ab59f286a6d2a5d8b7d62f4b17132b2b7 (diff)
Fix build
-rw-r--r--pom.xml16
-rw-r--r--src/main/java/com/amazon/carbonado/repo/indexed/IndexedStorage.java3
-rw-r--r--src/main/java/com/amazon/carbonado/spi/WrappedStorage.java2
3 files changed, 15 insertions, 6 deletions
diff --git a/pom.xml b/pom.xml
index 0419c47..b0aa812 100644
--- a/pom.xml
+++ b/pom.xml
@@ -88,13 +88,11 @@
</developers>
<dependencies>
- <!--
<dependency>
- <groupId>cojen</groupId>
+ <groupId>org.cojen</groupId>
<artifactId>cojen</artifactId>
- <version>1.1.4</version>
+ <version>2.0</version>
</dependency>
- -->
<dependency>
<groupId>joda-time</groupId>
@@ -137,6 +135,16 @@
</configuration>
</plugin>
-->
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
diff --git a/src/main/java/com/amazon/carbonado/repo/indexed/IndexedStorage.java b/src/main/java/com/amazon/carbonado/repo/indexed/IndexedStorage.java
index dd8b2b5..60a64d9 100644
--- a/src/main/java/com/amazon/carbonado/repo/indexed/IndexedStorage.java
+++ b/src/main/java/com/amazon/carbonado/repo/indexed/IndexedStorage.java
@@ -53,8 +53,9 @@ import com.amazon.carbonado.info.StorableIndex;
import com.amazon.carbonado.cursor.MergeSortBuffer;
+import com.amazon.carbonado.qe.BoundaryType;
+
import com.amazon.carbonado.spi.BaseQueryEngine;
-import com.amazon.carbonado.spi.BoundaryType;
import com.amazon.carbonado.spi.RepairExecutor;
import com.amazon.carbonado.spi.StorableIndexSet;
diff --git a/src/main/java/com/amazon/carbonado/spi/WrappedStorage.java b/src/main/java/com/amazon/carbonado/spi/WrappedStorage.java
index 00fe5a7..598e889 100644
--- a/src/main/java/com/amazon/carbonado/spi/WrappedStorage.java
+++ b/src/main/java/com/amazon/carbonado/spi/WrappedStorage.java
@@ -156,7 +156,7 @@ public abstract class WrappedStorage<S extends Storable> implements Storage<S> {
return new BasicSupport(mRepository, storable);
}
- public Repository getRepository() {
+ public Repository getRootRepository() {
return mRepository;
}