diff --git a/pom.xml b/pom.xml index 23d883b5c..6c17f1ef0 100644 --- a/pom.xml +++ b/pom.xml @@ -1,297 +1,100 @@ - - 4.0.0 - org.springframework.data - spring-data-mongodb-dist - Spring Data MongoDB Distribution - Spring Data project for MongoDB - http://www.springsource.org/spring-data/mongodb - 1.2.0.BUILD-SNAPSHOT - pom - - spring-data-mongodb - spring-data-mongodb-cross-store - spring-data-mongodb-log4j - spring-data-mongodb-parent - + - - - trisberg - Thomas Risberg - trisberg at vmware.com - SpringSource - http://www.SpringSource.com - - Project Admin - Developer - - -5 - - - mpollack - Mark Pollack - mpollack at vmware.com - SpringSource - http://www.SpringSource.com - - Project Admin - Developer - - -5 - - - ogierke - Oliver Gierke - ogierke at vmware.com - SpringSource - http://www.springsource.com - - Developer - - +1 - - - jbrisbin - Jon Brisbin - jbrisbin at vmware.com - SpringSource - http://www.springsource.com - - Developer - - -6 - - + 4.0.0 + + org.springframework.data + spring-data-mongodb-parent + 1.2.0.BUILD-SNAPSHOT + pom - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - Copyright 2010 the original author or authors. + Spring Data MongoDB + MongoDB support for Spring Data + http://www.springsource.org/spring-data/mongodb - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at + + org.springframework.data.build + spring-data-parent + 1.0.0.BUILD-SNAPSHOT + ../spring-data-build/parent/pom.xml + + + + spring-data-mongodb + spring-data-mongodb-cross-store + spring-data-mongodb-log4j + spring-data-mongodb-distribution + - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. - See the License for the specific language governing permissions and - limitations under the License. - - - + + multi + spring-data-mongodb + 1.5.0.BUILD-SNAPSHOT + 2.9.2 + + + + + ogierke + Oliver Gierke + ogierke at vmware.com + SpringSource + http://www.springsource.com + + Project Lean + + +1 + + + trisberg + Thomas Risberg + trisberg at vmware.com + SpringSource + http://www.springsource.com + + Developer + + -5 + + + mpollack + Mark Pollack + mpollack at vmware.com + SpringSource + http://www.springsource.com + + Developer + + -5 + + + jbrisbin + Jon Brisbin + jbrisbin at vmware.com + SpringSource + http://www.springsource.com + + Developer + + -6 + + - - UTF-8 - - spring-data-mongo - Spring Data Mongo - SDMONGO - ${project.version} - snapshot - ${dist.id}-${dist.version} - ${dist.finalName}.zip - target/${dist.fileName} - dist.springframework.org - - + + + + org.mongodb + mongo-java-driver + ${mongo} + + - - - - org.springframework.build.aws - org.springframework.build.aws.maven - 3.1.0.RELEASE - - + + + spring-libs-snapshot + http://repo.springsource.org/libs-snapshot-local + + - - - com.agilejava.docbkx - docbkx-maven-plugin - - 2.0.7 - - - - generate-html - generate-pdf - - pre-site - - - - - org.docbook - docbook-xml - 4.4 - runtime - - - - index.xml - true - ${project.basedir}/src/docbkx/resources/xsl/fopdf.xsl - css/html.css - false - ${project.basedir}/src/docbkx/resources/xsl/html.xsl - 1 - 1 - - - - - version - ${project.version} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - maven-javadoc-plugin - 2.5 - - true - true -
Spring Data Document
- 1.5 - true - ${project.basedir}/src/main/javadoc - ${project.basedir}/src/main/javadoc/overview.html - ${project.basedir}/src/main/javadoc/spring-javadoc.css - - true - - http://static.springframework.org/spring/docs/3.0.x/javadoc-api - http://download.oracle.com/javase/1.5.0/docs/api - http://api.mongodb.org/java/2.3 - - - - - maven-assembly-plugin - 2.2-beta-5 - false - - - distribution - - single - - package - - - ${project.basedir}/src/assembly/distribution.xml - - false - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.4 - - - upload-dist - deploy - - - - - - - - - run - - - - - - org.springframework.build - org.springframework.build.aws.ant - 3.0.5.RELEASE - - - net.java.dev.jets3t - jets3t - 0.7.2 - - - - - - ${dist.finalName} - - - - - - spring-plugins-release - http://repo.springsource.org/plugins-release - - - - - - http://www.springsource.com/spring-data - - static.springframework.org - - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-mongodb/snapshot-site - - - - spring-milestone - Spring Milestone Repository - s3://maven.springframework.org/milestone - - - spring-snapshot - Spring Snapshot Repository - s3://maven.springframework.org/snapshot - - - - - https://github.com/SpringSource/spring-data-mongodb - - - + \ No newline at end of file diff --git a/spring-data-mongodb-cross-store/pom.xml b/spring-data-mongodb-cross-store/pom.xml index 739774d9a..48a40fcad 100644 --- a/spring-data-mongodb-cross-store/pom.xml +++ b/spring-data-mongodb-cross-store/pom.xml @@ -1,139 +1,145 @@ - 4.0.0 - - org.springframework.data - spring-data-mongodb-parent - 1.2.0.BUILD-SNAPSHOT - ../spring-data-mongodb-parent/pom.xml - - spring-data-mongodb-cross-store - Spring Data MongoDB Cross-store Persistence Support - - - - org.springframework - spring-beans - ${org.springframework.version.range} - - - org.springframework - spring-tx - ${org.springframework.version.range} - - - org.springframework - spring-aspects - ${org.springframework.version.range} - - - org.springframework - spring-orm - ${org.springframework.version.range} - + 4.0.0 + + + org.springframework.data + spring-data-mongodb-parent + 1.2.0.BUILD-SNAPSHOT + ../pom.xml + + + spring-data-mongodb-cross-store + Spring Data MongoDB - Cross-Store Persistence Support + + + 1.0.0.Final + 3.6.10.Final + + + - - - org.springframework.data - spring-data-commons-core - ${data.commons.version} - - - org.springframework.data - spring-data-mongodb - 1.2.0.BUILD-SNAPSHOT - + + + org.springframework + spring-beans + ${spring} + + + commons-logging + commons-logging + + + + + org.springframework + spring-tx + ${spring} + + + org.springframework + spring-aspects + ${spring} + + + org.springframework + spring-orm + ${spring} + - - org.aspectj - aspectjrt - ${aspectj.version} - - - cglib - cglib - 2.2 - + + + org.springframework.data + spring-data-mongodb + ${project.version} + - - - org.hibernate.javax.persistence - hibernate-jpa-2.0-api - 1.0.0.Final - + + org.aspectj + aspectjrt + ${aspectj} + + + cglib + cglib + 2.2 + - - - org.hibernate - hibernate-entitymanager - 3.5.5-Final - test - - - hsqldb - hsqldb - 1.8.0.10 - test - - - javax.validation - validation-api - 1.0.0.GA - test - - - org.hibernate - hibernate-validator - 4.0.2.GA - test - + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api + ${jpa} + - + + + org.hibernate + hibernate-entitymanager + ${hibernate} + test + + + hsqldb + hsqldb + 1.8.0.10 + test + + + javax.validation + validation-api + 1.0.0.GA + test + + + org.hibernate + hibernate-validator + 4.0.2.GA + test + - - - - org.codehaus.mojo - aspectj-maven-plugin - 1.2 - - - org.aspectj - aspectjrt - ${aspectj.version} - - - org.aspectj - aspectjtools - ${aspectj.version} - - - - - - compile - test-compile - - - - - true - - - org.springframework - spring-aspects - - - - 1.5 - 1.5 - - - - + + + + + + org.codehaus.mojo + aspectj-maven-plugin + 1.4 + + + org.aspectj + aspectjrt + ${aspectj} + + + org.aspectj + aspectjtools + ${aspectj} + + + + + + compile + test-compile + + + + + true + + + org.springframework + spring-aspects + + + ${source.level} + ${source.level} + + + + diff --git a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoChangeSetPersister.java b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoChangeSetPersister.java index 49b7c70ed..404497caf 100644 --- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoChangeSetPersister.java +++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoChangeSetPersister.java @@ -17,8 +17,8 @@ package org.springframework.data.mongodb.crossstore; import javax.persistence.EntityManagerFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.dao.DataIntegrityViolationException; @@ -44,7 +44,7 @@ public class MongoChangeSetPersister implements ChangeSetPersister { private static final String ENTITY_FIELD_CLASS = "_entity_field_class"; - protected final Log log = LogFactory.getLog(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); private MongoTemplate mongoTemplate; diff --git a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoDocumentBacking.aj b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoDocumentBacking.aj index 5bb05290f..1a0a101c6 100644 --- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoDocumentBacking.aj +++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoDocumentBacking.aj @@ -21,13 +21,12 @@ import javax.persistence.EntityManager; import javax.persistence.Transient; import javax.persistence.Entity; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.aspectj.lang.JoinPoint; import org.aspectj.lang.reflect.FieldSignature; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.dao.DataAccessException; - import org.springframework.data.mongodb.crossstore.RelatedDocument; import org.springframework.data.mongodb.crossstore.DocumentBacked; import org.springframework.data.crossstore.ChangeSetBackedTransactionSynchronization; @@ -44,7 +43,7 @@ import org.springframework.transaction.support.TransactionSynchronizationManager */ public aspect MongoDocumentBacking { - private static final Log LOGGER = LogFactory.getLog(MongoDocumentBacking.class); + private static final Logger LOGGER = LoggerFactory.getLogger(MongoDocumentBacking.class); // Aspect shared config private ChangeSetPersister changeSetPersister; diff --git a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/CrossStoreMongoTests.java b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/CrossStoreMongoTests.java index a36229924..6dd23ea33 100644 --- a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/CrossStoreMongoTests.java +++ b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/CrossStoreMongoTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2011 the original author or authors. + * Copyright 2011-2013 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,7 +18,9 @@ package org.springframework.data.mongodb.crossstore; import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; +import org.junit.After; import org.junit.Assert; +import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -26,7 +28,6 @@ import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.crossstore.test.Address; import org.springframework.data.mongodb.crossstore.test.Person; import org.springframework.data.mongodb.crossstore.test.Resume; -import org.springframework.test.annotation.Rollback; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.PlatformTransactionManager; @@ -39,20 +40,55 @@ import com.mongodb.DBCollection; import com.mongodb.DBObject; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext.xml") +@ContextConfiguration("classpath:/META-INF/spring/applicationContext.xml") public class CrossStoreMongoTests { @Autowired - private MongoTemplate mongoTemplate; - - private EntityManager entityManager; - - @Autowired - private PlatformTransactionManager transactionManager; + MongoTemplate mongoTemplate; @PersistenceContext - public void setEntityManager(EntityManager entityManager) { - this.entityManager = entityManager; + EntityManager entityManager; + + @Autowired + PlatformTransactionManager transactionManager; + TransactionTemplate txTemplate; + + @Before + public void setUp() { + + txTemplate = new TransactionTemplate(transactionManager); + + clearData(Person.class.getName()); + + Address address = new Address(12, "MAin St.", "Boston", "MA", "02101"); + + Resume resume = new Resume(); + resume.addEducation("Skanstulls High School, 1975"); + resume.addEducation("Univ. of Stockholm, 1980"); + resume.addJob("DiMark, DBA, 1990-2000"); + resume.addJob("VMware, Developer, 2007-"); + + final Person person = new Person("Thomas", 20); + person.setAddress(address); + person.setResume(resume); + person.setId(1L); + + txTemplate.execute(new TransactionCallback() { + public Void doInTransaction(TransactionStatus status) { + entityManager.persist(person); + return null; + } + }); + } + + @After + public void tearDown() { + txTemplate.execute(new TransactionCallback() { + public Void doInTransaction(TransactionStatus status) { + entityManager.remove(entityManager.find(Person.class, 1L)); + return null; + } + }); } private void clearData(String collectionName) { @@ -64,26 +100,8 @@ public class CrossStoreMongoTests { @Test @Transactional - @Rollback(false) - public void testCreateJpaToMongoEntityRelationship() { - clearData(Person.class.getName()); - Person p = new Person("Thomas", 20); - Address a = new Address(12, "MAin St.", "Boston", "MA", "02101"); - p.setAddress(a); - Resume r = new Resume(); - r.addEducation("Skanstulls High School, 1975"); - r.addEducation("Univ. of Stockholm, 1980"); - r.addJob("DiMark, DBA, 1990-2000"); - r.addJob("VMware, Developer, 2007-"); - p.setResume(r); - p.setId(1L); - entityManager.persist(p); - } - - @Test - @Transactional - @Rollback(false) public void testReadJpaToMongoEntityRelationship() { + Person found = entityManager.find(Person.class, 1L); Assert.assertNotNull(found); Assert.assertEquals(Long.valueOf(1), found.getId()); @@ -91,15 +109,18 @@ public class CrossStoreMongoTests { Assert.assertEquals(Long.valueOf(1), found.getId()); Assert.assertNotNull(found.getResume()); Assert.assertEquals("DiMark, DBA, 1990-2000" + "; " + "VMware, Developer, 2007-", found.getResume().getJobs()); - found.getResume().addJob("SpringDeveloper.com, Consultant, 2005-2006"); - found.setAge(44); } @Test @Transactional - @Rollback(false) public void testUpdatedJpaToMongoEntityRelationship() { + Person found = entityManager.find(Person.class, 1L); + found.setAge(44); + found.getResume().addJob("SpringDeveloper.com, Consultant, 2005-2006"); + + entityManager.merge(found); + Assert.assertNotNull(found); Assert.assertEquals(Long.valueOf(1), found.getId()); Assert.assertNotNull(found); @@ -111,14 +132,19 @@ public class CrossStoreMongoTests { @Test public void testMergeJpaEntityWithMongoDocument() { - TransactionTemplate txTemplate = new TransactionTemplate(transactionManager); + final Person detached = entityManager.find(Person.class, 1L); + entityManager.detach(detached); detached.getResume().addJob("TargetRx, Developer, 2000-2005"); + Person merged = txTemplate.execute(new TransactionCallback() { public Person doInTransaction(TransactionStatus status) { - return entityManager.merge(detached); + Person result = entityManager.merge(detached); + entityManager.flush(); + return result; } }); + Assert.assertTrue(detached.getResume().getJobs().contains("TargetRx, Developer, 2000-2005")); Assert.assertTrue(merged.getResume().getJobs().contains("TargetRx, Developer, 2000-2005")); final Person updated = entityManager.find(Person.class, 1L); @@ -127,7 +153,7 @@ public class CrossStoreMongoTests { @Test public void testRemoveJpaEntityWithMongoDocument() { - TransactionTemplate txTemplate = new TransactionTemplate(transactionManager); + txTemplate.execute(new TransactionCallback() { public Person doInTransaction(TransactionStatus status) { Person p2 = new Person("Thomas", 20); @@ -154,7 +180,9 @@ public class CrossStoreMongoTests { return null; } }); + boolean weFound3 = false; + for (DBObject dbo : this.mongoTemplate.getCollection(Person.class.getName()).find()) { Assert.assertTrue(!dbo.get("_entity_id").equals(2L)); if (dbo.get("_entity_id").equals(3L)) { diff --git a/spring-data-mongodb-cross-store/template.mf b/spring-data-mongodb-cross-store/template.mf new file mode 100644 index 000000000..5f02da1bd --- /dev/null +++ b/spring-data-mongodb-cross-store/template.mf @@ -0,0 +1,18 @@ +Bundle-SymbolicName: org.springframework.data.mongodb.crossstore +Bundle-Name: Spring Data MongoDB Cross Store Support +Bundle-Vendor: SpringSource +Bundle-ManifestVersion: 2 +Import-Package: + sun.reflect;version="0";resolution:=optional +Export-Template: + org.springframework.data.mongodb.crossstore.*;version="${project.version}" +Import-Template: + com.mongodb.*;version="0", + javax.persistence.*;version="${jpa:[=.=.=,+1.0.0)}", + org.aspectj.*;version="${aspectj:[1.0.0, 2.0.0)}", + org.bson.*;version="0", + org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}", + org.springframework.*;version="${spring30:[=.=.=.=,+1.0.0)}", + org.springframework.data.*;version="${springdata.commons:[=.=.=.=,+1.0.0)}", + org.springframework.data.mongodb.*;version="${project.version:[=.=.=.=,+1.0.0)}", + org.w3c.dom.*;version="0" diff --git a/spring-data-mongodb-distribution/pom.xml b/spring-data-mongodb-distribution/pom.xml new file mode 100644 index 000000000..9213285f6 --- /dev/null +++ b/spring-data-mongodb-distribution/pom.xml @@ -0,0 +1,33 @@ + + + + 4.0.0 + + spring-data-mongodb-distribution + + pom + + Spring Data MongoDB - Distribution + Distribution build for Spring Data MongoDB + + + org.springframework.data + spring-data-mongodb-parent + 1.2.0.BUILD-SNAPSHOT + ../pom.xml + + + + ${basedir}/.. + + + + + + org.apache.maven.plugins + maven-assembly-plugin + + + + + \ No newline at end of file diff --git a/spring-data-mongodb-log4j/pom.xml b/spring-data-mongodb-log4j/pom.xml index 63924d6fb..d2a0465d5 100644 --- a/spring-data-mongodb-log4j/pom.xml +++ b/spring-data-mongodb-log4j/pom.xml @@ -1,44 +1,30 @@ - 4.0.0 - - org.springframework.data - spring-data-mongodb-parent - 1.2.0.BUILD-SNAPSHOT - ../spring-data-mongodb-parent/pom.xml - - spring-data-mongodb-log4j - Spring Data MongoDB Log4J Appender + 4.0.0 + + + org.springframework.data + spring-data-mongodb-parent + 1.2.0.BUILD-SNAPSHOT + ../pom.xml + - - 1.2.16 - + spring-data-mongodb-log4j + Spring Data MongoDB - Log4J Appender - + + 1.2.16 + - - - org.mongodb - mongo-java-driver - ${mongo.version} - + - - - log4j - log4j - ${log4j.version} - + + + log4j + log4j + ${log4j} + - - - - - - com.springsource.bundlor - com.springsource.bundlor.maven - - - + diff --git a/spring-data-mongodb-log4j/template.mf b/spring-data-mongodb-log4j/template.mf index 322786505..00c0d3339 100644 --- a/spring-data-mongodb-log4j/template.mf +++ b/spring-data-mongodb-log4j/template.mf @@ -5,6 +5,5 @@ Bundle-ManifestVersion: 2 Import-Package: sun.reflect;version="0";resolution:=optional Import-Template: - com.mongodb.*;version="${mongo.version:[=.=,+1.0.0)}", - org.apache.log4j.*;version="[1.2.15, 2.0.0)", - org.apache.log4j.spi.*;version="[1.2.15, 2.0.0)" + com.mongodb.*;version="${mongo:[=.=,+1.0.0)}", + org.apache.log4j.*;version="${log4j:[=.=.=,+1.0.0)}" diff --git a/spring-data-mongodb-parent/pom.xml b/spring-data-mongodb-parent/pom.xml deleted file mode 100644 index 5c0733adc..000000000 --- a/spring-data-mongodb-parent/pom.xml +++ /dev/null @@ -1,356 +0,0 @@ - - - 4.0.0 - org.springframework.data - spring-data-mongodb-parent - Spring Data MongoDB Parent - Spring Data project for MongoDB - http://www.springsource.org/spring-data/mongodb - 1.2.0.BUILD-SNAPSHOT - pom - - - - trisberg - Thomas Risberg - trisberg at vmware.com - SpringSource - http://www.SpringSource.com - - Project Admin - Developer - - -5 - - - mpollack - Mark Pollack - mpollack at vmware.com - SpringSource - http://www.SpringSource.com - - Project Admin - Developer - - -5 - - - ogierke - Oliver Gierke - ogierke at vmware.com - SpringSource - http://www.springsource.com - - Developer - - +1 - - - jbrisbin - Jon Brisbin - jbrisbin at vmware.com - SpringSource - http://www.springsource.com - - Developer - - -6 - - - - - - Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - - Copyright 2010 the original author or authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. - See the License for the specific language governing permissions and - limitations under the License. - - - - - - UTF-8 - - 2.9.2 - 4.10 - 1.0.6 - 1.9.0 - 1.6.1 - 1.6.1 - 3.0.7.RELEASE - 3.1.2.RELEASE - 1.5.0.BUILD-SNAPSHOT - 1.6.11.RELEASE - true - - - - - http://www.springsource.com/download/community - - - static.springframework.org - - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-data/data-mongodb/snapshot-site - - - - spring-milestone - Spring Milestone Repository - s3://maven.springframework.org/milestone - - - spring-snapshot - Spring Snapshot Repository - s3://maven.springframework.org/snapshot - - - - - - - - org.hamcrest - hamcrest-library - 1.2.1 - test - - - - junit - junit-dep - ${junit.version} - test - - - - org.mockito - mockito-core - ${org.mockito.version} - test - - - - joda-time - joda-time - 1.6 - test - - - - org.slf4j - slf4j-api - ${org.slf4j.version} - - - org.slf4j - jcl-over-slf4j - ${org.slf4j.version} - test - - - org.slf4j - jul-to-slf4j - ${org.slf4j.version} - test - - - ch.qos.logback - logback-classic - ${logback.version} - test - - - org.springframework - spring-test - ${org.springframework.version.range} - test - - - - - - - - - org.springframework.build.aws - org.springframework.build.aws.maven - 3.1.0.RELEASE - - - - - ${project.basedir}/src/main/java - - **/* - - - **/*.java - - - - ${project.basedir}/src/main/resources - - **/* - - - - - - ${project.basedir}/src/test/java - - **/* - - - **/*.java - - - - ${project.basedir}/src/test/resources - - **/* - - - **/*.java - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.5.1 - - 1.5 - 1.5 - -Xlint:-path - true - false - - - - org.apache.maven.plugins - maven-jar-plugin - 2.3.1 - - true - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.12 - - false - - **/*Tests.java - - - **/PerformanceTests.java - - junit:junit-dep - - src/test/resources/logging.properties - - - - - maven-source-plugin - 2.1.2 - - - attach-sources - - jar - - - - - - - - - - com.springsource.bundlor - com.springsource.bundlor.maven - 1.0.0.RELEASE - - ${bundlor.failOnWarnings} - - - - bundlor - - bundlor - - - - - - - - - - spring-plugins-release - http://repo.springsource.org/plugins-release - - - querydsl - http://source.mysema.com/maven2/releases - - - - - spring-libs-snapshot - http://repo.springsource.org/libs-snapshot - - - - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.1 - - false - - - - - - https://github.com/SpringSource/spring-data-mongodb - - diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml index e80a6dcad..eb34dc22e 100644 --- a/spring-data-mongodb/pom.xml +++ b/spring-data-mongodb/pom.xml @@ -1,78 +1,80 @@ - + + 4.0.0 + + spring-data-mongodb + + Spring Data MongoDB - Core + MongoDB support for Spring Data + org.springframework.data spring-data-mongodb-parent 1.2.0.BUILD-SNAPSHOT - ../spring-data-mongodb-parent/pom.xml + ../pom.xml - spring-data-mongodb - Spring Data MongoDB - 2.8.0 - 1.0 - 1.0.0.GA - 1.1.3 + 1.0.0.GA - + org.springframework spring-tx - ${org.springframework.version.range} + ${spring} org.springframework spring-context - ${org.springframework.version.range} + ${spring} org.springframework spring-beans - ${org.springframework.version.range} + ${spring} org.springframework spring-core - ${org.springframework.version.range} + ${spring} - commons-logging - commons-logging - + commons-logging + commons-logging + org.springframework spring-expression - ${org.springframework.version.range} + ${spring} - - org.springframework.data - spring-data-commons-core - ${data.commons.version} - - - - - org.mongodb - mongo-java-driver - ${mongo.version} + + ${project.groupId} + spring-data-commons + ${springdata.commons} com.mysema.querydsl querydsl-mongodb - ${querydsl.version} + ${querydsl} true + + com.mysema.querydsl + querydsl-apt + ${querydsl} + provided + + javax.annotation jsr250-api @@ -84,7 +86,7 @@ javax.enterprise cdi-api - ${cdi.version} + ${cdi} provided true @@ -92,14 +94,14 @@ javax.el el-api - ${cdi.version} + ${cdi} test org.apache.openwebbeans.test cditest-owb - ${webbeans.version} + ${webbeans} test @@ -114,7 +116,7 @@ javax.validation validation-api - ${validation.version} + ${validation} true @@ -124,39 +126,18 @@ 4.2.0.Final test - + + + joda-time + joda-time + ${jodatime} + test + + - - - performance-tests - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.8 - - - **/PerformanceTests.java - - - none - - junit:junit-dep - - - - - - - - - com.springsource.bundlor - com.springsource.bundlor.maven - com.mysema.maven @@ -166,7 +147,7 @@ com.mysema.querydsl querydsl-apt - ${querydsl.version} + ${querydsl} @@ -182,7 +163,25 @@ + + + org.apache.maven.plugins + maven-surefire-plugin + 2.12 + + false + + **/*Tests.java + + + **/PerformanceTests.java + + + src/test/resources/logging.properties + + + - - + + \ No newline at end of file diff --git a/spring-data-mongodb/template.mf b/spring-data-mongodb/template.mf index 9d9222fa8..e46a19ac9 100644 --- a/spring-data-mongodb/template.mf +++ b/spring-data-mongodb/template.mf @@ -11,13 +11,13 @@ Import-Template: com.mongodb.*;version="0", com.mysema.query.*;version="[2.1.1, 3.0.0)";resolution:=optional, javax.annotation.processing.*;version="0", - javax.enterprise.*;version="${cdi.version:[=.=.=,+1.0.0)}";resolution:=optional, + javax.enterprise.*;version="${cdi:[=.=.=,+1.0.0)}";resolution:=optional, javax.tools.*;version="0", - javax.validation.*;version="${validation.version:[=.=.=.=,+1.0.0)}";resolution:=optional, + javax.validation.*;version="${validation:[=.=.=.=,+1.0.0)}";resolution:=optional, org.aopalliance.*;version="[1.0.0, 2.0.0)";resolution:=optional, org.bson.*;version="0", - org.slf4j.*;version="${org.slf4j.version:[=.=.=,+1.0.0)}", - org.springframework.*;version="${org.springframework.version.30:[=.=.=.=,+1.0.0)}", - org.springframework.data.*;version="${data.commons.version:[=.=.=.=,+1.0.0)}", + org.slf4j.*;version="${slf4j:[=.=.=,+1.0.0)}", + org.springframework.*;version="${spring30:[=.=.=.=,+1.0.0)}", + org.springframework.data.*;version="${springdata.commons:[=.=.=.=,+1.0.0)}", org.springframework.data.mongodb.*;version="${project.version:[=.=.=.=,+1.0.0)}", org.w3c.dom.*;version="0" diff --git a/src/ant/upload-dist.xml b/src/ant/upload-dist.xml deleted file mode 100644 index 9f0df90b3..000000000 --- a/src/ant/upload-dist.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/assembly/distribution.xml b/src/assembly/distribution.xml deleted file mode 100644 index 0660e3933..000000000 --- a/src/assembly/distribution.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - distribution - - zip - - true - - - - src/main/resources - - readme.txt - license.txt - notice.txt - changelog.txt - - - dos - - - - target/site/reference - docs/reference - - - - target/site/apidocs - docs/javadoc - - - - - - - org.springframework.data:spring-data-mongodb - org.springframework.data:spring-data-mongodb-cross-store - org.springframework.data:spring-data-mongodb-log4j - - - - dist - false - false - - - - - - org.springframework.data:spring-data-mongodb - org.springframework.data:spring-data-mongodb-cross-store - org.springframework.data:spring-data-mongodb-log4j - - - - sources - src - false - false - - - - diff --git a/src/docbkx/resources/css/highlight.css b/src/docbkx/resources/css/highlight.css deleted file mode 100644 index ffefef72d..000000000 --- a/src/docbkx/resources/css/highlight.css +++ /dev/null @@ -1,35 +0,0 @@ -/* - code highlight CSS resemblign the Eclipse IDE default color schema - @author Costin Leau -*/ - -.hl-keyword { - color: #7F0055; - font-weight: bold; -} - -.hl-comment { - color: #3F5F5F; - font-style: italic; -} - -.hl-multiline-comment { - color: #3F5FBF; - font-style: italic; -} - -.hl-tag { - color: #3F7F7F; -} - -.hl-attribute { - color: #7F007F; -} - -.hl-value { - color: #2A00FF; -} - -.hl-string { - color: #2A00FF; -} \ No newline at end of file diff --git a/src/docbkx/resources/css/html.css b/src/docbkx/resources/css/html.css deleted file mode 100644 index dd2ab6941..000000000 --- a/src/docbkx/resources/css/html.css +++ /dev/null @@ -1,305 +0,0 @@ -@IMPORT url("highlight.css"); - -body { - text-align: justify; - margin-right: 2em; - margin-left: 2em; -} - -a, -a[accesskey^="h"], -a[accesskey^="n"], -a[accesskey^="u"], -a[accesskey^="p"] { - font-family: Verdana, Arial, helvetica, sans-serif; - font-size: 12px; - color: #003399; -} - -a:active { - color: #003399; -} - -a:visited { - color: #888888; -} - -p { - font-family: Verdana, Arial, sans-serif; -} - -dt { - font-family: Verdana, Arial, sans-serif; - font-size: 12px; -} - -p, dl, dt, dd, blockquote { - color: #000000; - margin-bottom: 3px; - margin-top: 3px; - padding-top: 0; -} - -ol, ul, p { - margin-top: 6px; - margin-bottom: 6px; -} - -p, blockquote { - font-size: 90%; -} - -p.releaseinfo { - font-size: 100%; - font-weight: bold; - font-family: Verdana, Arial, helvetica, sans-serif; - padding-top: 10px; -} - -p.pubdate { - font-size: 120%; - font-weight: bold; - font-family: Verdana, Arial, helvetica, sans-serif; -} - -td { - font-size: 80%; -} - -td, th, span { - color: #000000; -} - -td[width^="40%"] { - font-family: Verdana, Arial, helvetica, sans-serif; - font-size: 12px; - color: #003399; -} - -table[summary^="Navigation header"] tbody tr th[colspan^="3"] { - font-family: Verdana, Arial, helvetica, sans-serif; -} - -blockquote { - margin-right: 0; -} - -h1, h2, h3, h4, h6 { - color: #000000; - font-weight: 500; - margin-top: 0; - padding-top: 14px; - font-family: Verdana, Arial, helvetica, sans-serif; - margin-bottom: 0; -} - -h2.title { - font-weight: 800; - margin-bottom: 8px; -} - -h2.subtitle { - font-weight: 800; - margin-bottom: 20px; -} - -.firstname, .surname { - font-size: 12px; - font-family: Verdana, Arial, helvetica, sans-serif; -} - -table { - border-collapse: collapse; - border-spacing: 0; - border: 1px black; - empty-cells: hide; - margin: 10px 0 30px 50px; - width: 90%; -} - -div.table { - margin: 30px 0 10px 0; - border: 1px dashed gray; - padding: 10px; -} - -div .table-contents table { - border: 1px solid black; -} - -div.table > p.title { - padding-left: 10px; -} - -table[summary^="Navigation footer"] { - border-collapse: collapse; - border-spacing: 0; - border: 1px black; - empty-cells: hide; - margin: 0px; - width: 100%; -} - -table[summary^="Note"], -table[summary^="Warning"], -table[summary^="Tip"] { - border-collapse: collapse; - border-spacing: 0; - border: 1px black; - empty-cells: hide; - margin: 10px 0px 10px -20px; - width: 100%; -} - -td { - padding: 4pt; - font-family: Verdana, Arial, helvetica, sans-serif; -} - -div.warning TD { - text-align: justify; -} - -h1 { - font-size: 150%; -} - -h2 { - font-size: 110%; -} - -h3 { - font-size: 100%; font-weight: bold; -} - -h4 { - font-size: 90%; font-weight: bold; -} - -h5 { - font-size: 90%; font-style: italic; -} - -h6 { - font-size: 100%; font-style: italic; -} - -tt { - font-size: 110%; - font-family: "Courier New", Courier, monospace; - color: #000000; -} - -.navheader, .navfooter { - border: none; -} - -div.navfooter table { - border-style: dashed; - border-color: gray; - border-width: 1px 1px 1px 1px; - background-color: #cde48d; -} - -pre { - font-size: 110%; - padding: 5px; - border-style: solid; - border-width: 1px; - border-color: #CCCCCC; - background-color: #f3f5e9; -} - -ul, ol, li { - list-style: disc; -} - -hr { - width: 100%; - height: 1px; - background-color: #CCCCCC; - border-width: 0; - padding: 0; -} - -.variablelist { - padding-top: 10px; - padding-bottom: 10px; - margin: 0; -} - -.term { - font-weight:bold; -} - -.mediaobject { - padding-top: 30px; - padding-bottom: 30px; -} - -.legalnotice { - font-family: Verdana, Arial, helvetica, sans-serif; - font-size: 12px; - font-style: italic; -} - -.sidebar { - float: right; - margin: 10px 0 10px 30px; - padding: 10px 20px 20px 20px; - width: 33%; - border: 1px solid black; - background-color: #F4F4F4; - font-size: 14px; -} - -.property { - font-family: "Courier New", Courier, monospace; -} - -a code { - font-family: Verdana, Arial, monospace; - font-size: 12px; -} - -td code { - font-size: 110%; -} - -div.note * td, -div.tip * td, -div.warning * td, -div.calloutlist * td { - text-align: justify; - font-size: 100%; -} - -.programlisting { - clear: both; -} - -.programlisting .interfacename, -.programlisting .literal, -.programlisting .classname { - font-size: 95%; -} - -.title .interfacename, -.title .literal, -.title .classname { - font-size: 130%; -} - -/* everything in a is displayed in a coloured, comment-like font */ -.programlisting * .lineannotation, -.programlisting * .lineannotation * { - color: green; -} - -.question * p { - font-size: 100%; -} - -.answer * p { - font-size: 100%; -} \ No newline at end of file diff --git a/src/docbkx/resources/images/admons/blank.png b/src/docbkx/resources/images/admons/blank.png deleted file mode 100644 index 764bf4f0c..000000000 Binary files a/src/docbkx/resources/images/admons/blank.png and /dev/null differ diff --git a/src/docbkx/resources/images/admons/caution.gif b/src/docbkx/resources/images/admons/caution.gif deleted file mode 100644 index d9f5e5b1b..000000000 Binary files a/src/docbkx/resources/images/admons/caution.gif and /dev/null differ diff --git a/src/docbkx/resources/images/admons/caution.png b/src/docbkx/resources/images/admons/caution.png deleted file mode 100644 index 5b7809ca4..000000000 Binary files a/src/docbkx/resources/images/admons/caution.png and /dev/null differ diff --git a/src/docbkx/resources/images/admons/caution.tif b/src/docbkx/resources/images/admons/caution.tif deleted file mode 100644 index 4a282948c..000000000 Binary files a/src/docbkx/resources/images/admons/caution.tif and /dev/null differ diff --git a/src/docbkx/resources/images/admons/draft.png b/src/docbkx/resources/images/admons/draft.png deleted file mode 100644 index 0084708c9..000000000 Binary files a/src/docbkx/resources/images/admons/draft.png and /dev/null differ diff --git a/src/docbkx/resources/images/admons/home.gif b/src/docbkx/resources/images/admons/home.gif deleted file mode 100644 index 6784f5bb0..000000000 Binary files a/src/docbkx/resources/images/admons/home.gif and /dev/null differ diff --git a/src/docbkx/resources/images/admons/home.png b/src/docbkx/resources/images/admons/home.png deleted file mode 100644 index cbb711de7..000000000 Binary files a/src/docbkx/resources/images/admons/home.png and /dev/null differ diff --git a/src/docbkx/resources/images/admons/important.gif b/src/docbkx/resources/images/admons/important.gif deleted file mode 100644 index 6795d9a81..000000000 Binary files a/src/docbkx/resources/images/admons/important.gif and /dev/null differ diff --git a/src/docbkx/resources/images/admons/important.png b/src/docbkx/resources/images/admons/important.png deleted file mode 100644 index ad57f6f72..000000000 Binary files a/src/docbkx/resources/images/admons/important.png and /dev/null differ diff --git a/src/docbkx/resources/images/admons/important.tif b/src/docbkx/resources/images/admons/important.tif deleted file mode 100644 index 184de6371..000000000 Binary files a/src/docbkx/resources/images/admons/important.tif and /dev/null differ diff --git a/src/docbkx/resources/images/admons/next.gif b/src/docbkx/resources/images/admons/next.gif deleted file mode 100644 index aa1516e69..000000000 Binary files a/src/docbkx/resources/images/admons/next.gif and /dev/null differ diff --git a/src/docbkx/resources/images/admons/next.png b/src/docbkx/resources/images/admons/next.png deleted file mode 100644 index 45835bf89..000000000 Binary files a/src/docbkx/resources/images/admons/next.png and /dev/null differ diff --git a/src/docbkx/resources/images/admons/note.gif b/src/docbkx/resources/images/admons/note.gif deleted file mode 100644 index f329d359e..000000000 Binary files a/src/docbkx/resources/images/admons/note.gif and /dev/null differ diff --git a/src/docbkx/resources/images/admons/note.png b/src/docbkx/resources/images/admons/note.png deleted file mode 100644 index ad57f6f72..000000000 Binary files a/src/docbkx/resources/images/admons/note.png and /dev/null differ diff --git a/src/docbkx/resources/images/admons/note.tif b/src/docbkx/resources/images/admons/note.tif deleted file mode 100644 index 08644d6b5..000000000 Binary files a/src/docbkx/resources/images/admons/note.tif and /dev/null differ diff --git a/src/docbkx/resources/images/admons/prev.gif b/src/docbkx/resources/images/admons/prev.gif deleted file mode 100644 index 64ca8f3c7..000000000 Binary files a/src/docbkx/resources/images/admons/prev.gif and /dev/null differ diff --git a/src/docbkx/resources/images/admons/prev.png b/src/docbkx/resources/images/admons/prev.png deleted file mode 100644 index cf24654f8..000000000 Binary files a/src/docbkx/resources/images/admons/prev.png and /dev/null differ diff --git a/src/docbkx/resources/images/admons/tip.gif b/src/docbkx/resources/images/admons/tip.gif deleted file mode 100644 index 823f2b417..000000000 Binary files a/src/docbkx/resources/images/admons/tip.gif and /dev/null differ diff --git a/src/docbkx/resources/images/admons/tip.png b/src/docbkx/resources/images/admons/tip.png deleted file mode 100644 index ad57f6f72..000000000 Binary files a/src/docbkx/resources/images/admons/tip.png and /dev/null differ diff --git a/src/docbkx/resources/images/admons/tip.tif b/src/docbkx/resources/images/admons/tip.tif deleted file mode 100644 index 4a3d8c75f..000000000 Binary files a/src/docbkx/resources/images/admons/tip.tif and /dev/null differ diff --git a/src/docbkx/resources/images/admons/toc-blank.png b/src/docbkx/resources/images/admons/toc-blank.png deleted file mode 100644 index 6ffad17a0..000000000 Binary files a/src/docbkx/resources/images/admons/toc-blank.png and /dev/null differ diff --git a/src/docbkx/resources/images/admons/toc-minus.png b/src/docbkx/resources/images/admons/toc-minus.png deleted file mode 100644 index abbb020c8..000000000 Binary files a/src/docbkx/resources/images/admons/toc-minus.png and /dev/null differ diff --git a/src/docbkx/resources/images/admons/toc-plus.png b/src/docbkx/resources/images/admons/toc-plus.png deleted file mode 100644 index 941312ce0..000000000 Binary files a/src/docbkx/resources/images/admons/toc-plus.png and /dev/null differ diff --git a/src/docbkx/resources/images/admons/up.gif b/src/docbkx/resources/images/admons/up.gif deleted file mode 100644 index aabc2d016..000000000 Binary files a/src/docbkx/resources/images/admons/up.gif and /dev/null differ diff --git a/src/docbkx/resources/images/admons/up.png b/src/docbkx/resources/images/admons/up.png deleted file mode 100644 index 07634de26..000000000 Binary files a/src/docbkx/resources/images/admons/up.png and /dev/null differ diff --git a/src/docbkx/resources/images/admons/warning.gif b/src/docbkx/resources/images/admons/warning.gif deleted file mode 100644 index c6acdec60..000000000 Binary files a/src/docbkx/resources/images/admons/warning.gif and /dev/null differ diff --git a/src/docbkx/resources/images/admons/warning.png b/src/docbkx/resources/images/admons/warning.png deleted file mode 100644 index ef3e10f40..000000000 Binary files a/src/docbkx/resources/images/admons/warning.png and /dev/null differ diff --git a/src/docbkx/resources/images/admons/warning.tif b/src/docbkx/resources/images/admons/warning.tif deleted file mode 100644 index 7b6611ec7..000000000 Binary files a/src/docbkx/resources/images/admons/warning.tif and /dev/null differ diff --git a/src/docbkx/resources/images/callouts/1.png b/src/docbkx/resources/images/callouts/1.png deleted file mode 100644 index 7d473430b..000000000 Binary files a/src/docbkx/resources/images/callouts/1.png and /dev/null differ diff --git a/src/docbkx/resources/images/callouts/10.png b/src/docbkx/resources/images/callouts/10.png deleted file mode 100644 index 997bbc824..000000000 Binary files a/src/docbkx/resources/images/callouts/10.png and /dev/null differ diff --git a/src/docbkx/resources/images/callouts/11.png b/src/docbkx/resources/images/callouts/11.png deleted file mode 100644 index ce47dac3f..000000000 Binary files a/src/docbkx/resources/images/callouts/11.png and /dev/null differ diff --git a/src/docbkx/resources/images/callouts/12.png b/src/docbkx/resources/images/callouts/12.png deleted file mode 100644 index 31daf4e2f..000000000 Binary files a/src/docbkx/resources/images/callouts/12.png and /dev/null differ diff --git a/src/docbkx/resources/images/callouts/13.png b/src/docbkx/resources/images/callouts/13.png deleted file mode 100644 index 14021a89c..000000000 Binary files a/src/docbkx/resources/images/callouts/13.png and /dev/null differ diff --git a/src/docbkx/resources/images/callouts/14.png b/src/docbkx/resources/images/callouts/14.png deleted file mode 100644 index 64014b75f..000000000 Binary files a/src/docbkx/resources/images/callouts/14.png and /dev/null differ diff --git a/src/docbkx/resources/images/callouts/15.png b/src/docbkx/resources/images/callouts/15.png deleted file mode 100644 index 0d65765fc..000000000 Binary files a/src/docbkx/resources/images/callouts/15.png and /dev/null differ diff --git a/src/docbkx/resources/images/callouts/2.png b/src/docbkx/resources/images/callouts/2.png deleted file mode 100644 index 5d09341b2..000000000 Binary files a/src/docbkx/resources/images/callouts/2.png and /dev/null differ diff --git a/src/docbkx/resources/images/callouts/3.png b/src/docbkx/resources/images/callouts/3.png deleted file mode 100644 index ef7b70047..000000000 Binary files a/src/docbkx/resources/images/callouts/3.png and /dev/null differ diff --git a/src/docbkx/resources/images/callouts/4.png b/src/docbkx/resources/images/callouts/4.png deleted file mode 100644 index adb8364eb..000000000 Binary files a/src/docbkx/resources/images/callouts/4.png and /dev/null differ diff --git a/src/docbkx/resources/images/callouts/5.png b/src/docbkx/resources/images/callouts/5.png deleted file mode 100644 index 4d7eb4600..000000000 Binary files a/src/docbkx/resources/images/callouts/5.png and /dev/null differ diff --git a/src/docbkx/resources/images/callouts/6.png b/src/docbkx/resources/images/callouts/6.png deleted file mode 100644 index 0ba694af6..000000000 Binary files a/src/docbkx/resources/images/callouts/6.png and /dev/null differ diff --git a/src/docbkx/resources/images/callouts/7.png b/src/docbkx/resources/images/callouts/7.png deleted file mode 100644 index 472e96f8a..000000000 Binary files a/src/docbkx/resources/images/callouts/7.png and /dev/null differ diff --git a/src/docbkx/resources/images/callouts/8.png b/src/docbkx/resources/images/callouts/8.png deleted file mode 100644 index 5e60973c2..000000000 Binary files a/src/docbkx/resources/images/callouts/8.png and /dev/null differ diff --git a/src/docbkx/resources/images/callouts/9.png b/src/docbkx/resources/images/callouts/9.png deleted file mode 100644 index a0676d26c..000000000 Binary files a/src/docbkx/resources/images/callouts/9.png and /dev/null differ diff --git a/src/docbkx/resources/images/jconsole.png b/src/docbkx/resources/images/jconsole.png deleted file mode 100644 index 267aee8a4..000000000 Binary files a/src/docbkx/resources/images/jconsole.png and /dev/null differ diff --git a/src/docbkx/resources/images/logo.png b/src/docbkx/resources/images/logo.png deleted file mode 100644 index a9f6d959e..000000000 Binary files a/src/docbkx/resources/images/logo.png and /dev/null differ diff --git a/src/docbkx/resources/images/xdev-spring_logo.jpg b/src/docbkx/resources/images/xdev-spring_logo.jpg deleted file mode 100644 index 622962ee3..000000000 Binary files a/src/docbkx/resources/images/xdev-spring_logo.jpg and /dev/null differ diff --git a/src/docbkx/resources/xsl/fopdf.xsl b/src/docbkx/resources/xsl/fopdf.xsl deleted file mode 100644 index 0a90bfb9e..000000000 --- a/src/docbkx/resources/xsl/fopdf.xsl +++ /dev/null @@ -1,449 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - , - - - - - - - - - Copyright © 2011 - - - - - - - - - - - - - - - - - - - - - - - - - - - - -5em - -5em - - - - - - - - - - - Spring Data Document () - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - - 1 - 1 - 0 - - - - - - book toc - - - - 2 - - - - - - - - - - 0 - 0 - 0 - - - 5mm - 10mm - 10mm - - 15mm - 10mm - 0mm - - 18mm - 18mm - - - 0pc - - - - - justify - false - - - 11 - 8 - - - 1.4 - - - - - - - 0.8em - - - - - - 17.4cm - - - - 4pt - 4pt - 4pt - 4pt - - - - 0.1pt - 0.1pt - - - - - 1 - - - - - - - - left - bold - - - pt - - - - - - - - - - - - - - - 0.8em - 0.8em - 0.8em - - - pt - - 0.1em - 0.1em - 0.1em - - - 0.6em - 0.6em - 0.6em - - - pt - - 0.1em - 0.1em - 0.1em - - - 0.4em - 0.4em - 0.4em - - - pt - - 0.1em - 0.1em - 0.1em - - - - - bold - - - pt - - false - 0.4em - 0.6em - 0.8em - - - - - - - - - pt - - - - - 1em - 1em - 1em - #444444 - solid - 0.1pt - 0.5em - 0.5em - 0.5em - 0.5em - 0.5em - 0.5em - - - - 1 - - #F0F0F0 - - - - - - 0 - 1 - - - 90 - - - - - '1' - src/docbkx/resources/images/admons/ - - - - - - figure after - example before - equation before - table before - procedure before - - - - 1 - - - - 0.8em - 0.8em - 0.8em - 0.1em - 0.1em - 0.1em - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/docbkx/resources/xsl/highlight-fo.xsl b/src/docbkx/resources/xsl/highlight-fo.xsl deleted file mode 100644 index 09d808994..000000000 --- a/src/docbkx/resources/xsl/highlight-fo.xsl +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/docbkx/resources/xsl/highlight.xsl b/src/docbkx/resources/xsl/highlight.xsl deleted file mode 100644 index c63c4765c..000000000 --- a/src/docbkx/resources/xsl/highlight.xsl +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/docbkx/resources/xsl/html.xsl b/src/docbkx/resources/xsl/html.xsl deleted file mode 100644 index d3250c7cc..000000000 --- a/src/docbkx/resources/xsl/html.xsl +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - 0 - 0 - 1 - - - - - - book toc - - - - 3 - - - - - 1 - - - - - - - 1 - - - 90 - - - - - 1 - images/admons/ - - - - figure after - example before - equation before - table before - procedure before - - - - , - - - - - - - - -
-

