Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 1936 invoked from network); 17 Jan 2007 13:55:22 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Jan 2007 13:55:21 -0000 Received: (qmail 7416 invoked by uid 500); 17 Jan 2007 13:55:28 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 7385 invoked by uid 500); 17 Jan 2007 13:55:28 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 7376 invoked by uid 99); 17 Jan 2007 13:55:28 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jan 2007 05:55:28 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Jan 2007 05:55:21 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 74C4E1A981A; Wed, 17 Jan 2007 05:54:17 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r497019 - /jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java Date: Wed, 17 Jan 2007 13:54:17 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070117135417.74C4E1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Wed Jan 17 05:54:16 2007 New Revision: 497019 URL: http://svn.apache.org/viewvc?view=rev&rev=497019 Log: work in progress - retrieve default nt from definition if not present with nodeInfo Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java Modified: jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java?view=diff&rev=497019&r1=497018&r2=497019 ============================================================================== --- jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java (original) +++ jackrabbit/trunk/contrib/spi/jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java Wed Jan 17 05:54:16 2007 @@ -445,14 +445,19 @@ log.debug("Skipping protected nodeState (" + nodeInfo.getName() + ")"); return null; } else { - Operation an = AddNode.create(parent, nodeInfo.getName(), nodeInfo.getNodeTypeName(), nodeInfo.getUUID()); + QName ntName = nodeInfo.getNodeTypeName(); + if (ntName == null) { + // use default node type + ntName = def.getDefaultPrimaryType(); + } + Operation an = AddNode.create(parent, nodeInfo.getName(), ntName, nodeInfo.getUUID()); stateMgr.execute(an); // retrieve id of state that has been created during execution of AddNode NodeState childState; try { List cne = parent.getChildNodeEntries(nodeInfo.getName()); if (def.allowsSameNameSiblings()) { - // TODO: find proper solution. problem with same-name-siblings + // TODO TOBEFIXED find proper solution. problem with same-name-siblings childState = ((ChildNodeEntry)cne.get(cne.size()-1)).getNodeState(); } else { childState = ((ChildNodeEntry)cne.get(0)).getNodeState();