From 51fa4c275ba95a7fc9b80480817095351cd7bec7 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Fri, 8 Apr 2011 13:55:01 +0000
Subject: [PATCH] =?UTF-8?q?Erg=C3=A4nzungen=20an=20den=20TraversalAdaptern?=
 =?UTF-8?q?=20f=C3=BCr=20SciPublications?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@841 8810af33-2d31-482b-a856-94f89814c4df
---
 .../contenttypes/ArticleInCollectedVolume.xml  |  2 +-
 .../cms/contenttypes/ArticleInJournal.xml      |  2 +-
 .../cms/contenttypes/InProceedings.xml         | 18 ++++++++++++++++++
 .../arsdigita/cms/contenttypes/Proceedings.xml |  1 +
 .../com/arsdigita/cms/contenttypes/Series.xml  |  2 ++
 .../contenttypes/InProceedingsInitializer.java |  2 +-
 6 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/InProceedings.xml

diff --git a/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/ArticleInCollectedVolume.xml b/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/ArticleInCollectedVolume.xml
index 30ff0e6ae..cf99d7a17 100644
--- a/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/ArticleInCollectedVolume.xml
+++ b/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/ArticleInCollectedVolume.xml
@@ -7,7 +7,7 @@
   <xrd:context name="com.arsdigita.cms.dispatcher.SimpleXMLGenerator" >
 
     <xrd:adapter objectType="com.arsdigita.cms.contenttypes.ArticleInCollectedVolume"
-		 extends="com.arsdigita.cms.contenttypes.PublicationWithPublisher">
+		 extends="com.arsdigita.cms.contenttypes.Publication">
       <xrd:associations rule="include">
 	<xrd:property name="/object/collectedVolume"/>
       </xrd:associations>
diff --git a/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/ArticleInJournal.xml b/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/ArticleInJournal.xml
index 68b2ff94c..a71e02a73 100644
--- a/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/ArticleInJournal.xml
+++ b/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/ArticleInJournal.xml
@@ -7,7 +7,7 @@
   <xrd:context name="com.arsdigita.cms.dispatcher.SimpleXMLGenerator" >
 
     <xrd:adapter objectType="com.arsdigita.cms.contenttypes.ArticleInJournal"
-		 extends="com.arsdigita.cms.contenttypes.PublicationWithPublisher">
+		 extends="com.arsdigita.cms.contenttypes.Publication">
       <xrd:associations rule="include">
 	<xrd:property name="/object/journal"/>
       </xrd:associations>
diff --git a/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/InProceedings.xml b/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/InProceedings.xml
new file mode 100644
index 000000000..724290933
--- /dev/null
+++ b/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/InProceedings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xrd:adapters
+    xmlns:xrd="http://xmlns.redhat.com/schemas/waf/xml-renderer-rules"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://rhea.redhat.com/schemas/waf/xml-renderer-rules xml-renderer-rules.xsd">
+
+  <xrd:context name="com.arsdigita.cms.dispatcher.SimpleXMLGenerator" >
+
+    <xrd:adapter objectType="com.arsdigita.cms.contenttypes.InProceedings"
+		 extends="com.arsdigita.cms.contenttypes.Publication">
+      <xrd:associations rule="include">
+	<xrd:property name="/object/proceedings"/>
+      </xrd:associations>
+    </xrd:adapter>
+
+  </xrd:context>
+
+</xrd:adapters>
\ No newline at end of file
diff --git a/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Proceedings.xml b/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Proceedings.xml
index 3698bbb22..59baaf337 100644
--- a/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Proceedings.xml
+++ b/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Proceedings.xml
@@ -11,6 +11,7 @@
       
       <xrd:associations rule="include">
 	<xrd:property name="/object/papers"/>
+	<xrd:property name="/object/papers/authors"/>
         <xrd:property name="/object/organizer"/>
       </xrd:associations>
 
diff --git a/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Series.xml b/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Series.xml
index 0d1474ffa..159eac11e 100644
--- a/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Series.xml
+++ b/ccm-sci-publications/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/Series.xml
@@ -12,6 +12,8 @@
       <xrd:associations rule="include">
 	<xrd:property name="/object/editors"/>	
 	<xrd:property name="/object/publications"/>
+	<xrd:property name="/object/publications/authors"/>
+	<xrd:property name="/object/publications/publisher"/>
       </xrd:associations>
 
     </xrd:adapter>
diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/InProceedingsInitializer.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/InProceedingsInitializer.java
index 732d96ffa..0151ef9b2 100644
--- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/InProceedingsInitializer.java
+++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/InProceedingsInitializer.java
@@ -42,7 +42,7 @@ public class InProceedingsInitializer extends ContentTypeInitializer {
 
     @Override
     public String getTraversalXML() {
-        return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/PublicationWithPublisher.xml";
+        return "/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/InProceedings.xml";
     }
 
 }