From 56448fafa2f30f9e603a38a83a17851261e6fd63 Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Tue, 14 Jul 2015 14:46:02 -0500 Subject: [PATCH] HHH-9916 - Update quickstarts and tutorials for 5.0 + convert to asciidoc(tor) --- documentation/documentation.gradle | 103 +++--- .../asciidoc/quickstart/guides/index.adoc | 18 + .../asciidoc/quickstart/guides/obtaining.adoc | 55 +++ .../asciidoc/quickstart/guides/preface.adoc | 35 ++ .../guides/tutorial_annotations.adoc | 103 ++++++ .../quickstart/guides/tutorial_envers.adoc | 64 ++++ .../quickstart/guides/tutorial_jpa.adoc | 115 ++++++ .../quickstart/guides/tutorial_native.adoc | 231 ++++++++++++ .../quickstart/guides/tutorial_osgi.adoc | 17 + .../quickstart/tutorials/annotations/pom.xml | 0 .../AnnotationsIllustrationTest.java | 24 +- .../hibernate/tutorial/annotations/Event.java | 0 .../src/test/resources/hibernate.cfg.xml | 0 .../quickstart/tutorials/basic/pom.xml | 0 .../org/hibernate/tutorial/hbm/Event.hbm.xml | 0 .../org/hibernate/tutorial/hbm/Event.java | 0 .../hbm/NativeApiIllustrationTest.java | 25 +- .../src/test/resources/hibernate.cfg.xml | 0 .../tutorials/entitymanager/pom.xml | 0 .../em/EntityManagerIllustrationTest.java | 0 .../java/org/hibernate/tutorial/em/Event.java | 0 .../test/resources/META-INF/persistence.xml | 0 .../quickstart/tutorials/envers/pom.xml | 0 .../envers/EnversIllustrationTest.java | 0 .../org/hibernate/tutorial/envers/Event.java | 0 .../test/resources/META-INF/persistence.xml | 0 .../quickstart/tutorials/pom.xml | 0 .../sessionfactory/CustomSessionFactory.adoc | 4 +- .../docbook/quickstart/en-US/Author_Group.xml | 67 ---- .../en-US/Hibernate_Getting_Started_Guide.ent | 11 - .../en-US/Hibernate_Getting_Started_Guide.xml | 54 --- .../quickstart/en-US/content/obtaining.xml | 187 ---------- .../quickstart/en-US/content/preface.xml | 103 ------ .../en-US/content/tutorial_annotations.xml | 133 ------- .../en-US/content/tutorial_envers.xml | 107 ------ .../quickstart/en-US/content/tutorial_jpa.xml | 145 -------- .../en-US/content/tutorial_native.xml | 342 ------------------ .../en-US/content/tutorial_osgi.xml | 110 ------ .../en-US/images/hibernate_logo_a.png | Bin 31862 -> 0 bytes .../tutorials/osgi/datasource-h2.xml | 28 -- .../tutorials/osgi/managed-jpa/.gitignore | 1 - .../tutorials/osgi/managed-jpa/features.xml | 81 ----- .../tutorials/osgi/managed-jpa/pom.xml | 70 ---- .../hibernate/osgitest/DataPointService.java | 37 -- .../osgitest/DataPointServiceImpl.java | 58 --- .../osgitest/command/AddCommand.java | 44 --- .../osgitest/command/DeleteAllCommand.java | 37 -- .../osgitest/command/GetAllCommand.java | 43 --- .../hibernate/osgitest/entity/DataPoint.java | 53 --- .../main/resources/META-INF/persistence.xml | 21 -- .../OSGI-INF/blueprint/blueprint.xml | 46 --- .../tutorials/osgi/unmanaged-jpa/.gitignore | 1 - .../tutorials/osgi/unmanaged-jpa/features.xml | 47 --- .../tutorials/osgi/unmanaged-jpa/pom.xml | 81 ----- .../hibernate/osgitest/DataPointService.java | 41 --- .../osgitest/DataPointServiceImpl.java | 78 ---- .../org/hibernate/osgitest/HibernateUtil.java | 57 --- .../hibernate/osgitest/TestIntegrator.java | 45 --- .../TestStrategyRegistrationProvider.java | 37 -- .../osgitest/TestTypeContributor.java | 37 -- .../osgitest/command/AddCommand.java | 44 --- .../osgitest/command/DeleteAllCommand.java | 37 -- .../osgitest/command/GetAllCommand.java | 43 --- .../osgitest/command/UpdateCommand.java | 47 --- .../hibernate/osgitest/entity/DataPoint.java | 53 --- .../main/resources/META-INF/persistence.xml | 24 -- .../OSGI-INF/blueprint/blueprint.xml | 50 --- .../osgi/unmanaged-native/.gitignore | 1 - .../osgi/unmanaged-native/features.xml | 79 ---- .../tutorials/osgi/unmanaged-native/pom.xml | 89 ----- .../hibernate/osgitest/DataPointService.java | 47 --- .../osgitest/DataPointServiceImpl.java | 103 ------ .../org/hibernate/osgitest/HibernateUtil.java | 53 --- .../hibernate/osgitest/TestIntegrator.java | 45 --- .../TestStrategyRegistrationProvider.java | 37 -- .../osgitest/TestTypeContributor.java | 37 -- .../osgitest/command/AddCommand.java | 44 --- .../osgitest/command/DeleteAllCommand.java | 37 -- .../osgitest/command/GetAllCommand.java | 43 --- .../osgitest/command/GetCommand.java | 43 --- .../osgitest/command/GetRevisionsCommand.java | 48 --- .../osgitest/command/LoadCommand.java | 43 --- .../osgitest/command/UpdateCommand.java | 47 --- .../hibernate/osgitest/entity/DataPoint.java | 58 --- .../OSGI-INF/blueprint/blueprint.xml | 65 ---- .../src/main/resources/ehcache.xml | 94 ----- .../src/main/resources/hibernate.cfg.xml | 52 --- .../src/main/resources/pool-one.properties | 13 - 88 files changed, 724 insertions(+), 3648 deletions(-) create mode 100644 documentation/src/main/asciidoc/quickstart/guides/index.adoc create mode 100644 documentation/src/main/asciidoc/quickstart/guides/obtaining.adoc create mode 100644 documentation/src/main/asciidoc/quickstart/guides/preface.adoc create mode 100644 documentation/src/main/asciidoc/quickstart/guides/tutorial_annotations.adoc create mode 100644 documentation/src/main/asciidoc/quickstart/guides/tutorial_envers.adoc create mode 100644 documentation/src/main/asciidoc/quickstart/guides/tutorial_jpa.adoc create mode 100644 documentation/src/main/asciidoc/quickstart/guides/tutorial_native.adoc create mode 100644 documentation/src/main/asciidoc/quickstart/guides/tutorial_osgi.adoc rename documentation/src/main/{docbook => asciidoc}/quickstart/tutorials/annotations/pom.xml (100%) rename documentation/src/main/{docbook => asciidoc}/quickstart/tutorials/annotations/src/test/java/org/hibernate/tutorial/annotations/AnnotationsIllustrationTest.java (78%) rename documentation/src/main/{docbook => asciidoc}/quickstart/tutorials/annotations/src/test/java/org/hibernate/tutorial/annotations/Event.java (100%) rename documentation/src/main/{docbook => asciidoc}/quickstart/tutorials/annotations/src/test/resources/hibernate.cfg.xml (100%) rename documentation/src/main/{docbook => asciidoc}/quickstart/tutorials/basic/pom.xml (100%) rename documentation/src/main/{docbook => asciidoc}/quickstart/tutorials/basic/src/test/java/org/hibernate/tutorial/hbm/Event.hbm.xml (100%) rename documentation/src/main/{docbook => asciidoc}/quickstart/tutorials/basic/src/test/java/org/hibernate/tutorial/hbm/Event.java (100%) rename documentation/src/main/{docbook => asciidoc}/quickstart/tutorials/basic/src/test/java/org/hibernate/tutorial/hbm/NativeApiIllustrationTest.java (75%) rename documentation/src/main/{docbook => asciidoc}/quickstart/tutorials/basic/src/test/resources/hibernate.cfg.xml (100%) rename documentation/src/main/{docbook => asciidoc}/quickstart/tutorials/entitymanager/pom.xml (100%) rename documentation/src/main/{docbook => asciidoc}/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/EntityManagerIllustrationTest.java (100%) rename documentation/src/main/{docbook => asciidoc}/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/Event.java (100%) rename documentation/src/main/{docbook => asciidoc}/quickstart/tutorials/entitymanager/src/test/resources/META-INF/persistence.xml (100%) rename documentation/src/main/{docbook => asciidoc}/quickstart/tutorials/envers/pom.xml (100%) rename documentation/src/main/{docbook => asciidoc}/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/EnversIllustrationTest.java (100%) rename documentation/src/main/{docbook => asciidoc}/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/Event.java (100%) rename documentation/src/main/{docbook => asciidoc}/quickstart/tutorials/envers/src/test/resources/META-INF/persistence.xml (100%) rename documentation/src/main/{docbook => asciidoc}/quickstart/tutorials/pom.xml (100%) delete mode 100644 documentation/src/main/docbook/quickstart/en-US/Author_Group.xml delete mode 100644 documentation/src/main/docbook/quickstart/en-US/Hibernate_Getting_Started_Guide.ent delete mode 100644 documentation/src/main/docbook/quickstart/en-US/Hibernate_Getting_Started_Guide.xml delete mode 100644 documentation/src/main/docbook/quickstart/en-US/content/obtaining.xml delete mode 100644 documentation/src/main/docbook/quickstart/en-US/content/preface.xml delete mode 100644 documentation/src/main/docbook/quickstart/en-US/content/tutorial_annotations.xml delete mode 100644 documentation/src/main/docbook/quickstart/en-US/content/tutorial_envers.xml delete mode 100644 documentation/src/main/docbook/quickstart/en-US/content/tutorial_jpa.xml delete mode 100644 documentation/src/main/docbook/quickstart/en-US/content/tutorial_native.xml delete mode 100644 documentation/src/main/docbook/quickstart/en-US/content/tutorial_osgi.xml delete mode 100644 documentation/src/main/docbook/quickstart/en-US/images/hibernate_logo_a.png delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/datasource-h2.xml delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/.gitignore delete mode 100755 documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/features.xml delete mode 100755 documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/pom.xml delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/DataPointService.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/command/AddCommand.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/command/DeleteAllCommand.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/command/GetAllCommand.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/resources/META-INF/persistence.xml delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/resources/OSGI-INF/blueprint/blueprint.xml delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/.gitignore delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/features.xml delete mode 100755 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/pom.xml delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/DataPointService.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/HibernateUtil.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/TestIntegrator.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/TestStrategyRegistrationProvider.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/TestTypeContributor.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/command/AddCommand.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/command/DeleteAllCommand.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/command/GetAllCommand.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/command/UpdateCommand.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/resources/META-INF/persistence.xml delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/resources/OSGI-INF/blueprint/blueprint.xml delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/.gitignore delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/features.xml delete mode 100755 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/pom.xml delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/DataPointService.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/HibernateUtil.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/TestIntegrator.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/TestStrategyRegistrationProvider.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/TestTypeContributor.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/AddCommand.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/DeleteAllCommand.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/GetAllCommand.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/GetCommand.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/GetRevisionsCommand.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/LoadCommand.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/UpdateCommand.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/entity/DataPoint.java delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/resources/OSGI-INF/blueprint/blueprint.xml delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/resources/ehcache.xml delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/resources/hibernate.cfg.xml delete mode 100644 documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/resources/pool-one.properties diff --git a/documentation/documentation.gradle b/documentation/documentation.gradle index f4d9c4204d..4d17b690bf 100644 --- a/documentation/documentation.gradle +++ b/documentation/documentation.gradle @@ -1,3 +1,5 @@ +import org.asciidoctor.gradle.AsciidoctorTask + /* * Hibernate, Relational Persistence for Idiomatic Java * @@ -8,24 +10,23 @@ buildscript { repositories { mavenCentral() mavenLocal() + maven { name 'jboss-nexus' url "http://repository.jboss.org/nexus/content/groups/public/" } - maven { - name 'Bintray Asciidoctor repo' - url 'http://dl.bintray.com/content/aalmiray/asciidoctor' - } jcenter() } dependencies { classpath "org.jboss.jdocbook:gradle-jdocbook:1.2.2" - classpath 'org.asciidoctor:asciidoctor-gradle-plugin:0.7.0' + classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.2' } } apply plugin: "java" apply plugin: "jdocbook" +apply plugin: 'org.asciidoctor.convert' + apply from: "${rootProject.projectDir}/utilities.gradle" defaultTasks 'buildDocs' @@ -34,6 +35,7 @@ configurations { asciidoclet { description = 'Dependencies for Asciidoclet (the javadoc doclet tool for using Asciidoc)' } +// asciidoctor } if ( JavaVersion.current().isJava8Compatible() ) { @@ -45,6 +47,7 @@ if ( JavaVersion.current().isJava8Compatible() ) { dependencies { ext.pressgangVersion = '3.0.0' +// asciidoctor 'org.asciidoctor:asciidoctorj:1.5.2' asciidoclet 'org.asciidoctor:asciidoclet:0.+' jdocbookXsl "org.jboss.pressgang:pressgang-xslt-ns:${pressgangVersion}" @@ -162,10 +165,6 @@ jdocbook { } // book-specific config - quickstart { - masterSourceDocumentName = 'Hibernate_Getting_Started_Guide.xml' - } - devguide { masterSourceDocumentName = 'Hibernate_Development_Guide.xml' } @@ -188,7 +187,7 @@ stageStyles_devguide.doLast { } } -[ 'devguide', 'manual', 'quickstart' ].each { bookName -> +[ 'devguide', 'manual'].each { bookName -> task "stageLocalStyles_$bookName"(type: Copy) { into project.file( "target/docbook/stage/$bookName" ) from project.file( 'src/main/style' ) @@ -197,10 +196,46 @@ stageStyles_devguide.doLast { tasks[ "stageStyles_$bookName" ].dependsOn "stageLocalStyles_$bookName" } + +asciidoctor { + // we do not want it creating its "default task" + enabled = false +} + +// Topical Guides ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +task renderTopicalGuides(type: AsciidoctorTask, group: 'Documentation') { + description = 'Renders the Topical Guides in HTML format using Asciidoctor.' + sourceDir = file( 'src/main/asciidoc/topical' ) + outputDir = new File("$buildDir/asciidoc/topical/html") + backends "html5" + separateOutputDirs false + options logDocuments: true + attributes icons: 'font', experimental: true, 'source-highlighter': 'prettify' +} + +buildDocs.dependsOn renderTopicalGuides + + + +// Getting Started Guides (quick starts) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +task renderGettingStartedGuides(type: AsciidoctorTask, group: 'Documentation') { + description = 'Renders the Getting Started Guides (quick starts) in HTML format using Asciidoctor.' + sourceDir = file( 'src/main/asciidoc/quickstart/guides' ) + outputDir = new File("$buildDir/asciidoc/quickstart/html") + backends "html5" + separateOutputDirs false + options logDocuments: true + attributes icons: 'font', experimental: true, 'source-highlighter': 'prettify' +} + +buildDocs.dependsOn renderGettingStartedGuides + task buildTutorialZip(type: Zip) { - destinationDir = file( "target/work/tutorials" ) - archiveName = 'hibernate-tutorials.zip' - from 'src/main/docbook/quickstart/tutorials' + from 'src/main/asciidoc/quickstart/tutorials' + destinationDir = tasks.renderGettingStartedGuides.outputDir + archiveName = 'hibernate-tutorials.zip' expand( version: project.version, slf4j: "1.7.5", @@ -209,45 +244,5 @@ task buildTutorialZip(type: Zip) { ) } -buildDocs.dependsOn buildTutorialZip +renderGettingStartedGuides.dependsOn buildTutorialZip -buildDocs.doLast { - for ( File languageDir : dirList( "target/docbook/publish/quickstart" ) ) { - for ( File formatDir : dirList( languageDir ) ) { - final File copyDir = new File( formatDir, "files" ); - copyDir.mkdirs(); - ant.copy( file: buildTutorialZip.archivePath.getAbsolutePath(), todir: copyDir.getAbsolutePath() ) - } - } -} - -File[] dirList(String dirName) { - return dirList( (File) file(dirName) ); -} - -File[] dirList(File dir) { - return dir.listFiles({file -> file.isDirectory() } as FileFilter).sort(); -} - - -// asciidoctor ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -task asciidoctor(type: org.asciidoctor.gradle.AsciidoctorTask, group: 'Documentation') { - description = 'Generates the Asciidoc(tor) topical guides in HTML format.' - backend = 'html5' - sourceDir = file( 'src/main/asciidoc/topical' ) - outputDir = new File("$buildDir/asciidoc/topical/html") -} - -tasks.withType(org.asciidoctor.gradle.AsciidoctorTask) { docTask -> - options = [ - logDocuments: true, - attributes: [ - icons: 'font', - 'source-highlighter': 'prettify', - experimental: true - ] - ] -} - -buildDocs.dependsOn asciidoctor diff --git a/documentation/src/main/asciidoc/quickstart/guides/index.adoc b/documentation/src/main/asciidoc/quickstart/guides/index.adoc new file mode 100644 index 0000000000..04d686bfaa --- /dev/null +++ b/documentation/src/main/asciidoc/quickstart/guides/index.adoc @@ -0,0 +1,18 @@ += Hibernate Getting Started Guide +:toc: +:docinfo: + +include::preface.adoc[] + +:numbered: +include::obtaining.adoc[] + +include::tutorial_native.adoc[] + +include::tutorial_annotations.adoc[] + +include::tutorial_jpa.adoc[] + +include::tutorial_envers.adoc[] + +include::tutorial_osgi.adoc[] diff --git a/documentation/src/main/asciidoc/quickstart/guides/obtaining.adoc b/documentation/src/main/asciidoc/quickstart/guides/obtaining.adoc new file mode 100644 index 0000000000..bf52e391fc --- /dev/null +++ b/documentation/src/main/asciidoc/quickstart/guides/obtaining.adoc @@ -0,0 +1,55 @@ +[[obtaining]] +== Obtaining Hibernate + +=== The Hibernate Modules/Artifacts + +Hibernate's functionality is split into a number of modules/artifacts meant to isolate dependencies (modularity). + +hibernate-core:: The main (core) Hibernate module. Defines its ORM features and APIs as well as the various integration SPIs. +hibernate-entitymanager:: Defines Hibernate's support for link:$$http://jcp.org/en/jsr/detail?id=317$$[JPA] +hibernate-java8:: Support for using Java8 specific data-types such as any of the JSR 310 Date/Time types in domain model. +hibernate-envers:: Hibernate's historical entity versioning feature +hibernate-spatial:: Hibernate's Spatial/GIS data-type support +hibernate-osgi:: Hibernate support for running in OSGi containers. +hibernate-c3p0:: Integrates the link:$$http://www.mchange.com/projects/c3p0/$$[C3P0] connection pooling library into Hibernate +hibernate-hikaricp:: Integrates the link:$$http://brettwooldridge.github.io/HikariCP/$$[HikariCP] connection pooling library into Hibernate +hibernate-proxool:: Integrates the link:$$http://proxool.sourceforge.net/$$[Proxool] connection pooling library into Hibernate +hibernate-ehcache:: Integrates the link:$$http://ehcache.org/$$[Ehcache] caching library into Hibernate as a second-level cache provider. +hibernate-infinispan:: Integrates the link:$$http://infinispan.org/$$[Infinispan] caching library into Hibernate as a second-level cache provider. + + +=== Release Bundle Downloads + +The Hibernate team provides release bundles hosted on the SourceForge File Release System, in both +`TGZ` and `ZIP` formats. Each release bundle contains `JAR` files, documentation, source code, and other goodness. + +You can download releases of Hibernate, in your chosen format, from the list at +https://sourceforge.net/projects/hibernate/files/hibernate-orm/. The release bundle is structured as follows: + +* The `lib/required/` directory contains the `hibernate-core` jar and all of its dependencies. All of these jars are +required to be available on your classpath no matter which features of Hibernate are being used. +* The `/lib/jpa/` directory contains the `hibernate-entitymanager` jar as well as all of its dependencies (beyond +those in `lib/required/`) +* The `lib/java8/` directory contains the `hibernate-java8` jar and all of its dependencies (beyond those in `lib/required/`) +* The `lib/envers` directory contains the `hibernate-envers` jar and all of its dependencies (beyond those in +`lib/required/` and `lib/jpa/`). +* The `lib/spatial/` directory contains the `hibernate-spatial` jar and all of its dependencies (beyond those in `lib/required/`) +* The `lib/osgi/` directory contains the `hibernate-osgi` jar and all of its dependencies (beyond those in `lib/required/` and `lib/jpa/`) +* The `lib/optional/` directory contains the jars needed for the various connection pooling and second-level cache integrations +provided by Hibernate, along with their dependencies. + + +=== Maven Repository Artifacts + +The authoritative repository for Hibernate artifacts is the JBoss Maven repository. The Hibernate artifacts are +synced to Maven Central as part of an automated job (some small delay may occur). + +The team responsible for the JBoss Maven repository maintains a number of Wiki pages that contain important information: + +* http://community.jboss.org/docs/DOC-14900 - General information about the repository. +* http://community.jboss.org/docs/DOC-15170 - Information about setting up the JBoss repositories in order to do +development work on JBoss projects themselves. +* http://community.jboss.org/docs/DOC-15169 - Information about setting up access to the repository to use JBoss +projects as part of your own software. + +The Hibernate ORM artifacts are published under the `org.hibernate` groupId. \ No newline at end of file diff --git a/documentation/src/main/asciidoc/quickstart/guides/preface.adoc b/documentation/src/main/asciidoc/quickstart/guides/preface.adoc new file mode 100644 index 0000000000..77c2417a8a --- /dev/null +++ b/documentation/src/main/asciidoc/quickstart/guides/preface.adoc @@ -0,0 +1,35 @@ +[[preface]] + +[preface] +== Preface + +Working with both Object-Oriented software and Relational Databases can be cumbersome and time consuming. +Development costs are significantly higher due to a paradigm mismatch between how data is represented in objects +versus relational databases. Hibernate is an Object/Relational Mapping (ORM) solution for Java environments. The +term Object/Relational Mapping refers to the technique of mapping data between an object model representation to +a relational data model representation. See http://en.wikipedia.org/wiki/Object-relational_mapping for a good +high-level discussion. Also, Martin Fowler's link:$$http://martinfowler.com/bliki/OrmHate.html$$[OrmHate] article +takes a look at many of the mismatch problems. + +Although having a strong background in SQL is not required to use Hibernate, having a basic understanding of the +concepts can help you understand Hibernate more quickly and fully. An understanding of data modeling principles +is especially important. Both http://www.agiledata.org/essays/dataModeling101.html and +http://en.wikipedia.org/wiki/Data_modeling are good starting points for understanding these data modeling principles. + +Hibernate takes care of the mapping from Java classes to database tables, and from Java data types to SQL data +types. In addition, it provides data query and retrieval facilities. It can significantly reduce development +time otherwise spent with manual data handling in SQL and JDBC. Hibernate’s design goal is to relieve the +developer from 95% of common data persistence-related programming tasks by eliminating the need for manual, +hand-crafted data processing using SQL and JDBC. However, unlike many other persistence solutions, Hibernate +does not hide the power of SQL from you and guarantees that your investment in relational technology and +knowledge is as valid as always. + +Hibernate may not be the best solution for data-centric applications that only use stored-procedures to +implement the business logic in the database, it is most useful with object-oriented domain models and business +logic in the Java-based middle-tier. However, Hibernate can certainly help you to remove or encapsulate +vendor-specific SQL code and streamlines the common task of translating result sets from a tabular +representation to a graph of objects. + +See http://hibernate.org/orm/contribute/ for information on getting involved. + +IMPORTANT: The projects and code for the tutorials referenced in this guide are available as link:hibernate-tutorials.zip[] \ No newline at end of file diff --git a/documentation/src/main/asciidoc/quickstart/guides/tutorial_annotations.adoc b/documentation/src/main/asciidoc/quickstart/guides/tutorial_annotations.adoc new file mode 100644 index 0000000000..33d3ab8688 --- /dev/null +++ b/documentation/src/main/asciidoc/quickstart/guides/tutorial_annotations.adoc @@ -0,0 +1,103 @@ +[[tutorial_annotations]] +== Tutorial Using Native Hibernate APIs and Annotation Mappings + +NOTE: This tutorial is located within the download bundle under `annotations/`. + +.Objectives +- [*] Bootstrap a Hibernate `SessionFactory` +- [*] Use annotations to provide mapping information +- [*] Use the Hibernate native APIs + + +[[hibernate-gsg-tutorial-annotations-config]] +=== The Hibernate configuration file + +The contents are identical to <> with one important difference... +The `` element at the very end naming the annotated entity class using the `class` attribute. + + +[[hibernate-gsg-tutorial-annotations-entity]] +=== The annotated entity Java class + +The entity class in this tutorial is `org.hibernate.tutorial.annotations.Event` which follows JavaBean conventions. +In fact the class itself is identical to the one in <>, except that annotations +are used to provide the metadata, rather than a separate mapping file. + +[[hibernate-gsg-tutorial-annotations-entity-entity]] +.Identifying the class as an entity +==== +[source, JAVA] +---- +@Entity +@Table( name = "EVENTS" ) +public class Event { + ... +} +---- +==== + +The `@javax.persistence.Entity` annotation is used to mark a class as an entity. It functions the same as the +`` mapping element discussed in <>. Additionally the +`@javax.persistence.Table` annotation explicitly specifies the table name. Without this specification, the default +table name would be _EVENT_. + + +[[hibernate-gsg-tutorial-annotations-entity-id]] +.Identifying the identifier property +==== +[source, JAVA] +---- +@Id +@GeneratedValue(generator="increment") +@GenericGenerator(name="increment", strategy = "increment") +public Long getId() { + return id; +} +---- +==== + +`@javax.persistence.Id` marks the property which defines the entity's identifier. + +`@javax.persistence.GeneratedValue` and `@org.hibernate.annotations.GenericGenerator` work in tandem +to indicate that Hibernate should use Hibernate's `increment` generation strategy for this entity's identifier values. + + +[[hibernate-gsg-tutorial-annotations-entity-properties]] +.Identifying basic properties +==== +[source, JAVA] +---- +public String getTitle() { + return title; +} + +@Temporal(TemporalType.TIMESTAMP) +@Column(name = "EVENT_DATE") +public Date getDate() { + return date; +} +---- +==== + +As in <>. + + +[[hibernate-gsg-tutorial-annotations-further]] +=== Take it further! + +.Practice Exercises +- [ ] Add an association to the `Event` entity to model a message thread. Use the _Developer Guide_ +as a guide. +- [ ] Add a callback to receive notifications when an `Event` is created, updated or deleted. Try the same with +an event listener. Use the _Developer Guide_ as a guide. \ No newline at end of file diff --git a/documentation/src/main/asciidoc/quickstart/guides/tutorial_envers.adoc b/documentation/src/main/asciidoc/quickstart/guides/tutorial_envers.adoc new file mode 100644 index 0000000000..eba5a5348c --- /dev/null +++ b/documentation/src/main/asciidoc/quickstart/guides/tutorial_envers.adoc @@ -0,0 +1,64 @@ +[[tutorial_envers]] +== Tutorial Using Envers + +NOTE: This tutorial is located within the download bundle under `envers/`. + +.Objectives +- [*] Annotate an entity as historical +- [*] Configure Envers +- [*] Use the Envers APIs to view and analyze historical data + + +[[hibernate-gsg-tutorial-envers-config]] +=== persistence.xml + +This file was discussed in the JPA tutorial in <>, and is essentially the same here. + + +[[hibernate-gsg-tutorial-envers-entity]] +=== The annotated entity Java class + +Again, the entity is largely the same as in <>. The major difference is the +addition of the `@org.hibernate.envers.Audited` annotation, which tells Envers to automatically track changes to this +entity. + + +[[hibernate-gsg-tutorial-envers-test]] +=== Example code + +The code saves some entities, makes a change to one of the entities and then uses the Envers API to pull back the +initial revision as well as the updated revision. A revision refers to a historical snapshot of an entity. + + +[[hibernate-gsg-tutorial-envers-test-api]] +.Using the org.hibernate.envers.AuditReader +==== +[source, JAVA] +---- +public void testBasicUsage() { + ... + AuditReader reader = AuditReaderFactory.get( entityManager ); + Event firstRevision = reader.find( Event.class, 2L, 1 ); + ... + Event secondRevision = reader.find( Event.class, 2L, 2 ); + ... +} +---- +==== + +We see that an `org.hibernate.envers.AuditReader` is obtained from the `org.hibernate.envers.AuditReaderFactory` +which wraps the `javax.persistence.EntityManager`. + +Next, the `find` method retrieves specific revisions of the entity. The first call says to find revision number +1 of Event with id 2. The second call says to find revision number 2 of Event with id 2. + + +[[hibernate-gsg-tutorial-annotations-further]] +=== Take it further! + +.Practice Exercises +- [*] Provide a custom revision entity to additionally capture who made the changes. +- [*] Write a query to retrieve only historical data which meets some criteria. Use the _User Guide_ to see how +Envers queries are constructed. +- [*] Experiment with auditing entities which have various forms of relationships (many-to-one, many-to-many, etc). Try +retrieving historical versions (revisions) of such entities and navigating the object tree. \ No newline at end of file diff --git a/documentation/src/main/asciidoc/quickstart/guides/tutorial_jpa.adoc b/documentation/src/main/asciidoc/quickstart/guides/tutorial_jpa.adoc new file mode 100644 index 0000000000..11f49e362d --- /dev/null +++ b/documentation/src/main/asciidoc/quickstart/guides/tutorial_jpa.adoc @@ -0,0 +1,115 @@ +[[tutorial_jpa]] +== Tutorial Using the Java Persistence API (JPA) + +NOTE: This tutorial is located within the download bundle under `entitymanager/`. + +.Objectives +- [*] Bootstrap a JPA `EntityManagerFactory` +- [*] Use annotations to provide mapping information +- [*] Use JPA API calls + + +[[hibernate-gsg-tutorial-jpa-config]] +=== persistence.xml + +The previous tutorials used the Hibernate-specific `hibernate.cfg.xml` configuration file. JPA, however, defines +a different bootstrap process that uses its own configuration file named `persistence.xml`. This bootstrapping process +is defined by the JPA specification. In Java(TM) SE environments the persistence provider (Hibernate in this case) +is required to locate all JPA configuration files by classpath lookup of the `META-INF/persistence.xml` resource name. + + +[[hibernate-gsg-tutorial-jpa-config-pu]] +.persistence.xml +==== +[source, XML] +---- + + + ... + + +---- +==== + +`persistence.xml` files should provide a unique name for each "persistence unit". Applications use this name to +reference the configuration when obtaining an `javax.persistence.EntityManagerFactory reference. + +The settings defined in the `` element are discussed in <>. +Here the `javax.persistence`-prefixed varieties are used when possible. Notice that the remaining +Hibernate-specific configuration setting names are now prefixed with `hibernate.`. + +Additionally, the `` element functions the same as we saw in <>. + + +[[hibernate-gsg-tutorial-jpa-entity]] +=== The annotated entity Java class + +The entity is exactly the same as in <>. + + +[[hibernate-gsg-tutorial-jpa-test]] +=== Example code + +The previous tutorials used the Hibernate native APIs. This tutorial uses the JPA APIs. + +[[hibernate-gsg-tutorial-jpa-test-setUp]] +.Obtaining the javax.persistence.EntityManagerFactory +==== +[source, JAVA] +---- +protected void setUp() throws Exception { + entityManagerFactory = Persistence.createEntityManagerFactory( "org.hibernate.tutorial.jpa" ); +} +---- +==== + +Notice again that the persistence unit name is `org.hibernate.tutorial.jpa`, which matches <>. + + +[[hibernate-gsg-tutorial-jpa-test-saving]] +.Saving (persisting) entities +==== +[source, JAVA] +---- +EntityManager entityManager = entityManagerFactory.createEntityManager(); +entityManager.getTransaction().begin(); +entityManager.persist( new Event( "Our very first event!", new Date() ) ); +entityManager.persist( new Event( "A follow up event", new Date() ) ); +entityManager.getTransaction().commit(); +entityManager.close(); +---- +==== + +The code is similar to <>. The `javax.persistence.EntityManager` interface +is used instead of the `org.hibernate.Session` interface. JPA calls this operation "persist" instead of "save". + + +[[hibernate-gsg-tutorial-jpa-test-list]] +.Obtaining a list of entities +==== +[source, JAVA] +---- +entityManager = entityManagerFactory.createEntityManager(); +entityManager.getTransaction().begin(); +List result = entityManager.createQuery( "from Event", Event.class ).getResultList(); +for ( Event event : result ) { + System.out.println( "Event (" + event.getDate() + ") : " + event.getTitle() ); +} +entityManager.getTransaction().commit(); +entityManager.close(); +---- +==== + +Again, the code is pretty similar to what we saw in <>. + + +[[hibernate-gsg-tutorial-annotations-further]] +=== Take it further! + +.Practice Exercises +- [ ] Develop an EJB Session bean to investigate implications of using a container-managed +persistence context. Try both stateless and stateful use-cases. +- [ ] Use listeners with CDI-based injection to develop a JMS-based event message hub \ No newline at end of file diff --git a/documentation/src/main/asciidoc/quickstart/guides/tutorial_native.adoc b/documentation/src/main/asciidoc/quickstart/guides/tutorial_native.adoc new file mode 100644 index 0000000000..91b17d13e3 --- /dev/null +++ b/documentation/src/main/asciidoc/quickstart/guides/tutorial_native.adoc @@ -0,0 +1,231 @@ +[[tutorial-native]] +== Tutorial Using Native Hibernate APIs and hbm.xml Mapping + +NOTE: This tutorial is located within the download bundle under `basic/`. + +.Objectives +- [*] Bootstrap a Hibernate `SessionFactory` +- [*] Use Hibernate mapping (`hbm.xml`) files to provide mapping information +- [*] Use the Hibernate native APIs + + +[[hibernate-gsg-tutorial-basic-config]] +=== The Hibernate configuration file + +For this tutorial, the `hibernate.cfg.xml` file defines the Hibernate configuration information. + +The `connection.driver_class`, `connection.url`, `connection.username` and `connection.password` `` elements +define JDBC connection information. These tutorials utilize the H2 in-memory database, so the values of these properties +are all specific to running H2 in its in-memory mode. `connection.pool_size` is used to configure the number of +connections in Hibernate's built-in connection pool. + +IMPORTANT: The built-in Hibernate connection pool is in no way intended for production use. It lacks several +features found on production-ready connection pools. + +The `dialect` property specifies the particular SQL variant with which Hibernate will converse. + +TIP: In most cases, Hibernate is able to properly determine which dialect to use. This is particularly useful +if your application targets multiple databases. + +The `hbm2ddl.auto` property enables automatic generation of database schemas directly into the database. + +Finally, add the mapping file(s) for persistent classes to the configuration. The `resource` attribute of the +`` element causes Hibernate to attempt to locate that mapping as a classpath resource using a +`java.lang.ClassLoader` lookup. + +There are many ways and options to bootstrap a Hibernate `SessionFactory`. For additional details, see +the _Native Bootstrapping_ topical guide. + + +[[hibernate-gsg-tutorial-basic-entity]] +=== The entity Java class + +The entity class for this tutorial is `org.hibernate.tutorial.hbm.Event` + +.Notes About the Entity +* This class uses standard JavaBean naming conventions for property getter and setter methods, as well as +private visibility for the fields. Although this is the recommended design, it is not required. +* The no-argument constructor, which is also a JavaBean convention, is a requirement for all persistent classes. +Hibernate needs to create objects for you, using Java Reflection. The constructor can be private. However, package +or public visibility is required for runtime proxy generation and efficient data retrieval without bytecode +instrumentation. + + +[[hibernate-gsg-tutorial-basic-mapping]] +=== The mapping file + +The mapping file for this tutorial is the classpath resource `org/hibernate/tutorial/hbm/Event.hbm.xml` (as discussed above). + +Hibernate uses the mapping metadata to determine how to load and store objects of the persistent class. The Hibernate +mapping file is one choice for providing Hibernate with this metadata. + + +[[hibernate-gsg-tutorial-basic-mapping-class]] +.The class mapping element +==== +[source, XML] +---- + + ... + +---- +==== + +.Functions of the class mapping element +* The `name` attribute (combined here with the `package` attribute from the containing `` element) +names the FQN of the class to be defined as an entity. +* The `table` attribute names the database table which contains the data for this entity. + +Instances of the `Event` class are now mapped to rows in the `EVENTS` database table. + + +[[hibernate-gsg-tutorial-basic-mapping-id]] +.The id mapping element +==== +[source, XML] +---- + + ... + +---- +==== + +Hibernate uses the property named by the `` element to uniquely identify rows in the table. + +IMPORTANT: It is not required for the id element to map to the table's actual primary key column(s), but it is +the normal convention. Tables mapped in Hibernate do not even need to define primary keys. However, it is strongly +recommend that all schemas define proper referential integrity. Therefore id and primary key are used interchangeably +throughout Hibernate documentation. + +The `` element here names the EVENT_ID column as the primary key of the EVENTS table. It also identifies the +`id` property of the `Event` class as the property containing the identifier value. + +The `generator element informs Hibernate about which strategy is used to generated primary key values for this entity. +This example uses a simple incrementing count. + +[[hibernate-gsg-tutorial-basic-mapping-property]] +.The property mapping element +==== +[source, XML] +---- + + +---- +==== + +The two `` elements declare the remaining two persistent properties of the `Event` class: `date` and `title`. +The `date` property mapping includes the `column` attribute, but the `title` does not. +In the absence of a `column` attribute, Hibernate uses the property name as the column name. +This is appropriate for `title`, but since `date` is a reserved keyword in most databases, you need to specify a +non-reserved word for the column name. + +The `title mapping also lacks a type attribute. The types declared and used in the mapping files are neither Java data +types nor SQL database types. Instead, they are *Hibernate mapping types*, which are converters which translate between +Java and SQL data types. Hibernate attempts to determine the correct conversion and mapping type autonomously if the +type attribute is not specified in the mapping, by using Java reflection to determine the Java type of the declared +property and using a default mapping type for that Java type. + +In some cases this automatic detection might not chose the default you expect or need, as seen with the +`date` property. Hibernate cannot know if the property, which is of type `java.util.Date`, should map to a SQL +_DATE_, _TIME_, or _TIMESTAMP_ datatype. Full date and time information is preserved by mapping the property to +the _timestamp_ converter, which identifies the converter class `org.hibernate.type.TimestampType`. + +TIP: Hibernate determines the mapping type using reflection when the mapping files are processed. This process adds +overhead in terms of time and resources. If startup performance is important, consider explicitly defining the type +to use. + +[[hibernate-gsg-tutorial-basic-test]] +=== Example code + +The `org.hibernate.tutorial.hbm.NativeApiIllustrationTest` class illustrates using the Hibernate native API. + +NOTE: The examples in these tutorials are presented as JUnit tests, for ease of use. One benefit of this +approach is that `setUp` and `tearDown` roughly illustrate how a `org.hibernate.SessionFactory` is created at the +start-up of an application and closed at the end of the application lifecycle. + + +[[hibernate-gsg-tutorial-basic-test-setUp]] +.Obtaining the org.hibernate.SessionFactory +==== +[source, JAVA] +---- +protected void setUp() throws Exception { + // A SessionFactory is set up once for an application! + final StandardServiceRegistry registry = new StandardServiceRegistryBuilder() + .configure() // configures settings from hibernate.cfg.xml + .build(); + try { + sessionFactory = new MetadataSources( registry ).buildMetadata().buildSessionFactory(); + } + catch (Exception e) { + // The registry would be destroyed by the SessionFactory, but we had trouble building the SessionFactory + // so destroy it manually. + StandardServiceRegistryBuilder.destroy( registry ); + } +} +---- +==== + +The `setUp` method first builds a `org.hibernate.boot.registry.StandardServiceRegistry` instance which incorporates +configuration information into a working set of Services for use by the SessionFactory. In this tutorial +we defined all configuration information in `hibernate.cfg.xml` so there is not much interesting to see here. + +Using the `StandardServiceRegistry` we create the `org.hibernate.boot.MetadataSources` which is the start point for +telling Hibernate about your domain model. Again, since we defined that in `hibernate.cfg.xml` so there is not much +interesting to see here. + +`org.hibernate.boot.Metadata` represents the complete, partially validated view of the application domain model which the +`SessionFactory` will be based on. + +The final step in the bootstrap process is to build the `SessionFactory`. The `SessionFactory` is a +thread-safe object that is instantiated once to serve the entire application. + +The `SessionFactory` acts as a factory for `org.hibernate.Session` instances, which should be thought of +as a corollary to a "unit of work". + + +[[hibernate-gsg-tutorial-basic-test-saving]] +.Saving entities +==== +[source, JAVA] +---- +Session session = sessionFactory.openSession(); +session.beginTransaction(); +session.save( new Event( "Our very first event!", new Date() ) ); +session.save( new Event( "A follow up event", new Date() ) ); +session.getTransaction().commit(); +session.close(); +---- +==== + +`testBasicUsage()` first creates some new `Event` objects and hands them over to Hibernate for management, using the +`save()` method. Hibernate now takes responsibility to perform an _INSERT_ on the database for each `Event`. + + +[[hibernate-gsg-tutorial-basic-test-list]] +.Obtaining a list of entities +==== +[source, JAVA] +---- +session = sessionFactory.openSession(); +session.beginTransaction(); +List result = session.createQuery( "from Event" ).list(); +for ( Event event : (List) result ) { + System.out.println( "Event (" + event.getDate() + ") : " + event.getTitle() ); +} +session.getTransaction().commit(); +session.close(); +---- +==== + +Here we see an example of the Hibernate Query Language (HQL) to load all existing `Event` objects from the database +by generating the appropriate _SELECT_ SQL, sending it to the database and populating `Event` objects with the result +set data. + + +[[hibernate-gsg-tutorial-annotations-further]] +=== Take it further! + +.Practice Exercises +- [ ] Reconfigure the examples to connect to your own persistent relational database. +- [ ] Add an association to the `Event` entity to model a message thread. \ No newline at end of file diff --git a/documentation/src/main/asciidoc/quickstart/guides/tutorial_osgi.adoc b/documentation/src/main/asciidoc/quickstart/guides/tutorial_osgi.adoc new file mode 100644 index 0000000000..2d917fca95 --- /dev/null +++ b/documentation/src/main/asciidoc/quickstart/guides/tutorial_osgi.adoc @@ -0,0 +1,17 @@ +[[tutorial_osgi]] +== OSGi Tutorial + +[IMPORTANT] +==== +This guide and the tutorials were very much out-of-date as of 5.0, and were therefore removed until they can be updated. +For details see link:$$https://hibernate.atlassian.net/browse/HHH-9919$$[HHH-9919]. + +In the meantime, we suggest looking at the Pax Exam and Karaf based +link:$$https://github.com/hibernate/hibernate-orm/blob/master/hibernate-osgi/src/test/java/org/hibernate/osgi/test/OsgiIntegrationTest.java$$[hibernate-osgi tests] +for examples of using Hibernate in Karaf specifically. Usage in other OSGi containers should be similar. + +The Hibernate-produced Karaf features file (feature repository) is published to the JBoss Nexus repository, along +with our other artifacts, using the `org.hibernate` groupId and `hibernate-osgi` with the `karaf` classifier. The +features it defines are versioned using the same version as the release it comes from. The Karaf feature file is +tested against Karaf version 3.0.3. +==== diff --git a/documentation/src/main/docbook/quickstart/tutorials/annotations/pom.xml b/documentation/src/main/asciidoc/quickstart/tutorials/annotations/pom.xml similarity index 100% rename from documentation/src/main/docbook/quickstart/tutorials/annotations/pom.xml rename to documentation/src/main/asciidoc/quickstart/tutorials/annotations/pom.xml diff --git a/documentation/src/main/docbook/quickstart/tutorials/annotations/src/test/java/org/hibernate/tutorial/annotations/AnnotationsIllustrationTest.java b/documentation/src/main/asciidoc/quickstart/tutorials/annotations/src/test/java/org/hibernate/tutorial/annotations/AnnotationsIllustrationTest.java similarity index 78% rename from documentation/src/main/docbook/quickstart/tutorials/annotations/src/test/java/org/hibernate/tutorial/annotations/AnnotationsIllustrationTest.java rename to documentation/src/main/asciidoc/quickstart/tutorials/annotations/src/test/java/org/hibernate/tutorial/annotations/AnnotationsIllustrationTest.java index c1131d23f5..33e28629a9 100644 --- a/documentation/src/main/docbook/quickstart/tutorials/annotations/src/test/java/org/hibernate/tutorial/annotations/AnnotationsIllustrationTest.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/annotations/src/test/java/org/hibernate/tutorial/annotations/AnnotationsIllustrationTest.java @@ -26,11 +26,13 @@ package org.hibernate.tutorial.annotations; import java.util.Date; import java.util.List; -import junit.framework.TestCase; - import org.hibernate.Session; import org.hibernate.SessionFactory; -import org.hibernate.cfg.Configuration; +import org.hibernate.boot.MetadataSources; +import org.hibernate.boot.registry.StandardServiceRegistry; +import org.hibernate.boot.registry.StandardServiceRegistryBuilder; + +import junit.framework.TestCase; /** * Illustrates the use of Hibernate native APIs. The code here is unchanged from the {@code basic} example, the @@ -43,10 +45,18 @@ public class AnnotationsIllustrationTest extends TestCase { @Override protected void setUp() throws Exception { - // A SessionFactory is set up once for an application - sessionFactory = new Configuration() - .configure() // configures settings from hibernate.cfg.xml - .buildSessionFactory(); + // A SessionFactory is set up once for an application! + final StandardServiceRegistry registry = new StandardServiceRegistryBuilder() + .configure() // configures settings from hibernate.cfg.xml + .build(); + try { + sessionFactory = new MetadataSources( registry ).buildMetadata().buildSessionFactory(); + } + catch (Exception e) { + // The registry would be destroyed by the SessionFactory, but we had trouble building the SessionFactory + // so destroy it manually. + StandardServiceRegistryBuilder.destroy( registry ); + } } @Override diff --git a/documentation/src/main/docbook/quickstart/tutorials/annotations/src/test/java/org/hibernate/tutorial/annotations/Event.java b/documentation/src/main/asciidoc/quickstart/tutorials/annotations/src/test/java/org/hibernate/tutorial/annotations/Event.java similarity index 100% rename from documentation/src/main/docbook/quickstart/tutorials/annotations/src/test/java/org/hibernate/tutorial/annotations/Event.java rename to documentation/src/main/asciidoc/quickstart/tutorials/annotations/src/test/java/org/hibernate/tutorial/annotations/Event.java diff --git a/documentation/src/main/docbook/quickstart/tutorials/annotations/src/test/resources/hibernate.cfg.xml b/documentation/src/main/asciidoc/quickstart/tutorials/annotations/src/test/resources/hibernate.cfg.xml similarity index 100% rename from documentation/src/main/docbook/quickstart/tutorials/annotations/src/test/resources/hibernate.cfg.xml rename to documentation/src/main/asciidoc/quickstart/tutorials/annotations/src/test/resources/hibernate.cfg.xml diff --git a/documentation/src/main/docbook/quickstart/tutorials/basic/pom.xml b/documentation/src/main/asciidoc/quickstart/tutorials/basic/pom.xml similarity index 100% rename from documentation/src/main/docbook/quickstart/tutorials/basic/pom.xml rename to documentation/src/main/asciidoc/quickstart/tutorials/basic/pom.xml diff --git a/documentation/src/main/docbook/quickstart/tutorials/basic/src/test/java/org/hibernate/tutorial/hbm/Event.hbm.xml b/documentation/src/main/asciidoc/quickstart/tutorials/basic/src/test/java/org/hibernate/tutorial/hbm/Event.hbm.xml similarity index 100% rename from documentation/src/main/docbook/quickstart/tutorials/basic/src/test/java/org/hibernate/tutorial/hbm/Event.hbm.xml rename to documentation/src/main/asciidoc/quickstart/tutorials/basic/src/test/java/org/hibernate/tutorial/hbm/Event.hbm.xml diff --git a/documentation/src/main/docbook/quickstart/tutorials/basic/src/test/java/org/hibernate/tutorial/hbm/Event.java b/documentation/src/main/asciidoc/quickstart/tutorials/basic/src/test/java/org/hibernate/tutorial/hbm/Event.java similarity index 100% rename from documentation/src/main/docbook/quickstart/tutorials/basic/src/test/java/org/hibernate/tutorial/hbm/Event.java rename to documentation/src/main/asciidoc/quickstart/tutorials/basic/src/test/java/org/hibernate/tutorial/hbm/Event.java diff --git a/documentation/src/main/docbook/quickstart/tutorials/basic/src/test/java/org/hibernate/tutorial/hbm/NativeApiIllustrationTest.java b/documentation/src/main/asciidoc/quickstart/tutorials/basic/src/test/java/org/hibernate/tutorial/hbm/NativeApiIllustrationTest.java similarity index 75% rename from documentation/src/main/docbook/quickstart/tutorials/basic/src/test/java/org/hibernate/tutorial/hbm/NativeApiIllustrationTest.java rename to documentation/src/main/asciidoc/quickstart/tutorials/basic/src/test/java/org/hibernate/tutorial/hbm/NativeApiIllustrationTest.java index c714f7067f..a1e327e199 100644 --- a/documentation/src/main/docbook/quickstart/tutorials/basic/src/test/java/org/hibernate/tutorial/hbm/NativeApiIllustrationTest.java +++ b/documentation/src/main/asciidoc/quickstart/tutorials/basic/src/test/java/org/hibernate/tutorial/hbm/NativeApiIllustrationTest.java @@ -26,11 +26,13 @@ package org.hibernate.tutorial.hbm; import java.util.Date; import java.util.List; -import junit.framework.TestCase; - import org.hibernate.Session; import org.hibernate.SessionFactory; -import org.hibernate.cfg.Configuration; +import org.hibernate.boot.MetadataSources; +import org.hibernate.boot.registry.StandardServiceRegistry; +import org.hibernate.boot.registry.StandardServiceRegistryBuilder; + +import junit.framework.TestCase; /** * Illustrates use of Hibernate native APIs. @@ -42,10 +44,18 @@ public class NativeApiIllustrationTest extends TestCase { @Override protected void setUp() throws Exception { - // A SessionFactory is set up once for an application - sessionFactory = new Configuration() - .configure() // configures settings from hibernate.cfg.xml - .buildSessionFactory(); + // A SessionFactory is set up once for an application! + final StandardServiceRegistry registry = new StandardServiceRegistryBuilder() + .configure() // configures settings from hibernate.cfg.xml + .build(); + try { + sessionFactory = new MetadataSources( registry ).buildMetadata().buildSessionFactory(); + } + catch (Exception e) { + // The registry would be destroyed by the SessionFactory, but we had trouble building the SessionFactory + // so destroy it manually. + StandardServiceRegistryBuilder.destroy( registry ); + } } @Override @@ -55,6 +65,7 @@ public class NativeApiIllustrationTest extends TestCase { } } + @SuppressWarnings("unchecked") public void testBasicUsage() { // create a couple of events... Session session = sessionFactory.openSession(); diff --git a/documentation/src/main/docbook/quickstart/tutorials/basic/src/test/resources/hibernate.cfg.xml b/documentation/src/main/asciidoc/quickstart/tutorials/basic/src/test/resources/hibernate.cfg.xml similarity index 100% rename from documentation/src/main/docbook/quickstart/tutorials/basic/src/test/resources/hibernate.cfg.xml rename to documentation/src/main/asciidoc/quickstart/tutorials/basic/src/test/resources/hibernate.cfg.xml diff --git a/documentation/src/main/docbook/quickstart/tutorials/entitymanager/pom.xml b/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/pom.xml similarity index 100% rename from documentation/src/main/docbook/quickstart/tutorials/entitymanager/pom.xml rename to documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/pom.xml diff --git a/documentation/src/main/docbook/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/EntityManagerIllustrationTest.java b/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/EntityManagerIllustrationTest.java similarity index 100% rename from documentation/src/main/docbook/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/EntityManagerIllustrationTest.java rename to documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/EntityManagerIllustrationTest.java diff --git a/documentation/src/main/docbook/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/Event.java b/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/Event.java similarity index 100% rename from documentation/src/main/docbook/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/Event.java rename to documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/java/org/hibernate/tutorial/em/Event.java diff --git a/documentation/src/main/docbook/quickstart/tutorials/entitymanager/src/test/resources/META-INF/persistence.xml b/documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/resources/META-INF/persistence.xml similarity index 100% rename from documentation/src/main/docbook/quickstart/tutorials/entitymanager/src/test/resources/META-INF/persistence.xml rename to documentation/src/main/asciidoc/quickstart/tutorials/entitymanager/src/test/resources/META-INF/persistence.xml diff --git a/documentation/src/main/docbook/quickstart/tutorials/envers/pom.xml b/documentation/src/main/asciidoc/quickstart/tutorials/envers/pom.xml similarity index 100% rename from documentation/src/main/docbook/quickstart/tutorials/envers/pom.xml rename to documentation/src/main/asciidoc/quickstart/tutorials/envers/pom.xml diff --git a/documentation/src/main/docbook/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/EnversIllustrationTest.java b/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/EnversIllustrationTest.java similarity index 100% rename from documentation/src/main/docbook/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/EnversIllustrationTest.java rename to documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/EnversIllustrationTest.java diff --git a/documentation/src/main/docbook/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/Event.java b/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/Event.java similarity index 100% rename from documentation/src/main/docbook/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/Event.java rename to documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/java/org/hibernate/tutorial/envers/Event.java diff --git a/documentation/src/main/docbook/quickstart/tutorials/envers/src/test/resources/META-INF/persistence.xml b/documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/resources/META-INF/persistence.xml similarity index 100% rename from documentation/src/main/docbook/quickstart/tutorials/envers/src/test/resources/META-INF/persistence.xml rename to documentation/src/main/asciidoc/quickstart/tutorials/envers/src/test/resources/META-INF/persistence.xml diff --git a/documentation/src/main/docbook/quickstart/tutorials/pom.xml b/documentation/src/main/asciidoc/quickstart/tutorials/pom.xml similarity index 100% rename from documentation/src/main/docbook/quickstart/tutorials/pom.xml rename to documentation/src/main/asciidoc/quickstart/tutorials/pom.xml diff --git a/documentation/src/main/asciidoc/topical/sessionfactory/CustomSessionFactory.adoc b/documentation/src/main/asciidoc/topical/sessionfactory/CustomSessionFactory.adoc index b2a795d866..b87c33ea6a 100644 --- a/documentation/src/main/asciidoc/topical/sessionfactory/CustomSessionFactory.adoc +++ b/documentation/src/main/asciidoc/topical/sessionfactory/CustomSessionFactory.adoc @@ -8,7 +8,7 @@ specific to the custom implementation. The second way is to integrate with the This guide will cover the second approach. -=== Implementor contracts +== Implementor contracts A Hibernate naming convention is that SPI contracts extending API contracts are named with Implementor appended to the API contract name. For `SessionFactory` and `Session` that is `SessionFactoryImplementor` and @@ -18,7 +18,7 @@ implement `org.hibernate.engine.spi.SessionFactoryImplementor` and `org.hibernat See all pertinent JavaDocs for discussions of implementation details. -=== Integration hooks +== Integration hooks `org.hibernate.boot.SessionFactoryBuilder` is part of the Hibernate native bootstrap API where we want to configure the `SessionFactory` to be built. Third parties can hook into this process by supplying a diff --git a/documentation/src/main/docbook/quickstart/en-US/Author_Group.xml b/documentation/src/main/docbook/quickstart/en-US/Author_Group.xml deleted file mode 100644 index 555f11bc9b..0000000000 --- a/documentation/src/main/docbook/quickstart/en-US/Author_Group.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - Gavin - King - - - - - Christian - Bauer - - - - - Steve - Ebersole - - - - - Emmanuel - Bernard - - - - - Adam - Warski - - - - - Brett - Meyer - - - - - - James - Cobb - - - Graphic Design - - - - - - Cheyenne - Weaver - - - Graphic Design - - - - diff --git a/documentation/src/main/docbook/quickstart/en-US/Hibernate_Getting_Started_Guide.ent b/documentation/src/main/docbook/quickstart/en-US/Hibernate_Getting_Started_Guide.ent deleted file mode 100644 index db53b9bea5..0000000000 --- a/documentation/src/main/docbook/quickstart/en-US/Hibernate_Getting_Started_Guide.ent +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/documentation/src/main/docbook/quickstart/en-US/Hibernate_Getting_Started_Guide.xml b/documentation/src/main/docbook/quickstart/en-US/Hibernate_Getting_Started_Guide.xml deleted file mode 100644 index f5d41278c5..0000000000 --- a/documentation/src/main/docbook/quickstart/en-US/Hibernate_Getting_Started_Guide.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - -%BOOK_ENTITIES; -]> - - - - Hibernate Getting Started Guide - &version; - 1.0 - JBoss Hibernate Core - &version; - &today; - 1 - - - - - - - - - - ©rightYear; - ©rightHolder; - - - - The Hibernate Team - - - The JBoss Visual Design Team - - - - - - - - - - - - - - - diff --git a/documentation/src/main/docbook/quickstart/en-US/content/obtaining.xml b/documentation/src/main/docbook/quickstart/en-US/content/obtaining.xml deleted file mode 100644 index 9bb0083868..0000000000 --- a/documentation/src/main/docbook/quickstart/en-US/content/obtaining.xml +++ /dev/null @@ -1,187 +0,0 @@ - - - - - Obtaining Hibernate - -
- Release Bundle Downloads - - The Hibernate team provides release bundles hosted on the SourceForge File Release System, in - ZIP - and - TGZ - formats. Each release bundle containsJARs, - documentation, source code, and other goodness. - - - You can download releases of Hibernate, in your chosen format, from the list at - . - - - - - The lib/required/ directory contains all the JARs Hibernate requires. All the - jars in this directory must also be included in your project's classpath. - - - - - The /lib/jpa/ directory contains the - hibernate-entitymanager jar and its dependencies beyond those - in lib/required/. This defines Hibernate support for - JPA. - - - - - The lib/envers directory contains the hibernate-envers - jar and its dependencies beyond those in lib/required/ - - - - - The lib/optional directory contains the jars needed for optional features of - Hibernate. - - - -
- -
- Maven Repository Artifacts - - - The authoritative repository for Hibernate artifacts is the JBoss Maven repository. The team responsible - for the JBoss Maven repository maintains a number of Wiki pages that contain important information. - - - Maven Repository Wiki Pages - - - - General information about the repository. - - - - - - Information about setting up the JBoss - repositories in order to do development work on JBoss projects themselves. - - - - - - Information about setting up access to - the repository to use JBoss projects as part of your own software. - - - - - - - Hibernate produces a number of artifacts (all under the org.hibernate groupId): - - - Hibernate Artifacts under groupId <systemitem>org.hibernate</systemitem> - - - hibernate-core - - - The main artifact, needed to build applications using the native Hibernate APIs including - defining metadata in both annotations as well as Hibernate's own hbm.xml - format. - - - - - hibernate-entitymanager - - - Represents Hibernate's implementation of JPA, as specified at - . - - - This artifact depends on hibernate-core - - - - - hibernate-envers - - - An optional module that provides historical auditing of changes to your entities. - - - This artifact depends on both hibernate-core - and hibernate-entitymanager. - - - - - hibernate-c3p0 - - - Provides integration between Hibernate and the C3P0 connection - pool library. See for information - about C3P0. - - - This artifact depends on hibernate-core, but is generally included - in a project as a runtime dependency. It pulls in the C3P0 - dependencies automatically. - - - - - hibernate-proxool - - - Provides integration between Hibernate and the Proxool connection - pool library. See for more information about - this library. - - - This artifact depends on hibernate-core, but is generally included - in a project as a runtime dependency. It pulls in the Proxool - dependencies automatically.. - - - - - hibernate-ehcache - - - Privides integration between Hibernate and EhCache, as a - second-level cache. See for more - information aboutEhCache. - - - This artifact depends on hibernate-core, but is generally included - in a project as a runtime dependency. It pulls in the Ehcache - dependencies automatically. - - - - - hibernate-infinispan - - - Provides integration between Hibernate and Infinispan, as a - second-level cache. See for more information - about Infinispan. - - - This artifact depends on hibernate-core, but is generally included - in a project as a runtime dependency. It pulls in the Infinispan - dependencies automatically. - - - - -
- \ No newline at end of file diff --git a/documentation/src/main/docbook/quickstart/en-US/content/preface.xml b/documentation/src/main/docbook/quickstart/en-US/content/preface.xml deleted file mode 100644 index 6a417a23d7..0000000000 --- a/documentation/src/main/docbook/quickstart/en-US/content/preface.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - Preface - - - Working with both Object-Oriented software and Relational Databases can be cumbersome and time consuming. - Development costs are significantly higher due to a paradigm mismatch between how data is represented in objects - versus relational databases. Hibernate is an Object/Relational Mapping solution for Java environments. The - term Object/Relational Mapping refers to the technique of mapping data between an object model representation to - a relational data model representation. See - for a good high-level discussion. - - - - - You do not need a strong background in SQL to use Hibernate, but having a basic understanding of the - concepts can help you understand Hibernate more fully and quickly. An understanding of data modeling - principles is especially important. You might want to consider these resources as a good starting point: - - - Data Modeling Resources - - - - - - - - - - - - - - - Hibernate takes care of the mapping from Java classes to database tables, and from Java data types to SQL data - types. In addition, it provides data query and retrieval facilities. It can significantly reduce development - time otherwise spent with manual data handling in SQL and JDBC. Hibernate’s design goal is to relieve the - developer from 95% of common data persistence-related programming tasks by eliminating the need for manual, - hand-crafted data processing using SQL and JDBC. However, unlike many other persistence solutions, Hibernate - does not hide the power of SQL from you and guarantees that your investment in relational technology and - knowledge is as valid as always. - - - - Hibernate may not be the best solution for data-centric applications that only use stored-procedures to - implement the business logic in the database, it is most useful with object-oriented domain models and business - logic in the Java-based middle-tier. However, Hibernate can certainly help you to remove or encapsulate - vendor-specific SQL code and streamlines the common task of translating result sets from a tabular - representation to a graph of objects. - - -
- Get Involved - - - - Use Hibernate and report any bugs or issues you find. See - for details. - - - - - Try your hand at fixing some bugs or implementing enhancements. Again, see - . - - - - - Engage with the community using mailing lists, forums, IRC, or other ways listed at - . - - - - - Help improve or translate this documentation. Contact us on - the developer mailing list if you have interest. - - - - - Spread the word. Let the rest of your organization know about the benefits of - Hibernate. - - - -
- -
- Tutorial code - - The referenced projects and code for the tutorials in this guide are available at - . - -
- diff --git a/documentation/src/main/docbook/quickstart/en-US/content/tutorial_annotations.xml b/documentation/src/main/docbook/quickstart/en-US/content/tutorial_annotations.xml deleted file mode 100644 index 06dee7b1cd..0000000000 --- a/documentation/src/main/docbook/quickstart/en-US/content/tutorial_annotations.xml +++ /dev/null @@ -1,133 +0,0 @@ - - - - - Tutorial Using Native Hibernate APIs and Annotation Mappings - - - This tutorial is located within the download bundle under annotations. - - - Objectives - - - Use annotations to provide mapping information - - - - - Use the native Hibernate APIs - - - - - -
- The Hibernate configuration file - - - The contents are identical to , with one important - difference. The mapping element at the very end naming the annotated entity class using - the attribute. - -
- -
- The annotated entity Java class - - The entity class in this tutorial is org.hibernate.tutorial.annotations.Event which - follows JavaBean conventions. In fact the class itself is identical to the one in , except that annotations are used to provide the metadata, - rather than a separate hbm.xml file. - - - - Identifying the class as an entity - @Entity -@Table( name = "EVENTS" ) -public class Event { - ... -} - - - - - The @javax.persistence.Entity annotation is used to mark a class as an entity. - It functions the same as the class mapping element discussed in . Additionally the - @javax.persistence.Table annotation explicitly specifies the table - name. Without this specification, the default table name would be EVENT). - - - - Identifying the identifier property - @Id -@GeneratedValue(generator="increment") -@GenericGenerator(name="increment", strategy = "increment") -public Long getId() { - return id; -} - - - - @javax.persistence.Id marks the property which defines the - entity's identifier. @javax.persistence.GeneratedValue and - @org.hibernate.annotations.GenericGenerator work in tandem - to indicate that Hibernate should use Hibernate's increment generation - strategy for this entity's identifier values. - - - - Identifying basic properties - public String getTitle() { - return title; -} - -@Temporal(TemporalType.TIMESTAMP) -@Column(name = "EVENT_DATE") -public Date getDate() { - return date; -} - - - - As in , the date property needs - special handling to account for its special naming and its SQL type. - -
- -
- Example code - - org.hibernate.tutorial.annotations.AnnotationsIllustrationTest is essentially the - same as org.hibernate.tutorial.hbm.NativeApiIllustrationTest discussed in - . - -
- -
- Take it further! - - Practice Exercises - - - Add an association to the Event entity to model a message thread. Use the - Developer Guide as a guide. - - - - - Add a callback to receive notifications when an Event is created, updated or - deleted. Try the same with an event listener. Use the Developer - Guide as a guide. - - - -
- - \ No newline at end of file diff --git a/documentation/src/main/docbook/quickstart/en-US/content/tutorial_envers.xml b/documentation/src/main/docbook/quickstart/en-US/content/tutorial_envers.xml deleted file mode 100644 index 3cb3b1930c..0000000000 --- a/documentation/src/main/docbook/quickstart/en-US/content/tutorial_envers.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - Tutorial Using Envers - - - This tutorial is located within the download bundle under envers. - - - Objectives - - - Configure Envers. - - - - - Use the Envers APIs to view and analyze historical data. - - - - -
- <filename>persistence.xml</filename> - - This file was discussed in the JPA tutorial in , and is essentially the same here. - -
- -
- The annotated entity Java class - - Again, the entity is largely the same as in . The major - difference is the addition of the @org.hibernate.envers.Audited annotation, which - tells Envers to automatically track changes to this entity. - -
- -
- Example code - - Again, this tutorial makes use of the JPA APIs. However, the code also makes a change to one - of the entities, then uses the Envers API to pull back the initial revision as well as the updated - revision. A revision refers to a version of an entity. - - - Using the <interfacename>org.hibernate.envers.AuditReader</interfacename> - public void testBasicUsage() { - ... - AuditReader reader = AuditReaderFactory.get( entityManager ); - Event firstRevision = reader.find( Event.class, 2L, 1 ); - ... - Event secondRevision = reader.find( Event.class, 2L, 2 ); - ... -} - - - Description of Example - - - An org.hibernate.envers.AuditReader is obtained from the - org.hibernate.envers.AuditReaderFactory which wraps the - javax.persistence.EntityManager. - - - - - Next, the find method retrieves specific revisions of the entity. The first call - reads find revision number 1 of Event with id 2. The second call reads find - revision number 2 of Event with id 2. - - - -
- -
- Take it further! - - Practice Exercises - - - Provide a custom revision entity to additionally capture who made the changes. - - - - - Write a query to retrieve only historical data which meets some criteria. Use the - Envers User Guide to see how Envers queries are constructed. - - - - - Experiment with auditing entities which have many-to-one, many-to-many relations as well as collections. - Try retrieving historical versions (revisions) of such entities and navigating the object tree. - - - -
- - \ No newline at end of file diff --git a/documentation/src/main/docbook/quickstart/en-US/content/tutorial_jpa.xml b/documentation/src/main/docbook/quickstart/en-US/content/tutorial_jpa.xml deleted file mode 100644 index 597ca02ad5..0000000000 --- a/documentation/src/main/docbook/quickstart/en-US/content/tutorial_jpa.xml +++ /dev/null @@ -1,145 +0,0 @@ - - - - - Tutorial Using the <firstterm><phrase>Java Persistence API (JPA)</phrase></firstterm> - - - This tutorial is located within the download bundle under entitymanager. - - - Objectives - - - Use annotations to provide mapping information. - - - - - Use JPA. - - - - -
- <filename>persistence.xml</filename> - - - The previous tutorials used the Hibernate-specific - hibernate.cfg.xml configuration file. - JPA, however, defines a different bootstrap process that uses its own configuration - file named persistence.xml. This bootstrapping process is defined by the - JPA specification. In Java SE environments the persistence - provider (Hibernate in this case) is required to locate all JPA configuration files - by classpath lookup of the META-INF/persistence.xml resource name. - - - - <filename>persistence.xml</filename> - - - ... - -]]> - - - - persistence.xml files should provide a unique name for each persistence - unit. Applications use this name to reference the configuration when obtaining an - javax.persistence.EntityManagerFactory reference. - - - - The settings defined in the properties element are discussed in . Here the javax.persistence-prefixed - varieties are used when possible. Notice that the remaining Hibernate-specific configuration setting names - are now prefixed with hibernate.. - - - - Additionally, the class element functions the same as in . - -
- -
- The annotated entity Java class - - The entity is exactly the same as in - -
- -
- Example code - - The previous tutorials used the Hibernate APIs. This tutorial uses the JPA APIs. - - - - Obtaining the <interfacename>javax.persistence.EntityManagerFactory</interfacename> - protected void setUp() throws Exception { - entityManagerFactory = Persistence.createEntityManagerFactory( "org.hibernate.tutorial.jpa" ); -} - - - - Notice again that the persistence unit name is org.hibernate.tutorial.jpa, which matches - - - - - Saving (persisting) entities - EntityManager entityManager = entityManagerFactory.createEntityManager(); -entityManager.getTransaction().begin(); -entityManager.persist( new Event( "Our very first event!", new Date() ) ); -entityManager.persist( new Event( "A follow up event", new Date() ) ); -entityManager.getTransaction().commit(); -entityManager.close(); - - - - The code is similar to . An - javax.persistence.EntityManager interface is used instead of a - org.hibernate.Session interface. JPA calls this - operation persist instead of save. - - - - Obtaining a list of entities - result = entityManager.createQuery( "from Event", Event.class ).getResultList(); -for ( Event event : result ) { - System.out.println( "Event (" + event.getDate() + ") : " + event.getTitle() ); -} -entityManager.getTransaction().commit(); -entityManager.close();]]> - - - - Again, the code is pretty similar to . - -
- -
- Take it further! - - Practice Exercises - - - Develop an EJB Session bean to investigate implications of using a container-managed - persistence context (javax.persistence.EntityManager). Try both - stateless and stateful use-cases. - - - -
- \ No newline at end of file diff --git a/documentation/src/main/docbook/quickstart/en-US/content/tutorial_native.xml b/documentation/src/main/docbook/quickstart/en-US/content/tutorial_native.xml deleted file mode 100644 index 231c911c14..0000000000 --- a/documentation/src/main/docbook/quickstart/en-US/content/tutorial_native.xml +++ /dev/null @@ -1,342 +0,0 @@ - - - - - Tutorial Using Native Hibernate APIs and <phrase>hbm.xml</phrase> Mappings - - - This tutorial is located within the download bundle under basic/. - - - Objectives - - - using Hibernate mapping files (hbm.xml) to provide mapping information - - - - - using the native Hibernate APIs - - - - - -
- The Hibernate configuration file - - - The resource file hibernate.cfg.xml defines Hibernate configuration - information. - - - - The connection.driver_class, connection.url, - connection.username and connection.password - property elements define JDBC connection information. These tutorials utilize the H2 - in-memory database, So the values of these properties are all specific to running H2 in its in-memory mode. - connection.pool_size is used to configure the number of connections in Hibernate's - built-in connection pool. - - - - - The built-in Hibernate connection pool is in no way intended for production use. It lacks several - features found on production-ready connection pools. See the section discussion in Hibernate Developer Guide for further information. - - - - - The dialect property specifies the particular SQL variant with which Hibernate will - converse. - - - - - In most cases, Hibernate is able to properly determine which dialect to use. This is particularly useful - if your application targets multiple databases. This is discussed in detail in the Hibernate Developer Guide - - - - - The hbm2ddl.auto property enables automatic generation of database schemas directly into - the database. - - - - Finally, add the mapping file(s) for persistent classes to the configuration. The - attribute of the mapping element causes Hibernate to attempt to locate that mapping as a - classpath resource, using a java.lang.ClassLoader lookup. - - -
- - -
- The entity Java class - - The entity class for this tutorial is org.hibernate.tutorial.hbm.Event. - - - Notes About the Entity - - - This class uses standard JavaBean naming conventions for property getter and setter methods, as well as - private visibility for the fields. Although this is the recommended design, it is not required. - - - - - The no-argument constructor, which is also a JavaBean convention, is a - requirement for all persistent classes. Hibernate needs to create objects for you, using Java - Reflection. The constructor can be private. However, package or public visibility is required for runtime - proxy generation and efficient data retrieval without bytecode instrumentation. - - - -
- - -
- The mapping file - - The hbm.xml mapping file for this tutorial is the classpath resource - org/hibernate/tutorial/hbm/Event.hbm.xml as we saw in - - - - - Hibernate uses the mapping metadata to determine how to load and store objects of the persistent class. The - Hibernate mapping file is one choice for providing Hibernate with this metadata. - - - - The <literal>class</literal> mapping element - - ... -]]> - - - - Functions of the <varname>class</varname> mapping element - - - The attribute (combined here with the attribute from - the containing hibernate-mapping element) names the FQN of the class to be - defined as an entity. - - - - - The attribute names the database table which contains the data for this - entity. - - - - - - Instances of the Event class are now mapped to rows in the - EVENTS table. - - - - The <literal>id</literal> mapping element - - ... -]]> - - - - Hibernate uses the property named by the id element to uniquely identify rows in the - table. - - - - - - It is not required for the id element to map to the table's actual primary key - column(s), but it is the normal convention. Tables mapped in Hibernate do not even need to define - primary keys. However, it is strongly recommend that all schemas define proper referential - integrity. Therefore id and primary key are used interchangeably - throughout Hibernate documentation. - - - - The id element here identifies the EVENT_ID column as - the primary key of the EVENTS table. It also identifies the - id property of the Event class as the property containing the - identifier value. - - - The generator element nested inside the id element informs Hibernate - about which strategy is used to generated primary key values for this entity. This example uses a simple - incrementing count. - - - - The <literal>property</literal> mapping element - -]]> - - - - The two property elements declare the remaining two properties of the - Event class: date and title. The - date property mapping includes the attribute, but the - title does not. In the absence of a attribute, Hibernate - uses the property name as the column name. This is appropriate for title, but since - date is a reserved keyword in most databases, you need to specify a non-reserved - word for the column name. - - - The title mapping also lacks a attribute. The types - declared and used in the mapping files are neither Java data types nor SQL database types. Instead, - they are Hibernate mapping types. Hibernate mapping types are - converters which translate between Java and SQL data types. Hibernate attempts to determine the correct - conversion and mapping type autonomously if the attribute is not present in the - mapping, by using Java reflection to determine the Java type of the declared property and using a - default mapping type for that Java type. - - - In some cases this automatic detection might not chose the default you expect or need, as seen with the - date property. Hibernate cannot know if the property, which is of type - java.util.Date, should map to a SQL DATE, - TIME, or TIMESTAMP datatype. - Full date and time information is preserved by mapping the property to a timestamp converter, - which identifies an instance of the class org.hibernate.type.TimestampType. - - - - - - Hibernate determines the mapping type using reflection when the mapping files are processed. This - process adds overhead in terms of time and resources. If startup performance is important, consider - explicitly defining the type to use. - - - -
- -
- Example code - - The org.hibernate.tutorial.hbm.NativeApiIllustrationTest class illustrates using - the Hibernate native API. - - - - The examples in these tutorials are presented as JUnit tests, for ease of use. One benefit of this - approach is that setUp and tearDown roughly illustrate - how a org.hibernate.SessionFactory is created at the start-up of an - application and closed at the end of the application lifecycle. - - - - - Obtaining the <interfacename>org.hibernate.SessionFactory</interfacename> - protected void setUp() throws Exception { - // A SessionFactory is set up once for an application - sessionFactory = new Configuration() - .configure() // configures settings from hibernate.cfg.xml - .buildSessionFactory(); -} - - - - Tutorial Workflow - - The configuration is loaded. - - The org.hibernate.cfg.Configuration class is the first thing to notice. In this - tutorial, all configuration details are located in the hibernate.cfg.xml file - discussed in . - - - - The <interfacename>org.hibernate.SessionFactory</interfacename> is created. - - The org.hibernate.cfg.Configuration then creates the - org.hibernate.SessionFactory which is a thread-safe object that is - instantiated once to serve the entire application. - - - - <interfacename>SessionFactory</interfacename> creates <classname>Session</classname> instances. - - The org.hibernate.SessionFactory acts as a factory for - org.hibernate.Session instances as can be seen in the - testBasicUsage method. - - - - - <classname>Session</classname>s perform work. - - A org.hibernate.Session should be thought of as a corollary to a "unit of - work". - - - - - - Saving entities - Session session = sessionFactory.openSession(); -session.beginTransaction(); -session.save( new Event( "Our very first event!", new Date() ) ); -session.save( new Event( "A follow up event", new Date() ) ); -session.getTransaction().commit(); -session.close(); - - - - testBasicUsage first creates some new Event objects and - hands them over to Hibernate for management, using the save method. Hibernate now - takes responsibility to perform an INSERT on the database. - - - - Obtaining a list of entities - ) result ) { - System.out.println( "Event (" + event.getDate() + ") : " + event.getTitle() ); -} -session.getTransaction().commit(); -session.close();]]> - - - - testBasicUsage illustrates use of the Hibernate Query Language - (HQL) to load all existing Event objects from the database and generate the - appropriate SELECT SQL, send it to the database and populate Event - objects with the result set data. - -
- -
- Take it further! - - Practice Exercises - - - Reconfigure the examples to connect to your own persistent relational database. - - - - - With help of the Developer Guide, add an association to - the Event entity to model a message thread. - - - -
- - \ No newline at end of file diff --git a/documentation/src/main/docbook/quickstart/en-US/content/tutorial_osgi.xml b/documentation/src/main/docbook/quickstart/en-US/content/tutorial_osgi.xml deleted file mode 100644 index 7e9aaa8aa0..0000000000 --- a/documentation/src/main/docbook/quickstart/en-US/content/tutorial_osgi.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - OSGi Tutorial - - - Hibernate targets the OSGi 4.3 spec or later and supports three types - of configurations. - - - - Container-Managed JPA - - - Unmanaged JPA - - - Unmanaged Native - - - - - - For more details about OSGi, the three configurations, hibernate-osgi, extensions points, and caveats, please - see the OSGi chapter of the Developer's Guide! - - -
- - Project Overview - - - Each configuration has a QuickStart project located within the download bundle (under osgi). - The bundles can be used as-is within Apache Karaf. Feel free to use them as literal - "quick start" bundle templates. - -
- -
- - Project Structure - - - - osgi/datasource-h2.xml: Enterprise OSGi JPA usage can include a DataSource installed in the container. - The client bundle's persistence.xml references the DataSource through JNDI. For an - example, see how managed-jpa's persistence.xml calls out the - jta-data-source. - - - osgi/[project]/features.xml: This is arguably the most important "quick start" material. It defines - a single Karaf feature ("hibernate-test") that demonstrates the necessary 3rd party libraries and - bundle activation ordering. - - - osgi/[project]/pom.xml: The POM includes typical compile-time dependencies (JPA, OSGi Core, - OSGi Enterprise), as well as OSGi manifest data. - - - osgi/[project]/src/main/resources/OSGI-INF/blueprint/blueprint.xml: - The Blueprint includes container-managed EntityManager - injection (for managed-jpa), as well as demonstrations showing how to register - your custom implementations of Hibernate extension points. - - - osgi/[project]/src/main/resources/META-INF/persistence.xml or - osgi/[project]/src/main/resources/hibernate.cfg.xml: Note that the configurations - are no different than typical uses of Hibernate! - - - osgi/[project]/src/main/java/org/hibernate/osgitest/HibernateUtil.java: Demonstrates how to create an - EntityManagerFactory (JPA) or SessionFactory (Native) using hibernate-osgi's services. Note that in - managed-jpa, this is replaced by DataPointServiceImpl#entityManager, injected by - blueprint.xml (described above). - - -
- -
- - TODOs - - - - If using managed-jpa, features.xml will need the path to - datasource-h2.xml updated. - - -
- -
- - Karaf Commands - - - All three bundles include Karaf Commands that can be used directly on the Karaf command line to test - basic persistence operations ("dp:add [name]", "dp:getall", "dp:deleteall", etc.). I leave them in the - QuickStarts as a useful sanity check. - -
- - diff --git a/documentation/src/main/docbook/quickstart/en-US/images/hibernate_logo_a.png b/documentation/src/main/docbook/quickstart/en-US/images/hibernate_logo_a.png deleted file mode 100644 index 0a343c4bca60a2d585b3d9efe11c9a328b4c83cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 31862 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 QNpeyu3hH~~ - - - - - - - - - - - - - - - - - diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/.gitignore b/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/.gitignore deleted file mode 100644 index ea8c4bf7f3..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/features.xml b/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/features.xml deleted file mode 100755 index b7600d1f11..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/features.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - aries.transaction.recoverable = true - aries.transaction.timeout = 600 - aries.transaction.howl.logFileDir = /tmp/karaf/txlog - aries.transaction.howl.maxLogFiles = 2 - aries.transaction.howl.maxBlocksPerFile = 512 - aries.transaction.howl.bufferSizeKBytes = 4 - - mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1 - mvn:org.apache.aries.transaction/org.apache.aries.transaction.blueprint/1.0.0 - mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.0.1 - - - mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0.Final - - mvn:org.apache.aries/org.apache.aries.util/1.1.1-SNAPSHOT - mvn:org.apache.aries.jpa/org.apache.aries.jpa.api/1.0.1-SNAPSHOT - mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint.aries/1.0.2-SNAPSHOT - mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/1.0.1-SNAPSHOT - mvn:org.apache.aries.jpa/org.apache.aries.jpa.container.context/1.0.2-SNAPSHOT - - - mvn:org.apache.aries/org.apache.aries.util/1.0.0 - mvn:org.apache.aries.jndi/org.apache.aries.jndi.api/1.0.0 - mvn:org.apache.aries.jndi/org.apache.aries.jndi.core/1.0.0 - mvn:org.apache.aries.jndi/org.apache.aries.jndi.rmi/1.0.0 - mvn:org.apache.aries.jndi/org.apache.aries.jndi.url/1.0.0 - mvn:org.apache.aries.jndi/org.apache.aries.jndi.legacy.support/1.0.0 - - - mvn:commons-collections/commons-collections/3.2.1 - mvn:commons-pool/commons-pool/1.5.4 - mvn:commons-dbcp/commons-dbcp/1.4 - mvn:commons-lang/commons-lang/2.6 - wrap:mvn:net.sourceforge.serp/serp/1.13.1 - - mvn:com.h2database/h2/1.3.170 - blueprint:file:/[PATH]/datasource-h2.xml - - - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/2.7.7_5 - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/1.6.1_5 - - - wrap:mvn:org.jboss/jandex/1.1.0.Final - - mvn:com.fasterxml/classmate/0.8.0 - mvn:org.apache.logging.log4j/log4j-api/2.0 - mvn:log4j/log4j/1.2.17 - mvn:org.jboss.logging/jboss-logging/3.2.1.Final - mvn:org.javassist/javassist/3.18.1-GA - - mvn:org.hibernate.common/hibernate-commons-annotations/4.0.5.Final - - mvn:org.hibernate/hibernate-core/5.0.0-SNAPSHOT - mvn:org.hibernate/hibernate-entitymanager/5.0.0-SNAPSHOT - - - mvn:org.hibernate.osgi/managed-jpa/1.0.0 - - mvn:org.hibernate/hibernate-osgi/5.0.0-SNAPSHOT - - diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/pom.xml b/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/pom.xml deleted file mode 100755 index 55ccacd3c9..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/pom.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - 4.0.0 - org.hibernate.osgi - managed-jpa - 1.0.0 - bundle - - - - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - 1.0.0.Final - - - org.osgi - org.osgi.core - 4.3.1 - - - org.osgi - org.osgi.enterprise - 4.2.0 - - - org.apache.karaf.shell - org.apache.karaf.shell.console - 2.3.0 - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - org.hibernate.osgi.managed-jpa - managed-jpa - 1.0.0 - - org.hibernate.osgitest, - org.hibernate.osgitest.entity - - - org.apache.felix.service.command, - org.apache.felix.gogo.commands, - org.apache.karaf.shell.console, - org.apache.karaf.shell.commands, - javax.persistence;version="[1.0.0,2.1.0]", - - org.hibernate.proxy, - javassist.util.proxy, - * - - META-INF/persistence.xml - - - - - - diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/DataPointService.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/DataPointService.java deleted file mode 100644 index bdeaace115..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/DataPointService.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * JBoss, Home of Professional Open Source - * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors - * as indicated by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * 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, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.hibernate.osgitest; - -import java.util.List; - -import org.hibernate.osgitest.entity.DataPoint; - -/** - * @author Brett Meyer - */ -public interface DataPointService { - - public void add(DataPoint dp); - - public List getAll(); - - public void deleteAll(); -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java deleted file mode 100644 index f324889603..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * JBoss, Home of Professional Open Source - * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors - * as indicated by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * 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, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.hibernate.osgitest; - -import java.util.List; - -import javax.persistence.EntityManager; - -import org.hibernate.osgitest.entity.DataPoint; - -/** - * @author Brett Meyer - */ -public class DataPointServiceImpl implements DataPointService { - - private EntityManager entityManager; - - public void add(DataPoint dp) { - entityManager.persist( dp ); - entityManager.flush(); - } - - public List getAll() { - return entityManager.createQuery( "select d from DataPoint d", DataPoint.class ).getResultList(); - } - - public void deleteAll() { - entityManager.createQuery( "delete from DataPoint" ).executeUpdate(); - entityManager.flush(); - } - - public EntityManager getEntityManager() { - return entityManager; - } - - public void setEntityManager(EntityManager entityManager) { - this.entityManager = entityManager; - } - -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/command/AddCommand.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/command/AddCommand.java deleted file mode 100644 index 9e9844c331..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/command/AddCommand.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ -package org.hibernate.osgitest.command; - -import org.apache.felix.gogo.commands.Action; -import org.apache.felix.gogo.commands.Argument; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.service.command.CommandSession; -import org.hibernate.osgitest.DataPointService; -import org.hibernate.osgitest.entity.DataPoint; - -@Command(scope = "dp", name = "add") -public class AddCommand implements Action { - @Argument(index=0, name="Name", required=true, description="Name", multiValued=false) - String name; - - private DataPointService dpService; - - public void setDpService(DataPointService dpService) { - this.dpService = dpService; - } - - public Object execute(CommandSession session) throws Exception { - DataPoint dp = new DataPoint(); - dp.setName( name ); - dpService.add( dp ); - return null; - } - -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/command/DeleteAllCommand.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/command/DeleteAllCommand.java deleted file mode 100644 index d6c4ccf676..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/command/DeleteAllCommand.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ -package org.hibernate.osgitest.command; - -import org.apache.felix.gogo.commands.Action; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.service.command.CommandSession; -import org.hibernate.osgitest.DataPointService; - -@Command(scope = "dp", name = "deleteAll") -public class DeleteAllCommand implements Action { -private DataPointService dpService; - - public void setDpService(DataPointService dpService) { - this.dpService = dpService; - } - - public Object execute(CommandSession session) throws Exception { - dpService.deleteAll(); - return null; - } - -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/command/GetAllCommand.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/command/GetAllCommand.java deleted file mode 100644 index ebdac60ea2..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/command/GetAllCommand.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ -package org.hibernate.osgitest.command; - -import java.util.List; - -import org.apache.felix.gogo.commands.Action; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.service.command.CommandSession; -import org.hibernate.osgitest.DataPointService; -import org.hibernate.osgitest.entity.DataPoint; - -@Command(scope = "dp", name = "getAll") -public class GetAllCommand implements Action { - private DataPointService dpService; - - public void setDpService(DataPointService dpService) { - this.dpService = dpService; - } - - public Object execute(CommandSession session) throws Exception { - List dps = dpService.getAll(); - for (DataPoint dp : dps) { - System.out.println(dp.getId() + ", " + dp.getName()); - } - return null; - } - -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java deleted file mode 100644 index 2a566d8829..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * JBoss, Home of Professional Open Source - * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors - * as indicated by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * 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, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.hibernate.osgitest.entity; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -/** - * @author Brett Meyer - */ -@Entity -public class DataPoint { - @Id - @GeneratedValue - private long id; - - private String name; - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/resources/META-INF/persistence.xml b/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/resources/META-INF/persistence.xml deleted file mode 100644 index 77555cb42c..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - osgi:service/javax.sql.DataSource/(osgi.jndi.service.name=jdbc/h2ds) - - - - - - - - - \ No newline at end of file diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/resources/OSGI-INF/blueprint/blueprint.xml deleted file mode 100644 index 2436aa7467..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/managed-jpa/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/.gitignore b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/.gitignore deleted file mode 100644 index ea8c4bf7f3..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/features.xml b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/features.xml deleted file mode 100644 index 30a32a0d7f..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/features.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1 - - - mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0.Final - - - mvn:commons-collections/commons-collections/3.2.1 - mvn:commons-pool/commons-pool/1.5.4 - mvn:commons-dbcp/commons-dbcp/1.4 - mvn:commons-lang/commons-lang/2.6 - wrap:mvn:net.sourceforge.serp/serp/1.13.1 - - mvn:com.h2database/h2/1.3.170 - - - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/2.7.7_5 - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/1.6.1_5 - - - wrap:mvn:org.jboss/jandex/1.1.0.Final - - mvn:com.fasterxml/classmate/0.8.0 - mvn:org.apache.logging.log4j/log4j-api/2.0 - mvn:log4j/log4j/1.2.17 - mvn:org.jboss.logging/jboss-logging/3.2.1.Final - mvn:org.javassist/javassist/3.18.1-GA - - mvn:org.hibernate.common/hibernate-commons-annotations/4.0.5.Final - - mvn:org.hibernate/hibernate-core/5.0.0-SNAPSHOT - mvn:org.hibernate/hibernate-entitymanager/5.0.0-SNAPSHOT - mvn:org.hibernate/hibernate-osgi/5.0.0-SNAPSHOT - - mvn:org.hibernate.osgi/unmanaged-jpa/1.0.0 - - diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/pom.xml b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/pom.xml deleted file mode 100755 index d5a23ff555..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/pom.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - 4.0.0 - org.hibernate.osgi - unmanaged-jpa - 1.0.0 - bundle - - - - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - 1.0.0.Final - - - org.osgi - org.osgi.core - 4.3.1 - - - org.osgi - org.osgi.enterprise - 4.2.0 - - - org.apache.karaf.shell - org.apache.karaf.shell.console - 2.3.0 - - - org.hibernate - hibernate-entitymanager - 5.0.0-SNAPSHOT - - - com.h2database - h2 - 1.3.170 - - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - org.hibernate.osgi.unmanaged-jpa - unmanaged-jpa - 1.0.0 - - org.hibernate.osgitest, - org.hibernate.osgitest.entity - - - org.apache.felix.service.command, - org.apache.felix.gogo.commands, - org.apache.karaf.shell.console, - org.apache.karaf.shell.commands, - org.h2, - javax.persistence;version="[1.0.0,2.1.0]", - - org.hibernate.proxy, - javassist.util.proxy, - * - - - - - - - diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/DataPointService.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/DataPointService.java deleted file mode 100644 index de8c960c1f..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/DataPointService.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * JBoss, Home of Professional Open Source - * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors - * as indicated by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * 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, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.hibernate.osgitest; - -import java.util.List; - -import org.hibernate.osgitest.entity.DataPoint; - -/** - * @author Brett Meyer - */ -public interface DataPointService { - - public void add(DataPoint dp); - - public void update(DataPoint dp); - - public DataPoint get(long id); - - public List getAll(); - - public void deleteAll(); -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java deleted file mode 100644 index dba3609e97..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * JBoss, Home of Professional Open Source - * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors - * as indicated by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * 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, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.hibernate.osgitest; - -import java.util.List; - -import javax.persistence.EntityManager; - -import org.hibernate.osgitest.entity.DataPoint; - -/** - * @author Brett Meyer - */ -public class DataPointServiceImpl implements DataPointService { - - private HibernateUtil hibernateUtil = new HibernateUtil(); - - public void add(DataPoint dp) { - EntityManager em = hibernateUtil.getEntityManager(); - em.getTransaction().begin(); - em.persist( dp ); - em.getTransaction().commit(); - em.close(); - } - - public void update(DataPoint dp) { - EntityManager em = hibernateUtil.getEntityManager(); - em.getTransaction().begin(); - em.merge( dp ); - em.getTransaction().commit(); - em.close(); - } - - public DataPoint get(long id) { - EntityManager em = hibernateUtil.getEntityManager(); - em.getTransaction().begin(); - DataPoint dp = (DataPoint) em.createQuery( "from DataPoint dp where dp.id=" + id ).getSingleResult(); - em.getTransaction().commit(); - em.close(); - return dp; - } - - public List getAll() { - EntityManager em = hibernateUtil.getEntityManager(); - em.getTransaction().begin(); - List list = em.createQuery( "from DataPoint" ).getResultList(); - em.getTransaction().commit(); - em.close(); - return list; - } - - public void deleteAll() { - EntityManager em = hibernateUtil.getEntityManager(); - em.getTransaction().begin(); - em.createQuery( "delete from DataPoint" ).executeUpdate(); - em.getTransaction().commit(); - em.close(); - } - -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/HibernateUtil.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/HibernateUtil.java deleted file mode 100644 index 0927f15f7d..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/HibernateUtil.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * JBoss, Home of Professional Open Source - * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors - * as indicated by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * 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, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.hibernate.osgitest; - -import javax.persistence.EntityManager; -import javax.persistence.EntityManagerFactory; -import javax.persistence.spi.PersistenceProvider; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.FrameworkUtil; -import org.osgi.framework.ServiceReference; - -/** - * @author Brett Meyer - */ - -public class HibernateUtil { - - private EntityManagerFactory emf; - - public EntityManager getEntityManager() { - return getEntityManagerFactory().createEntityManager(); - } - - private EntityManagerFactory getEntityManagerFactory() { - if ( emf == null ) { - Bundle thisBundle = FrameworkUtil.getBundle( HibernateUtil.class ); - // Could get this by wiring up OsgiTestBundleActivator as well. - BundleContext context = thisBundle.getBundleContext(); - - ServiceReference serviceReference = context.getServiceReference( PersistenceProvider.class.getName() ); - PersistenceProvider persistenceProvider = (PersistenceProvider) context.getService( serviceReference ); - - emf = persistenceProvider.createEntityManagerFactory( "unmanaged-jpa", null ); - } - return emf; - } -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/TestIntegrator.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/TestIntegrator.java deleted file mode 100644 index f4436346cc..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/TestIntegrator.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * JBoss, Home of Professional Open Source - * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors - * as indicated by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * 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, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.hibernate.osgitest; - -import org.hibernate.boot.Metadata; -import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.integrator.spi.Integrator; -import org.hibernate.service.spi.SessionFactoryServiceRegistry; - - -/** - * @author Brett Meyer - */ -public class TestIntegrator implements Integrator { - - public void integrate( - Metadata metadata, - SessionFactoryImplementor sessionFactory, - SessionFactoryServiceRegistry serviceRegistry) { - System.out.println("Integrator#integrate"); - } - - public void disintegrate(SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) { - System.out.println("Integrator#disintegrate"); - } - -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/TestStrategyRegistrationProvider.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/TestStrategyRegistrationProvider.java deleted file mode 100644 index f7ad26f593..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/TestStrategyRegistrationProvider.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * JBoss, Home of Professional Open Source - * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors - * as indicated by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * 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, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.hibernate.osgitest; - -import java.util.Collections; - -import org.hibernate.boot.registry.selector.StrategyRegistration; -import org.hibernate.boot.registry.selector.StrategyRegistrationProvider; - -/** - * @author Brett Meyer - */ -public class TestStrategyRegistrationProvider implements StrategyRegistrationProvider { - - public Iterable getStrategyRegistrations() { - System.out.println("StrategyRegistrationProvider#getStrategyRegistrations"); - return Collections.EMPTY_LIST; - } -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/TestTypeContributor.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/TestTypeContributor.java deleted file mode 100644 index 0da11cb60a..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/TestTypeContributor.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * JBoss, Home of Professional Open Source - * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors - * as indicated by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * 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, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.hibernate.osgitest; - -import org.hibernate.boot.model.TypeContributions; -import org.hibernate.boot.model.TypeContributor; -import org.hibernate.service.ServiceRegistry; - - -/** - * @author Brett Meyer - */ -public class TestTypeContributor implements TypeContributor { - - public void contribute(TypeContributions typeContributions, ServiceRegistry serviceRegistry) { - System.out.println("TypeContributor#contribute"); - } - -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/command/AddCommand.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/command/AddCommand.java deleted file mode 100644 index c1b906c012..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/command/AddCommand.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ -package org.hibernate.osgitest.command; - -import org.apache.felix.gogo.commands.Action; -import org.apache.felix.gogo.commands.Argument; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.service.command.CommandSession; -import org.hibernate.osgitest.DataPointService; -import org.hibernate.osgitest.entity.DataPoint; - -@Command(scope = "dp", name = "addJPA") -public class AddCommand implements Action { - @Argument(index=0, name="Name", required=true, description="Name", multiValued=false) - String name; - - private DataPointService dpService; - - public void setDpService(DataPointService dpService) { - this.dpService = dpService; - } - - public Object execute(CommandSession session) throws Exception { - DataPoint dp = new DataPoint(); - dp.setName( name ); - dpService.add( dp ); - return null; - } - -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/command/DeleteAllCommand.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/command/DeleteAllCommand.java deleted file mode 100644 index 0d404ae1a1..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/command/DeleteAllCommand.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ -package org.hibernate.osgitest.command; - -import org.apache.felix.gogo.commands.Action; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.service.command.CommandSession; -import org.hibernate.osgitest.DataPointService; - -@Command(scope = "dp", name = "deleteAllJPA") -public class DeleteAllCommand implements Action { -private DataPointService dpService; - - public void setDpService(DataPointService dpService) { - this.dpService = dpService; - } - - public Object execute(CommandSession session) throws Exception { - dpService.deleteAll(); - return null; - } - -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/command/GetAllCommand.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/command/GetAllCommand.java deleted file mode 100644 index 6873e46303..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/command/GetAllCommand.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ -package org.hibernate.osgitest.command; - -import java.util.List; - -import org.apache.felix.gogo.commands.Action; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.service.command.CommandSession; -import org.hibernate.osgitest.DataPointService; -import org.hibernate.osgitest.entity.DataPoint; - -@Command(scope = "dp", name = "getAllJPA") -public class GetAllCommand implements Action { - private DataPointService dpService; - - public void setDpService(DataPointService dpService) { - this.dpService = dpService; - } - - public Object execute(CommandSession session) throws Exception { - List dps = dpService.getAll(); - for (DataPoint dp : dps) { - System.out.println(dp.getId() + ", " + dp.getName()); - } - return null; - } - -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/command/UpdateCommand.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/command/UpdateCommand.java deleted file mode 100644 index 5de8983dd9..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/command/UpdateCommand.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ -package org.hibernate.osgitest.command; - -import org.apache.felix.gogo.commands.Action; -import org.apache.felix.gogo.commands.Argument; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.service.command.CommandSession; -import org.hibernate.osgitest.DataPointService; -import org.hibernate.osgitest.entity.DataPoint; - -@Command(scope = "dp", name = "updateJPA") -public class UpdateCommand implements Action { - @Argument(index=0, name="Id", required=true, description="Id", multiValued=false) - String id; - - @Argument(index=1, name="Name", required=true, description="Name", multiValued=false) - String name; - - private DataPointService dpService; - - public void setDpService(DataPointService dpService) { - this.dpService = dpService; - } - - public Object execute(CommandSession session) throws Exception { - DataPoint dp = dpService.get( Long.valueOf( id ) ); - dp.setName( name ); - dpService.update( dp ); - return null; - } - -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java deleted file mode 100644 index 2a566d8829..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/java/org/hibernate/osgitest/entity/DataPoint.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * JBoss, Home of Professional Open Source - * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors - * as indicated by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * 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, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.hibernate.osgitest.entity; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -/** - * @author Brett Meyer - */ -@Entity -public class DataPoint { - @Id - @GeneratedValue - private long id; - - private String name; - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/resources/META-INF/persistence.xml b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/resources/META-INF/persistence.xml deleted file mode 100644 index b0ebfe7053..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/resources/META-INF/persistence.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - org.hibernate.osgitest.entity.DataPoint - true - - - - - - - - - - - \ No newline at end of file diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/resources/OSGI-INF/blueprint/blueprint.xml deleted file mode 100644 index 283ee1073a..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-jpa/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/.gitignore b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/.gitignore deleted file mode 100644 index ea8c4bf7f3..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/features.xml b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/features.xml deleted file mode 100644 index db86b0dacd..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/features.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1 - - - mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0.Final - - - mvn:commons-collections/commons-collections/3.2.1 - mvn:commons-pool/commons-pool/1.5.4 - mvn:commons-dbcp/commons-dbcp/1.4 - mvn:commons-lang/commons-lang/2.6 - wrap:mvn:net.sourceforge.serp/serp/1.13.1 - - mvn:com.h2database/h2/1.3.170 - - - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.antlr/2.7.7_5 - mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/1.6.1_5 - - - wrap:mvn:org.jboss/jandex/1.1.0.Final - - - - - - - - mvn:com.fasterxml/classmate/0.8.0 - mvn:org.apache.logging.log4j/log4j-api/2.0 - mvn:log4j/log4j/1.2.17 - mvn:org.jboss.logging/jboss-logging/3.2.1.Final - mvn:org.javassist/javassist/3.18.1-GA - - mvn:org.hibernate.common/hibernate-commons-annotations/4.0.5.Final - - - - - - - - - - - - mvn:org.hibernate/hibernate-core/5.0.0-SNAPSHOT - - mvn:org.hibernate/hibernate-entitymanager/5.0.0-SNAPSHOT - mvn:org.hibernate/hibernate-envers/5.0.0-SNAPSHOT - - - - - mvn:org.hibernate/hibernate-osgi/5.0.0-SNAPSHOT - - mvn:org.hibernate.osgi/unmanaged-native/1.0.0 - - diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/pom.xml b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/pom.xml deleted file mode 100755 index cc32c375cc..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/pom.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - 4.0.0 - org.hibernate.osgi - unmanaged-native - 1.0.0 - bundle - - - - org.hibernate.javax.persistence - hibernate-jpa-2.1-api - 1.0.0.Final - - - org.osgi - org.osgi.core - 4.3.1 - - - org.osgi - org.osgi.enterprise - 4.2.0 - - - org.apache.karaf.shell - org.apache.karaf.shell.console - 2.3.0 - - - org.hibernate - hibernate-core - 5.0.0-SNAPSHOT - - - org.hibernate - hibernate-envers - 5.0.0-SNAPSHOT - - - com.h2database - h2 - 1.3.170 - - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - org.hibernate.osgi.unmanaged-native - unmanaged-native - 1.0.0 - - org.hibernate.osgitest, - org.hibernate.osgitest.entity - - - org.apache.felix.service.command, - org.apache.felix.gogo.commands, - org.apache.karaf.shell.console, - org.apache.karaf.shell.commands, - org.h2, - org.hibernate, - org.hibernate.cfg, - org.hibernate.service, - javax.persistence;version="[1.0.0,2.1.0]", - - org.hibernate.proxy, - javassist.util.proxy, - * - - - - - - - diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/DataPointService.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/DataPointService.java deleted file mode 100644 index 12fb79a95a..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/DataPointService.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * JBoss, Home of Professional Open Source - * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors - * as indicated by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * 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, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.hibernate.osgitest; - -import java.util.List; -import java.util.Map; - -import org.hibernate.envers.DefaultRevisionEntity; -import org.hibernate.osgitest.entity.DataPoint; - -/** - * @author Brett Meyer - */ -public interface DataPointService { - - public void add(DataPoint dp); - - public void update(DataPoint dp); - - public DataPoint get(long id); - - public DataPoint load(long id); - - public List getAll(); - - public Map getRevisions(long id); - - public void deleteAll(); -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java deleted file mode 100644 index a8f6f72023..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * JBoss, Home of Professional Open Source - * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors - * as indicated by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * 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, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.hibernate.osgitest; - -import org.hibernate.Session; -import org.hibernate.criterion.Restrictions; -import org.hibernate.envers.AuditReader; -import org.hibernate.envers.AuditReaderFactory; -import org.hibernate.envers.DefaultRevisionEntity; -import org.hibernate.osgitest.entity.DataPoint; - -import java.util.HashSet; -import java.util.List; -import java.util.Map; - -/** - * @author Brett Meyer - */ -public class DataPointServiceImpl implements DataPointService { - - private HibernateUtil hibernateUtil = new HibernateUtil(); - - public void add(DataPoint dp) { - Session s = hibernateUtil.getSession(); - s.getTransaction().begin(); - s.persist( dp ); - s.getTransaction().commit(); - s.close(); - } - - public void update(DataPoint dp) { - Session s = hibernateUtil.getSession(); - s.getTransaction().begin(); - s.update( dp ); - s.getTransaction().commit(); - s.close(); - } - - public DataPoint get(long id) { - Session s = hibernateUtil.getSession(); - s.getTransaction().begin(); - DataPoint dp = (DataPoint) s.createCriteria( DataPoint.class ).add( - Restrictions.eq( "id", id ) ).uniqueResult(); - s.getTransaction().commit(); - s.close(); - return dp; - } - - // Test lazy loading (mainly to make sure the proxy classes work in OSGi) - public DataPoint load(long id) { - Session s = hibernateUtil.getSession(); - s.getTransaction().begin(); - DataPoint dp = (DataPoint) s.load( DataPoint.class, new Long(id) ); - // initialize - dp.getName(); - s.getTransaction().commit(); - s.close(); - return dp; - } - - public List getAll() { - Session s = hibernateUtil.getSession(); - s.getTransaction().begin(); - List list = s.createQuery( "from DataPoint" ).list(); - s.getTransaction().commit(); - s.close(); - return list; - } - - public Map getRevisions(long id) { - Session s = hibernateUtil.getSession(); - AuditReader reader = AuditReaderFactory.get(s); - List revisionNums = reader.getRevisions( DataPoint.class, id ); - return reader.findRevisions( DefaultRevisionEntity.class, new HashSet(revisionNums) ); - } - - public void deleteAll() { - Session s = hibernateUtil.getSession(); - s.getTransaction().begin(); - s.createQuery( "delete from DataPoint" ).executeUpdate(); - s.getTransaction().commit(); - s.close(); - } - -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/HibernateUtil.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/HibernateUtil.java deleted file mode 100644 index 15fb4c7db1..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/HibernateUtil.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * JBoss, Home of Professional Open Source - * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors - * as indicated by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * 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, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.hibernate.osgitest; - -import org.hibernate.Session; -import org.hibernate.SessionFactory; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.FrameworkUtil; -import org.osgi.framework.ServiceReference; - -/** - * @author Brett Meyer - */ - -public class HibernateUtil { - - private SessionFactory sf; - - public Session getSession() { - return getSessionFactory().openSession(); - } - - private SessionFactory getSessionFactory() { - if ( sf == null ) { - Bundle thisBundle = FrameworkUtil.getBundle( HibernateUtil.class ); - // Could get this by wiring up OsgiTestBundleActivator as well. - BundleContext context = thisBundle.getBundleContext(); - - ServiceReference sr = context.getServiceReference( SessionFactory.class.getName() ); - sf = (SessionFactory) context.getService( sr ); - } - return sf; - } -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/TestIntegrator.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/TestIntegrator.java deleted file mode 100644 index 95b2e631db..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/TestIntegrator.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * JBoss, Home of Professional Open Source - * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors - * as indicated by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * 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, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.hibernate.osgitest; - -import org.hibernate.boot.Metadata; -import org.hibernate.engine.spi.SessionFactoryImplementor; -import org.hibernate.integrator.spi.Integrator; -import org.hibernate.service.spi.SessionFactoryServiceRegistry; - - -/** - * @author Brett Meyer - */ -public class TestIntegrator implements Integrator { - - public void integrate( - Metadata metadata, - SessionFactoryImplementor sessionFactory, - SessionFactoryServiceRegistry serviceRegistry) { - System.out.println("Integrator#integrate"); - } - - public void disintegrate(SessionFactoryImplementor sessionFactory, SessionFactoryServiceRegistry serviceRegistry) { - System.out.println("Integrator#disintegrate"); - } - -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/TestStrategyRegistrationProvider.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/TestStrategyRegistrationProvider.java deleted file mode 100644 index f7ad26f593..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/TestStrategyRegistrationProvider.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * JBoss, Home of Professional Open Source - * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors - * as indicated by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * 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, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.hibernate.osgitest; - -import java.util.Collections; - -import org.hibernate.boot.registry.selector.StrategyRegistration; -import org.hibernate.boot.registry.selector.StrategyRegistrationProvider; - -/** - * @author Brett Meyer - */ -public class TestStrategyRegistrationProvider implements StrategyRegistrationProvider { - - public Iterable getStrategyRegistrations() { - System.out.println("StrategyRegistrationProvider#getStrategyRegistrations"); - return Collections.EMPTY_LIST; - } -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/TestTypeContributor.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/TestTypeContributor.java deleted file mode 100644 index 87a8384176..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/TestTypeContributor.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * JBoss, Home of Professional Open Source - * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors - * as indicated by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * 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, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.hibernate.osgitest; - -import org.hibernate.boot.model.TypeContributions; -import org.hibernate.boot.model.TypeContributor; -import org.hibernate.service.ServiceRegistry; - - -/** - * @author Brett Meyer - */ -public class TestTypeContributor implements TypeContributor { - - public void contribute(TypeContributions typeContributions, ServiceRegistry serviceRegistry) { - System.out.println("TypeContributor#contribute"); - } - -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/AddCommand.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/AddCommand.java deleted file mode 100644 index 9e9844c331..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/AddCommand.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ -package org.hibernate.osgitest.command; - -import org.apache.felix.gogo.commands.Action; -import org.apache.felix.gogo.commands.Argument; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.service.command.CommandSession; -import org.hibernate.osgitest.DataPointService; -import org.hibernate.osgitest.entity.DataPoint; - -@Command(scope = "dp", name = "add") -public class AddCommand implements Action { - @Argument(index=0, name="Name", required=true, description="Name", multiValued=false) - String name; - - private DataPointService dpService; - - public void setDpService(DataPointService dpService) { - this.dpService = dpService; - } - - public Object execute(CommandSession session) throws Exception { - DataPoint dp = new DataPoint(); - dp.setName( name ); - dpService.add( dp ); - return null; - } - -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/DeleteAllCommand.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/DeleteAllCommand.java deleted file mode 100644 index d6c4ccf676..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/DeleteAllCommand.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ -package org.hibernate.osgitest.command; - -import org.apache.felix.gogo.commands.Action; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.service.command.CommandSession; -import org.hibernate.osgitest.DataPointService; - -@Command(scope = "dp", name = "deleteAll") -public class DeleteAllCommand implements Action { -private DataPointService dpService; - - public void setDpService(DataPointService dpService) { - this.dpService = dpService; - } - - public Object execute(CommandSession session) throws Exception { - dpService.deleteAll(); - return null; - } - -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/GetAllCommand.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/GetAllCommand.java deleted file mode 100644 index ebdac60ea2..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/GetAllCommand.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ -package org.hibernate.osgitest.command; - -import java.util.List; - -import org.apache.felix.gogo.commands.Action; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.service.command.CommandSession; -import org.hibernate.osgitest.DataPointService; -import org.hibernate.osgitest.entity.DataPoint; - -@Command(scope = "dp", name = "getAll") -public class GetAllCommand implements Action { - private DataPointService dpService; - - public void setDpService(DataPointService dpService) { - this.dpService = dpService; - } - - public Object execute(CommandSession session) throws Exception { - List dps = dpService.getAll(); - for (DataPoint dp : dps) { - System.out.println(dp.getId() + ", " + dp.getName()); - } - return null; - } - -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/GetCommand.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/GetCommand.java deleted file mode 100644 index 0597d709dd..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/GetCommand.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ -package org.hibernate.osgitest.command; - -import org.apache.felix.gogo.commands.Action; -import org.apache.felix.gogo.commands.Argument; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.service.command.CommandSession; -import org.hibernate.osgitest.DataPointService; -import org.hibernate.osgitest.entity.DataPoint; - -@Command(scope = "dp", name = "get") -public class GetCommand implements Action { - @Argument(index = 0, name = "Id", required = true, description = "Id", multiValued = false) - String id; - - private DataPointService dpService; - - public void setDpService(DataPointService dpService) { - this.dpService = dpService; - } - - public Object execute(CommandSession session) throws Exception { - DataPoint dp = dpService.get( Long.valueOf( id ) ); - System.out.println( dp.getId() + ", " + dp.getName() ); - return null; - } - -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/GetRevisionsCommand.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/GetRevisionsCommand.java deleted file mode 100644 index b4573f6200..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/GetRevisionsCommand.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ -package org.hibernate.osgitest.command; - -import java.util.Map; - -import org.apache.felix.gogo.commands.Action; -import org.apache.felix.gogo.commands.Argument; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.service.command.CommandSession; -import org.hibernate.envers.DefaultRevisionEntity; -import org.hibernate.osgitest.DataPointService; - -@Command(scope = "dp", name = "getRevisions") -public class GetRevisionsCommand implements Action { - @Argument(index=0, name="Id", required=true, description="Id", multiValued=false) - String id; - - private DataPointService dpService; - - public void setDpService(DataPointService dpService) { - this.dpService = dpService; - } - - public Object execute(CommandSession session) throws Exception { - Map revisions = dpService.getRevisions(Long.valueOf( id )); - for (Number revisionNum : revisions.keySet()) { - DefaultRevisionEntity dre = revisions.get( revisionNum ); - System.out.println(revisionNum + ": " + dre.getId() + ", " + dre.getTimestamp()); - } - return null; - } - -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/LoadCommand.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/LoadCommand.java deleted file mode 100644 index 3451a986ba..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/LoadCommand.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ -package org.hibernate.osgitest.command; - -import org.apache.felix.gogo.commands.Action; -import org.apache.felix.gogo.commands.Argument; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.service.command.CommandSession; -import org.hibernate.osgitest.DataPointService; -import org.hibernate.osgitest.entity.DataPoint; - -@Command(scope = "dp", name = "load") -public class LoadCommand implements Action { - @Argument(index = 0, name = "Id", required = true, description = "Id", multiValued = false) - String id; - - private DataPointService dpService; - - public void setDpService(DataPointService dpService) { - this.dpService = dpService; - } - - public Object execute(CommandSession session) throws Exception { - DataPoint dp = dpService.load( Long.valueOf( id ) ); - System.out.println( dp.getId() + ", " + dp.getName() ); - return null; - } - -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/UpdateCommand.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/UpdateCommand.java deleted file mode 100644 index f694967444..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/command/UpdateCommand.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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. - */ -package org.hibernate.osgitest.command; - -import org.apache.felix.gogo.commands.Action; -import org.apache.felix.gogo.commands.Argument; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.service.command.CommandSession; -import org.hibernate.osgitest.DataPointService; -import org.hibernate.osgitest.entity.DataPoint; - -@Command(scope = "dp", name = "update") -public class UpdateCommand implements Action { - @Argument(index=0, name="Id", required=true, description="Id", multiValued=false) - String id; - - @Argument(index=1, name="Name", required=true, description="Name", multiValued=false) - String name; - - private DataPointService dpService; - - public void setDpService(DataPointService dpService) { - this.dpService = dpService; - } - - public Object execute(CommandSession session) throws Exception { - DataPoint dp = dpService.get( Long.valueOf( id ) ); - dp.setName( name ); - dpService.update( dp ); - return null; - } - -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/entity/DataPoint.java b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/entity/DataPoint.java deleted file mode 100644 index 2e5ef72422..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/java/org/hibernate/osgitest/entity/DataPoint.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Hibernate, Relational Persistence for Idiomatic Java - * - * JBoss, Home of Professional Open Source - * Copyright 2013 Red Hat Inc. and/or its affiliates and other contributors - * as indicated by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * 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, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.hibernate.osgitest.entity; - -import java.io.Serializable; - -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; - -import org.hibernate.envers.Audited; - -/** - * @author Brett Meyer - */ -@Entity -@Audited -public class DataPoint implements Serializable { - @Id - @GeneratedValue - private long id; - - private String name; - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/resources/OSGI-INF/blueprint/blueprint.xml deleted file mode 100644 index f62626a14d..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/resources/ehcache.xml b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/resources/ehcache.xml deleted file mode 100644 index 52d198d65f..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/resources/ehcache.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - - - - - - - - - - - - --> - - - - diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/resources/hibernate.cfg.xml b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/resources/hibernate.cfg.xml deleted file mode 100644 index 7f9f2380c9..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/resources/hibernate.cfg.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - org.h2.Driver - jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE - sa - - org.hibernate.dialect.H2Dialect - create-drop - - - - - - - - - - - - - diff --git a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/resources/pool-one.properties b/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/resources/pool-one.properties deleted file mode 100644 index 7e1c4cf1ba..0000000000 --- a/documentation/src/main/docbook/quickstart/tutorials/osgi/unmanaged-native/src/main/resources/pool-one.properties +++ /dev/null @@ -1,13 +0,0 @@ -# -# Hibernate, Relational Persistence for Idiomatic Java -# -# License: GNU Lesser General Public License (LGPL), version 2.1 or later. -# See the lgpl.txt file in the root directory or . -# -jdbc-0.proxool.alias=pool-one -jdbc-0.proxool.driver-url=jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE -jdbc-0.proxool.driver-class=org.h2.Driver -jdbc-0.user=sa -jdbc-0.password= -jdbc-0.proxool.maximum-connection-count=2 -jdbc-0.proxool.house-keeping-test-sql=select CURRENT_DATE \ No newline at end of file