Authors

-

- -

- - - - - - - - - diff --git a/src/docbkx/resources/xsl/html_chunk.xsl b/src/docbkx/resources/xsl/html_chunk.xsl deleted file mode 100644 index 29b35d281..000000000 --- a/src/docbkx/resources/xsl/html_chunk.xsl +++ /dev/null @@ -1,221 +0,0 @@ - - - - - - - - - - '5' - '1' - 0 - 0 - 1 - - - - book toc - qandaset toc - - - 3 - - - 1 - - - - - 1 - 90 - - - - - 1 - images/admons/ - - - - figure after - example before - equation before - table before - procedure before - - - - , - - - - () - - - - - -
-

Authors

-

- -

- - - - - - - - - 1 - - - - - - - - - - -
- -
- - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - -   - - - - - - - - - - - - - - -  |  - - -   - - - - - - - - -toc - - - - - - - - -   - - - - - - - - - - - - -
- - - -   - - - Sponsored by SpringSource - - - -   - - - -
- -
- - - diff --git a/src/main/javadoc/doc-files/th-background.png b/src/main/javadoc/doc-files/th-background.png deleted file mode 100644 index 72d65e771..000000000 Binary files a/src/main/javadoc/doc-files/th-background.png and /dev/null differ diff --git a/src/main/javadoc/spring-javadoc.css b/src/main/javadoc/spring-javadoc.css deleted file mode 100644 index 79cb2cedb..000000000 --- a/src/main/javadoc/spring-javadoc.css +++ /dev/null @@ -1,148 +0,0 @@ -/* 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; -}