Browse files

HHH-7197 - update build scripts to not use deprecated gradle apis and…

… change manual's xml declation to use doc namespace
  • Loading branch information...
1 parent 96e2318 commit e4a82a0b6b912ac3f8c9aeb0e5e5da25208fad56 @stliu stliu committed Mar 26, 2012
Showing with 103 additions and 134 deletions.
  1. +2 −2 build.gradle
  2. +6 −7 buildSrc/build.gradle
  3. +7 −5 ...hibernate/build/gradle/testing/database/{JdbcDirectoryProfile.java → JdbcDirectoryProfile.groovy}
  4. +8 −8 buildSrc/src/main/groovy/org/hibernate/build/gradle/testing/matrix/MatrixTestingPlugin.groovy
  5. +4 −5 documentation/src/main/docbook/manual/en-US/content/additionalmodules.xml
  6. +1 −2 documentation/src/main/docbook/manual/en-US/content/architecture.xml
  7. +1 −2 documentation/src/main/docbook/manual/en-US/content/association_mapping.xml
  8. +3 −4 documentation/src/main/docbook/manual/en-US/content/basic_mapping.xml
  9. +5 −6 documentation/src/main/docbook/manual/en-US/content/batch.xml
  10. +1 −2 documentation/src/main/docbook/manual/en-US/content/best_practices.xml
  11. +2 −3 documentation/src/main/docbook/manual/en-US/content/bibliography.xml
  12. +1 −2 documentation/src/main/docbook/manual/en-US/content/collection_mapping.xml
  13. +1 −2 documentation/src/main/docbook/manual/en-US/content/component_mapping.xml
  14. +3 −4 documentation/src/main/docbook/manual/en-US/content/configuration.xml
  15. +1 −2 documentation/src/main/docbook/manual/en-US/content/events.xml
  16. +1 −1 documentation/src/main/docbook/manual/en-US/content/example_mappings.xml
  17. +1 −2 documentation/src/main/docbook/manual/en-US/content/example_parentchild.xml
  18. +1 −2 documentation/src/main/docbook/manual/en-US/content/example_weblog.xml
  19. +1 −2 documentation/src/main/docbook/manual/en-US/content/filters.xml
  20. +1 −2 documentation/src/main/docbook/manual/en-US/content/inheritance_mapping.xml
  21. +2 −3 documentation/src/main/docbook/manual/en-US/content/performance.xml
  22. +1 −2 documentation/src/main/docbook/manual/en-US/content/persistent_classes.xml
  23. +2 −3 documentation/src/main/docbook/manual/en-US/content/portability.xml
  24. +9 −10 documentation/src/main/docbook/manual/en-US/content/preface.xml
  25. +1 −2 documentation/src/main/docbook/manual/en-US/content/query_criteria.xml
  26. +2 −3 documentation/src/main/docbook/manual/en-US/content/query_hql.xml
  27. +1 −2 documentation/src/main/docbook/manual/en-US/content/query_sql.xml
  28. +1 −2 documentation/src/main/docbook/manual/en-US/content/readonly.xml
  29. +1 −2 documentation/src/main/docbook/manual/en-US/content/session_api.xml
  30. +1 −2 documentation/src/main/docbook/manual/en-US/content/toolset_guide.xml
  31. +2 −3 documentation/src/main/docbook/manual/en-US/content/transactions.xml
  32. +5 −6 documentation/src/main/docbook/manual/en-US/content/tutorial.xml
  33. +2 −3 documentation/src/main/docbook/manual/en-US/content/type.xml
  34. +1 −2 documentation/src/main/docbook/manual/en-US/content/xml.xml
  35. +2 −5 documentation/src/main/docbook/manual/en-US/legal_notice.xml
  36. +2 −2 hibernate-entitymanager/hibernate-entitymanager.gradle
  37. +1 −1 hibernate-envers/hibernate-envers.gradle
  38. +16 −16 release/release.gradle
