diff --git a/pom.xml b/pom.xml
index 3f6cf2162..cf2a1228a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,15 +1,19 @@
 <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>
-	<artifactId>spring-data-jpa</artifactId>
-	<name>Spring JPA</name>
 	
-	<parent>
-		<groupId>org.springframework.data</groupId>
-		<artifactId>spring-data-commons-parent</artifactId>
-		<version>1.0.0.BUILD-SNAPSHOT</version>
-		<relativePath>../spring-data-commons-parent/pom.xml</relativePath>
-	</parent>
+	<groupId>org.springframework.data</groupId>
+	<artifactId>spring-data-jpa</artifactId>
+	<version>1.0.0.BUILD-SNAPSHOT</version>
+	
+	<name>Spring JPA</name>
+	<description>Spring Data module to provide sophisticated support for JPA repositories</description>
+	<url>http://www.springsource.org/spring-data</url>
+	<inceptionYear>2011</inceptionYear>
+	<organization>
+		<name>SpringSource</name>
+		<url>http://www.springsource.org</url>
+	</organization>
 	
 	<developers>
 		<developer>
@@ -49,16 +53,19 @@
 	</licenses>
 	
 	<properties>
+		<spring.version>3.0.5.RELEASE</spring.version>
 		<hibernate.version>3.6.0.Final</hibernate.version>
 		<openjpa.version>2.0.0</openjpa.version>
 		<aspectj.version>1.6.8</aspectj.version>
+		<junit.version>4.8.1</junit.version>
+		<jpa.version>2.0.0</jpa.version>
+		<slf4j.version>1.5.10</slf4j.version>
 		
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<dist.id>spring-data-jpa</dist.id>
 		<dist.name>Spring Data JPA</dist.name>
 		<dist.key>DATAJPA</dist.key>
 		<dist.version>${project.version}</dist.version>
-		<dist.releaseType>milestone</dist.releaseType>
 		<dist.finalName>${dist.id}-${dist.version}</dist.finalName>
 		<dist.fileName>${dist.finalName}.zip</dist.fileName>
 		<dist.filePath>target/${dist.fileName}</dist.filePath>
@@ -87,6 +94,154 @@
 				</snapshotRepository>
 			</distributionManagement>
 		</profile>
