IDEMPIERE-1698 change exported package name as hengsin suggested
This commit is contained in:
parent
42a3f4f9f3
commit
78eccc2deb
|
@ -9,7 +9,7 @@ Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
|
||||||
Import-Package: net.sf.jasperreports.engine,
|
Import-Package: net.sf.jasperreports.engine,
|
||||||
net.sf.jasperreports.engine.export,
|
net.sf.jasperreports.engine.export,
|
||||||
net.sf.jasperreports.view,
|
net.sf.jasperreports.view,
|
||||||
org.compiere.report.jasper,
|
org.adempiere.report.jasper,
|
||||||
org.osgi.framework
|
org.osgi.framework
|
||||||
Service-Component: OSGI-INF/jrviewerprovider.xml
|
Service-Component: OSGI-INF/jrviewerprovider.xml
|
||||||
Bundle-ActivationPolicy: lazy
|
Bundle-ActivationPolicy: lazy
|
||||||
|
|
|
@ -2,6 +2,6 @@
|
||||||
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.compiere.report.SwingJRViewerProvider">
|
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.compiere.report.SwingJRViewerProvider">
|
||||||
<implementation class="org.compiere.report.SwingJRViewerProvider"/>
|
<implementation class="org.compiere.report.SwingJRViewerProvider"/>
|
||||||
<service>
|
<service>
|
||||||
<provide interface="org.compiere.report.jasper.JRViewerProvider"/>
|
<provide interface="org.adempiere.report.jasper.JRViewerProvider"/>
|
||||||
</service>
|
</service>
|
||||||
</scr:component>
|
</scr:component>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package org.compiere.report;
|
package org.compiere.report;
|
||||||
|
|
||||||
import org.compiere.report.jasper.JRViewerProvider;
|
import org.adempiere.report.jasper.JRViewerProvider;
|
||||||
|
|
||||||
import net.sf.jasperreports.engine.JRException;
|
import net.sf.jasperreports.engine.JRException;
|
||||||
import net.sf.jasperreports.engine.JasperPrint;
|
import net.sf.jasperreports.engine.JasperPrint;
|
||||||
|
|
|
@ -12,5 +12,5 @@ Import-Package: org.apache.commons.codec;version="1.3.0",
|
||||||
Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
|
Require-Bundle: org.adempiere.base;bundle-version="2.0.0",
|
||||||
org.adempiere.report.jasper.library;bundle-version="2.0.0"
|
org.adempiere.report.jasper.library;bundle-version="2.0.0"
|
||||||
Service-Component: OSGI-INF/processfactory.xml
|
Service-Component: OSGI-INF/processfactory.xml
|
||||||
Export-Package: org.compiere.report.jasper
|
Export-Package: org.adempiere.report.jasper
|
||||||
Bundle-ActivationPolicy: lazy
|
Bundle-ActivationPolicy: lazy
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.compiere.report.jasper.ProcessFactory">
|
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.report.jasper.ProcessFactory">
|
||||||
<implementation class="org.compiere.report.jasper.ProcessFactory"/>
|
<implementation class="org.adempiere.report.jasper.ProcessFactory"/>
|
||||||
<service>
|
<service>
|
||||||
<provide interface="org.adempiere.base.IProcessFactory"/>
|
<provide interface="org.adempiere.base.IProcessFactory"/>
|
||||||
</service>
|
</service>
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package org.compiere.report.jasper;
|
package org.adempiere.report.jasper;
|
||||||
|
|
||||||
import net.sf.jasperreports.engine.JRException;
|
import net.sf.jasperreports.engine.JRException;
|
||||||
import net.sf.jasperreports.engine.JasperPrint;
|
import net.sf.jasperreports.engine.JasperPrint;
|
|
@ -11,7 +11,7 @@
|
||||||
* with this program; if not, write to the Free Software Foundation, Inc., *
|
* with this program; if not, write to the Free Software Foundation, Inc., *
|
||||||
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
|
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. *
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
package org.compiere.report.jasper;
|
package org.adempiere.report.jasper;
|
||||||
|
|
||||||
import org.adempiere.base.IProcessFactory;
|
import org.adempiere.base.IProcessFactory;
|
||||||
import org.adempiere.util.ProcessUtil;
|
import org.adempiere.util.ProcessUtil;
|
|
@ -79,6 +79,7 @@ import net.sf.jasperreports.engine.xml.JRXmlWriter;
|
||||||
import org.adempiere.base.Service;
|
import org.adempiere.base.Service;
|
||||||
import org.adempiere.exceptions.AdempiereException;
|
import org.adempiere.exceptions.AdempiereException;
|
||||||
import org.adempiere.exceptions.DBException;
|
import org.adempiere.exceptions.DBException;
|
||||||
|
import org.adempiere.report.jasper.JRViewerProvider;
|
||||||
import org.adempiere.util.IProcessUI;
|
import org.adempiere.util.IProcessUI;
|
||||||
import org.compiere.model.MAttachment;
|
import org.compiere.model.MAttachment;
|
||||||
import org.compiere.model.MAttachmentEntry;
|
import org.compiere.model.MAttachmentEntry;
|
||||||
|
@ -95,7 +96,6 @@ import org.compiere.process.ClientProcess;
|
||||||
import org.compiere.process.ProcessCall;
|
import org.compiere.process.ProcessCall;
|
||||||
import org.compiere.process.ProcessInfo;
|
import org.compiere.process.ProcessInfo;
|
||||||
import org.compiere.process.ProcessInfoParameter;
|
import org.compiere.process.ProcessInfoParameter;
|
||||||
import org.compiere.report.jasper.JRViewerProvider;
|
|
||||||
import org.compiere.util.CLogger;
|
import org.compiere.util.CLogger;
|
||||||
import org.compiere.util.DB;
|
import org.compiere.util.DB;
|
||||||
import org.compiere.util.Env;
|
import org.compiere.util.Env;
|
||||||
|
|
|
@ -11,13 +11,13 @@ Import-Package: javax.activation;version="1.1.1",
|
||||||
net.sf.jasperreports.engine,
|
net.sf.jasperreports.engine,
|
||||||
net.sf.jasperreports.engine.export,
|
net.sf.jasperreports.engine.export,
|
||||||
net.sf.jasperreports.engine.util,
|
net.sf.jasperreports.engine.util,
|
||||||
|
org.adempiere.report.jasper,
|
||||||
org.apache.commons.codec.binary,
|
org.apache.commons.codec.binary,
|
||||||
org.apache.ecs,
|
org.apache.ecs,
|
||||||
org.apache.ecs.xhtml,
|
org.apache.ecs.xhtml,
|
||||||
org.apache.tools.ant,
|
org.apache.tools.ant,
|
||||||
org.apache.tools.ant.taskdefs,
|
org.apache.tools.ant.taskdefs,
|
||||||
org.compiere.css,
|
org.compiere.css,
|
||||||
org.compiere.report.jasper,
|
|
||||||
org.osgi.framework;version="1.5.0",
|
org.osgi.framework;version="1.5.0",
|
||||||
org.osgi.service.event;version="1.3.0",
|
org.osgi.service.event;version="1.3.0",
|
||||||
org.osgi.util.tracker;version="1.5.0",
|
org.osgi.util.tracker;version="1.5.0",
|
||||||
|
|
|
@ -2,6 +2,6 @@
|
||||||
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.window.ZkJRViewerProvider">
|
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.adempiere.webui.window.ZkJRViewerProvider">
|
||||||
<implementation class="org.adempiere.webui.window.ZkJRViewerProvider"/>
|
<implementation class="org.adempiere.webui.window.ZkJRViewerProvider"/>
|
||||||
<service>
|
<service>
|
||||||
<provide interface="org.compiere.report.jasper.JRViewerProvider"/>
|
<provide interface="org.adempiere.report.jasper.JRViewerProvider"/>
|
||||||
</service>
|
</service>
|
||||||
</scr:component>
|
</scr:component>
|
||||||
|
|
|
@ -3,11 +3,11 @@ package org.adempiere.webui.window;
|
||||||
import net.sf.jasperreports.engine.JRException;
|
import net.sf.jasperreports.engine.JRException;
|
||||||
import net.sf.jasperreports.engine.JasperPrint;
|
import net.sf.jasperreports.engine.JasperPrint;
|
||||||
|
|
||||||
|
import org.adempiere.report.jasper.JRViewerProvider;
|
||||||
import org.adempiere.webui.apps.AEnv;
|
import org.adempiere.webui.apps.AEnv;
|
||||||
import org.adempiere.webui.component.Window;
|
import org.adempiere.webui.component.Window;
|
||||||
import org.adempiere.webui.part.WindowContainer;
|
import org.adempiere.webui.part.WindowContainer;
|
||||||
import org.adempiere.webui.session.SessionManager;
|
import org.adempiere.webui.session.SessionManager;
|
||||||
import org.compiere.report.jasper.JRViewerProvider;
|
|
||||||
|
|
||||||
public class ZkJRViewerProvider implements JRViewerProvider {
|
public class ZkJRViewerProvider implements JRViewerProvider {
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue