Kaydet (Commit) 6f28efc2 authored tarafından David Ostrovsky's avatar David Ostrovsky Kaydeden (comit) David Ostrovsky

fdo#61726: rename report-builder package to org.libreoffice.report

To prevent future clashes with uno name space rename the
com.sun.star.report package to org.libreoffice.report.

Bump the version to 1.2.4.

Change-Id: Ia06cb7ad8c1528c1d5b5eeb70f1e4b2aa854b70f
Reviewed-on: https://gerrit.libreoffice.org/2578Reviewed-by: 's avatarDavid Ostrovsky <David.Ostrovsky@gmx.de>
Tested-by: 's avatarDavid Ostrovsky <David.Ostrovsky@gmx.de>
üst ab8f432b
......@@ -786,7 +786,7 @@ $(eval $(call gb_Helper_register_jars,OXT, \
mediawiki \
nlpsolver \
passive_java \
sun-report-builder \
report-builder \
))
# External executables
......
......@@ -1007,10 +1007,10 @@ sal_Int32 DBTypeConversion::convertUnicodeStringToLength( const ::rtl::OUString&
}
}
else
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.pentaho.SOReportJobFactory"));
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.libreoffice.report.pentaho.SOReportJobFactory"));
}
else
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.pentaho.SOReportJobFactory"));
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.libreoffice.report.pentaho.SOReportJobFactory"));
return ::rtl::OUString();
}
// -----------------------------------------------------------------------------
......
......@@ -1627,7 +1627,7 @@ void ODocumentDefinition::loadEmbeddedObject( const Reference< XConnection >& i_
{
sDocumentService = GetDocumentServiceFromMediaType( getContentType(), m_aContext, aClassID );
// check if we are not a form and
// the com.sun.star.report.pentaho.SOReportJobFactory is not present.
// the org.libreoffice.report.pentaho.SOReportJobFactory is not present.
if ( !m_bForm && !(sDocumentService == "com.sun.star.text.TextDocument"))
{
// we seem to be a "new style" report, check if report extension is present.
......
......@@ -746,7 +746,7 @@ FeatureState OApplicationController::GetState(sal_uInt16 _nId) const
aReturn.bEnabled = xEnumAccess.is();
if ( aReturn.bEnabled )
{
static OUString s_sReportDesign("com.sun.star.report.pentaho.SOReportJobFactory");
static OUString s_sReportDesign("org.libreoffice.report.pentaho.SOReportJobFactory");
Reference< XEnumeration > xEnumDrivers = xEnumAccess->createContentEnumeration(s_sReportDesign);
aReturn.bEnabled = xEnumDrivers.is() && xEnumDrivers->hasMoreElements();
}
......
......@@ -25,23 +25,23 @@
# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
# instead of those above.
$(eval $(call gb_Configuration_Configuration,sun-report-builder,nodeliver))
$(eval $(call gb_Configuration_Configuration,report-builder,nodeliver))
$(eval $(call gb_Configuration_use_configuration,sun-report-builder,registry))
$(eval $(call gb_Configuration_use_configuration,report-builder,registry))
$(eval $(call gb_Configuration_add_schemas,sun-report-builder,reportbuilder/registry/schema,\
$(eval $(call gb_Configuration_add_schemas,report-builder,reportbuilder/registry/schema,\
org/openoffice/Office/ReportDesign.xcs \
org/openoffice/Office/UI/DbReportWindowState.xcs \
org/openoffice/Office/UI/ReportCommands.xcs \
))
$(eval $(call gb_Configuration_add_datas,sun-report-builder,reportbuilder/registry/data,\
$(eval $(call gb_Configuration_add_datas,report-builder,reportbuilder/registry/data,\
org/openoffice/Office/Paths.xcu \
org/openoffice/Office/ReportDesign.xcu \
org/openoffice/Office/UI/Controller.xcu \
))
$(eval $(call gb_Configuration_add_localized_datas,sun-report-builder,reportbuilder/registry/data,\
$(eval $(call gb_Configuration_add_localized_datas,report-builder,reportbuilder/registry/data,\
org/openoffice/Office/Accelerators.xcu \
org/openoffice/Office/DataAccess.xcu \
org/openoffice/Office/Embedding.xcu \
......
......@@ -32,7 +32,7 @@ $(eval $(call gb_Extension_use_default_license,report-builder))
$(eval $(call gb_Extension_add_files,report-builder,,\
$(call gb_Jar_get_outdir_target,reportbuilderwizard) \
$(call gb_Jar_get_outdir_target,sun-report-builder) \
$(call gb_Jar_get_outdir_target,report-builder) \
$(SRCDIR)/reportbuilder/license/readme_en-US.html \
$(SRCDIR)/reportbuilder/license/readme_en-US.txt \
$(SRCDIR)/reportbuilder/util/components.rdb \
......
......@@ -17,5 +17,5 @@
#
# x-no-translate
org.jfree.report.modules.sun.report.Module=com.sun.star.report.pentaho.StarReportModule
org.jfree.report.modules.sun.report.Module=org.libreoffice.report.pentaho.StarReportModule
......@@ -28,7 +28,7 @@ org.pentaho.reporting.libraries.formula.datesystem.ExcelHack=false
##
# Meta data functions
org.pentaho.reporting.libraries.formula.functions.metadata.Author.class=com.sun.star.report.function.metadata.AuthorFunction
org.pentaho.reporting.libraries.formula.functions.metadata.Author.description=com.sun.star.report.function.metadata.AuthorFunctionDescription
org.pentaho.reporting.libraries.formula.functions.metadata.Title.class=com.sun.star.report.function.metadata.TitleFunction
org.pentaho.reporting.libraries.formula.functions.metadata.Title.description=com.sun.star.report.function.metadata.TitleFunctionDescription
org.pentaho.reporting.libraries.formula.functions.metadata.Author.class=org.libreoffice.report.function.metadata.AuthorFunction
org.pentaho.reporting.libraries.formula.functions.metadata.Author.description=org.libreoffice.report.function.metadata.AuthorFunctionDescription
org.pentaho.reporting.libraries.formula.functions.metadata.Title.class=org.libreoffice.report.function.metadata.TitleFunction
org.pentaho.reporting.libraries.formula.functions.metadata.Title.description=org.libreoffice.report.function.metadata.TitleFunctionDescription
......@@ -17,6 +17,6 @@
#
# x-no-translate
org.pentaho.reporting.libraries.resourceloader.factory.type.com.sun.star.report.pentaho.model.OfficeDocument=com.sun.star.report.pentaho.parser.OfficeDocumentXmlResourceFactory
org.pentaho.reporting.libraries.resourceloader.factory.type.com.sun.star.report.pentaho.model.OfficeStylesCollection=com.sun.star.report.pentaho.parser.OfficeStylesXmlResourceFactory
org.pentaho.reporting.libraries.resourceloader.factory.type.com.sun.star.report.pentaho.styles.StyleMapper=com.sun.star.report.pentaho.styles.StyleMapperXmlResourceFactory
org.pentaho.reporting.libraries.resourceloader.factory.type.org.libreoffice.report.pentaho.model.OfficeDocument=org.libreoffice.report.pentaho.parser.OfficeDocumentXmlResourceFactory
org.pentaho.reporting.libraries.resourceloader.factory.type.org.libreoffice.report.pentaho.model.OfficeStylesCollection=org.libreoffice.report.pentaho.parser.OfficeStylesXmlResourceFactory
org.pentaho.reporting.libraries.resourceloader.factory.type.org.libreoffice.report.pentaho.styles.StyleMapper=org.libreoffice.report.pentaho.styles.StyleMapperXmlResourceFactory
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
/**
* This feeds data into the reporting engine, in case the data has been provided
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
/**
* This feeds data into the reporting engine, in case the data has been provided
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
/**
* A general exception to indicate that there was an error while accessing the
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
import java.util.Map;
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
import com.sun.star.awt.Size;
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
import java.io.IOException;
import java.io.InputStream;
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
/**
* Creation-Date: 05.02.2006, 17:36:33
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
/**
* Based on
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
public interface JobProperties
{
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
public class OfficeToken
{
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
import java.io.IOException;
import java.io.OutputStream;
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
public interface ParameterMap
{
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
/**
* A report add-in defines a set of expressions, which can
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
public interface ReportEngineMetaData
{
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
/**
* Making this enumeration typesafe and fully defined here would
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
public class ReportExecutionException extends Exception
{
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
/**
* Expressions are simple computation components.
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
import java.util.Locale;
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
/**
* Functions are statefull computation components.
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
import java.io.IOException;
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
/**
* The report job is created by the report job factory and holds all properties
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
import com.sun.star.beans.NamedValue;
import com.sun.star.lang.IllegalArgumentException;
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
import com.sun.star.beans.UnknownPropertyException;
import com.sun.star.beans.XPropertySet;
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
import com.sun.star.beans.PropertyVetoException;
import com.sun.star.beans.UnknownPropertyException;
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
import com.sun.star.awt.Size;
import com.sun.star.beans.PropertyValue;
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report;
package org.libreoffice.report;
import com.sun.star.beans.PropertyVetoException;
import com.sun.star.beans.UnknownPropertyException;
......
......@@ -15,9 +15,9 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report.function.metadata;
package org.libreoffice.report.function.metadata;
import com.sun.star.report.ReportEngineParameterNames;
import org.libreoffice.report.ReportEngineParameterNames;
import org.pentaho.reporting.libraries.formula.EvaluationException;
import org.pentaho.reporting.libraries.formula.FormulaContext;
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report.function.metadata;
package org.libreoffice.report.function.metadata;
import org.pentaho.reporting.libraries.formula.function.AbstractFunctionDescription;
import org.pentaho.reporting.libraries.formula.function.FunctionCategory;
......@@ -27,7 +27,7 @@ public class AuthorFunctionDescription extends AbstractFunctionDescription
public AuthorFunctionDescription()
{
super("AUTHOR", "com.sun.star.report.function.metadata.Author-Function");
super("AUTHOR", "org.libreoffice.report.function.metadata.Author-Function");
}
public FunctionCategory getCategory()
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report.function.metadata;
package org.libreoffice.report.function.metadata;
import org.pentaho.reporting.libraries.formula.function.AbstractFunctionCategory;
import org.pentaho.reporting.libraries.formula.function.FunctionCategory;
......@@ -27,7 +27,7 @@ public class MetaDataFunctionCategory extends AbstractFunctionCategory
private MetaDataFunctionCategory()
{
super("com.sun.star.report.function.metadata.category");
super("org.libreoffice.report.function.metadata.category");
}
}
......@@ -15,9 +15,9 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report.function.metadata;
package org.libreoffice.report.function.metadata;
import com.sun.star.report.ReportEngineParameterNames;
import org.libreoffice.report.ReportEngineParameterNames;
import org.pentaho.reporting.libraries.formula.EvaluationException;
import org.pentaho.reporting.libraries.formula.FormulaContext;
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report.function.metadata;
package org.libreoffice.report.function.metadata;
import org.pentaho.reporting.libraries.formula.function.AbstractFunctionDescription;
import org.pentaho.reporting.libraries.formula.function.FunctionCategory;
......@@ -27,7 +27,7 @@ public class TitleFunctionDescription extends AbstractFunctionDescription
public TitleFunctionDescription()
{
super("TITLE", "com.sun.star.report.function.metadata.Title-Function");
super("TITLE", "org.libreoffice.report.function.metadata.Title-Function");
}
public FunctionCategory getCategory()
......
......@@ -15,9 +15,9 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report.pentaho;
package org.libreoffice.report.pentaho;
import com.sun.star.report.OutputRepository;
import org.libreoffice.report.OutputRepository;
import java.io.IOException;
......
RegistrationClassName: com.sun.star.report.pentaho.SOReportJobFactory
RegistrationClassName: org.libreoffice.report.pentaho.SOReportJobFactory
Class-Path: reportbuilderwizard.jar
flute-1.1.6.jar libserializer-1.1.6.jar libbase-1.1.6.jar
libfonts-1.1.6.jar libformula-1.1.7.jar liblayout-0.2.10.jar
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report.pentaho;
package org.libreoffice.report.pentaho;
/**
* Creation-Date: Feb 22, 2007, 1:53:29 PM
......
......@@ -15,7 +15,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report.pentaho;
package org.libreoffice.report.pentaho;
import org.pentaho.reporting.libraries.base.config.Configuration;
import org.pentaho.reporting.libraries.formula.ContextEvaluationException;
......
......@@ -15,12 +15,12 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report.pentaho;
package org.libreoffice.report.pentaho;
import com.sun.star.report.ReportAddIn;
import com.sun.star.report.ReportExpression;
import com.sun.star.report.ReportExpressionMetaData;
import com.sun.star.report.pentaho.expressions.SumExpression;
import org.libreoffice.report.ReportAddIn;
import org.libreoffice.report.ReportExpression;
import org.libreoffice.report.ReportExpressionMetaData;
import org.libreoffice.report.pentaho.expressions.SumExpression;
/**
* This class is a dummy implementation. Ignore it for now, we may extend this
......
......@@ -15,13 +15,13 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report.pentaho;
package org.libreoffice.report.pentaho;
import com.sun.star.report.JobDefinitionException;
import com.sun.star.report.ReportEngineMetaData;
import com.sun.star.report.ReportJob;
import com.sun.star.report.ReportJobDefinition;
import com.sun.star.report.util.DefaultReportJobDefinition;
import org.libreoffice.report.JobDefinitionException;
import org.libreoffice.report.ReportEngineMetaData;
import org.libreoffice.report.ReportJob;
import org.libreoffice.report.ReportJobDefinition;
import org.libreoffice.report.util.DefaultReportJobDefinition;
import org.jfree.report.JFreeReportBoot;
public class PentahoReportEngine
......@@ -50,7 +50,7 @@ public class PentahoReportEngine
*
* @return the report job definition for the job description.
*
* @throws com.sun.star.report.JobDefinitionException
* @throws org.libreoffice.report.JobDefinitionException
*
*/
public ReportJob createJob(final ReportJobDefinition definition)
......
......@@ -15,15 +15,15 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
package com.sun.star.report.pentaho;
import com.sun.star.report.DataSourceFactory;
import com.sun.star.report.ImageService;
import com.sun.star.report.InputRepository;
import com.sun.star.report.OutputRepository;
import com.sun.star.report.ReportEngineMetaData;
import com.sun.star.report.ReportEngineParameterNames;
import com.sun.star.report.ReportJobFactory;
package org.libreoffice.report.pentaho;
import org.libreoffice.report.DataSourceFactory;
import org.libreoffice.report.ImageService;
import org.libreoffice.report.InputRepository;
import org.libreoffice.report.OutputRepository;
import org.libreoffice.report.ReportEngineMetaData;
import org.libreoffice.report.ReportEngineParameterNames;
import org.libreoffice.report.ReportJobFactory;