+		
+		<profile>
+			<!-- Profile used when doing milestone or release ddeployments-->
+			<id>distribute</id>			
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>2.5</version>
+						<executions>
+							<execution>
+								<goals>
+									<goal>javadoc</goal>
+								</goals>
+								<phase>package</phase>
+							</execution>
+						</executions>
+						<configuration>
+							<breakiterator>true</breakiterator>
+							<header>Spring Data Jpa</header>
+							<source>1.5</source>
+							<quiet>true</quiet>
+							<javadocDirectory>${project.basedir}/src/main/javadoc</javadocDirectory>
+							<overview>${project.basedir}/src/main/javadoc/overview.html</overview>
+							<stylesheetfile>${project.basedir}/src/main/javadoc/spring-javadoc.css</stylesheetfile>
+							<!-- copies doc-files subdirectory which contains image resources -->
+							<docfilessubdirs>true</docfilessubdirs>
+							<links>
+								<link>http://static.springframework.org/spring/docs/3.0.x/javadoc-api</link>
+								<link>http://download.oracle.com/javase/1.5.0/docs/api</link>
+							</links>
+						</configuration>
+					</plugin>
+					
+					<plugin>
+						<groupId>com.agilejava.docbkx</groupId>
+						<artifactId>docbkx-maven-plugin</artifactId>
+						<version>2.0.7</version>
+						<executions>
+							<execution>
+								<goals>
+									<goal>generate-html</goal>
+									<goal>generate-pdf</goal>
+								</goals>
+								<phase>package</phase>
+							</execution>
+						</executions>
+						<dependencies>
+							<dependency>
+								<groupId>org.docbook</groupId>
+								<artifactId>docbook-xml</artifactId>
+								<version>4.4</version>
+								<scope>runtime</scope>
+							</dependency>
+						</dependencies>
+						<configuration>
+						    <includes>index.xml</includes>
+							<xincludeSupported>true</xincludeSupported>
+							<foCustomization>${project.basedir}/src/docbkx/resources/xsl/fopdf.xsl</foCustomization>
+							<htmlStylesheet>css/html.css</htmlStylesheet>
+							<chunkedOutput>false</chunkedOutput>
+							<htmlCustomization>${project.basedir}/src/docbkx/resources/xsl/html.xsl</htmlCustomization>
+							<useExtensions>1</useExtensions>
+							<entities>
+								<entity>
+									<name>version</name>
+									<value>${project.version}</value>
+								</entity>
+							</entities>
+							<postProcess>
+								<copy todir="${project.basedir}/target/site/reference">
+									<fileset dir="${project.basedir}/target/docbkx">
+										<include name="**/*.html" />
+										<include name="**/*.pdf" />
+									</fileset>
+								</copy>
+								<copy todir="${project.basedir}/target/site/reference/html">
+									<fileset dir="${project.basedir}/src/docbkx/resources">
+										<include name="**/*.css" />
+										<include name="**/*.png" />
+										<include name="**/*.gif" />
+										<include name="**/*.jpg" />
+									</fileset>
+								</copy>
+								<move file="${project.basedir}/target/site/reference/pdf/index.pdf"
+									tofile="${project.basedir}/target/site/reference/pdf/${project.artifactId}-reference.pdf"
+									failonerror="false" />
+							</postProcess>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<version>2.2-beta-5</version>
+						<inherited>false</inherited>
+						<executions>
+							<execution>
+								<id>distribution</id>
+								<goals>
+									<goal>single</goal>
+								</goals>
+								<phase>package</phase>
+								<configuration>
+									<descriptors>
+										<descriptor>${project.basedir}/src/assembly/distribution.xml</descriptor>
+									</descriptors>
+									<appendAssemblyId>false</appendAssemblyId>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<version>1.4</version>
+						<executions>
+							<execution>
+								<id>upload-dist</id>
+								<phase>deploy</phase>
+								<configuration>
+									<tasks>
+										<ant antfile="${basedir}/src/ant/upload-dist.xml">
+											<target name="upload-dist"/>
+										</ant>
+									</tasks>
+								</configuration>
+								<goals>
+									<goal>run</goal>
+								</goals>
+							</execution>
+						</executions>
+						<dependencies>
+							<dependency>
+								<groupId>org.springframework.build</groupId>
+								<artifactId>org.springframework.build.aws.ant</artifactId>
+								<version>3.0.5.RELEASE</version>
+							</dependency>
+							<dependency>
+								<groupId>net.java.dev.jets3t</groupId>
+								<artifactId>jets3t</artifactId>
+								<version>0.7.2</version>
+							</dependency>
+						</dependencies>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 	
 	<dependencies>
@@ -94,13 +249,39 @@
 		<dependency>
 			<groupId>${project.groupId}</groupId>
 			<artifactId>spring-data-commons-core</artifactId>
-			<version>${project.version}</version>
+			<version>1.0.0.BUILD-SNAPSHOT</version>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-orm</artifactId>
-			<version>${org.springframework.version}</version>
+			<version>${spring.version}</version>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+			<version>${spring.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		
+		<!-- Logging (SLF4J + JCL bridge) -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<version>${slf4j.version}</version>
+			<scope>runtime</scope>
 		</dependency>
 		
 		<dependency>
@@ -117,17 +298,23 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-aspects</artifactId>
-			<version>${org.springframework.version}</version>
+			<version>${spring.version}</version>
 			<optional>true</optional>
 		</dependency>
 		
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
-			<version>${org.springframework.version}</version>
+			<version>${spring.version}</version>
 			<scope>test</scope>
 		</dependency>
 		
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>${junit.version}</version>
+		</dependency>
+		
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-all</artifactId>
@@ -135,6 +322,12 @@
 			<scope>test</scope>
 		</dependency>
 		
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-all</artifactId>
+			<version>1.1</version>
+			<scope>test</scope>
+		</dependency>
 		
 		<dependency>
 			<groupId>org.hsqldb</groupId>
@@ -150,6 +343,20 @@
 			<optional>true</optional>
 		</dependency>
 		
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<version>${slf4j.version}</version>
+			<scope>test</scope>
+		</dependency>
+		
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.16</version>
+			<scope>test</scope>
+		</dependency>
+		
 	
 		<!-- Persistence providers -->
 		<dependency>
@@ -179,19 +386,41 @@
 	</dependencies>
 	
 	<build>
+		
+		<extensions>
+			<extension>
+				<!-- available only in the springframework maven repository. see <repositories> section below -->
+				<groupId>org.springframework.build.aws</groupId>
+				<artifactId>org.springframework.build.aws.maven</artifactId>
+				<version>2.0.0.RELEASE</version>
+			</extension>
+		</extensions>
+		
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3</version>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>2.5</version>
 				<configuration>
-					<argLine>-javaagent:${settings.localRepository}/org/springframework/org.springframework.instrument/${org.springframework.version}/org.springframework.instrument-${org.springframework.version}.jar -javaagent:${settings.localRepository}/org/apache/openjpa/openjpa/${openjpa.version}/openjpa-${openjpa.version}.jar</argLine>
+					<includes>
+						<include>**/*Tests.java</include>
+					</includes>
+					<argLine>-javaagent:${settings.localRepository}/org/springframework/spring-instrument/${spring.version}/spring-instrument-${spring.version}.jar -javaagent:${settings.localRepository}/org/apache/openjpa/openjpa/${openjpa.version}/openjpa-${openjpa.version}.jar</argLine>
 				</configuration>
 				<dependencies>
 					<dependency>
 						<groupId>org.springframework</groupId>
-						<artifactId>org.springframework.instrument</artifactId>
-						<version>${org.springframework.version}</version>
+						<artifactId>spring-instrument</artifactId>
+						<version>${spring.version}</version>
 						<scope>runtime</scope>
 					</dependency>
 					<dependency>
@@ -240,80 +469,34 @@
 					<target>1.5</target>
 				</configuration>
 			</plugin>
+
 			<plugin>
-				<groupId>com.agilejava.docbkx</groupId>
-				<artifactId>docbkx-maven-plugin</artifactId>
-				<version>2.0.7</version>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>2.1.1</version>
 				<executions>
 					<execution>
+						<id>attach-sources</id>
 						<goals>
-							<goal>generate-html</goal>
-							<goal>generate-pdf</goal>
+							<goal>jar</goal>
 						</goals>
-						<phase>pre-site</phase>
 					</execution>
 				</executions>
-				<dependencies>
-					<dependency>
-						<groupId>org.docbook</groupId>
-						<artifactId>docbook-xml</artifactId>
-						<version>4.4</version>
-						<scope>runtime</scope>
-					</dependency>
-				</dependencies>
-				<configuration>
-				        <includes>index.xml</includes>
-					<xincludeSupported>true</xincludeSupported>
-					<foCustomization>${project.basedir}/src/docbkx/resources/xsl/fopdf.xsl</foCustomization>
-					<htmlStylesheet>css/html.css</htmlStylesheet>
-					<chunkedOutput>false</chunkedOutput>
-					<htmlCustomization>${project.basedir}/src/docbkx/resources/xsl/html.xsl</htmlCustomization>
-					<useExtensions>1</useExtensions>
-          <!-- callouts -->
-					<entities>
-						<entity>
-							<name>version</name>
-							<value>${pom.version}</value>
-						</entity>
-					</entities>
-					<postProcess>
-						<copy todir="${project.basedir}/target/site/reference">
-							<fileset dir="${project.basedir}/target/docbkx">
-								<include name="**/*.html" />
-								<include name="**/*.pdf" />
-							</fileset>
-						</copy>
-						<copy todir="${project.basedir}/target/site/reference/html">
-							<fileset dir="${project.basedir}/src/docbkx/resources">
-								<include name="**/*.css" />
-								<include name="**/*.png" />
-								<include name="**/*.gif" />
-								<include name="**/*.jpg" />
-							</fileset>
-						</copy>
-						<move file="${project.basedir}/target/site/reference/pdf/index.pdf"
-							tofile="${project.basedir}/target/site/reference/pdf/${project.artifactId}-reference.pdf"
-							failonerror="false" />
-					</postProcess>
-				</configuration>
 			</plugin>
+			
 			<plugin>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.2-beta-5</version>
-				<inherited>false</inherited>
+				<groupId>com.springsource.bundlor</groupId>
+				<artifactId>com.springsource.bundlor.maven</artifactId>
+				<version>1.0.0.RELEASE</version>
+				<configuration>
+					<failOnWarnings>true</failOnWarnings>
+				</configuration>
 				<executions>
 					<execution>
-						<id>distribution</id>
+						<id>bundlor</id>
 						<goals>
-							<goal>single</goal>
+							<goal>bundlor</goal>
 						</goals>
-						<phase>package</phase>
-						<configuration>
-							<descriptors>
-								<descriptor>${project.basedir}/src/assembly/distribution.xml</descriptor>
-							</descriptors>
-							<appendAssemblyId>false</appendAssemblyId>
-						</configuration>
 					</execution>
 				</executions>
 			</plugin>
@@ -322,7 +505,7 @@
 	
 	<distributionManagement>
 		<!-- see 'staging' profile for dry-run deployment settings -->
-		<downloadUrl>http://www.springsource.com/spring-data</downloadUrl>
+		<downloadUrl>http://www.springsource.org/spring-data</downloadUrl>
 		<site>
 			<id>static.springframework.org</id>
 			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-jpa/snapshot-site/</url>
@@ -339,7 +522,28 @@
 		</snapshotRepository>
 	</distributionManagement>
 	
+	<ciManagement>
+        <system>Bamboo</system>
+        <url>http://build.springsource.org/browse/SPRINGDATA</url>
+    </ciManagement>
+
+    <issueManagement>
+        <system>JIRA</system>
+        <url>https://jira.springsource.org/browse/DATAJPA</url>
+    </issueManagement>
+
+    <scm>
+        <url>https://github.com/SpringSource/spring-data-jpa</url>
+        <connection>scm:git:git://github.com/SpringSource/spring-data-jpa.git</connection>
+        <developerConnection>scm:git:ssh://git@github.com:SpringSource/spring-data-jpa.git</developerConnection>
+    </scm>
+	
 	<repositories>
+		<repository>
+			<id>repository.springframework.maven.milestone</id>
+			<name>Spring Framework Maven Milestone Repository</name>
+			<url>http://maven.springframework.org/milestone</url>
+		</repository>
 		<repository>
 			<id>jboss</id>
 			<name>JBoss repository</name>
diff --git a/src/ant/upload-dist.xml b/src/ant/upload-dist.xml
new file mode 100644
index 000000000..e87a9604c
--- /dev/null
+++ b/src/ant/upload-dist.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<project name="upload-dist-tasks">
+
+<!-- can be run independent of maven as follows
+   - classpath must be uncommented below. when run from maven,
+   - the classpath is set up for you
+
+ant -f src/ant/upload-dist.xml \
+    -Ddist.id=spring-data-jpa \
+    -Ddist.name='Spring Data JPA' \
+    -Ddist.key=DATAJPA \
+    -Ddist.releaseType=milestone \
+    -Ddist.accessKey=<access key> \
+    -Ddist.secretKey=<secret key> \
+    -Ddist.bucketName=dist.springframework.org \
+    -Ddist.fileName=spring-data-jpa-1.0.0.???.zip \
+    -Ddist.filePath=../../spring-data-jpa-1.0.0.???.zip \
+    -Ddist.version=1.0.0.??? \
+    upload-dist
+-->
+
+    <taskdef resource="org/springframework/build/aws/ant/antlib.xml">
+        <!-- see comment above
+        <classpath>
+            <pathelement location="/Users/cbeams/Desktop/org.springframework.build.aws.ant-3.0.5.RELEASE.jar"/>
+            <pathelement location="/Users/cbeams/.m2/repository/net/java/dev/jets3t/jets3t/0.7.2/jets3t-0.7.2.jar"/>
+            <pathelement location="/Users/cbeams/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
+            <pathelement location="/Users/cbeams/.m2/repository/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar"/>
+            <pathelement location="/Users/cbeams/.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar"/>
+        </classpath>
+        -->
+    </taskdef>
+    <target name="upload-dist">
+        <checksum file="${dist.filePath}" algorithm="sha1"/>
+        <s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
+            <upload bucketName="${dist.bucketName}" file="${dist.filePath}"
+                    toFile="${dist.releaseType}/${dist.key}/${dist.fileName}" publicRead="true">
+                <metadata name="project.name" value="${dist.name}"/>
+                <metadata name="release.type" value="${dist.releaseType}"/>
+                <metadata name="bundle.version" value="${dist.version}"/>
+                <metadata name="package.file.name" value="${dist.fileName}"/>
+            </upload>
+            <upload bucketName="${dist.bucketName}" file="${dist.filePath}.sha1"
+                    toFile="${dist.releaseType}/${dist.key}/${dist.fileName}.sha1" publicRead="true">
+            </upload>
+        </s3>
+    </target>
+</project>
diff --git a/src/assembly/distribution.xml b/src/assembly/distribution.xml
index 79a3e6e67..d02c8f9a6 100644
--- a/src/assembly/distribution.xml
+++ b/src/assembly/distribution.xml
@@ -38,4 +38,16 @@
 			<outputDirectory>docs/javadoc</outputDirectory>
 		</fileSet>
 	</fileSets>
+	<files>
+		<file> 
+			<source>target/${dist.finalName}.jar</source>
+			<outputDirectory>dist</outputDirectory> 
+			<fileMode>0644</fileMode>
+		</file>
+		<file> 
+			<source>target/${dist.finalName}-sources.jar</source>
+			<outputDirectory>sources</outputDirectory> 
+			<fileMode>0644</fileMode>
+		</file>
+	</files>
 </assembly>
\ No newline at end of file
diff --git a/src/docbkx/index.xml b/src/docbkx/index.xml
index 37733ea96..993d4e9ae 100644
--- a/src/docbkx/index.xml
+++ b/src/docbkx/index.xml
@@ -60,7 +60,9 @@
   <part id="reference">
     <title>Reference Documentation</title>
 
-    <xi:include href="https://github.com/SpringSource/spring-data-commons/raw/master/src/docbkx/repositories.xml" />
+    <xi:include href="https://github.com/SpringSource/spring-data-commons/raw/master/src/docbkx/repositories.xml">
+    	<xi:fallback href="../../../spring-data-commons/src/docbkx/repositories.xml" />
+    </xi:include>
 
     <xi:include href="reference/jpa.xml" />
   </part>
@@ -68,7 +70,9 @@
   <part id="appendix">
     <title>Appendix</title>
 
-    <xi:include href="https://github.com/SpringSource/spring-data-commons/raw/master/src/docbkx/repository-namespace-reference.xml" />
+    <xi:include href="https://github.com/SpringSource/spring-data-commons/raw/master/src/docbkx/repository-namespace-reference.xml">
+    	<xi:fallback href="../../../spring-data-commons/src/docbkx/repository-namespace-reference.xml" />
+    </xi:include>
 
     <xi:include href="appendix/faq.xml" />
 
diff --git a/src/main/javadoc/doc-files/th-background.png b/src/main/javadoc/doc-files/th-background.png
new file mode 100644
index 000000000..72d65e771
Binary files /dev/null and b/src/main/javadoc/doc-files/th-background.png differ
diff --git a/src/main/javadoc/spring-javadoc.css b/src/main/javadoc/spring-javadoc.css
new file mode 100644
index 000000000..c438fafa5
--- /dev/null
+++ b/src/main/javadoc/spring-javadoc.css
@@ -0,0 +1,178 @@
+/* stylesheet.css 2008/04/22 nicolekonicki */
+
+/*
+ *
+ * Spring-specific Javadoc style sheet
+ *
+ */
+
+
+
+.code 
+{
+	border: 1px solid black;
+	background-color: #F4F4F4;
+	padding: 5px;
+}
+
+body 
+{
+	font: 12px Verdana, Arial, Helvetica, "Bitstream Vera Sans", sans-serif;
+	background-color: #fff;
+	color: #333;
+}
+
+
+/* Link colors */
+a 
+{
+	color:#2c7b14;
+	text-decoration:none; 
+}
+
+a:hover 
+{
+	text-decoration:underline;
+}
+
+/* Headings */
+h1 
+{ 
+	font-size:28px;
+	color:#007c00; 
+}
+
+/* Table colors */
+
+table
+{
+	border:none;
+}
+
+td
+{
+	border:none;
+	border-bottom:1px dotted #ddd;
+}
+
+th
+{
+	border:none;
+}
+
+.TableHeadingColor th
+{
+	background-color: #efffcb;
+	background-image: url(doc-files/th-background.png);
+	background-repeat: repeat-x;
+	color:#fff;
+	font-size:14px;
+	height:26px;
+}
+
+.TableSubHeadingColor  
+{ 
+	background: #f7ffee;
+
+} 
+.TableRowColor         
+{ 
+	background: #fff;
+}
+
+.TableRowColor a      
+{ 
+	border-bottom:none;
+	color:#2c7b14;
+	font-weight:normal;
+}
+
+tr.TableRowColor:hover
+{
+	background:#eef2e1;
+}
+
+ 
+/* Font used in left-hand frame lists */
+.FrameTitleFont   
+{ 
+	font-size: 120%; 
+	font-weight:bold;
+}
+
+.FrameTitleFont a   
+{  
+	color: #333;
+}
+
+.FrameHeadingFont 
+{ 
+	font-weight: bold;
+	font-size:95%;
+}
+
+.FrameItemFont    
+{ 
+	line-height:130%;
+	font-size: 95%; 
+}
+
+.FrameItemFont a
+{
+	color:#333;
+}
+
+.FrameItemFont a:hover
+{
+	color:#249901;
+	border-bottom:none;
+	text-decoration:underline;
+}
+
+/* Navigation bar fonts and colors */
+.NavBarCell1    
+{ 
+	background-color:#fff;
+	border:none;
+} 
+
+.NavBarCell1Rev 
+{ 
+	background-color:#e3faa5;
+	border:1px solid #9ad00c;
+	padding:0;
+	margin:0;
+} 
+
+.NavBarCell1 a  
+{ 
+	color:#333;
+	text-decoration:none;
+}
+
+.NavBarFont1Rev 
+{ 
+
+}
+
+.NavBarCell2
+{
+	border:none;
+}
+
+.NavBarCell2 a    
+{ 
+	color:#249901;
+	font-size:90%;
+}
+
+.NavBarCell3    
+{ 
+	border:none;
+}
+
+/* Override sizes in font tags */
+font
+{
+	font: inherit !important;
+}
diff --git a/template.mf b/template.mf
new file mode 100644
index 000000000..838534381
--- /dev/null
+++ b/template.mf
@@ -0,0 +1,21 @@
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: ${project.artifactId}
+Bundle-Name: ${project.name}
+Bundle-Vendor: SpringSource
+Bundle-Version: ${project.version}
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Template: 
+ org.springframework.data.jpa.*;version="${project.version}"
+Import-Template: 
+ javax.persistence.*;version="${jpa.version:[=.=.=,+1.0.0)}", 
+ org.aopalliance.*;version="[1.0.0,2.0.0)", 
+ org.slf4j.*;version="${slf4j.version:[=.=.=,+1.0.0)}",
+ org.aspectj.*;version="${aspectj.version:[=.=.=,+1.0.0)}";resolution:=optional,
+ org.eclipse.persistence.*;version="[2.0.0,3.0.0)";resolution:=optional,
+ org.hibernate.*;version="[3.5.3,4.0.0)";resolution:=optional, 
+ org.apache.openjpa.persistence.*;version="${openjpa.version:[=.=.=,+1.0.0)}";resolution:=optional, 
+ org.joda.time.*;version="[1.5.0,2.0.0)";resolution:=optional,
+ org.springframework.*;version="${spring.version:[=.=.=.=,+1.0.0)}",
+ org.springframework.beans.factory.aspectj;version="${spring.version:[=.=.=.=,+1.0.0)}";resolution:=optional,
+ org.w3c.*;version="0.0.0"
+ 
\ No newline at end of file