[jboss-cvs] JBossAS SVN: r97572 - in projects/docs/enterprise/5.0/Hibernate/Hibernate_Core: en-US and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Dec 8 19:17:46 EST 2009
Author: benlc
Date: 2009-12-08 19:17:45 -0500 (Tue, 08 Dec 2009)
New Revision: 97572
Added:
projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/extras/
projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/extras/allproperties.xml_sample
projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/extras/namespacing.xml_sample
Modified:
projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/architecture.xml
projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/basic_mapping.xml
projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/example_mappings.xml
projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/inheritance_mapping.xml
projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/publican.cfg
Log:
'committing Hibernate Core modifications to permit a publican 1.3 build (doesn't build fully as yet)'
Modified: projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/architecture.xml
===================================================================
--- projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/architecture.xml 2009-12-09 00:11:05 UTC (rev 97571)
+++ projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/architecture.xml 2009-12-09 00:17:45 UTC (rev 97572)
@@ -38,10 +38,10 @@
<mediaobject>
<imageobject role="fo">
- <imagedata fileref="../images/overview.svg" format="SVG" align="center"/>
+ <imagedata fileref="images/overview.svg" format="SVG" align="center"/>
</imageobject>
<imageobject role="html">
- <imagedata fileref="../images/overview.png" format="PNG" align="center"/>
+ <imagedata fileref="images/overview.png" format="PNG" align="center"/>
</imageobject>
</mediaobject>
@@ -64,10 +64,10 @@
<mediaobject>
<imageobject role="fo">
- <imagedata fileref="../images/lite.svg" format="SVG" align="center"/>
+ <imagedata fileref="images/lite.svg" format="SVG" align="center"/>
</imageobject>
<imageobject role="html">
- <imagedata fileref="../images/lite.png" format="PNG" align="center"/>
+ <imagedata fileref="images/lite.png" format="PNG" align="center"/>
</imageobject>
</mediaobject>
@@ -78,10 +78,10 @@
<mediaobject>
<imageobject role="fo">
- <imagedata fileref="../images/full_cream.svg" format="SVG" align="center"/>
+ <imagedata fileref="images/full_cream.svg" format="SVG" align="center"/>
</imageobject>
<imageobject role="html">
- <imagedata fileref="../images/full_cream.png" format="PNG" align="center"/>
+ <imagedata fileref="images/full_cream.png" format="PNG" align="center"/>
</imageobject>
</mediaobject>
Modified: projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/basic_mapping.xml
===================================================================
--- projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/basic_mapping.xml 2009-12-09 00:11:05 UTC (rev 97571)
+++ projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/basic_mapping.xml 2009-12-09 00:17:45 UTC (rev 97572)
@@ -166,21 +166,10 @@
<para>
The following is an example of utilizing user namespacing:
</para>
- <programlisting><![CDATA[<?xml version="1.0"?>
-<!DOCTYPE hibernate-mapping PUBLIC
- "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
- "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" [
- <!ENTITY types SYSTEM "classpath://your/domain/types.xml">
-]>
-
-<hibernate-mapping package="your.domain">
- <class name="MyEntity">
- <id name="id" type="my-custom-id-type">
- ...
- </id>
- <class>
- &types;
-</hibernate-mapping>]]></programlisting>
+ <programlisting language="XML" role="XML">
+<xi:include parse="text" href="extras/namespacing.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</programlisting>
+
<para>
Where <literal>types.xml</literal> is a resource in the <literal>your.domain</literal>
package and contains a custom <xref linkend="mapping-types-custom" />.
Modified: projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/example_mappings.xml
===================================================================
--- projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/example_mappings.xml 2009-12-09 00:11:05 UTC (rev 97571)
+++ projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/example_mappings.xml 2009-12-09 00:17:45 UTC (rev 97572)
@@ -46,10 +46,10 @@
<mediaobject>
<imageobject role="html">
- <imagedata fileref="../images/EmployerEmployee.png" format="PNG" align="center" />
+ <imagedata fileref="images/EmployerEmployee.png" format="PNG" align="center" />
</imageobject>
<imageobject role="fo">
- <imagedata fileref="../images/EmployerEmployee.png" format="PNG" align="center" width="17cm" />
+ <imagedata fileref="images/EmployerEmployee.png" format="PNG" align="center" width="17cm" />
</imageobject>
</mediaobject>
@@ -160,10 +160,10 @@
<mediaobject>
<imageobject role="html">
- <imagedata fileref="../images/AuthorWork.png" format="PNG" align="center" />
+ <imagedata fileref="images/AuthorWork.png" format="PNG" align="center" />
</imageobject>
<imageobject role="fo">
- <imagedata fileref="../images/AuthorWork.png" format="PNG" align="center" width="17cm" />
+ <imagedata fileref="images/AuthorWork.png" format="PNG" align="center" width="17cm" />
</imageobject>
</mediaobject>
@@ -284,10 +284,10 @@
<mediaobject>
<imageobject role="html">
- <imagedata fileref="../images/CustomerOrderProduct.png" format="PNG" align="center" />
+ <imagedata fileref="images/CustomerOrderProduct.png" format="PNG" align="center" />
</imageobject>
<imageobject role="fo">
- <imagedata fileref="../images/CustomerOrderProduct.png" format="PNG" align="center" width="17cm" />
+ <imagedata fileref="images/CustomerOrderProduct.png" format="PNG" align="center" width="17cm" />
</imageobject>
</mediaobject>
Added: projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/extras/allproperties.xml_sample
===================================================================
--- projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/extras/allproperties.xml_sample (rev 0)
+++ projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/extras/allproperties.xml_sample 2009-12-09 00:17:45 UTC (rev 97572)
@@ -0,0 +1 @@
+<literal>&allproperties;</literal>
Added: projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/extras/namespacing.xml_sample
===================================================================
--- projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/extras/namespacing.xml_sample (rev 0)
+++ projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/extras/namespacing.xml_sample 2009-12-09 00:17:45 UTC (rev 97572)
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+ "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd" [
+ <!ENTITY types SYSTEM "classpath://your/domain/types.xml">
+]>
+
+<hibernate-mapping package="your.domain">
+ <class name="MyEntity">
+ <id name="id" type="my-custom-id-type">
+ ...
+ </id>
+ <class>
+ &types;
+</hibernate-mapping>
Modified: projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/inheritance_mapping.xml
===================================================================
--- projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/inheritance_mapping.xml 2009-12-09 00:11:05 UTC (rev 97571)
+++ projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/en-US/inheritance_mapping.xml 2009-12-09 00:17:45 UTC (rev 97572)
@@ -346,10 +346,13 @@
Notice that the <literal>Payment</literal> interface
is not mentioned explicitly. Also notice that properties of <literal>Payment</literal> are
mapped in each of the subclasses. If you want to avoid duplication, consider
- using XML entities
- (for example, <literal>[ <!ENTITY allproperties SYSTEM "allproperties.xml"> ]</literal>
- in the <literal>DOCTYPE</literal> declaration and
- <literal>&allproperties;</literal> in the mapping).
+ using XML entities. For example,
+ <literal>[ <!ENTITY allproperties SYSTEM "allproperties.xml"> ]</literal>
+ in the <literal>DOCTYPE</literal> declaration and
+ <programlisting language="XML" role="XML">
+<xi:include parse="text" href="extras/allproperties.xml_sample" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</programlisting>
+ <!-- <literal>&allproperties;</literal> in the mapping). -->
</para>
<para>
Modified: projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/publican.cfg
===================================================================
--- projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/publican.cfg 2009-12-09 00:11:05 UTC (rev 97571)
+++ projects/docs/enterprise/5.0/Hibernate/Hibernate_Core/publican.cfg 2009-12-09 00:17:45 UTC (rev 97572)
@@ -1,7 +1,7 @@
# Config::Simple 4.59
-# Wed Nov 25 15:00:38 2009
+# Wed Dec 9 09:53:51 2009
debug: 1
xml_lang: en-US
-brand: JBoss
+brand: RedHat
More information about the jboss-cvs-commits
mailing list