View
4 build.gradle
@@ -168,7 +168,7 @@ subprojects { subProject ->
deployerJars "org.apache.maven.wagon:wagon-http:1.0"
}
- aptDumpDir = file( buildDirName + "/tmp/apt" )
+ aptDumpDir = file( "${buildDir}/tmp/apt" )
sourceSets.main {
compileClasspath += configurations.provided
@@ -231,7 +231,7 @@ subprojects { subProject ->
include '**/*.properties'
include '**/*.xml'
}
- into sourceSets.test.classesDir
+ into sourceSets.test.output.classesDir
}
} )
View
13 buildSrc/build.gradle
@@ -39,19 +39,18 @@ dependencies {
// common
compile gradleApi()
compile localGroovy()
+ groovy localGroovy()
compile 'org.apache.ant:ant:1.8.2'
-// compile 'org.apache.maven:maven-ant-tasks:2.1.0'
-
- // needed?
-// compile 'org.apache.maven.wagon:wagon-http:1.0-beta-6'
-
// injection plugin
- compile 'javassist:javassist:3.12.0.GA'
+ compile 'org.javassist:javassist:3.15.0-GA'
- groovy localGroovy()
+
}
idea {
+ project {
+ jdkName = "1.6"
+ }
module {
downloadSources = true
downloadJavadoc = true
View
12 ...esting/database/JdbcDirectoryProfile.java → ...ting/database/JdbcDirectoryProfile.groovy
@@ -23,11 +23,9 @@
*/
package org.hibernate.build.gradle.testing.database;
-import java.io.File;
import org.gradle.api.Project;
import org.gradle.api.artifacts.Configuration;
-import org.gradle.api.internal.artifacts.dependencies.DefaultSelfResolvingDependency;
/**
* Database profile as defined by a directory named {@code jdbc} containing JDBC drivers.
@@ -41,9 +39,13 @@
public JdbcDirectoryProfile(File jdbcDirectory, Project project) {
super( jdbcDirectory.getParentFile(), project );
jdbcDependencies = prepareConfiguration( getName() );
- DefaultSelfResolvingDependency dependency =
- new DefaultSelfResolvingDependency( project.files( jdbcDirectory.listFiles() ) );
- jdbcDependencies.addDependency( dependency );
+// DefaultSelfResolvingDependency dependency =
+// new DefaultSelfResolvingDependency( project.files( jdbcDirectory.listFiles() ) );
+ File [] jdbcDriverJars = jdbcDirectory.listFiles();
+ // jdbcDependencies.addDependency( dependency );
+ project.dependencies {
+ jdbcDependency files(jdbcDriverJars)
+ }
}
@Override
View
16 ...dSrc/src/main/groovy/org/hibernate/build/gradle/testing/matrix/MatrixTestingPlugin.groovy
@@ -136,9 +136,9 @@ public class MatrixTestingPlugin implements Plugin<Project> {
}
final SourceSet mainSourceSet = sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME); //sourceSets.main
final SourceSet unitTestSourceSet = sourceSets.getByName(SourceSet.TEST_SOURCE_SET_NAME); //sourceSets.test
- sourceSet.compileClasspath = mainSourceSet.classes + unitTestSourceSet.classes + matrixCompileConfig
- sourceSet.runtimeClasspath = sourceSet.classes + mainSourceSet.classes + unitTestSourceSet.classes + matrixRuntimeConfig
- sourceSet.classesDir = new File(unitTestSourceSet.classesDir.parentFile, "matrix")
+ sourceSet.compileClasspath = mainSourceSet.output + unitTestSourceSet.output + matrixCompileConfig
+ sourceSet.runtimeClasspath = sourceSet.output + mainSourceSet.output + unitTestSourceSet.output + matrixRuntimeConfig
+ sourceSet.output.classesDir = new File(unitTestSourceSet.output.classesDir.parentFile, "matrix")
sourceSet.resources {
setSrcDirs(['src/matrix/java', 'src/matrix/resources'])
}
@@ -170,7 +170,7 @@ public class MatrixTestingPlugin implements Plugin<Project> {
final Test nodeTask = project.tasks.add( taskName, Test );
nodeTask.description = "Runs the matrix against ${node.name}"
nodeTask.classpath = node.databaseProfile.testingRuntimeConfiguration + matrixSourceSet.runtimeClasspath
- nodeTask.testClassesDir = matrixSourceSet.classesDir
+ nodeTask.testClassesDir = matrixSourceSet.output.classesDir
nodeTask.ignoreFailures = true
nodeTask.workingDir = node.baseOutputDirectory
nodeTask.testReportDir = new File(node.baseOutputDirectory, "reports")
@@ -192,7 +192,7 @@ public class MatrixTestingPlugin implements Plugin<Project> {
final Test matrixUnitTask = project.tasks.add("matrixUnitTest", Test)
matrixUnitTask.description = "Run matrix sources as unit test"
matrixUnitTask.classpath = matrixSourceSet.runtimeClasspath
- matrixUnitTask.testClassesDir = matrixSourceSet.classesDir
+ matrixUnitTask.testClassesDir = matrixSourceSet.output.classesDir
matrixUnitTask.workingDir = test.workingDir
matrixUnitTask.testReportDir = test.testReportDir
@@ -206,21 +206,21 @@ public class MatrixTestingPlugin implements Plugin<Project> {
include '**/*.properties'
include '**/*.xml'
}
- into matrixSourceSet.classesDir
+ into matrixSourceSet.output.classesDir
}
project.copy {
from(sourceSets.test.resources.srcDirs) {
include '**/*.properties'
include '**/*.xml'
}
- into matrixSourceSet.classesDir
+ into matrixSourceSet.output.classesDir
}
project.copy {
from(matrixSourceSet.java.srcDirs) {
include '**/*.properties'
include '**/*.xml'
}
- into matrixSourceSet.classesDir
+ into matrixSourceSet.output.classesDir
}
})
View
9 documentation/src/main/docbook/manual/en-US/content/additionalmodules.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="additionalmodules">
+<chapter xml:id="additionalmodules" xmlns="http://docbook.org/ns/docbook" xmlns:xl="http://www.w3.org/1999/xlink">
<title>Additional modules</title>
<para>Hibernate Core also offers integration with some external
@@ -229,7 +228,7 @@
<para>
For more information check the Hibernate Validator reference documentation at
- <link xlink:href="http://docs.jboss.org/hibernate/stable/validator/reference/en-US/html/" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+ <link xl:href="http://docs.jboss.org/hibernate/stable/validator/reference/en-US/html/"/>
</para>
</section>
</section>
@@ -247,7 +246,7 @@
model, querying mismatch...) Hibernate Search indexes your domain model thanks to a few annotations,
takes care of the database / index synchronization and brings you back regular managed objects from
free text queries. Hibernate Search is using
- <link xlink:href="http://lucene.apache.org" xmlns:xlink="http://www.w3.org/1999/xlink">Apache Lucene</link>
+ <link xl:href="http://lucene.apache.org" >Apache Lucene</link>
under the covers.
</para>
</section>
@@ -264,7 +263,7 @@
<para>
Check the Hibernate Search reference documentation (
- <link xlink:href="http://docs.jboss.org/hibernate/stable/validator/reference/en-US/html/" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+ <link xl:href="http://docs.jboss.org/hibernate/stable/validator/reference/en-US/html/" />
) for more information.
</para>
</section>
View
3 documentation/src/main/docbook/manual/en-US/content/architecture.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="architecture">
+<chapter xml:id="architecture" xmlns="http://docbook.org/ns/docbook">
<title>Architecture</title>
View
3 documentation/src/main/docbook/manual/en-US/content/association_mapping.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="associations">
+<chapter xml:id="associations" xmlns="http://docbook.org/ns/docbook">
<title>Association Mappings</title>
View
7 documentation/src/main/docbook/manual/en-US/content/basic_mapping.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="mapping">
+<chapter xml:id="mapping" xmlns="http://docbook.org/ns/docbook" xmlns:xl="http://www.w3.org/1999/xlink">
<title>Basic O/R Mapping</title>
<section xml:id="mapping-declaration" revision="2">
@@ -1585,8 +1584,8 @@ public String getId() {</programlisting>
mac address and integrating it via the
<interfacename>org.hibernate.id.UUIDGenerationStrategy</interfacename>
contract. Two such libraries known at time of this
- writing include <link xlink:href="http://johannburkard.de/software/uuid/"/>
- and <link xlink:href="http://commons.apache.org/sandbox/id/uuid.html"/>
+ writing include <link xl:href="http://johannburkard.de/software/uuid/"/>
+ and <link xl:href="http://commons.apache.org/sandbox/id/uuid.html"/>
</para>
</listitem>
</itemizedlist></para>
View
11 documentation/src/main/docbook/manual/en-US/content/batch.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="batch">
+<chapter xml:id="batch" xmlns="http://docbook.org/ns/docbook" >
<title>Batch processing</title>
<para>
@@ -167,7 +166,7 @@ session.close();]]></programlisting>
(DML) the statements: <literal>INSERT</literal>, <literal>UPDATE</literal>, <literal>DELETE</literal>)
will not affect in-memory state. However, Hibernate provides methods
for bulk SQL-style DML statement execution that is performed through the
- Hibernate Query Language (<link linkend="queryhql">HQL</link>).
+ Hibernate Query Language (<xref linkend="queryhql">HQL</xref>).
</para>
<para>
@@ -195,7 +194,7 @@ session.close();]]></programlisting>
</listitem>
<listitem>
<para>
- No <link linkend="queryhql-joins-forms">joins</link>, either implicit or explicit,
+ No <xref linkend="queryhql-joins-forms">joins</xref>, either implicit or explicit,
can be specified in a bulk HQL query. Sub-queries can be used in the where-clause, where
the subqueries themselves may contain joins.
</para>
@@ -227,8 +226,8 @@ session.close();]]></programlisting>
<para>
In keeping with the EJB3 specification, HQL <literal>UPDATE</literal> statements, by default, do not effect the
- <link linkend="mapping-declaration-version">version</link>
- or the <link linkend="mapping-declaration-timestamp">timestamp</link> property values
+ <xref linkend="mapping-declaration-version">version</xref>
+ or the <xref linkend="mapping-declaration-timestamp">timestamp</xref> property values
for the affected entities. However,
you can force Hibernate to reset the <literal>version</literal> or
<literal>timestamp</literal> property values through the use of a <literal>versioned update</literal>.
View
3 documentation/src/main/docbook/manual/en-US/content/best_practices.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="best-practices" revision="3">
+<chapter xml:id="best-practices" revision="3" xmlns="http://docbook.org/ns/docbook">
<title>Best Practices</title>
<variablelist spacing="compact">
View
5 documentation/src/main/docbook/manual/en-US/content/bibliography.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE bibliography SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<bibliography>
+<bibliography xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>References</title>
<biblioentry xml:id="biblio-PoEAA">
@@ -31,7 +30,7 @@
<subtitle>Second Edition of Hibernate in Action</subtitle>
<biblioid class="isbn">1-932394-88-5</biblioid>
<bibliomisc>
- <link xlink:href="http://www.manning.com/bauer2" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+ <link xlink:href="http://www.manning.com/bauer2"/>
</bibliomisc>
<authorgroup>
<author>
View
3 documentation/src/main/docbook/manual/en-US/content/collection_mapping.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="collections">
+<chapter xml:id="collections" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Collection mapping</title>
<section xml:id="collections-persistent" revision="3">
View
3 documentation/src/main/docbook/manual/en-US/content/component_mapping.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="components">
+<chapter xml:id="components" xmlns="http://docbook.org/ns/docbook">
<title>Component Mapping</title>
<para>
View
7 documentation/src/main/docbook/manual/en-US/content/configuration.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="session-configuration" revision="1">
+<chapter xml:id="session-configuration" revision="1" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Configuration</title>
<para>Hibernate is designed to operate in many different environments and,
@@ -1205,15 +1204,15 @@ hibernate.dialect = org.hibernate.dialect.PostgreSQLDialect</programlisting>
</para>
</important>
- <para>Hibernate utilizes <link xlink:href="http://www.slf4j.org/" xmlns:xlink="http://www.w3.org/1999/xlink">Simple Logging
+ <para>Hibernate utilizes <link xlink:href="http://www.slf4j.org/" >Simple Logging
Facade for Java</link> (SLF4J) in order to log various system events.
SLF4J can direct your logging output to several logging frameworks (NOP,
Simple, log4j version 1.2, JDK 1.4 logging, JCL or logback) depending on
your chosen binding. In order to setup logging you will need
<filename>slf4j-api.jar</filename> in your classpath together with the jar
file for your preferred binding - <filename>slf4j-log4j12.jar</filename>
in the case of Log4J. See the SLF4J
- <link xlink:href="http://www.slf4j.org/manual.html" xmlns:xlink="http://www.w3.org/1999/xlink">documentation</link>
+ <link xlink:href="http://www.slf4j.org/manual.html">documentation</link>
for more
detail. To use Log4j you will also need to place a
<filename>log4j.properties</filename> file in your classpath. An example
View
3 documentation/src/main/docbook/manual/en-US/content/events.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="events">
+<chapter xml:id="events" xmlns="http://docbook.org/ns/docbook">
<title>Interceptors and events</title>
<para>
View
2 documentation/src/main/docbook/manual/en-US/content/example_mappings.xml
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding="UTF-8"?>
<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="example-mappings">
+<chapter xml:id="example-mappings" xmlns="http://docbook.org/ns/docbook">
<title>Example: Various Mappings</title>
View
3 documentation/src/main/docbook/manual/en-US/content/example_parentchild.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="example-parentchild">
+<chapter xml:id="example-parentchild" xmlns="http://docbook.org/ns/docbook">
<title>Example: Parent/Child</title>
<para>
View
3 documentation/src/main/docbook/manual/en-US/content/example_weblog.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="example-weblog">
+<chapter xml:id="example-weblog" xmlns="http://docbook.org/ns/docbook">
<title>Example: Weblog Application</title>
<section xml:id="example-weblog-classes">
View
3 documentation/src/main/docbook/manual/en-US/content/filters.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="filters">
+<chapter xml:id="filters" xmlns="http://docbook.org/ns/docbook" >
<title>Filtering data</title>
<para>Hibernate3 provides an innovative new approach to handling data with
View
3 documentation/src/main/docbook/manual/en-US/content/inheritance_mapping.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="inheritance">
+<chapter xml:id="inheritance" xmlns="http://docbook.org/ns/docbook">
<title>Inheritance mapping</title>
<section xml:id="inheritance-strategies" revision="3">
View
5 documentation/src/main/docbook/manual/en-US/content/performance.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="performance">
+<chapter xml:id="performance" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Improving performance</title>
<section xml:id="performance-fetching" revision="2">
@@ -616,7 +615,7 @@ Customer customer = (Customer) session.get( Customer.class, customerId );
<para>
Currently only join style fetch profiles are supported, but they plan is to support additional styles. See
- <link xlink:href="http://opensource.atlassian.com/projects/hibernate/browse/HHH-3414" xmlns:xlink="http://www.w3.org/1999/xlink">HHH-3414</link>
+ <link xlink:href="http://opensource.atlassian.com/projects/hibernate/browse/HHH-3414">HHH-3414</link>
for details.
</para>
</section>
View
3 documentation/src/main/docbook/manual/en-US/content/persistent_classes.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="persistent-classes">
+<chapter xml:id="persistent-classes" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Persistent Classes</title>
<para>
View
5 documentation/src/main/docbook/manual/en-US/content/portability.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="portability">
+<chapter xml:id="portability" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Database Portability Considerations</title>
<section xml:id="portability-basics">
@@ -106,7 +105,7 @@
<para>
Starting with version 3.2.3, Hibernate comes with a set of
- <link xlink:href="http://in.relation.to/2082.lace" xmlns:xlink="http://www.w3.org/1999/xlink">enhanced</link>
+ <link xlink:href="http://in.relation.to/2082.lace">enhanced</link>
identifier generators targetting
portability in a much different way.
<note>
View
19 documentation/src/main/docbook/manual/en-US/content/preface.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE preface SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<preface xml:id="preface">
+<preface xml:id="preface" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Preface</title>
<para>
@@ -10,7 +9,7 @@
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 from an object model representation
to a relational data model representation (and visa versa). See
- <link xlink:href="http://en.wikipedia.org/wiki/Object-relational_mapping" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+ <link xlink:href="http://en.wikipedia.org/wiki/Object-relational_mapping"/>
for a good high-level discussion.
</para>
@@ -23,12 +22,12 @@
<itemizedlist>
<listitem>
<para>
- <link xlink:href="http://www.agiledata.org/essays/dataModeling101.html" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+ <link xlink:href="http://www.agiledata.org/essays/dataModeling101.html" />
</para>
</listitem>
<listitem>
<para>
- <link xlink:href="http://en.wikipedia.org/wiki/Data_modeling" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+ <link xlink:href="http://en.wikipedia.org/wiki/Data_modeling" />
</para>
</listitem>
</itemizedlist>
@@ -90,7 +89,7 @@
information. Consider reading <biblioref linkend="biblio-JPwH"/>
if you need more help with application design, or if you prefer
a step-by-step tutorial. Also visit
- <link xlink:href="http://caveatemptor.hibernate.org" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+ <link xlink:href="http://caveatemptor.hibernate.org"/>
and download the example application from <biblioref linkend="biblio-JPwH"/>.
</para>
</listitem>
@@ -120,20 +119,20 @@
<listitem>
<para>
Trying stuff out and reporting bugs. See
- <link xlink:href="http://hibernate.org/issuetracker.html" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+ <link xlink:href="http://hibernate.org/issuetracker.html" />
details.
</para>
</listitem>
<listitem>
<para>
Trying your hand at fixing some bugs or implementing enhancements. Again, see
- <link xlink:href="http://hibernate.org/issuetracker.html" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+ <link xlink:href="http://hibernate.org/issuetracker.html"/>
details.
</para>
</listitem>
<listitem>
<para>
- <link xlink:href="http://hibernate.org/community.html" xmlns:xlink="http://www.w3.org/1999/xlink"/>
+ <link xlink:href="http://hibernate.org/community.html"/>
lists a few ways to engage in the community.
<itemizedlist>
<listitem>
@@ -144,7 +143,7 @@
<listitem>
<para>
There are also
- <link xlink:href="http://en.wikipedia.org/wiki/Internet_Relay_Chat" xmlns:xlink="http://www.w3.org/1999/xlink">IRC</link>
+ <link xlink:href="http://en.wikipedia.org/wiki/Internet_Relay_Chat">IRC</link>
channels for both user and developer discussions.
</para>
</listitem>
View
3 documentation/src/main/docbook/manual/en-US/content/query_criteria.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE preface SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="querycriteria">
+<chapter xml:id="querycriteria" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Criteria Queries</title>
<para>
View
5 documentation/src/main/docbook/manual/en-US/content/query_hql.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="queryhql" revision="1">
+<chapter xml:id="queryhql" revision="1" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>HQL: The Hibernate Query Language</title>
<para>
@@ -1195,7 +1194,7 @@ Collection counts = s.filter( collection, "select this.type, count(this) group b
<programlisting><![CDATA[from Person p order by p.name.first]]></programlisting>
<para>
- Another common use of components is in <link linkend="queryhql-tuple">row value constructors</link>.
+ Another common use of components is in <xref linkend="queryhql-tuple">row value constructors</xref>.
</para>
</section>
View
3 documentation/src/main/docbook/manual/en-US/content/query_sql.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="querysql" revision="2">
+<chapter xml:id="querysql" revision="2" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Native SQL</title>
<para>You can also express queries in the native SQL dialect of your
View
3 documentation/src/main/docbook/manual/en-US/content/readonly.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="readonly">
+<chapter xml:id="readonly" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Read-only entities</title>
<important>
View
3 documentation/src/main/docbook/manual/en-US/content/session_api.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="objectstate">
+<chapter xml:id="objectstate" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Working with objects</title>
<para>Hibernate is a full object/relational mapping solution that not only
View
3 documentation/src/main/docbook/manual/en-US/content/toolset_guide.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="toolsetguide" revision="2">
+<chapter xml:id="toolsetguide" revision="2" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Toolset Guide</title>
<para>
View
5 documentation/src/main/docbook/manual/en-US/content/transactions.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="transactions" revision="2">
+<chapter xml:id="transactions" revision="2" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Transactions and Concurrency</title>
<para>
@@ -455,7 +454,7 @@ finally {
<para>
You do not have to <literal>flush()</literal> the <literal>Session</literal> explicitly:
the call to <literal>commit()</literal> automatically triggers the synchronization depending
- on the <link linkend="objectstate-flushing">FlushMode</link> for the session.
+ on the <xref linkend="objectstate-flushing">FlushMode</xref> for the session.
A call to <literal>close()</literal> marks the end of a session. The main implication
of <literal>close()</literal> is that the JDBC connection will be relinquished by the
session. This Java code is portable and runs in both non-managed and JTA environments.
View
11 documentation/src/main/docbook/manual/en-US/content/tutorial.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="tutorial">
+<chapter xml:id="tutorial" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Tutorial</title>
<para>
@@ -424,9 +423,9 @@ public class Event {
how to obtain connections. For this tutorial we will be using a standalone connection
pool (as opposed to a <interfacename>javax.sql.DataSource</interfacename>). Hibernate comes with
support for two third-party open source JDBC connection pools:
- <link xlink:href="https://sourceforge.net/projects/c3p0" xmlns:xlink="http://www.w3.org/1999/xlink">c3p0</link>
+ <link xlink:href="https://sourceforge.net/projects/c3p0">c3p0</link>
and
- <link xlink:href="http://proxool.sourceforge.net/" xmlns:xlink="http://www.w3.org/1999/xlink">proxool</link>.
+ <link xlink:href="http://proxool.sourceforge.net/">proxool</link>.
However, we will be using the Hibernate built-in connection pool for this tutorial.
</para>
@@ -528,7 +527,7 @@ public class Event {
<para>
We will now build the tutorial with Maven. You will need to
have Maven installed; it is available from the
- <link xlink:href="http://maven.apache.org/download.html" xmlns:xlink="http://www.w3.org/1999/xlink">Maven download page</link>.
+ <link xlink:href="http://maven.apache.org/download.html">Maven download page</link>.
Maven will read the <filename>/pom.xml</filename> file we created
earlier and know how to perform some basic project tasks. First,
lets run the <literal>compile</literal> goal to make sure we can compile
@@ -1458,7 +1457,7 @@ public class EventManagerServlet extends HttpServlet {
<para>
This coding style, with a mix of Java and HTML, would not scale
- in a more complex application&mdash;keep in mind that we are only illustrating
+ in a more complex application;keep in mind that we are only illustrating
basic Hibernate concepts in this tutorial. The code prints an HTML
header and a footer. Inside this page, an HTML form for event entry and
a list of all events in the database are printed. The first method is
View
5 documentation/src/main/docbook/manual/en-US/content/type.xml
@@ -1,6 +1,5 @@
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-
-<chapter xml:id="types">
+<?xml version='1.0' encoding="UTF-8"?>
+<chapter xml:id="types" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>Types</title>
<para>
View
3 documentation/src/main/docbook/manual/en-US/content/xml.xml
@@ -1,7 +1,6 @@
<?xml version='1.0' encoding="UTF-8"?>
-<!DOCTYPE chapter SYSTEM "http://docbook.org/xml/5.0/dtd/docbook.dtd">
-<chapter xml:id="xml">
+<chapter xml:id="xml" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>XML Mapping</title>
<para><emphasis>
View
7 documentation/src/main/docbook/manual/en-US/legal_notice.xml
@@ -22,10 +22,7 @@
~ 51 Franklin Street, Fifth Floor
~ Boston, MA 02110-1301 USA
-->
-<!DOCTYPE legalnotice PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
-
-]>
-<legalnotice id="Legal_Notice">
+<legalnotice xml:id="Legal_Notice" xmlns="http://docbook.org/ns/docbook" xmlns:xl="http://www.w3.org/1999/xlink">
<title>Legal Notice</title>
<para>
<address>
@@ -40,7 +37,7 @@
<para>
Copyright <trademark class="copyright"/> 2007 by Red Hat, Inc. 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 <ulink url="http://www.gnu.org/licenses/lgpl-2.1.html">Lesser General Public License</ulink>, as published
+ GNU <link xl:href="http://www.gnu.org/licenses/lgpl-2.1.html">Lesser General Public License</link>, as published
by the Free Software Foundation.
</para>
<para>
View
4 hibernate-entitymanager/hibernate-entitymanager.gradle
@@ -32,7 +32,7 @@ sourceSets {
////////////////////////////////////////////////////////////////////////////////////////////////////////
// JPA model-gen set up
////////////////////////////////////////////////////////////////////////////////////////////////////////
-aptDumpDir = file( buildDirName + "/tmp/apt" )
+aptDumpDir = file( "${buildDir}/tmp/apt" )
////////////////////////////////////////////////////////////////////////////////////////////////////////
// 'test' sourceSet specific JPA model-gen set up
@@ -94,7 +94,7 @@ compileMatrixJava.options.define(compilerArgs: ["-proc:none", "-encoding", "UTF-
-bundlesTargetDir = file( "$buildDirName/bundles" )
+bundlesTargetDir = file( "${buildDir}/bundles" )
task copyBundleResources (type: Copy) {
from file('src/test/bundles')
into bundlesTargetDir
View
2 hibernate-envers/hibernate-envers.gradle
@@ -38,7 +38,7 @@ compileMatrixJava.options.define(compilerArgs: ["-proc:none", "-encoding", "UTF-
task generateJpaMetamodelClasses(type: Compile) {
classpath = compileJava.classpath + configurations.hibernateJpaModelGenTool
source = sourceSets.main.originalJavaSrcDirs
- destinationDir = file( buildDirName + "/tmp/apt" )
+ destinationDir = file( "${buildDir}/tmp/apt" )
options.define(
compilerArgs: [
"-proc:only",
View
32 release/release.gradle
@@ -10,7 +10,7 @@ idea.module {
// Javadocs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-javadocBuildDir = dir( buildDirName + "/documentation/javadocs" )
+javadocBuildDir = mkdir( "${buildDir}/documentation/javadocs" )
def copyRightYear = new java.util.GregorianCalendar().get( java.util.Calendar.YEAR );
@@ -34,10 +34,10 @@ task aggregateJavadocs(type: Javadoc) {
source sourceSet.java
if( classpath ) {
- classpath += sourceSet.classes + sourceSet.compileClasspath
+ classpath += sourceSet.output + sourceSet.compileClasspath
}
else {
- classpath = sourceSet.classes + sourceSet.compileClasspath
+ classpath = sourceSet.output + sourceSet.compileClasspath
}
sourceSet.java.each { javaFile ->
@@ -63,7 +63,7 @@ task aggregateJavadocs(type: Javadoc) {
// apply standard config
description = "Build the aggregated JavaDocs for all modules"
maxMemory = '512m'
- destinationDir = javadocBuildDir.dir
+ destinationDir = javadocBuildDir
configure( options ) {
overview = new File( projectDir, 'src/javadoc/overview.html' )
stylesheetFile = new File( projectDir, 'src/javadoc/stylesheet.css' )
@@ -101,13 +101,13 @@ String determinePackageName(SourceDirectorySet sourceDirectorySet, File javaFile
aggregateJavadocs.doLast {
copy {
from new File( projectDir, 'src/javadoc/images' )
- into new File( javadocBuildDir.dir, "/images" )
+ into new File( javadocBuildDir, "/images" )
}
}
// release bundles ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-releaseBuildDir = dir( buildDirName )
+releaseBuildDir = mkdir( buildDir )
task prepareReleaseBundles( dependsOn: [parent.project( 'documentation' ).tasks.buildDocs,aggregateJavadocs] )
@@ -120,7 +120,7 @@ releaseCopySpec = copySpec {
into('lib/required') {
from parent.project( 'hibernate-core' ).configurations.provided.files { dep -> dep.name == 'jta' }
from parent.project( 'hibernate-core' ).configurations.runtime
- from parent.project( 'hibernate-core' ).configurations.archives.allArtifactFiles.filter{ file -> !file.name.endsWith('-sources.jar') }
+ from parent.project( 'hibernate-core' ).configurations.archives.allArtifacts.files.filter{ file -> !file.name.endsWith('-sources.jar') }
// for now,
from parent.project( 'hibernate-core' ).configurations.provided.files { dep -> dep.name == 'javassist' }
}
@@ -130,17 +130,17 @@ releaseCopySpec = copySpec {
// }
into( 'lib/jpa' ) {
- from parent.project( 'hibernate-entitymanager' ).configurations.archives.allArtifactFiles.filter{ file -> !file.name.endsWith('-sources.jar') }
+ from parent.project( 'hibernate-entitymanager' ).configurations.archives.allArtifacts.files.filter{ file -> !file.name.endsWith('-sources.jar') }
}
into( 'lib/envers' ) {
from(
- ( parent.project( 'hibernate-envers' ).configurations.archives.allArtifactFiles.filter{ file -> !file.name.endsWith('-sources.jar') }
+ ( parent.project( 'hibernate-envers' ).configurations.archives.allArtifacts.files.filter{ file -> !file.name.endsWith('-sources.jar') }
+ parent.project( 'hibernate-envers' ).configurations.runtime )
- parent.project( 'hibernate-core' ).configurations.runtime
- - parent.project( 'hibernate-core' ).configurations.archives.allArtifactFiles
+ - parent.project( 'hibernate-core' ).configurations.archives.allArtifacts.files
- parent.project( 'hibernate-entitymanager' ).configurations.runtime
- - parent.project( 'hibernate-entitymanager' ).configurations.archives.allArtifactFiles
+ - parent.project( 'hibernate-entitymanager' ).configurations.archives.allArtifacts.files
)
}
@@ -152,10 +152,10 @@ releaseCopySpec = copySpec {
// into('lib/optional/' + shortName) {
owner.into('lib/optional/' + shortName) {
from (
- ( parent.project( feature ).configurations.archives.allArtifactFiles.filter{ file -> !file.name.endsWith('-sources.jar') }
+ ( parent.project( feature ).configurations.archives.allArtifacts.files.filter{ file -> !file.name.endsWith('-sources.jar') }
+ parent.project( feature ).configurations.runtime )
- parent.project( 'hibernate-core' ).configurations.runtime
- - parent.project( 'hibernate-core' ).configurations.archives.allArtifactFiles
+ - parent.project( 'hibernate-core' ).configurations.archives.allArtifacts.files
)
}
}
@@ -165,7 +165,7 @@ releaseCopySpec = copySpec {
}
into('documentation/javadocs') {
- from javadocBuildDir.dir
+ from javadocBuildDir
}
into( 'project' ) {
@@ -198,14 +198,14 @@ releaseCopySpec = copySpec {
task buildReleaseZip( type: Zip, dependsOn: [prepareReleaseBundles] ) {
description = "Build release bundle in ZIP format"
baseName = 'hibernate-release'
- destinationDir = releaseBuildDir.dir
+ destinationDir = releaseBuildDir
with project.releaseCopySpec
}
task buildReleaseTgz( type: Tar, dependsOn: [prepareReleaseBundles] ) {
description = "Build release bundle in GZIP format"
baseName = 'hibernate-release'
- destinationDir = releaseBuildDir.dir
+ destinationDir = releaseBuildDir
compression = Compression.GZIP
with project.releaseCopySpec
}

0 comments on commit e4a82a0

Please sign in to comment.