From 0f1bc7200d75f61cbee8dfcb284ad543ce6e0875 Mon Sep 17 00:00:00 2001 From: Imran M Yousuf Date: Wed, 18 Aug 2010 11:25:02 +0600 Subject: [PATCH] Integrate Smart Core into smart dao In this process deleted compass related code. Because it will probably be wiser to have compass related code in a separate module at a later time. It could also have a Solr implementation. Signed-off-by: Imran M Yousuf --- docs/pom.xml | 41 +- pom.xml | 998 ++++++++------------- smart-abstract-dao/pom.xml | 6 - smart-cache/pom.xml | 9 - smart-dao-queryparam/pom.xml | 3 - smart-dao-search/pom.xml | 12 - .../search/compass/CommonCompassSearchDao.java | 31 - .../common/search/compass/CompassReadExtender.java | 29 - .../search/compass/impl/CompassQueryBuilder.java | 204 ----- .../search/compass/impl/CompassSearchDao.java | 175 ---- smart-domain/pom.xml | 3 - smart-exim/pom.xml | 1 - smart-exim/smart-exim-api/pom.xml | 6 - smart-exim/smart-exim-xml-impl/pom.xml | 10 - smart-hibernate-abstract-dao/pom.xml | 309 +++---- smart-rs/pom.xml | 10 - smart-version/pom.xml | 3 - smart-version/smart-dao-version/pom.xml | 3 - smart-version/smart-version-api/pom.xml | 7 - smart-version/smart-version-jgit-impl/pom.xml | 26 - .../java/com/smartitengineering/dao/AppTest.java | 38 - 21 files changed, 521 insertions(+), 1403 deletions(-) rewrite pom.xml (93%) delete mode 100644 smart-dao-search/src/main/java/com/smartitengineering/dao/common/search/compass/CommonCompassSearchDao.java delete mode 100644 smart-dao-search/src/main/java/com/smartitengineering/dao/common/search/compass/CompassReadExtender.java delete mode 100644 smart-dao-search/src/main/java/com/smartitengineering/dao/common/search/compass/impl/CompassQueryBuilder.java delete mode 100644 smart-dao-search/src/main/java/com/smartitengineering/dao/common/search/compass/impl/CompassSearchDao.java rewrite smart-hibernate-abstract-dao/pom.xml (76%) delete mode 100644 src/test/java/com/smartitengineering/dao/AppTest.java diff --git a/docs/pom.xml b/docs/pom.xml index 8d4fa28..34ac92b 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -35,88 +35,60 @@ org.apache.maven.plugins maven-assembly-plugin - ${assembly.version} com.smartitengineering - ${project.version} smart-domain com.smartitengineering - ${project.version} smart-abstract-dao com.smartitengineering.smart-dao smart-hbase-dao - ${project.version} com.smartitengineering - ${project.version} smart-dao-queryparam com.smartitengineering - ${project.version} smart-hibernate-abstract-dao - - - asm - asm - - - asm - asm-attrs - - - cglib - cglib - - com.smartitengineering - ${project.version} smart-cache - + com.smartitengineering - ${project.version} - smart-dao-search - + smart-rs + com.smartitengineering - ${project.version} - smart-rs + smart-dao-search com.smartitengineering.smart-version - ${project.version} smart-version-api com.smartitengineering.smart-version - ${project.version} smart-dao-version com.smartitengineering.smart-version - ${project.version} smart-version-jgit-impl com.smartitengineering.smart-exim - ${project.version} smart-exim-api com.smartitengineering.smart-exim - ${project.version} smart-exim-xml-impl @@ -134,7 +106,6 @@ org.apache.maven.plugins maven-assembly-plugin - ${assembly.version} false @@ -168,7 +139,6 @@ org.apache.maven.plugins maven-assembly-plugin - ${assembly.version} true @@ -223,7 +193,6 @@ org.apache.maven.plugins maven-antrun-plugin - ${antrun.version} false @@ -249,7 +218,7 @@ ant-contrib ant-contrib - ${ant-contrib.version} + ${ant.contrib.version} diff --git a/pom.xml b/pom.xml dissimilarity index 93% index b5e87d9..c0f0ff8 100644 --- a/pom.xml +++ b/pom.xml @@ -1,637 +1,361 @@ - - - - 4.0.0 - com.smartitengineering - smart-dao - pom - 0.4-SNAPSHOT - Smart DAO - 2007 - - This project basically aims to create an abstraction layer above common - ORM used this days and provide a simplified DAO layer which is not only - independent of the ORM tool being used but also integrated with other - services, for example App Layer Caching, Free Text Search Engine etc. - Initial target is to implement it for Hibernate and when JPA provides - Hibernate's Criteria like API implement for JPA as well. Integrate - App Layer Cache and Compass Framework. - - http://code.google.com/p/smart-dao - - Smart IT Engineering - http://www.smartitengineering.com - - - Google Code Issue Tracker - http://code.google.com/p/smart-dao/issues/ - - - - User List - http://groups.google.com/group/smart-dao-users - smart-dao-users@googlegroups.com - smart-dao-users-subscribe@googlegroups.com - smart-dao-users+unsubscribe@googlegroups.com - - - Developer List - http://groups.google.com/group/smart-dao-dev - smart-dao-dev@googlegroups.com - smart-dao-dev-subscribe@googlegroups.com - smart-dao-dev+unsubscribe@googlegroups.com - - - - - LGPL v3 - repo and manual - http://www.gnu.org/licenses/lgpl.html - - - - - imyousuf - Imran M Yousuf - imyousuf@smartitengineering.com - Smart IT Engineering - GMT +0600 - - Project Owner - Developer - Maintainer - - - - - scm:git:git://repo.or.cz/smart-dao.git - scm:git:ssh://imyousuf@repo.or.cz/srv/git/smart-dao.git - - - - - smartit-googlecode - Smart IT Engineering GoogleCode repository - svn:https://imyousuf@smart-it.googlecode.com/svn/maven2/releases - - - - smartit-googlecode - Smart IT Engineering GoogleCode repository - svn:https://imyousuf@smart-it.googlecode.com/svn/maven2/snapshots - - - - smartit-googlecode - Smart IT Engineering GoogleCode repository - svn:https://imyousuf@smart-it.googlecode.com/svn/maven2/site/dao - - - - - maven2-repository.dev.java.net - Java.net Repository for Maven - http://download.java.net/maven/2/ - default - - true - - - false - - - - compass-project.org - Compass - http://repo.compass-project.org - - true - - - false - - - - smartit-googlecode-snapshots - Smart IT Snapshot GoogleCode Snapshot Repo - http://smart-it.googlecode.com/svn/maven2/snapshots/ - default - - false - - - true - - - - smartit-googlecode-releases - Smart IT Snapshot GoogleCode Release Repo - http://smart-it.googlecode.com/svn/maven2/releases/ - default - - true - - - false - - - - apache-sonatype-snapshot - Apache Snapshot repo hosted by Sonatype - http://repository.sonatype.org/content/repositories/apache-snapshots/ - default - - false - - - true - - - - jgit-repository - http://download.eclipse.org/jgit/maven - - - - - - org.eclipse.jgit - org.eclipse.jgit - ${jgit.version} - - - junit - junit - ${junit.version} - test - - - org.apache.hbase - hbase - ${hbase.version} - - - com.smartitengineering - smart-dao-queryparam - ${project.version} - - - - - - junit - junit - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - ${assembly.version} - - - org.apache.maven.plugins - maven-surefire-plugin - ${surefire.version} - - - org.apache.maven.plugins - maven-release-plugin - ${release.version} - - - org.apache.maven.plugins - maven-scm-plugin - ${scm.version} - - - org.apache.maven.plugins - maven-javadoc-plugin - ${javadoc.version} - - - org.apache.maven.plugins - maven-compiler-plugin - ${compiler.version} - - - org.apache.maven.plugins - maven-changelog-plugin - ${changelog.version} - - - org.apache.maven.plugins - maven-source-plugin - ${src.version} - - - org.apache.maven.plugins - maven-site-plugin - ${site.version} - - - org.codehaus.mojo - cobertura-maven-plugin - ${cobertura.version} - - - org.apache.maven.plugins - maven-surefire-report-plugin - ${surefire-report.version} - - - org.apache.maven.plugins - maven-antrun-plugin - ${antrun.version} - - - org.codehaus.mojo - findbugs-maven-plugin - ${findbugs.version} - - - org.codehaus.mojo - xml-maven-plugin - ${xml-plugin.version} - - - org.codehaus.mojo - sonar-maven-plugin - ${sonar.plugin.version} - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - org.apache.maven.plugins - maven-release-plugin - - - org.apache.maven.plugins - maven-scm-plugin - - - org.apache.maven.plugins - maven-javadoc-plugin - true - - true - true - true - - - - gen-javadoc - package - - jar - - - - - - org.apache.maven.plugins - maven-compiler-plugin - true - - ${javac.src.version} - ${javac.target.version} - - - - org.apache.maven.plugins - maven-source-plugin - true - - true - - - - attach-sources - verify - - jar - - - - - - org.apache.maven.plugins - maven-changelog-plugin - false - - - org.codehaus.plexus - plexus-utils - ${plexus-utils.version} - - - org.apache.maven.scm - maven-scm-provider-gitexe - ${scm.version} - - - - - - - org.jvnet.wagon-svn - wagon-svn - ${wagon-svn.version} - - - org.apache.maven.wagon - wagon-ftp - ${wagon-ftp.version} - - - - - - - org.apache.maven.plugins - maven-site-plugin - true - - - org.apache.maven.plugins - maven-javadoc-plugin - - false - true - - - - org.codehaus.mojo - cobertura-maven-plugin - - - org.apache.maven.plugins - maven-surefire-report-plugin - true - - - org.codehaus.mojo - findbugs-maven-plugin - true - - - org.apache.maven.plugins - maven-changelog-plugin - - tag - - ${last.release.tag} - - HEAD - - - - - - - - - build-ext - - - build.complete - true - - - - - - org.apache.maven.plugins - maven-changelog-plugin - false - - - org.codehaus.plexus - plexus-utils - ${plexus-utils.version} - - - org.apache.maven.scm - maven-scm-provider-gitexe - ${scm.version} - - - - ./target/change/changes.xml - - - - attach-changelog - generate-sources - false - - changelog - - - - - - org.codehaus.mojo - xml-maven-plugin - false - - - generate-changes - generate-resources - false - - transform - - - - - - - ./target/change - src/main/xsl/changes.xsl - - - - - - org.apache.maven.plugins - maven-antrun-plugin - false - - - rename-changes - generate-resources - false - - run - - - - - - - - - - - ant-contrib - ant-contrib - ${ant-contrib.version} - - - - - org.apache.maven.plugins - maven-assembly-plugin - true - - - - assemble-static-gh-pages - compile - false - - single - - - - src/main/assembly/assemble-gh-pages.xml - - - - - - assemble-readme - compile - true - - single - - - - src/main/assembly/assemble-readme.xml - - - - - - - org.apache.maven.plugins - maven-site-plugin - true - - - site-gen - prepare-package - true - - site - - - - - - - - - sonar-config - - - sonar.enabled - true - - - - - - org.codehaus.mojo - sonar-maven-plugin - - - - - - - smart-hibernate-abstract-dao - smart-abstract-dao - smart-domain - smart-cache - smart-dao-search - smart-version - smart-dao-queryparam - smart-rs - docs - smart-exim - smart-hbase-dao - - - 2.3 - 0.2-SNAPSHOT - 0.8.4 - 1.3 - 1.0.3 - 2.1 - 1.5.6 - 3.1 - 0.3 - 1.2 - 3.8.1 - 1.8 - 1.0-alpha-6 - 1.0-beta-2 - 2.0.4 - 2.0.2 - 2.5 - 2.0-beta-8 - 1.5 - 1.5 - 1.0 - 2.2 - 2.0-beta-7 - 2.2-beta-2 - 2.2 - 2.1.0 - 1.5.0 - 2.1.0 - 2.5.6 - 2.0.8 - 3.2.5.ga - 0.9.1.2 - 10.4.2.0 - 2.1_3 - 2.4.2 - 2.0 - 1.6.1 - 1.0b3 - gh-pages - 2.4.3 - 1.0-beta-1 - 0.21.0-SNAPSHOT - - + + + + 4.0.0 + + com.smartitengineering + smart-core + 0.1-SNAPSHOT + + com.smartitengineering + smart-dao + pom + 0.4-SNAPSHOT + Smart DAO + 2007 + + This project basically aims to create an abstraction layer above common + ORM used this days and provide a simplified DAO layer which is not only + independent of the ORM tool being used but also integrated with other + services, for example App Layer Caching, Free Text Search Engine etc. + Initial target is to implement it for Hibernate and when JPA provides + Hibernate's Criteria like API implement for JPA as well. Integrate + App Layer Cache and Compass Framework. + + http://code.google.com/p/smart-dao + + Google Code Issue Tracker + http://code.google.com/p/smart-dao/issues/ + + + + User List + http://groups.google.com/group/smart-dao-users + smart-dao-users@googlegroups.com + smart-dao-users-subscribe@googlegroups.com + smart-dao-users+unsubscribe@googlegroups.com + + + Developer List + http://groups.google.com/group/smart-dao-dev + smart-dao-dev@googlegroups.com + smart-dao-dev-subscribe@googlegroups.com + smart-dao-dev+unsubscribe@googlegroups.com + + + + + LGPL v3 + repo and manual + http://www.gnu.org/licenses/lgpl.html + + + + + imyousuf + Imran M Yousuf + imyousuf@smartitengineering.com + Smart IT Engineering + GMT +0600 + + Project Owner + Developer + Maintainer + + + + + scm:git:git://github.com/imyousuf/smart-dao.git + scm:git:ssh://git@github.com:imyousuf/smart-dao.git + + + + smartit-googlecode + Smart IT Engineering GoogleCode repository + svn:https://imyousuf@smart-it.googlecode.com/svn/maven2/site/dao + + + + + + org.apache.maven.plugins + maven-source-plugin + + + org.apache.maven.plugins + maven-javadoc-plugin + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.maven.plugins + maven-release-plugin + + + org.apache.maven.plugins + maven-scm-plugin + + + org.apache.maven.plugins + maven-changelog-plugin + false + + + org.codehaus.plexus + plexus-utils + ${plexus-utils.version} + + + org.apache.maven.scm + maven-scm-provider-gitexe + ${scm.version} + + + + + + + + + org.apache.maven.plugins + maven-site-plugin + true + + + org.apache.maven.plugins + maven-javadoc-plugin + + false + true + + + + org.codehaus.mojo + cobertura-maven-plugin + + + org.apache.maven.plugins + maven-surefire-report-plugin + true + + + org.codehaus.mojo + findbugs-maven-plugin + true + + + org.apache.maven.plugins + maven-changelog-plugin + + tag + + ${last.release.tag} + + HEAD + + + + + + + + + build-ext + + + build.complete + true + + + + + + org.apache.maven.plugins + maven-changelog-plugin + false + + + org.codehaus.plexus + plexus-utils + ${plexus-utils.version} + + + org.apache.maven.scm + maven-scm-provider-gitexe + ${scm.version} + + + + ./target/change/changes.xml + + + + attach-changelog + generate-sources + false + + changelog + + + + + + org.codehaus.mojo + xml-maven-plugin + false + + + generate-changes + generate-resources + false + + transform + + + + + + + ./target/change + src/main/xsl/changes.xsl + + + + + + org.apache.maven.plugins + maven-antrun-plugin + false + + + rename-changes + generate-resources + false + + run + + + + + + + + + + + ant-contrib + ant-contrib + ${ant-contrib.version} + + + + + org.apache.maven.plugins + maven-assembly-plugin + true + + + + assemble-static-gh-pages + compile + false + + single + + + + src/main/assembly/assemble-gh-pages.xml + + + + + + assemble-readme + compile + true + + single + + + + src/main/assembly/assemble-readme.xml + + + + + + + org.apache.maven.plugins + maven-site-plugin + true + + + site-gen + prepare-package + true + + site + + + + + + + + + sonar-config + + + sonar.enabled + true + + + + + + org.codehaus.mojo + sonar-maven-plugin + + + + + + + smart-hibernate-abstract-dao + smart-abstract-dao + smart-domain + smart-cache + smart-dao-search + smart-version + smart-dao-queryparam + smart-rs + docs + smart-exim + smart-hbase-dao + + diff --git a/smart-abstract-dao/pom.xml b/smart-abstract-dao/pom.xml index 5805385..7e71016 100644 --- a/smart-abstract-dao/pom.xml +++ b/smart-abstract-dao/pom.xml @@ -40,7 +40,6 @@ maven-jar-plugin - ${jar.version} @@ -58,7 +57,6 @@ org.apache.maven.plugins maven-assembly-plugin - ${assembly.version} @@ -66,18 +64,14 @@ junit junit - ${junit.version} - test com.smartitengineering smart-domain - ${project.version} com.smartitengineering smart-dao-queryparam - ${project.version} diff --git a/smart-cache/pom.xml b/smart-cache/pom.xml index e975bcd..b1a1c22 100644 --- a/smart-cache/pom.xml +++ b/smart-cache/pom.xml @@ -44,7 +44,6 @@ org.apache.maven.plugins maven-assembly-plugin - ${assembly.version} @@ -52,30 +51,22 @@ junit junit - ${junit.version} - test org.jmock jmock - ${jmock.version} - test org.jmock jmock-junit3 - ${jmock.version} - test net.sf.ehcache ehcache - ${ehcache.version} com.smartitengineering smart-domain - ${project.version} diff --git a/smart-dao-queryparam/pom.xml b/smart-dao-queryparam/pom.xml index 05ef68a..6422771 100644 --- a/smart-dao-queryparam/pom.xml +++ b/smart-dao-queryparam/pom.xml @@ -44,7 +44,6 @@ org.apache.maven.plugins maven-assembly-plugin - ${assembly.version} @@ -52,8 +51,6 @@ junit junit - ${junit.version} - test diff --git a/smart-dao-search/pom.xml b/smart-dao-search/pom.xml index a790d53..35afc0a 100644 --- a/smart-dao-search/pom.xml +++ b/smart-dao-search/pom.xml @@ -42,7 +42,6 @@ org.apache.maven.plugins maven-assembly-plugin - ${assembly.version} @@ -50,33 +49,22 @@ junit junit - ${junit.version} - test com.smartitengineering smart-domain - ${project.version} com.smartitengineering smart-dao-queryparam - ${project.version} com.smartitengineering smart-abstract-dao - ${project.version} - - - org.compass-project - compass - ${compass.version} commons-lang commons-lang - ${commons-lang.version} diff --git a/smart-dao-search/src/main/java/com/smartitengineering/dao/common/search/compass/CommonCompassSearchDao.java b/smart-dao-search/src/main/java/com/smartitengineering/dao/common/search/compass/CommonCompassSearchDao.java deleted file mode 100644 index a091c9d..0000000 --- a/smart-dao-search/src/main/java/com/smartitengineering/dao/common/search/compass/CommonCompassSearchDao.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This is a common dao with basic CRUD operations and is not limited to any - * persistent layer implementation - * - * Copyright (C) 2008 Imran M Yousuf (imyousuf@smartitengineering.com) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ -package com.smartitengineering.dao.common.search.compass; - -import com.smartitengineering.domain.PersistentDTO; - -/** - * - * @author imyousuf - */ -public interface CommonCompassSearchDao