X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Ftabular%2FJcrTabularWriter.java;h=29933cd75e236a98053fd959e5e0e6b6790cf5b5;hb=d169026cb1939009fd90ac46a11f480cb3d803c0;hp=7249fd509fa4bf65593e5aa6c472c18053b659a3;hpb=61780b581925666edd4bd7743a00dca7170f1d35;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/tabular/JcrTabularWriter.java b/org.argeo.cms/src/org/argeo/cms/tabular/JcrTabularWriter.java index 7249fd509..29933cd75 100644 --- a/org.argeo.cms/src/org/argeo/cms/tabular/JcrTabularWriter.java +++ b/org.argeo.cms/src/org/argeo/cms/tabular/JcrTabularWriter.java @@ -1,18 +1,3 @@ -/* - * Copyright (C) 2007-2012 Argeo GmbH - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ package org.argeo.cms.tabular; import java.io.ByteArrayInputStream; @@ -27,12 +12,12 @@ import javax.jcr.PropertyType; import javax.jcr.RepositoryException; import org.apache.commons.io.IOUtils; -import org.argeo.jcr.ArgeoJcrException; +import org.argeo.api.tabular.TabularColumn; +import org.argeo.api.tabular.TabularWriter; +import org.argeo.cms.ArgeoTypes; +import org.argeo.jcr.JcrException; import org.argeo.jcr.JcrUtils; -import org.argeo.node.ArgeoTypes; import org.argeo.util.CsvWriter; -import org.argeo.util.tabular.TabularColumn; -import org.argeo.util.tabular.TabularWriter; /** Write / reference tabular content in a JCR repository. */ public class JcrTabularWriter implements TabularWriter { @@ -70,7 +55,7 @@ public class JcrTabularWriter implements TabularWriter { csvWriter = new CsvWriter(out); } } catch (RepositoryException e) { - throw new ArgeoJcrException("Cannot create table node " + tableNode, e); + throw new JcrException("Cannot create table node " + tableNode, e); } } @@ -88,7 +73,7 @@ public class JcrTabularWriter implements TabularWriter { .createBinary(in); contentNode.setProperty(Property.JCR_DATA, binary); } catch (RepositoryException e) { - throw new ArgeoJcrException("Cannot store data in " + contentNode, e); + throw new JcrException("Cannot store data in " + contentNode, e); } finally { IOUtils.closeQuietly(in); JcrUtils.closeQuietly(binary);