From 5424b1ea646bf099c059cc5170c40b468038d9cd Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Fri, 24 Sep 2010 09:51:21 +0000
Subject: [PATCH] Beispiele und Dokumentation fuer importer aktualisiert.

git-svn-id: https://svn.libreccm.org/ccm/trunk@541 8810af33-2d31-482b-a856-94f89814c4df
---
 ccm-ldn-importer/doc/items/mpa-test.xml               |  4 ++--
 ccm-ldn-importer/doc/items/one/eeek.xml               |  6 +++---
 ccm-ldn-importer/doc/items/sfsdfsdfs.xml              |  6 +++---
 .../src/com/arsdigita/london/importer/package.html    | 11 +++++++++++
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ccm-ldn-importer/doc/items/mpa-test.xml b/ccm-ldn-importer/doc/items/mpa-test.xml
index 56f401add..9e650841d 100755
--- a/ccm-ldn-importer/doc/items/mpa-test.xml
+++ b/ccm-ldn-importer/doc/items/mpa-test.xml
@@ -5,8 +5,8 @@
    <launchDate>Wed Nov 05 00:00:00 GMT 2003</launchDate>
    <title>mpa-test</title>
    <summary>asdf</summary>
-   <dublinCore oid="[com.arsdigita.london.cms.dublin.DublinCoreItem:{id=2103}]">
+   <!--<dublinCore oid="[com.arsdigita.london.cms.dublin.DublinCoreItem:{id=2103}]">
       <name>mpa-test-dublin-metadata</name>
       <dcLanguage>en</dcLanguage>
-   </dublinCore>
+   </dublinCore>-->
 </cms:item>
\ No newline at end of file
diff --git a/ccm-ldn-importer/doc/items/one/eeek.xml b/ccm-ldn-importer/doc/items/one/eeek.xml
index 52ce03bb1..ac40801a2 100755
--- a/ccm-ldn-importer/doc/items/one/eeek.xml
+++ b/ccm-ldn-importer/doc/items/one/eeek.xml
@@ -11,7 +11,7 @@
    <textAsset oid="[com.arsdigita.cms.TextAsset:{id=4429}]">
       <content>Edit text here</content>
    </textAsset>
-   <imageCaptions oid="[com.arsdigita.cms.ArticleImageAssociation:{id=4439}]">
+   <imageCaptions oid="[com.arsdigita.cms.contenttypes.GenericArticleImageAssociation:{id=4439}]">
       <caption>sdfdsfs</caption>
       <imageAsset oid="[com.arsdigita.cms.ReusableImageAsset:{id=1734}]">
          <name>5.jpg</name>
@@ -26,8 +26,8 @@
       </imageAsset>
    </imageCaptions>
    <lead>sadfsd</lead>
-   <dublinCore oid="[com.arsdigita.london.cms.dublin.DublinCoreItem:{id=4413}]">
+   <!--<dublinCore oid="[com.arsdigita.london.cms.dublin.DublinCoreItem:{id=4413}]">
       <name>eeek-dublin-metadata</name>
       <dcLanguage>en</dcLanguage>
-   </dublinCore>
+   </dublinCore>-->
 </cms:item>
diff --git a/ccm-ldn-importer/doc/items/sfsdfsdfs.xml b/ccm-ldn-importer/doc/items/sfsdfsdfs.xml
index 1c4bd33c0..221ef0a9b 100755
--- a/ccm-ldn-importer/doc/items/sfsdfsdfs.xml
+++ b/ccm-ldn-importer/doc/items/sfsdfsdfs.xml
@@ -386,7 +386,7 @@
  Cannot find danpb on irc&#xD;
  Signoff: lutter (Do</content>
    </textAsset>
-   <imageCaptions oid="[com.arsdigita.cms.ArticleImageAssociation:{id=1742}]">
+   <imageCaptions oid="[com.arsdigita.cms.contenttypes.GenericArticleImageAssociation:{id=1742}]">
       <caption>fsfs</caption>
       <imageAsset oid="[com.arsdigita.cms.ReusableImageAsset:{id=1734}]">
          <name>5.jpg</name>
@@ -400,8 +400,8 @@
          <content file="content-1734-5.jpg"/>
       </imageAsset>
    </imageCaptions>
-   <dublinCore oid="[com.arsdigita.london.cms.dublin.DublinCoreItem:{id=1710}]">
+<!--   <dublinCore oid="[com.arsdigita.london.cms.dublin.DublinCoreItem:{id=1710}]">
       <name>sfsdfsdfs-dublin-metadata</name>
       <dcLanguage>en</dcLanguage>
-   </dublinCore>
+   </dublinCore>-->
 </cms:item>
diff --git a/ccm-ldn-importer/src/com/arsdigita/london/importer/package.html b/ccm-ldn-importer/src/com/arsdigita/london/importer/package.html
index 931651f09..916a42f4d 100755
--- a/ccm-ldn-importer/src/com/arsdigita/london/importer/package.html
+++ b/ccm-ldn-importer/src/com/arsdigita/london/importer/package.html
@@ -185,6 +185,17 @@
 
 <p> Importer can be invoked via standalone command-line tool like this:
 
+<h4>With tools-ng and ecdc</h4>
+<pre>
+  ant -Dccm.classname=com.arsdigita.london.importer.cms.ItemImportTool \
+      -Dccm.parameters="path/to/index/file /path/to/items/dir /path/to/assets/dir content" \
+      ccm-run
+</pre>
+
+<code>content</code> is the content section where the imported should
+be placed.
+
+<h4>With tools-legacy</h4>
 <pre>
   ccm-run com.arsdigita.london.importer.cms.ItemImportTool \
       master-import.xml /dir/with/files/to/include /dir/containing/lobs