Tag: cws_src680_rpt23fix02 User: oj Date: 2007-07-27 11:12:47+0000 Modified: dba/reportdesign/java/com/sun/star/report/pentaho/OfficeNamespaces.java dba/reportdesign/java/com/sun/star/report/util/ManifestWriter.java
Log: build problems with manifest file resoved File Changes: Directory: /dba/reportdesign/java/com/sun/star/report/pentaho/ ============================================================== File [changed]: OfficeNamespaces.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/pentaho/OfficeNamespaces.java?r1=1.2&r2=1.2.4.1 Delta lines: +2 -3 ------------------- --- OfficeNamespaces.java 2007-07-09 11:56:04+0000 1.2 +++ OfficeNamespaces.java 2007-07-27 11:12:44+0000 1.2.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: OfficeNamespaces.java,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.4.1 $ * - * last change: $Author: rt $ $Date: 2007/07/09 11:56:04 $ + * last change: $Author: oj $ $Date: 2007/07/27 11:12:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -73,7 +73,6 @@ public static final String OOREPORT_NS = "http://openoffice.org/2005/report";; public static final String CONFIG = "urn:oasis:names:tc:opendocument:xmlns:config:1.0"; public static final String INTERNAL_NS = "http://reporting.pentaho.org/namespaces/engine";; - public static final String MANIFEST_NS = "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"; /** * @deprecated */ Directory: /dba/reportdesign/java/com/sun/star/report/util/ =========================================================== File [changed]: ManifestWriter.java Url: http://dba.openoffice.org/source/browse/dba/reportdesign/java/com/sun/star/report/util/ManifestWriter.java?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +13 -12 --------------------- --- ManifestWriter.java 2007-07-24 17:19:28+0000 1.1.2.1 +++ ManifestWriter.java 2007-07-27 11:12:44+0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: ManifestWriter.java,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: tmorgner $ $Date: 2007/07/24 17:19:28 $ + * last change: $Author: oj $ $Date: 2007/07/27 11:12:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -48,8 +48,6 @@ import org.jfree.xmlns.writer.XmlWriter; import org.jfree.xmlns.common.AttributeList; import org.jfree.report.JFreeReportBoot; -import com.sun.star.report.pentaho.OfficeNamespaces; -import com.sun.star.report.pentaho.output.OfficeDocumentReportTarget; import com.sun.star.report.OutputRepository; /** @@ -59,6 +57,9 @@ */ public class ManifestWriter { + // need this two strings other it breaks the ooo build :-( + public static final String MANIFEST_NS = "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"; + public static final String TAG_DEF_PREFIX = "com.sun.star.report.pentaho.output."; private HashMap entries; public ManifestWriter() @@ -97,7 +98,7 @@ final DefaultTagDescription tagDescription = new DefaultTagDescription(); tagDescription.configure(JFreeReportBoot.getInstance().getGlobalConfig(), - OfficeDocumentReportTarget.TAG_DEF_PREFIX); + TAG_DEF_PREFIX); final OutputStream manifestOutputStream = outputRepository.createOutputStream("META-INF/manifest.xml", "text/xml"); @@ -108,17 +109,17 @@ xmlWriter.writeXmlDeclaration("UTF-8"); final AttributeList rootAttributes = new AttributeList(); - rootAttributes.addNamespaceDeclaration("manifest", OfficeNamespaces.MANIFEST_NS); - xmlWriter.writeTag(OfficeNamespaces.MANIFEST_NS, "manifest", rootAttributes, XmlWriterSupport.OPEN); + rootAttributes.addNamespaceDeclaration("manifest", MANIFEST_NS); + xmlWriter.writeTag(MANIFEST_NS, "manifest", rootAttributes, XmlWriterSupport.OPEN); final Iterator iterator = entries.entrySet().iterator(); while (iterator.hasNext()) { final Map.Entry entry = (Map.Entry) iterator.next(); final AttributeList entryAttrs = new AttributeList(); - entryAttrs.setAttribute(OfficeNamespaces.MANIFEST_NS, "media-type", (String) entry.getValue()); - entryAttrs.setAttribute(OfficeNamespaces.MANIFEST_NS, "full-path", (String) entry.getKey()); - xmlWriter.writeTag(OfficeNamespaces.MANIFEST_NS, "file-entry", entryAttrs, XmlWriterSupport.CLOSE); + entryAttrs.setAttribute(MANIFEST_NS, "media-type", (String) entry.getValue()); + entryAttrs.setAttribute(MANIFEST_NS, "full-path", (String) entry.getKey()); + xmlWriter.writeTag(MANIFEST_NS, "file-entry", entryAttrs, XmlWriterSupport.CLOSE); } xmlWriter.writeCloseTag(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
