IDEMPIERE-5448 2023 June Platform Update (#1531)
* IDEMPIERE-5448 Can't launch unit test with Eclipse 2022-09 - upgrade to tycho 3.1.0-SNAPSHOT - set maven compiler source and target level to 11 - upgrade to junit 5.9.1 * IDEMPIERE-5448 Can't launch unit test with Eclipse 2022-09 - Change tycho version to 3.0.3 * IDEMPIERE-5448 2023 June Platform Update * IDEMPIERE-5448 2023 June Platform Update - Explicitly set target, source and release level to JavaSE 11 * IDEMPIERE-5448 2023 June Platform Update - Use 3.0.5-SNAPSHOT to fix stack overflow error. * IDEMPIERE-5448 2023 June Platform Update - Change source, target and release level to JDK 17 - Update target platform name to idempiere-230620 * IDEMPIERE-5448 2023 June Platform Update - Fix LogFactory ClassNotFound exception with Eclipse 2023-06
This commit is contained in:
parent
4f6b718ab1
commit
9c7713fa8d
|
@ -15,12 +15,14 @@
|
|||
<setAttribute key="deselected_workspace_bundles"/>
|
||||
<booleanAttribute key="includeOptional" value="false"/>
|
||||
<stringAttribute key="location" value="${workspace_loc}/runtime-model.generator"/>
|
||||
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
|
||||
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.pde.ui.launcher.PDESourceLookupDirector"/>
|
||||
<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;classpathContainer path=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathContainer"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;default/&gt;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
|
||||
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
|
||||
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
|
||||
</listAttribute>
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
|
||||
|
@ -33,6 +35,7 @@
|
|||
<setEntry value="bcpkix@default:default"/>
|
||||
<setEntry value="bcprov@default:default"/>
|
||||
<setEntry value="bcutil@default:default"/>
|
||||
<setEntry value="com.diffplug.osgi.extension.sun.misc@default:false"/>
|
||||
<setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/>
|
||||
<setEntry value="com.github.librepdf.openpdf@default:default"/>
|
||||
<setEntry value="com.google.gson@default:default"/>
|
||||
|
@ -86,9 +89,32 @@
|
|||
<setEntry value="org.fusesource.hawtbuf.hawtbuf@default:default"/>
|
||||
<setEntry value="org.jsr-305@default:default"/>
|
||||
<setEntry value="org.krysalis.barcode4j@default:default"/>
|
||||
<setEntry value="org.osgi.annotation.bundle@default:default"/>
|
||||
<setEntry value="org.osgi.annotation.versioning@default:default"/>
|
||||
<setEntry value="org.osgi.service.cm@default:default"/>
|
||||
<setEntry value="org.osgi.service.component.annotations@default:default"/>
|
||||
<setEntry value="org.osgi.service.component@default:default"/>
|
||||
<setEntry value="org.osgi.service.coordinator@default:default"/>
|
||||
<setEntry value="org.osgi.service.device@default:default"/>
|
||||
<setEntry value="org.osgi.service.event@default:default"/>
|
||||
<setEntry value="org.osgi.service.log.stream@default:default"/>
|
||||
<setEntry value="org.osgi.service.metatype.annotations@default:default"/>
|
||||
<setEntry value="org.osgi.service.metatype@default:default"/>
|
||||
<setEntry value="org.osgi.service.prefs@default:default"/>
|
||||
<setEntry value="org.osgi.service.provisioning@default:default"/>
|
||||
<setEntry value="org.osgi.service.upnp@default:default"/>
|
||||
<setEntry value="org.osgi.service.useradmin@default:default"/>
|
||||
<setEntry value="org.osgi.service.wireadmin@default:default"/>
|
||||
<setEntry value="org.osgi.util.function@default:default"/>
|
||||
<setEntry value="org.osgi.util.measurement@default:default"/>
|
||||
<setEntry value="org.osgi.util.position@default:default"/>
|
||||
<setEntry value="org.osgi.util.promise@default:default"/>
|
||||
<setEntry value="org.osgi.util.pushstream@default:default"/>
|
||||
<setEntry value="org.osgi.util.tracker@default:default"/>
|
||||
<setEntry value="org.osgi.util.xml@default:default"/>
|
||||
<setEntry value="org.passay@default:default"/>
|
||||
<setEntry value="slf4j.api*1.7.30@default:default"/>
|
||||
<setEntry value="slf4j.jcl@default:false"/>
|
||||
<setEntry value="slf4j.jdk14@default:default"/>
|
||||
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
|
||||
<setEntry value="wrapped.com.google.zxing.javase@default:default"/>
|
||||
<setEntry value="wrapped.dev.samstevens.totp.totp@default:default"/>
|
||||
|
|
|
@ -15,12 +15,14 @@
|
|||
<setAttribute key="deselected_workspace_bundles"/>
|
||||
<booleanAttribute key="includeOptional" value="false"/>
|
||||
<stringAttribute key="location" value="${workspace_loc}/runtime-packinfolder.app"/>
|
||||
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
|
||||
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.pde.ui.launcher.PDESourceLookupDirector"/>
|
||||
<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;classpathContainer path=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathContainer"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;default/&gt;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
|
||||
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
|
||||
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
|
||||
</listAttribute>
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog ${workspace_loc}/2packs"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
|
||||
|
@ -105,9 +107,32 @@
|
|||
<setEntry value="org.objectweb.asm.tree@default:default"/>
|
||||
<setEntry value="org.objectweb.asm.util@default:default"/>
|
||||
<setEntry value="org.objectweb.asm@default:default"/>
|
||||
<setEntry value="org.osgi.annotation.bundle@default:default"/>
|
||||
<setEntry value="org.osgi.annotation.versioning@default:default"/>
|
||||
<setEntry value="org.osgi.service.cm@default:default"/>
|
||||
<setEntry value="org.osgi.service.component.annotations@default:default"/>
|
||||
<setEntry value="org.osgi.service.component@default:default"/>
|
||||
<setEntry value="org.osgi.service.coordinator@default:default"/>
|
||||
<setEntry value="org.osgi.service.device@default:default"/>
|
||||
<setEntry value="org.osgi.service.event@default:default"/>
|
||||
<setEntry value="org.osgi.service.log.stream@default:default"/>
|
||||
<setEntry value="org.osgi.service.metatype.annotations@default:default"/>
|
||||
<setEntry value="org.osgi.service.metatype@default:default"/>
|
||||
<setEntry value="org.osgi.service.prefs@default:default"/>
|
||||
<setEntry value="org.osgi.service.provisioning@default:default"/>
|
||||
<setEntry value="org.osgi.service.upnp@default:default"/>
|
||||
<setEntry value="org.osgi.service.useradmin@default:default"/>
|
||||
<setEntry value="org.osgi.service.wireadmin@default:default"/>
|
||||
<setEntry value="org.osgi.util.function@default:default"/>
|
||||
<setEntry value="org.osgi.util.measurement@default:default"/>
|
||||
<setEntry value="org.osgi.util.position@default:default"/>
|
||||
<setEntry value="org.osgi.util.promise@default:default"/>
|
||||
<setEntry value="org.osgi.util.pushstream@default:default"/>
|
||||
<setEntry value="org.osgi.util.tracker@default:default"/>
|
||||
<setEntry value="org.osgi.util.xml@default:default"/>
|
||||
<setEntry value="org.passay@default:default"/>
|
||||
<setEntry value="slf4j.api*1.7.30@default:default"/>
|
||||
<setEntry value="slf4j.jcl@default:false"/>
|
||||
<setEntry value="slf4j.jdk14@default:default"/>
|
||||
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
|
||||
<setEntry value="wrapped.com.google.zxing.javase@default:default"/>
|
||||
<setEntry value="wrapped.dev.samstevens.totp.totp@default:default"/>
|
||||
|
|
|
@ -15,12 +15,14 @@
|
|||
<setAttribute key="deselected_workspace_bundles"/>
|
||||
<booleanAttribute key="includeOptional" value="false"/>
|
||||
<stringAttribute key="location" value="${workspace_loc}/runtime-sign.database.build"/>
|
||||
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
|
||||
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.pde.ui.launcher.PDESourceLookupDirector"/>
|
||||
<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;classpathContainer path=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathContainer"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;default/&gt;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
|
||||
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
|
||||
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
|
||||
</listAttribute>
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
|
||||
|
@ -30,7 +32,7 @@
|
|||
<stringAttribute key="product" value="org.adempiere.server.server_product"/>
|
||||
<stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
|
||||
<setAttribute key="selected_target_bundles">
|
||||
<setEntry value="bcpg*1.69.0@default:default"/>
|
||||
<setEntry value="bcpg@default:default"/>
|
||||
<setEntry value="bcpkix@default:default"/>
|
||||
<setEntry value="bcprov@default:default"/>
|
||||
<setEntry value="bcutil@default:default"/>
|
||||
|
@ -105,9 +107,32 @@
|
|||
<setEntry value="org.objectweb.asm.tree@default:default"/>
|
||||
<setEntry value="org.objectweb.asm.util@default:default"/>
|
||||
<setEntry value="org.objectweb.asm@default:default"/>
|
||||
<setEntry value="org.osgi.annotation.bundle@default:default"/>
|
||||
<setEntry value="org.osgi.annotation.versioning@default:default"/>
|
||||
<setEntry value="org.osgi.service.cm@default:default"/>
|
||||
<setEntry value="org.osgi.service.component.annotations@default:default"/>
|
||||
<setEntry value="org.osgi.service.component@default:default"/>
|
||||
<setEntry value="org.osgi.service.coordinator@default:default"/>
|
||||
<setEntry value="org.osgi.service.device@default:default"/>
|
||||
<setEntry value="org.osgi.service.event@default:default"/>
|
||||
<setEntry value="org.osgi.service.log.stream@default:default"/>
|
||||
<setEntry value="org.osgi.service.metatype.annotations@default:default"/>
|
||||
<setEntry value="org.osgi.service.metatype@default:default"/>
|
||||
<setEntry value="org.osgi.service.prefs@default:default"/>
|
||||
<setEntry value="org.osgi.service.provisioning@default:default"/>
|
||||
<setEntry value="org.osgi.service.upnp@default:default"/>
|
||||
<setEntry value="org.osgi.service.useradmin@default:default"/>
|
||||
<setEntry value="org.osgi.service.wireadmin@default:default"/>
|
||||
<setEntry value="org.osgi.util.function@default:default"/>
|
||||
<setEntry value="org.osgi.util.measurement@default:default"/>
|
||||
<setEntry value="org.osgi.util.position@default:default"/>
|
||||
<setEntry value="org.osgi.util.promise@default:default"/>
|
||||
<setEntry value="org.osgi.util.pushstream@default:default"/>
|
||||
<setEntry value="org.osgi.util.tracker@default:default"/>
|
||||
<setEntry value="org.osgi.util.xml@default:default"/>
|
||||
<setEntry value="org.passay@default:default"/>
|
||||
<setEntry value="slf4j.api*1.7.30@default:default"/>
|
||||
<setEntry value="slf4j.jcl@default:false"/>
|
||||
<setEntry value="slf4j.jdk14@default:false"/>
|
||||
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
|
||||
<setEntry value="wrapped.com.google.zxing.javase@default:default"/>
|
||||
<setEntry value="wrapped.dev.samstevens.totp.totp@default:default"/>
|
||||
|
|
|
@ -15,12 +15,14 @@
|
|||
<setAttribute key="deselected_workspace_bundles"/>
|
||||
<booleanAttribute key="includeOptional" value="false"/>
|
||||
<stringAttribute key="location" value="${workspace_loc}/runtime-synchronize-terminology.app"/>
|
||||
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
|
||||
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.pde.ui.launcher.PDESourceLookupDirector"/>
|
||||
<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;classpathContainer path=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathContainer"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;default/&gt;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
|
||||
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
|
||||
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
|
||||
</listAttribute>
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog sync"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
|
||||
|
@ -30,7 +32,7 @@
|
|||
<stringAttribute key="product" value="org.adempiere.server.server_product"/>
|
||||
<stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
|
||||
<setAttribute key="selected_target_bundles">
|
||||
<setEntry value="bcpg*1.69.0@default:default"/>
|
||||
<setEntry value="bcpg@default:default"/>
|
||||
<setEntry value="bcpkix@default:default"/>
|
||||
<setEntry value="bcprov@default:default"/>
|
||||
<setEntry value="bcutil@default:default"/>
|
||||
|
@ -106,9 +108,32 @@
|
|||
<setEntry value="org.objectweb.asm.tree@default:default"/>
|
||||
<setEntry value="org.objectweb.asm.util@default:default"/>
|
||||
<setEntry value="org.objectweb.asm@default:default"/>
|
||||
<setEntry value="org.osgi.annotation.bundle@default:default"/>
|
||||
<setEntry value="org.osgi.annotation.versioning@default:default"/>
|
||||
<setEntry value="org.osgi.service.cm@default:default"/>
|
||||
<setEntry value="org.osgi.service.component.annotations@default:default"/>
|
||||
<setEntry value="org.osgi.service.component@default:default"/>
|
||||
<setEntry value="org.osgi.service.coordinator@default:default"/>
|
||||
<setEntry value="org.osgi.service.device@default:default"/>
|
||||
<setEntry value="org.osgi.service.event@default:default"/>
|
||||
<setEntry value="org.osgi.service.log.stream@default:default"/>
|
||||
<setEntry value="org.osgi.service.metatype.annotations@default:default"/>
|
||||
<setEntry value="org.osgi.service.metatype@default:default"/>
|
||||
<setEntry value="org.osgi.service.prefs@default:default"/>
|
||||
<setEntry value="org.osgi.service.provisioning@default:default"/>
|
||||
<setEntry value="org.osgi.service.upnp@default:default"/>
|
||||
<setEntry value="org.osgi.service.useradmin@default:default"/>
|
||||
<setEntry value="org.osgi.service.wireadmin@default:default"/>
|
||||
<setEntry value="org.osgi.util.function@default:default"/>
|
||||
<setEntry value="org.osgi.util.measurement@default:default"/>
|
||||
<setEntry value="org.osgi.util.position@default:default"/>
|
||||
<setEntry value="org.osgi.util.promise@default:default"/>
|
||||
<setEntry value="org.osgi.util.pushstream@default:default"/>
|
||||
<setEntry value="org.osgi.util.tracker@default:default"/>
|
||||
<setEntry value="org.osgi.util.xml@default:default"/>
|
||||
<setEntry value="org.passay@default:default"/>
|
||||
<setEntry value="slf4j.api*1.7.30@default:default"/>
|
||||
<setEntry value="slf4j.jcl@default:false"/>
|
||||
<setEntry value="slf4j.jdk14@default:default"/>
|
||||
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
|
||||
<setEntry value="wrapped.com.google.zxing.javase@default:default"/>
|
||||
<setEntry value="wrapped.dev.samstevens.totp.totp@default:default"/>
|
||||
|
@ -124,7 +149,6 @@
|
|||
<setEntry value="xstream@default:default"/>
|
||||
</setAttribute>
|
||||
<setAttribute key="selected_workspace_bundles">
|
||||
<setEntry value="org.adempiere.base.callout@default:default"/>
|
||||
<setEntry value="org.adempiere.base.process@default:default"/>
|
||||
<setEntry value="org.adempiere.base@default:default"/>
|
||||
<setEntry value="org.adempiere.install@default:default"/>
|
||||
|
|
|
@ -15,12 +15,14 @@
|
|||
<setAttribute key="deselected_workspace_bundles"/>
|
||||
<booleanAttribute key="includeOptional" value="false"/>
|
||||
<stringAttribute key="location" value="${workspace_loc}/runtime-translation.app"/>
|
||||
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
|
||||
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.pde.ui.launcher.PDESourceLookupDirector"/>
|
||||
<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;classpathContainer path=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathContainer"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;default/&gt;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
|
||||
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
|
||||
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
|
||||
</listAttribute>
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog import ../globalqss-idempiere-lco/es_CO es_CO"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
|
||||
|
@ -30,7 +32,7 @@
|
|||
<stringAttribute key="product" value="org.adempiere.server.server_product"/>
|
||||
<stringAttribute key="productFile" value="/org.adempiere.server-feature/server.product"/>
|
||||
<setAttribute key="selected_target_bundles">
|
||||
<setEntry value="bcpg*1.69.0@default:default"/>
|
||||
<setEntry value="bcpg@default:default"/>
|
||||
<setEntry value="bcpkix@default:default"/>
|
||||
<setEntry value="bcprov@default:default"/>
|
||||
<setEntry value="bcutil@default:default"/>
|
||||
|
@ -105,9 +107,32 @@
|
|||
<setEntry value="org.objectweb.asm.tree@default:default"/>
|
||||
<setEntry value="org.objectweb.asm.util@default:default"/>
|
||||
<setEntry value="org.objectweb.asm@default:default"/>
|
||||
<setEntry value="org.osgi.annotation.bundle@default:default"/>
|
||||
<setEntry value="org.osgi.annotation.versioning@default:default"/>
|
||||
<setEntry value="org.osgi.service.cm@default:default"/>
|
||||
<setEntry value="org.osgi.service.component.annotations@default:default"/>
|
||||
<setEntry value="org.osgi.service.component@default:default"/>
|
||||
<setEntry value="org.osgi.service.coordinator@default:default"/>
|
||||
<setEntry value="org.osgi.service.device@default:default"/>
|
||||
<setEntry value="org.osgi.service.event@default:default"/>
|
||||
<setEntry value="org.osgi.service.log.stream@default:default"/>
|
||||
<setEntry value="org.osgi.service.metatype.annotations@default:default"/>
|
||||
<setEntry value="org.osgi.service.metatype@default:default"/>
|
||||
<setEntry value="org.osgi.service.prefs@default:default"/>
|
||||
<setEntry value="org.osgi.service.provisioning@default:default"/>
|
||||
<setEntry value="org.osgi.service.upnp@default:default"/>
|
||||
<setEntry value="org.osgi.service.useradmin@default:default"/>
|
||||
<setEntry value="org.osgi.service.wireadmin@default:default"/>
|
||||
<setEntry value="org.osgi.util.function@default:default"/>
|
||||
<setEntry value="org.osgi.util.measurement@default:default"/>
|
||||
<setEntry value="org.osgi.util.position@default:default"/>
|
||||
<setEntry value="org.osgi.util.promise@default:default"/>
|
||||
<setEntry value="org.osgi.util.pushstream@default:default"/>
|
||||
<setEntry value="org.osgi.util.tracker@default:default"/>
|
||||
<setEntry value="org.osgi.util.xml@default:default"/>
|
||||
<setEntry value="org.passay@default:default"/>
|
||||
<setEntry value="slf4j.api*1.7.30@default:default"/>
|
||||
<setEntry value="slf4j.jcl@default:false"/>
|
||||
<setEntry value="slf4j.jdk14@default:default"/>
|
||||
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
|
||||
<setEntry value="wrapped.com.google.zxing.javase@default:default"/>
|
||||
<setEntry value="wrapped.dev.samstevens.totp.totp@default:default"/>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="src" path="src/"/>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
|
|
|
@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
|
|||
Bundle-Name: iDempiere Callout
|
||||
Bundle-SymbolicName: org.adempiere.base.callout
|
||||
Bundle-Version: 11.0.0.qualifier
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
|
||||
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
|
||||
Eclipse-RegisterBuddy: org.adempiere.base
|
||||
Service-Component: OSGI-INF/*.xml
|
||||
|
|
|
@ -3,3 +3,4 @@ bin.includes = META-INF/,\
|
|||
.
|
||||
output.. = target/classes/
|
||||
source.. = src/
|
||||
jre.compilation.profile = JavaSE-17
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="src" path="src/"/>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
|
|
|
@ -21,12 +21,12 @@
|
|||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.m2e.core.maven2Builder</name>
|
||||
<name>org.eclipse.pde.ds.core.builder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.pde.ds.core.builder</name>
|
||||
<name>org.eclipse.m2e.core.maven2Builder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
|
|
|
@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
|
|||
Bundle-Name: iDempiere Processes
|
||||
Bundle-SymbolicName: org.adempiere.base.process
|
||||
Bundle-Version: 11.0.0.qualifier
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
|
||||
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
|
||||
Export-Package: org.adempiere.process,
|
||||
org.compiere.process,
|
||||
|
|
|
@ -3,3 +3,4 @@ bin.includes = META-INF/,\
|
|||
OSGI-INF/
|
||||
output.. = target/classes/
|
||||
source.. = src/
|
||||
jre.compilation.profile = JavaSE-17
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
|
||||
<attributes>
|
||||
<attribute name="module" value="true"/>
|
||||
</attributes>
|
||||
|
|
|
@ -65,8 +65,8 @@ Export-Package: bsh,
|
|||
org.idempiere.model,
|
||||
org.idempiere.print,
|
||||
org.idempiere.process
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
|
||||
Import-Package: com.google.zxing,
|
||||
com.google.zxing.qrcode.decoder,
|
||||
com.google.zxing.qrcode.encoder,
|
||||
|
|
|
@ -12,3 +12,4 @@ bin.includes = plugin.xml,\
|
|||
src.includes = schema/
|
||||
source.. = src/
|
||||
output.. = target/classes/
|
||||
jre.compilation.profile = JavaSE-17
|
||||
|
|
|
@ -488,20 +488,8 @@ public class FileUtil
|
|||
|
||||
String fileName = prefix + suffix;
|
||||
|
||||
SecurityManager sm = System.getSecurityManager();
|
||||
File f = new File(tmpdirname, fileName);
|
||||
|
||||
if (sm != null) {
|
||||
try {
|
||||
sm.checkWrite(f.getPath());
|
||||
} catch (SecurityException se) {
|
||||
// don't reveal temporary directory location
|
||||
if (directory == null)
|
||||
throw new SecurityException("Unable to create temporary file");
|
||||
throw se;
|
||||
}
|
||||
}
|
||||
|
||||
return f;
|
||||
}
|
||||
|
||||
|
|
|
@ -136,8 +136,8 @@ public class CLogFormatter extends Formatter
|
|||
sb.append(" ")
|
||||
.append(record.getLevel().getLocalizedName());
|
||||
/** Thread **/
|
||||
if (record.getThreadID() != 10)
|
||||
sb.append(" [").append(record.getThreadID()).append("]");
|
||||
if (record.getLongThreadID() != 10)
|
||||
sb.append(" [").append(record.getLongThreadID()).append("]");
|
||||
|
||||
//
|
||||
sb.append(NL);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="src" path="src/"/>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
Manifest-Version: 1.0
|
||||
Bundle-Localization: plugin
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
|
||||
Bundle-SymbolicName: org.adempiere.eclipse.equinox.http.servlet
|
||||
Eclipse-LazyStart: true
|
||||
Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/rt:
|
||||
|
|
|
@ -4,3 +4,4 @@ bin.includes = META-INF/,\
|
|||
javacErrors.. = -assertIdentifier,-enumIdentifier
|
||||
output.. = target/classes/
|
||||
source.. = src/
|
||||
jre.compilation.profile = JavaSE-17
|
||||
|
|
|
@ -14,7 +14,6 @@
|
|||
package org.adempiere.eclipse.equinox.http.servlet;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.security.AccessController;
|
||||
import java.util.*;
|
||||
import javax.servlet.*;
|
||||
import javax.servlet.http.*;
|
||||
|
@ -187,7 +186,7 @@ public class ProxyServlet extends HttpServlet implements Filter {
|
|||
throw new ServletException("This servlet has already been registered."); //$NON-NLS-1$
|
||||
|
||||
ServletRegistration registration = new ServletRegistration(servlet, httpContext);
|
||||
ServletContext wrappedServletContext = new ServletContextAdaptor(proxyContext, getServletContext(), httpContext, AccessController.getContext());
|
||||
ServletContext wrappedServletContext = new ServletContextAdaptor(proxyContext, getServletContext(), httpContext);
|
||||
ServletConfig servletConfig = new ServletConfigImpl(servlet, initparams, wrappedServletContext);
|
||||
|
||||
boolean initialized = false;
|
||||
|
@ -206,7 +205,7 @@ public class ProxyServlet extends HttpServlet implements Filter {
|
|||
//Effective registration of the resources as defined HttpService#registerResources()
|
||||
synchronized void registerResources(String alias, String name, HttpContext httpContext) throws NamespaceException {
|
||||
checkName(name);
|
||||
Servlet resourceServlet = new ResourceServlet(name, httpContext, AccessController.getContext());
|
||||
Servlet resourceServlet = new ResourceServlet(name, httpContext);
|
||||
try {
|
||||
registerServlet(alias, resourceServlet, null, httpContext);
|
||||
} catch (ServletException e) {
|
||||
|
@ -252,7 +251,7 @@ public class ProxyServlet extends HttpServlet implements Filter {
|
|||
|
||||
int filterPriority = findFilterPriority(initparams);
|
||||
FilterRegistration registration = new FilterRegistration(filter, httpContext, alias, filterPriority);
|
||||
ServletContext wrappedServletContext = new ServletContextAdaptor(proxyContext, getServletContext(), httpContext, AccessController.getContext());
|
||||
ServletContext wrappedServletContext = new ServletContextAdaptor(proxyContext, getServletContext(), httpContext);
|
||||
FilterConfig filterConfig = new FilterConfigImpl(filter, initparams, wrappedServletContext);
|
||||
|
||||
boolean initialized = false;
|
||||
|
|
|
@ -16,7 +16,6 @@ package org.adempiere.eclipse.equinox.http.servlet;
|
|||
import java.io.*;
|
||||
import java.net.URL;
|
||||
import java.net.URLConnection;
|
||||
import java.security.*;
|
||||
import javax.servlet.http.*;
|
||||
import org.osgi.service.http.HttpContext;
|
||||
|
||||
|
@ -29,15 +28,13 @@ public class ResourceServlet extends HttpServlet {
|
|||
|
||||
private String internalName;
|
||||
HttpContext httpContext;
|
||||
private AccessControlContext acc;
|
||||
|
||||
public ResourceServlet(String internalName, HttpContext context, AccessControlContext acc) {
|
||||
public ResourceServlet(String internalName, HttpContext context) {
|
||||
this.internalName = internalName;
|
||||
if (internalName.equals("/")) { //$NON-NLS-1$
|
||||
this.internalName = ""; //$NON-NLS-1$
|
||||
}
|
||||
this.httpContext = context;
|
||||
this.acc = acc;
|
||||
}
|
||||
|
||||
public void service(HttpServletRequest req, final HttpServletResponse resp) throws IOException {
|
||||
|
@ -58,93 +55,84 @@ public class ResourceServlet extends HttpServlet {
|
|||
}
|
||||
|
||||
private void writeResource(final HttpServletRequest req, final HttpServletResponse resp, final String resourcePath, final URL resourceURL) throws IOException {
|
||||
try {
|
||||
AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
|
||||
URLConnection connection = resourceURL.openConnection();
|
||||
long lastModified = connection.getLastModified();
|
||||
int contentLength = connection.getContentLength();
|
||||
|
||||
public Object run() throws Exception {
|
||||
URLConnection connection = resourceURL.openConnection();
|
||||
long lastModified = connection.getLastModified();
|
||||
int contentLength = connection.getContentLength();
|
||||
String etag = null;
|
||||
if (lastModified != -1 && contentLength != -1)
|
||||
etag = "W/\"" + contentLength + "-" + lastModified + "\""; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
|
||||
|
||||
String etag = null;
|
||||
if (lastModified != -1 && contentLength != -1)
|
||||
etag = "W/\"" + contentLength + "-" + lastModified + "\""; //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$
|
||||
|
||||
// Check for cache revalidation.
|
||||
// We should prefer ETag validation as the guarantees are stronger and all HTTP 1.1 clients should be using it
|
||||
String ifNoneMatch = req.getHeader(IF_NONE_MATCH);
|
||||
if (ifNoneMatch != null && etag != null && ifNoneMatch.indexOf(etag) != -1) {
|
||||
resp.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
|
||||
return Boolean.TRUE;
|
||||
}
|
||||
|
||||
long ifModifiedSince = req.getDateHeader(IF_MODIFIED_SINCE);
|
||||
// for purposes of comparison we add 999 to ifModifiedSince since the fidelity
|
||||
// of the IMS header generally doesn't include milli-seconds
|
||||
if (ifModifiedSince > -1 && lastModified > 0 && lastModified <= (ifModifiedSince + 999)) {
|
||||
resp.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
|
||||
return Boolean.TRUE;
|
||||
}
|
||||
|
||||
// return the full contents regularly
|
||||
if (contentLength != -1)
|
||||
resp.setContentLength(contentLength);
|
||||
|
||||
String contentType = httpContext.getMimeType(resourcePath);
|
||||
if (contentType == null)
|
||||
contentType = getServletConfig().getServletContext().getMimeType(resourcePath);
|
||||
|
||||
if (contentType != null)
|
||||
resp.setContentType(contentType);
|
||||
|
||||
if (lastModified > 0)
|
||||
resp.setDateHeader(LAST_MODIFIED, lastModified);
|
||||
|
||||
if (etag != null)
|
||||
resp.setHeader(ETAG, etag);
|
||||
|
||||
if (contentLength != 0) {
|
||||
// open the input stream
|
||||
InputStream is = null;
|
||||
try {
|
||||
is = connection.getInputStream();
|
||||
// write the resource
|
||||
try {
|
||||
OutputStream os = resp.getOutputStream();
|
||||
int writtenContentLength = writeResourceToOutputStream(is, os);
|
||||
if (contentLength == -1 || contentLength != writtenContentLength)
|
||||
resp.setContentLength(writtenContentLength);
|
||||
} catch (IllegalStateException e) { // can occur if the response output is already open as a Writer
|
||||
Writer writer = resp.getWriter();
|
||||
writeResourceToWriter(is, writer);
|
||||
// Since ContentLength is a measure of the number of bytes contained in the body
|
||||
// of a message when we use a Writer we lose control of the exact byte count and
|
||||
// defer the problem to the Servlet Engine's Writer implementation.
|
||||
}
|
||||
} catch (FileNotFoundException e) {
|
||||
// FileNotFoundException may indicate the following scenarios
|
||||
// - url is a directory
|
||||
// - url is not accessible
|
||||
sendError(resp, HttpServletResponse.SC_FORBIDDEN);
|
||||
} catch (SecurityException e) {
|
||||
// SecurityException may indicate the following scenarios
|
||||
// - url is not accessible
|
||||
sendError(resp, HttpServletResponse.SC_FORBIDDEN);
|
||||
} finally {
|
||||
if (is != null)
|
||||
try {
|
||||
is.close();
|
||||
} catch (IOException e) {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
}
|
||||
return Boolean.TRUE;
|
||||
}
|
||||
}, acc);
|
||||
} catch (PrivilegedActionException e) {
|
||||
throw (IOException) e.getException();
|
||||
// Check for cache revalidation.
|
||||
// We should prefer ETag validation as the guarantees are stronger and all HTTP 1.1 clients should be using it
|
||||
String ifNoneMatch = req.getHeader(IF_NONE_MATCH);
|
||||
if (ifNoneMatch != null && etag != null && ifNoneMatch.indexOf(etag) != -1) {
|
||||
resp.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
|
||||
return;
|
||||
}
|
||||
|
||||
long ifModifiedSince = req.getDateHeader(IF_MODIFIED_SINCE);
|
||||
// for purposes of comparison we add 999 to ifModifiedSince since the fidelity
|
||||
// of the IMS header generally doesn't include milli-seconds
|
||||
if (ifModifiedSince > -1 && lastModified > 0 && lastModified <= (ifModifiedSince + 999)) {
|
||||
resp.setStatus(HttpServletResponse.SC_NOT_MODIFIED);
|
||||
return;
|
||||
}
|
||||
|
||||
// return the full contents regularly
|
||||
if (contentLength != -1)
|
||||
resp.setContentLength(contentLength);
|
||||
|
||||
String contentType = httpContext.getMimeType(resourcePath);
|
||||
if (contentType == null)
|
||||
contentType = getServletConfig().getServletContext().getMimeType(resourcePath);
|
||||
|
||||
if (contentType != null)
|
||||
resp.setContentType(contentType);
|
||||
|
||||
if (lastModified > 0)
|
||||
resp.setDateHeader(LAST_MODIFIED, lastModified);
|
||||
|
||||
if (etag != null)
|
||||
resp.setHeader(ETAG, etag);
|
||||
|
||||
if (contentLength != 0) {
|
||||
// open the input stream
|
||||
InputStream is = null;
|
||||
try {
|
||||
is = connection.getInputStream();
|
||||
// write the resource
|
||||
try {
|
||||
OutputStream os = resp.getOutputStream();
|
||||
int writtenContentLength = writeResourceToOutputStream(is, os);
|
||||
if (contentLength == -1 || contentLength != writtenContentLength)
|
||||
resp.setContentLength(writtenContentLength);
|
||||
} catch (IllegalStateException e) { // can occur if the response output is already open as a Writer
|
||||
Writer writer = resp.getWriter();
|
||||
writeResourceToWriter(is, writer);
|
||||
// Since ContentLength is a measure of the number of bytes contained in the body
|
||||
// of a message when we use a Writer we lose control of the exact byte count and
|
||||
// defer the problem to the Servlet Engine's Writer implementation.
|
||||
}
|
||||
} catch (FileNotFoundException e) {
|
||||
// FileNotFoundException may indicate the following scenarios
|
||||
// - url is a directory
|
||||
// - url is not accessible
|
||||
sendError(resp, HttpServletResponse.SC_FORBIDDEN);
|
||||
} catch (SecurityException e) {
|
||||
// SecurityException may indicate the following scenarios
|
||||
// - url is not accessible
|
||||
sendError(resp, HttpServletResponse.SC_FORBIDDEN);
|
||||
} finally {
|
||||
if (is != null)
|
||||
try {
|
||||
is.close();
|
||||
} catch (IOException e) {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
void sendError(final HttpServletResponse resp, int sc) throws IOException {
|
||||
|
|
|
@ -14,7 +14,6 @@ package org.adempiere.eclipse.equinox.http.servlet;
|
|||
import java.io.*;
|
||||
import java.lang.reflect.Method;
|
||||
import java.net.URL;
|
||||
import java.security.*;
|
||||
import java.util.*;
|
||||
|
||||
import javax.servlet.*;
|
||||
|
@ -29,13 +28,11 @@ public class ServletContextAdaptor implements ServletContext {
|
|||
|
||||
private ServletContext servletContext;
|
||||
HttpContext httpContext;
|
||||
private AccessControlContext acc;
|
||||
private ProxyContext proxyContext;
|
||||
|
||||
public ServletContextAdaptor(ProxyContext proxyContext, ServletContext servletContext, HttpContext httpContext, AccessControlContext acc) {
|
||||
public ServletContextAdaptor(ProxyContext proxyContext, ServletContext servletContext, HttpContext httpContext) {
|
||||
this.servletContext = servletContext;
|
||||
this.httpContext = httpContext;
|
||||
this.acc = acc;
|
||||
this.proxyContext = proxyContext;
|
||||
}
|
||||
|
||||
|
@ -88,16 +85,7 @@ public class ServletContextAdaptor implements ServletContext {
|
|||
}
|
||||
|
||||
public URL getResource(final String name) {
|
||||
try {
|
||||
return (URL) AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
|
||||
public Object run() throws Exception {
|
||||
return httpContext.getResource(name);
|
||||
}
|
||||
}, acc);
|
||||
} catch (PrivilegedActionException e) {
|
||||
log(e.getException().getMessage(), e.getException());
|
||||
}
|
||||
return null;
|
||||
return httpContext.getResource(name);
|
||||
}
|
||||
|
||||
public InputStream getResourceAsStream(String name) {
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="src" path="src/"/>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
|
|
|
@ -7,8 +7,8 @@ Export-Package: org.adempiere.install,
|
|||
org.compiere.install
|
||||
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
|
||||
org.eclipse.jetty.util
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
|
||||
Import-Package: javax.mail;version="1.5",
|
||||
javax.mail.internet;version="1.5",
|
||||
org.apache.tools.ant,
|
||||
|
|
|
@ -3,3 +3,4 @@ bin.includes = META-INF/,\
|
|||
.
|
||||
output.. = target/classes/
|
||||
source.. = src/
|
||||
jre.compilation.profile = JavaSE-17
|
||||
|
|
|
@ -15,11 +15,13 @@
|
|||
<setAttribute key="deselected_workspace_bundles"/>
|
||||
<booleanAttribute key="includeOptional" value="false"/>
|
||||
<stringAttribute key="location" value="${workspace_loc}/runtime-install.app"/>
|
||||
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
|
||||
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
|
||||
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
|
||||
</listAttribute>
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.compatibility.bootdelegation=true"/>
|
||||
|
@ -30,6 +32,7 @@
|
|||
<setEntry value="bcpkix@default:default"/>
|
||||
<setEntry value="bcprov@default:default"/>
|
||||
<setEntry value="bcutil@default:default"/>
|
||||
<setEntry value="com.diffplug.osgi.extension.sun.misc@default:false"/>
|
||||
<setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/>
|
||||
<setEntry value="com.github.librepdf.openpdf@default:default"/>
|
||||
<setEntry value="com.google.gson@default:default"/>
|
||||
|
@ -88,9 +91,32 @@
|
|||
<setEntry value="org.jsr-305@default:default"/>
|
||||
<setEntry value="org.junit@default:default"/>
|
||||
<setEntry value="org.krysalis.barcode4j@default:default"/>
|
||||
<setEntry value="org.osgi.annotation.bundle@default:default"/>
|
||||
<setEntry value="org.osgi.annotation.versioning@default:default"/>
|
||||
<setEntry value="org.osgi.service.cm@default:default"/>
|
||||
<setEntry value="org.osgi.service.component.annotations@default:default"/>
|
||||
<setEntry value="org.osgi.service.component@default:default"/>
|
||||
<setEntry value="org.osgi.service.coordinator@default:default"/>
|
||||
<setEntry value="org.osgi.service.device@default:default"/>
|
||||
<setEntry value="org.osgi.service.event@default:default"/>
|
||||
<setEntry value="org.osgi.service.log.stream@default:default"/>
|
||||
<setEntry value="org.osgi.service.metatype.annotations@default:default"/>
|
||||
<setEntry value="org.osgi.service.metatype@default:default"/>
|
||||
<setEntry value="org.osgi.service.prefs@default:default"/>
|
||||
<setEntry value="org.osgi.service.provisioning@default:default"/>
|
||||
<setEntry value="org.osgi.service.upnp@default:default"/>
|
||||
<setEntry value="org.osgi.service.useradmin@default:default"/>
|
||||
<setEntry value="org.osgi.service.wireadmin@default:default"/>
|
||||
<setEntry value="org.osgi.util.function@default:default"/>
|
||||
<setEntry value="org.osgi.util.measurement@default:default"/>
|
||||
<setEntry value="org.osgi.util.position@default:default"/>
|
||||
<setEntry value="org.osgi.util.promise@default:default"/>
|
||||
<setEntry value="org.osgi.util.pushstream@default:default"/>
|
||||
<setEntry value="org.osgi.util.tracker@default:default"/>
|
||||
<setEntry value="org.osgi.util.xml@default:default"/>
|
||||
<setEntry value="org.passay@default:default"/>
|
||||
<setEntry value="slf4j.api*1.7.30@default:default"/>
|
||||
<setEntry value="slf4j.jcl@default:false"/>
|
||||
<setEntry value="slf4j.jdk14@default:false"/>
|
||||
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
|
||||
<setEntry value="wrapped.com.google.zxing.javase@default:default"/>
|
||||
<setEntry value="wrapped.dev.samstevens.totp.totp@default:default"/>
|
||||
|
|
|
@ -15,11 +15,13 @@
|
|||
<setAttribute key="deselected_workspace_bundles"/>
|
||||
<booleanAttribute key="includeOptional" value="false"/>
|
||||
<stringAttribute key="location" value="${workspace_loc}/runtime-install.console.app"/>
|
||||
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
|
||||
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
|
||||
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
|
||||
</listAttribute>
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dosgi.compatibility.bootdelegation=true"/>
|
||||
|
@ -30,6 +32,7 @@
|
|||
<setEntry value="bcpkix@default:default"/>
|
||||
<setEntry value="bcprov@default:default"/>
|
||||
<setEntry value="bcutil@default:default"/>
|
||||
<setEntry value="com.diffplug.osgi.extension.sun.misc@default:false"/>
|
||||
<setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/>
|
||||
<setEntry value="com.github.librepdf.openpdf@default:default"/>
|
||||
<setEntry value="com.google.gson@default:default"/>
|
||||
|
@ -85,9 +88,32 @@
|
|||
<setEntry value="org.jsr-305@default:default"/>
|
||||
<setEntry value="org.junit@default:default"/>
|
||||
<setEntry value="org.krysalis.barcode4j@default:default"/>
|
||||
<setEntry value="org.osgi.annotation.bundle@default:default"/>
|
||||
<setEntry value="org.osgi.annotation.versioning@default:default"/>
|
||||
<setEntry value="org.osgi.service.cm@default:default"/>
|
||||
<setEntry value="org.osgi.service.component.annotations@default:default"/>
|
||||
<setEntry value="org.osgi.service.component@default:default"/>
|
||||
<setEntry value="org.osgi.service.coordinator@default:default"/>
|
||||
<setEntry value="org.osgi.service.device@default:default"/>
|
||||
<setEntry value="org.osgi.service.event@default:default"/>
|
||||
<setEntry value="org.osgi.service.log.stream@default:default"/>
|
||||
<setEntry value="org.osgi.service.metatype.annotations@default:default"/>
|
||||
<setEntry value="org.osgi.service.metatype@default:default"/>
|
||||
<setEntry value="org.osgi.service.prefs@default:default"/>
|
||||
<setEntry value="org.osgi.service.provisioning@default:default"/>
|
||||
<setEntry value="org.osgi.service.upnp@default:default"/>
|
||||
<setEntry value="org.osgi.service.useradmin@default:default"/>
|
||||
<setEntry value="org.osgi.service.wireadmin@default:default"/>
|
||||
<setEntry value="org.osgi.util.function@default:default"/>
|
||||
<setEntry value="org.osgi.util.measurement@default:default"/>
|
||||
<setEntry value="org.osgi.util.position@default:default"/>
|
||||
<setEntry value="org.osgi.util.promise@default:default"/>
|
||||
<setEntry value="org.osgi.util.pushstream@default:default"/>
|
||||
<setEntry value="org.osgi.util.tracker@default:default"/>
|
||||
<setEntry value="org.osgi.util.xml@default:default"/>
|
||||
<setEntry value="org.passay@default:default"/>
|
||||
<setEntry value="slf4j.api*1.7.30@default:default"/>
|
||||
<setEntry value="slf4j.jcl@default:false"/>
|
||||
<setEntry value="slf4j.jdk14@default:default"/>
|
||||
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
|
||||
<setEntry value="wrapped.com.google.zxing.javase@default:default"/>
|
||||
<setEntry value="wrapped.dev.samstevens.totp.totp@default:default"/>
|
||||
|
|
|
@ -15,10 +15,12 @@
|
|||
<setAttribute key="deselected_workspace_bundles"/>
|
||||
<booleanAttribute key="includeOptional" value="false"/>
|
||||
<stringAttribute key="location" value="${workspace_loc}/runtime-install.silent.app"/>
|
||||
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
|
||||
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
|
||||
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
|
||||
</listAttribute>
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
|
||||
|
@ -30,6 +32,7 @@
|
|||
<setEntry value="bcpkix@default:default"/>
|
||||
<setEntry value="bcprov@default:default"/>
|
||||
<setEntry value="bcutil@default:default"/>
|
||||
<setEntry value="com.diffplug.osgi.extension.sun.misc@default:false"/>
|
||||
<setEntry value="com.github.librepdf.openpdf-fonts-extra@default:default"/>
|
||||
<setEntry value="com.github.librepdf.openpdf@default:default"/>
|
||||
<setEntry value="com.google.gson@default:default"/>
|
||||
|
@ -85,9 +88,32 @@
|
|||
<setEntry value="org.jsr-305@default:default"/>
|
||||
<setEntry value="org.junit@default:default"/>
|
||||
<setEntry value="org.krysalis.barcode4j@default:default"/>
|
||||
<setEntry value="org.osgi.annotation.bundle@default:default"/>
|
||||
<setEntry value="org.osgi.annotation.versioning@default:default"/>
|
||||
<setEntry value="org.osgi.service.cm@default:default"/>
|
||||
<setEntry value="org.osgi.service.component.annotations@default:default"/>
|
||||
<setEntry value="org.osgi.service.component@default:default"/>
|
||||
<setEntry value="org.osgi.service.coordinator@default:default"/>
|
||||
<setEntry value="org.osgi.service.device@default:default"/>
|
||||
<setEntry value="org.osgi.service.event@default:default"/>
|
||||
<setEntry value="org.osgi.service.log.stream@default:default"/>
|
||||
<setEntry value="org.osgi.service.metatype.annotations@default:default"/>
|
||||
<setEntry value="org.osgi.service.metatype@default:default"/>
|
||||
<setEntry value="org.osgi.service.prefs@default:default"/>
|
||||
<setEntry value="org.osgi.service.provisioning@default:default"/>
|
||||
<setEntry value="org.osgi.service.upnp@default:default"/>
|
||||
<setEntry value="org.osgi.service.useradmin@default:default"/>
|
||||
<setEntry value="org.osgi.service.wireadmin@default:default"/>
|
||||
<setEntry value="org.osgi.util.function@default:default"/>
|
||||
<setEntry value="org.osgi.util.measurement@default:default"/>
|
||||
<setEntry value="org.osgi.util.position@default:default"/>
|
||||
<setEntry value="org.osgi.util.promise@default:default"/>
|
||||
<setEntry value="org.osgi.util.pushstream@default:default"/>
|
||||
<setEntry value="org.osgi.util.tracker@default:default"/>
|
||||
<setEntry value="org.osgi.util.xml@default:default"/>
|
||||
<setEntry value="org.passay@default:default"/>
|
||||
<setEntry value="slf4j.api*1.7.30@default:default"/>
|
||||
<setEntry value="slf4j.jcl@default:false"/>
|
||||
<setEntry value="slf4j.jdk14@default:default"/>
|
||||
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
|
||||
<setEntry value="wrapped.com.google.zxing.javase@default:default"/>
|
||||
<setEntry value="wrapped.dev.samstevens.totp.totp@default:default"/>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="src" path="src/"/>
|
||||
<classpathentry exported="true" kind="lib" path="lib/jpayment.jar"/>
|
||||
|
|
|
@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
|
|||
Bundle-Name: iDempiere Payment Processor
|
||||
Bundle-SymbolicName: org.adempiere.payment.processor;singleton:=true
|
||||
Bundle-Version: 11.0.0.qualifier
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
|
||||
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
|
||||
Bundle-ClassPath: .,
|
||||
lib/jpayment.jar,
|
||||
|
|
|
@ -5,4 +5,5 @@ bin.includes = META-INF/,\
|
|||
lib/payflow.jar,\
|
||||
lib/Verisign.jar
|
||||
source.. = src/
|
||||
output.. = target/classes/
|
||||
output.. = target/classes/
|
||||
jre.compilation.profile = JavaSE-17
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="src" path="src/"/>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
|
|
|
@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
|
|||
Bundle-Name: iDempiere 2Pack Handlers
|
||||
Bundle-SymbolicName: org.adempiere.pipo.handlers;singleton:=true
|
||||
Bundle-Version: 11.0.0.qualifier
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
|
||||
Require-Bundle: org.adempiere.pipo;bundle-version="0.0.0",
|
||||
org.adempiere.base;bundle-version="0.0.0"
|
||||
Bundle-ClassPath: .
|
||||
|
|
|
@ -3,3 +3,4 @@ bin.includes = META-INF/,\
|
|||
.
|
||||
output.. = target/classes/
|
||||
source.. = src/
|
||||
jre.compilation.profile = JavaSE-17
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="src" path="src/"/>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
|
|
|
@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
|
|||
Bundle-Name: iDempiere 2Pack Core
|
||||
Bundle-SymbolicName: org.adempiere.pipo;singleton:=true
|
||||
Bundle-Version: 11.0.0.qualifier
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
|
||||
Import-Package: org.apache.commons.codec,
|
||||
org.apache.commons.codec.binary,
|
||||
org.apache.tools.ant,
|
||||
|
|
|
@ -5,3 +5,4 @@ bin.includes = META-INF/,\
|
|||
.
|
||||
output.. = target/classes/
|
||||
source.. = src/
|
||||
jre.compilation.profile = JavaSE-17
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="src" path="src/"/>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
|
|
|
@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
|
|||
Bundle-Name: iDempiere Plugin Utils
|
||||
Bundle-SymbolicName: org.adempiere.plugin.utils
|
||||
Bundle-Version: 11.0.0.qualifier
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
|
||||
Import-Package: org.apache.xerces.dom;version="2.9.0",
|
||||
org.apache.xerces.dom.events;version="2.9.0",
|
||||
org.apache.xerces.dom3.as;version="2.9.0",
|
||||
|
|
|
@ -2,3 +2,4 @@ bin.includes = META-INF/,\
|
|||
.
|
||||
output.. = target/classes/
|
||||
source.. = src/
|
||||
jre.compilation.profile = JavaSE-17
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="src" path="src/"/>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
|
|
|
@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
|
|||
Bundle-Name: iDempiere Replication Server
|
||||
Bundle-SymbolicName: org.adempiere.replication.server;singleton:=true
|
||||
Bundle-Version: 11.0.0.qualifier
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
|
||||
Require-Bundle: org.adempiere.server;bundle-version="0.0.0",
|
||||
org.adempiere.replication;bundle-version="0.0.0",
|
||||
org.adempiere.base;bundle-version="0.0.0"
|
||||
|
|
|
@ -4,3 +4,4 @@ bin.includes = META-INF/,\
|
|||
.
|
||||
output.. = target/classes/
|
||||
source.. = src/
|
||||
jre.compilation.profile = JavaSE-17
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="src" path="src/"/>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
|
|
|
@ -21,12 +21,12 @@
|
|||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.m2e.core.maven2Builder</name>
|
||||
<name>org.eclipse.pde.ds.core.builder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.pde.ds.core.builder</name>
|
||||
<name>org.eclipse.m2e.core.maven2Builder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
|
|
|
@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
|
|||
Bundle-Name: iDempiere Replication
|
||||
Bundle-SymbolicName: org.adempiere.replication;singleton:=true
|
||||
Bundle-Version: 11.0.0.qualifier
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
|
||||
Require-Bundle: org.adempiere.base;bundle-version="0.0.0"
|
||||
Export-Package: org.adempiere.process.rpl,
|
||||
org.adempiere.process.rpl.exp,
|
||||
|
|
|
@ -4,3 +4,4 @@ bin.includes = META-INF/,\
|
|||
OSGI-INF/
|
||||
output.. = target/classes/
|
||||
source.. = src/
|
||||
jre.compilation.profile = JavaSE-17
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
|
||||
<attributes>
|
||||
<attribute name="module" value="true"/>
|
||||
</attributes>
|
||||
|
|
|
@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
|
|||
Bundle-Name: Library
|
||||
Bundle-SymbolicName: org.adempiere.report.jasper.library;singleton:=true
|
||||
Bundle-Version: 11.0.0.qualifier
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
|
||||
Fragment-Host: net.sf.jasperreports.engine;bundle-version="6.11.0"
|
||||
Bundle-ClassPath: .,
|
||||
lib/castor-core.jar,
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="src" path="src/"/>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
|
|
|
@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
|
|||
Bundle-Name: iDempiere JasperReport integration
|
||||
Bundle-SymbolicName: org.adempiere.report.jasper;singleton:=true
|
||||
Bundle-Version: 11.0.0.qualifier
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
|
||||
Import-Package: com.zaxxer.sparsebits;version="1.2.0",
|
||||
net.sourceforge.barbecue,
|
||||
org.apache.commons.codec,
|
||||
|
|
|
@ -3,3 +3,4 @@ bin.includes = META-INF/,\
|
|||
.
|
||||
output.. = target/classes/
|
||||
source.. = src/
|
||||
jre.compilation.profile = JavaSE-17
|
||||
|
|
|
@ -369,14 +369,6 @@
|
|||
version="1.7.30"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="slf4j.jcl"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
fragment="true"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.jdt.core"
|
||||
download-size="0"
|
||||
|
@ -652,4 +644,47 @@
|
|||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.jdt.core.compiler.batch"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="jakarta.annotation-api"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="io.github.classgraph.classgraph"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.apache.httpcomponents.httpclient"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.apache.httpcomponents.httpcore"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="slf4j.jdk14"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
fragment="true"
|
||||
unpack="false"/>
|
||||
|
||||
</feature>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?pde version="3.5"?>
|
||||
|
||||
<product name="iDempiere Server" uid="org.adempiere.server.product" id="org.adempiere.server.server_product" application="org.adempiere.server.application" version="11.0.0.qualifier" useFeatures="true" includeLaunchers="true">
|
||||
<product name="iDempiere Server" uid="org.adempiere.server.product" id="org.adempiere.server.server_product" application="org.adempiere.server.application" version="11.0.0.qualifier" useFeatures="true" includeLaunchers="true" autoIncludeRequirements="false">
|
||||
|
||||
<configIni use="default">
|
||||
</configIni>
|
||||
|
@ -24,7 +24,7 @@
|
|||
</launcher>
|
||||
|
||||
<vm>
|
||||
<linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11</linux>
|
||||
<linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</linux>
|
||||
</vm>
|
||||
|
||||
<plugins>
|
||||
|
|
|
@ -42,12 +42,14 @@
|
|||
<setAttribute key="deselected_workspace_bundles"/>
|
||||
<booleanAttribute key="includeOptional" value="false"/>
|
||||
<stringAttribute key="location" value="${workspace_loc}/runtime-server.product.functionaltest"/>
|
||||
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
|
||||
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.pde.ui.launcher.PDESourceLookupDirector"/>
|
||||
<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;classpathContainer path=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathContainer"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;default/&gt;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
|
||||
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
|
||||
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
|
||||
</listAttribute>
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
|
||||
|
@ -75,10 +77,9 @@
|
|||
</setAttribute>
|
||||
<setAttribute key="selected_target_bundles">
|
||||
<setEntry value="bcmail@default:default"/>
|
||||
<setEntry value="bcpg*1.69.0@default:default"/>
|
||||
<setEntry value="bcpg@default:default"/>
|
||||
<setEntry value="bcpkix@default:default"/>
|
||||
<setEntry value="bcprov@default:default"/>
|
||||
<setEntry value="bctsp@default:default"/>
|
||||
<setEntry value="bcutil@default:default"/>
|
||||
<setEntry value="com.diffplug.osgi.extension.sun.misc@default:false"/>
|
||||
<setEntry value="com.fasterxml.jackson.core.jackson-annotations@default:default"/>
|
||||
|
@ -252,6 +253,7 @@
|
|||
<setEntry value="org.eclipse.equinox.servletbridge@default:default"/>
|
||||
<setEntry value="org.eclipse.equinox.simpleconfigurator.manipulator@default:default"/>
|
||||
<setEntry value="org.eclipse.equinox.simpleconfigurator@1:true"/>
|
||||
<setEntry value="org.eclipse.jdt.core.compiler.batch*3.33.0.v20230218-1114@default:default"/>
|
||||
<setEntry value="org.eclipse.jdt.core@default:default"/>
|
||||
<setEntry value="org.eclipse.jetty.alpn.client@default:default"/>
|
||||
<setEntry value="org.eclipse.jetty.annotations@default:default"/>
|
||||
|
@ -324,6 +326,29 @@
|
|||
<setEntry value="org.objectweb.asm.tree@default:default"/>
|
||||
<setEntry value="org.objectweb.asm.util@default:default"/>
|
||||
<setEntry value="org.objectweb.asm@default:default"/>
|
||||
<setEntry value="org.osgi.annotation.bundle@default:default"/>
|
||||
<setEntry value="org.osgi.annotation.versioning@default:default"/>
|
||||
<setEntry value="org.osgi.service.cm@default:default"/>
|
||||
<setEntry value="org.osgi.service.component.annotations@default:default"/>
|
||||
<setEntry value="org.osgi.service.component@default:default"/>
|
||||
<setEntry value="org.osgi.service.coordinator@default:default"/>
|
||||
<setEntry value="org.osgi.service.device@default:default"/>
|
||||
<setEntry value="org.osgi.service.event@default:default"/>
|
||||
<setEntry value="org.osgi.service.log.stream@default:default"/>
|
||||
<setEntry value="org.osgi.service.metatype.annotations@default:default"/>
|
||||
<setEntry value="org.osgi.service.metatype@default:default"/>
|
||||
<setEntry value="org.osgi.service.prefs@default:default"/>
|
||||
<setEntry value="org.osgi.service.provisioning@default:default"/>
|
||||
<setEntry value="org.osgi.service.upnp@default:default"/>
|
||||
<setEntry value="org.osgi.service.useradmin@default:default"/>
|
||||
<setEntry value="org.osgi.service.wireadmin@default:default"/>
|
||||
<setEntry value="org.osgi.util.function@default:default"/>
|
||||
<setEntry value="org.osgi.util.measurement@default:default"/>
|
||||
<setEntry value="org.osgi.util.position@default:default"/>
|
||||
<setEntry value="org.osgi.util.promise@default:default"/>
|
||||
<setEntry value="org.osgi.util.pushstream@default:default"/>
|
||||
<setEntry value="org.osgi.util.tracker@default:default"/>
|
||||
<setEntry value="org.osgi.util.xml@default:default"/>
|
||||
<setEntry value="org.passay@default:default"/>
|
||||
<setEntry value="org.sat4j.core@default:default"/>
|
||||
<setEntry value="org.sat4j.pb@default:default"/>
|
||||
|
@ -334,10 +359,11 @@
|
|||
<setEntry value="org.w3c.dom.svg@default:default"/>
|
||||
<setEntry value="org.zkoss.zsoup@default:default"/>
|
||||
<setEntry value="slf4j.api*1.7.30@default:default"/>
|
||||
<setEntry value="slf4j.jcl@default:false"/>
|
||||
<setEntry value="slf4j.jdk14@default:false"/>
|
||||
<setEntry value="stax2-api@default:default"/>
|
||||
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
|
||||
<setEntry value="wrapped.com.google.zxing.javase@default:default"/>
|
||||
<setEntry value="wrapped.com.sun.net.httpserver.http@default:default"/>
|
||||
<setEntry value="wrapped.com.zaxxer.SparseBitSet@default:default"/>
|
||||
<setEntry value="wrapped.dev.samstevens.totp.totp@default:default"/>
|
||||
<setEntry value="wrapped.io.grpc.grpc-context@default:default"/>
|
||||
|
@ -355,6 +381,7 @@
|
|||
<setEntry value="wrapped.org.springframework.spring-context@default:default"/>
|
||||
<setEntry value="wrapped.org.springframework.spring-core@default:default"/>
|
||||
<setEntry value="wrapped.org.springframework.spring-expression@default:default"/>
|
||||
<setEntry value="wrapped.org.springframework.spring-jcl@default:default"/>
|
||||
<setEntry value="wrapped.org.springframework.spring-web@default:default"/>
|
||||
<setEntry value="wrapped.wsdl4j.wsdl4j@default:default"/>
|
||||
<setEntry value="xstream@default:default"/>
|
||||
|
|
|
@ -42,13 +42,15 @@
|
|||
<setAttribute key="deselected_workspace_bundles"/>
|
||||
<booleanAttribute key="includeOptional" value="false"/>
|
||||
<stringAttribute key="location" value="${workspace_loc}/runtime-server.product"/>
|
||||
<booleanAttribute key="org.eclipse.debug.core.ATTR_FORCE_SYSTEM_CONSOLE_ENCODING" value="false"/>
|
||||
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.pde.ui.launcher.PDESourceLookupDirector"/>
|
||||
<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <sourceLookupDirector> <sourceContainers duplicates="false"> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;classpathContainer path=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot;/&gt;&#10;" typeId="org.eclipse.jdt.launching.sourceContainer.classpathContainer"/> <container memento="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#10;&lt;default/&gt;&#10;" typeId="org.eclipse.debug.core.containerType.default"/> </sourceContainers> </sourceLookupDirector> "/>
|
||||
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
|
||||
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
|
||||
</listAttribute>
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<booleanAttribute key="org.eclipse.jdt.launching.ATTR_SHOW_CODEDETAILS_IN_EXCEPTION_MESSAGES" value="true"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
|
||||
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true --add-modules=java.se --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-exports=java.base/jdk.internal.ref=ALL-UNNAMED --add-exports=java.desktop/sun.awt=ALL-UNNAMED --add-exports=java.sql.rowset/com.sun.rowset=ALL-UNNAMED --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED -Declipse.product=org.adempiere.server.product -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -Dorg.osgi.framework.bootdelegation=sun.security.ssl -Dosgi.compatibility.bootdelegation=true -Djetty.home=jettyhome -Djetty.etc.config.urls=etc/jetty.xml,etc/jetty-deployer.xml,etc/jetty-ssl.xml,etc/jetty-ssl-context.xml,etc/jetty-http.xml,etc/jetty-https.xml,etc/jetty-threadpool.xml,etc/jetty-http-forwarded.xml -Dmail.mime.encodefilename=true -Dmail.mime.decodefilename=true -Dmail.mime.encodeparameters=true -Dmail.mime.decodeparameters=true -Dhazelcast.config=hazelcast.xml"/>
|
||||
|
@ -75,10 +77,9 @@
|
|||
</setAttribute>
|
||||
<setAttribute key="selected_target_bundles">
|
||||
<setEntry value="bcmail@default:default"/>
|
||||
<setEntry value="bcpg*1.69.0@default:default"/>
|
||||
<setEntry value="bcpg@default:default"/>
|
||||
<setEntry value="bcpkix@default:default"/>
|
||||
<setEntry value="bcprov@default:default"/>
|
||||
<setEntry value="bctsp@default:default"/>
|
||||
<setEntry value="bcutil@default:default"/>
|
||||
<setEntry value="com.diffplug.osgi.extension.sun.misc@default:false"/>
|
||||
<setEntry value="com.fasterxml.jackson.core.jackson-annotations@default:default"/>
|
||||
|
@ -257,6 +258,7 @@
|
|||
<setEntry value="org.eclipse.equinox.servletbridge@default:default"/>
|
||||
<setEntry value="org.eclipse.equinox.simpleconfigurator.manipulator@default:default"/>
|
||||
<setEntry value="org.eclipse.equinox.simpleconfigurator@1:true"/>
|
||||
<setEntry value="org.eclipse.jdt.core.compiler.batch*3.33.0.v20230218-1114@default:default"/>
|
||||
<setEntry value="org.eclipse.jdt.core@default:default"/>
|
||||
<setEntry value="org.eclipse.jetty.alpn.client@default:default"/>
|
||||
<setEntry value="org.eclipse.jetty.annotations@default:true"/>
|
||||
|
@ -332,6 +334,29 @@
|
|||
<setEntry value="org.objectweb.asm.tree@default:default"/>
|
||||
<setEntry value="org.objectweb.asm.util@default:default"/>
|
||||
<setEntry value="org.objectweb.asm@default:default"/>
|
||||
<setEntry value="org.osgi.annotation.bundle@default:default"/>
|
||||
<setEntry value="org.osgi.annotation.versioning@default:default"/>
|
||||
<setEntry value="org.osgi.service.cm@default:default"/>
|
||||
<setEntry value="org.osgi.service.component.annotations@default:default"/>
|
||||
<setEntry value="org.osgi.service.component@default:default"/>
|
||||
<setEntry value="org.osgi.service.coordinator@default:default"/>
|
||||
<setEntry value="org.osgi.service.device@default:default"/>
|
||||
<setEntry value="org.osgi.service.event@default:default"/>
|
||||
<setEntry value="org.osgi.service.log.stream@default:default"/>
|
||||
<setEntry value="org.osgi.service.metatype.annotations@default:default"/>
|
||||
<setEntry value="org.osgi.service.metatype@default:default"/>
|
||||
<setEntry value="org.osgi.service.prefs@default:default"/>
|
||||
<setEntry value="org.osgi.service.provisioning@default:default"/>
|
||||
<setEntry value="org.osgi.service.upnp@default:default"/>
|
||||
<setEntry value="org.osgi.service.useradmin@default:default"/>
|
||||
<setEntry value="org.osgi.service.wireadmin@default:default"/>
|
||||
<setEntry value="org.osgi.util.function@default:default"/>
|
||||
<setEntry value="org.osgi.util.measurement@default:default"/>
|
||||
<setEntry value="org.osgi.util.position@default:default"/>
|
||||
<setEntry value="org.osgi.util.promise@default:default"/>
|
||||
<setEntry value="org.osgi.util.pushstream@default:default"/>
|
||||
<setEntry value="org.osgi.util.tracker@default:default"/>
|
||||
<setEntry value="org.osgi.util.xml@default:default"/>
|
||||
<setEntry value="org.passay@default:default"/>
|
||||
<setEntry value="org.sat4j.core@default:default"/>
|
||||
<setEntry value="org.sat4j.pb@default:default"/>
|
||||
|
@ -342,7 +367,7 @@
|
|||
<setEntry value="org.w3c.dom.svg@default:default"/>
|
||||
<setEntry value="org.zkoss.zsoup@default:default"/>
|
||||
<setEntry value="slf4j.api*1.7.30@default:default"/>
|
||||
<setEntry value="slf4j.jcl@default:false"/>
|
||||
<setEntry value="slf4j.jdk14@default:false"/>
|
||||
<setEntry value="stax2-api@default:default"/>
|
||||
<setEntry value="wrapped.com.google.http-client.google-http-client-gson@default:default"/>
|
||||
<setEntry value="wrapped.com.google.zxing.javase@default:default"/>
|
||||
|
@ -374,6 +399,7 @@
|
|||
<setEntry value="wrapped.org.springframework.spring-context@default:default"/>
|
||||
<setEntry value="wrapped.org.springframework.spring-core@default:default"/>
|
||||
<setEntry value="wrapped.org.springframework.spring-expression@default:default"/>
|
||||
<setEntry value="wrapped.org.springframework.spring-jcl@default:default"/>
|
||||
<setEntry value="wrapped.org.springframework.spring-web@default:default"/>
|
||||
<setEntry value="wrapped.wsdl4j.wsdl4j@default:default"/>
|
||||
<setEntry value="xstream@default:default"/>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
osgi.framework=file\:../plugins/org.eclipse.osgi_3.17.200.v20220215-2237.jar
|
||||
osgi.framework=file\:../plugins/org.eclipse.osgi_3.18.300.v20230220-1352.jar
|
||||
osgi.install.area=setup
|
||||
osgi.bundles=org.apache.felix.scr@1:start,\
|
||||
org.eclipse.core.variables,\
|
||||
|
@ -43,7 +43,7 @@ osgi.bundles=org.apache.felix.scr@1:start,\
|
|||
org.eclipse.jetty.util,\
|
||||
jakarta.annotation-api,\
|
||||
slf4j.api,\
|
||||
slf4j.jcl,\
|
||||
slf4j.jdk14,\
|
||||
org.apache.commons.commons-codec,\
|
||||
org.eclipse.osgi.compatibility.state,\
|
||||
org.cryptacular,\
|
||||
|
@ -81,7 +81,28 @@ osgi.bundles=org.apache.felix.scr@1:start,\
|
|||
org.antlr.antlr4-runtime,\
|
||||
xstream,\
|
||||
org.fusesource.hawtbuf.hawtbuf,\
|
||||
io.github.classgraph.classgraph
|
||||
io.github.classgraph.classgraph,\
|
||||
org.osgi.service.cm,\
|
||||
org.osgi.service.component,\
|
||||
org.osgi.service.component.annotations,\
|
||||
org.osgi.service.coordinator,\
|
||||
org.osgi.service.device,\
|
||||
org.osgi.service.event,\
|
||||
org.osgi.service.log.stream,\
|
||||
org.osgi.service.metatype,\
|
||||
org.osgi.service.metatype.annotations,\
|
||||
org.osgi.service.prefs,\
|
||||
org.osgi.service.provisioning,\
|
||||
org.osgi.service.upnp,\
|
||||
org.osgi.service.useradmin,\
|
||||
org.osgi.service.wireadmin,\
|
||||
org.osgi.util.function,\
|
||||
org.osgi.util.measurement,\
|
||||
org.osgi.util.position,\
|
||||
org.osgi.util.promise,\
|
||||
org.osgi.util.pushstream,\
|
||||
org.osgi.util.tracker,\
|
||||
org.osgi.util.xml
|
||||
osgi.framework.extensions=
|
||||
osgi.bundles.defaultStartLevel=4
|
||||
osgi.compatibility.bootdelegation=true
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
|
||||
<attributes>
|
||||
<attribute name="module" value="true"/>
|
||||
</attributes>
|
||||
|
|
|
@ -6,8 +6,8 @@ Bundle-Version: 11.0.0.qualifier
|
|||
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
|
||||
org.eclipse.equinox.app;bundle-version="0.0.0",
|
||||
org.eclipse.jetty.apache-jsp;bundle-version="0.0.0"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
|
||||
Web-ContextPath: /
|
||||
Bundle-ClassPath: .
|
||||
Import-Package: javax.jms;version="1.1.0",
|
||||
|
|
|
@ -35,3 +35,4 @@ bin.excludes = src/**,\
|
|||
.classpath,\
|
||||
.project,\
|
||||
build.properties
|
||||
jre.compilation.profile = JavaSE-17
|
||||
|
|
|
@ -9,21 +9,4 @@
|
|||
</parent>
|
||||
<artifactId>org.adempiere.server</artifactId>
|
||||
<packaging>eclipse-plugin</packaging>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.eclipse.tycho</groupId>
|
||||
<artifactId>tycho-compiler-plugin</artifactId>
|
||||
<configuration>
|
||||
<compilerArgs>
|
||||
<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=367431 -->
|
||||
<arg>-warn:+forbidden</arg>
|
||||
<arg>--add-exports</arg>
|
||||
<arg>java.naming/com.sun.jndi.ldap=ALL-UNNAMED</arg>
|
||||
</compilerArgs>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</project>
|
||||
</project>
|
||||
|
|
|
@ -32,6 +32,7 @@ public class AdempiereServerGroup extends ThreadGroup
|
|||
* Get Adempiere Server Group
|
||||
* @return Server Group
|
||||
*/
|
||||
@SuppressWarnings("removal")
|
||||
public static AdempiereServerGroup get()
|
||||
{
|
||||
if (s_group == null || s_group.isDestroyed())
|
||||
|
@ -45,6 +46,7 @@ public class AdempiereServerGroup extends ThreadGroup
|
|||
/**
|
||||
* AdempiereServerGroup
|
||||
*/
|
||||
@SuppressWarnings("removal")
|
||||
private AdempiereServerGroup ()
|
||||
{
|
||||
super ("AdempiereServers");
|
||||
|
@ -79,6 +81,7 @@ public class AdempiereServerGroup extends ThreadGroup
|
|||
/**
|
||||
* Dump Info
|
||||
*/
|
||||
@SuppressWarnings("removal")
|
||||
public void dump ()
|
||||
{
|
||||
if (log.isLoggable(Level.FINE)) log.fine(getName() + (isDestroyed() ? " (destroyed)" : ""));
|
||||
|
|
|
@ -247,7 +247,7 @@ public class SystemInfo implements Serializable {
|
|||
si.availableProcessors = os.getAvailableProcessors();
|
||||
if (os instanceof com.sun.management.OperatingSystemMXBean) {
|
||||
com.sun.management.OperatingSystemMXBean extInfo = (com.sun.management.OperatingSystemMXBean) os;
|
||||
si.averageSystemLoad = extInfo.getSystemCpuLoad() * 100;
|
||||
si.averageSystemLoad = extInfo.getCpuLoad() * 100;
|
||||
} else {
|
||||
si.averageSystemLoad = (os.getSystemLoadAverage() / si.availableProcessors) * 100;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="src" path="WEB-INF/src/"/>
|
||||
<classpathentry exported="true" kind="lib" path="lib/ckez.jar"/>
|
||||
|
|
|
@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
|
|||
Bundle-Name: iDempiere Web Client
|
||||
Bundle-SymbolicName: org.adempiere.ui.zk;singleton:=true
|
||||
Bundle-Version: 11.0.0.qualifier
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
|
||||
Import-Package: com.google.common.annotations;version="30.1.1",
|
||||
com.google.common.base;version="30.1.1",
|
||||
com.google.common.cache;version="30.1.1",
|
||||
|
|
|
@ -102,7 +102,7 @@ public class LoggedSessionListener implements HttpSessionListener, ServletContex
|
|||
}
|
||||
}
|
||||
|
||||
logger.log(Level.OFF, "context initialized");
|
||||
logger.log(Level.OFF, "context initialized for " + org.zkoss.zk.Version.RELEASE);
|
||||
/**
|
||||
* End iDempiere Start
|
||||
*/
|
||||
|
|
|
@ -49,3 +49,4 @@ src.includes = WEB-INF/tld/,\
|
|||
WEB-INF/src/web/theme/default/zul/calendar/divtab.zul
|
||||
bin.excludes = WEB-INF/src/
|
||||
source.. = WEB-INF/src/
|
||||
jre.compilation.profile = JavaSE-17
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="src" path="src/"/>
|
||||
<classpathentry exported="true" kind="lib" path="lib/org-netbeans-api-visual.jar"/>
|
||||
|
|
|
@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
|
|||
Bundle-Name: iDempiere UI base
|
||||
Bundle-SymbolicName: org.adempiere.ui;singleton:=true
|
||||
Bundle-Version: 11.0.0.qualifier
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
|
||||
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
|
||||
org.apache.servicemix.bundles.xerces;bundle-version="0.0.0",
|
||||
org.eclipse.equinox.app;bundle-version="0.0.0"
|
||||
|
|
|
@ -5,3 +5,4 @@ bin.includes = META-INF/,\
|
|||
lib/org-openide-util-lookup.jar
|
||||
source.. = src/
|
||||
output.. = target/classes/
|
||||
jre.compilation.profile = JavaSE-17
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="src" path="src/"/>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
|
|
|
@ -5,8 +5,8 @@ Bundle-SymbolicName: org.apache.ecs
|
|||
Bundle-Version: 11.0.0.qualifier
|
||||
Bundle-Activator: org.apache.ecs.Activator
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
|
||||
Import-Package: org.osgi.framework;version="1.3.0"
|
||||
Export-Package: org.apache.ecs;uses:="org.apache.ecs.xhtml",
|
||||
org.apache.ecs.filter;uses:="org.apache.ecs",
|
||||
|
|
|
@ -2,3 +2,4 @@ bin.includes = META-INF/,\
|
|||
.
|
||||
output.. = target/classes/
|
||||
source.. = src/
|
||||
jre.compilation.profile = JavaSE-17
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="src" path="src/"/>
|
||||
<classpathentry exported="true" kind="lib" path="lib/HikariCP.jar"/>
|
||||
|
|
|
@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
|
|||
Bundle-Name: iDempiere Oracle Provider
|
||||
Bundle-SymbolicName: org.compiere.db.oracle.provider;singleton:=true
|
||||
Bundle-Version: 11.0.0.qualifier
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
|
||||
Require-Bundle: org.adempiere.base;bundle-version="0.0.0",
|
||||
org.adempiere.install;bundle-version="0.0.0";resolution:=optional
|
||||
Bundle-ClassPath: .,
|
||||
|
|
|
@ -7,3 +7,4 @@ bin.includes = META-INF/,\
|
|||
lib/ojdbc10.jar,\
|
||||
lib/HikariCP.jar
|
||||
source.. = src/
|
||||
jre.compilation.profile = JavaSE-17
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
|
||||
<attributes>
|
||||
<attribute name="module" value="true"/>
|
||||
</attributes>
|
||||
|
|
|
@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
|
|||
Bundle-Name: iDempiere Postgresql Provider
|
||||
Bundle-SymbolicName: org.compiere.db.postgresql.provider;singleton:=true
|
||||
Bundle-Version: 11.0.0.qualifier
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
|
||||
Bundle-ClassPath: .,
|
||||
lib/postgresql.jar,
|
||||
lib/HikariCP.jar
|
||||
|
|
|
@ -7,3 +7,4 @@ bin.includes = META-INF/,\
|
|||
lib/postgresql.jar,\
|
||||
lib/HikariCP.jar
|
||||
source.. = src/
|
||||
jre.compilation.profile = JavaSE-17
|
||||
|
|
|
@ -79,7 +79,7 @@
|
|||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
|
||||
<plugin
|
||||
id="org.eclipse.core.jobs"
|
||||
download-size="0"
|
||||
|
@ -432,4 +432,165 @@
|
|||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.osgi.annotation.bundle"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.osgi.annotation.versioning"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.osgi.service.cm"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.osgi.service.component"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.osgi.service.component.annotations"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.osgi.service.coordinator"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.osgi.service.device"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.osgi.service.event"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.osgi.service.log.stream"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.osgi.service.metatype"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.osgi.service.metatype.annotations"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.osgi.service.prefs"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.osgi.service.provisioning"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.osgi.service.upnp"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.osgi.service.useradmin"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.osgi.service.wireadmin"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.osgi.util.function"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.osgi.util.measurement"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.osgi.util.position"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.osgi.util.promise"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.osgi.util.pushstream"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.osgi.util.tracker"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
<plugin
|
||||
id="org.osgi.util.xml"
|
||||
download-size="0"
|
||||
install-size="0"
|
||||
version="0.0.0"
|
||||
unpack="false"/>
|
||||
|
||||
</feature>
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
osgi.framework=file\:../plugins/org.eclipse.osgi_3.17.200.v20220215-2237.jar
|
||||
osgi.framework=file\:../plugins/org.eclipse.osgi_3.18.300.v20230220-1352.jar
|
||||
osgi.install.area=director
|
||||
equinox.use.ds=true
|
||||
osgi.bundles=org.eclipse.core.net@start,\
|
||||
|
@ -60,10 +60,31 @@ osgi.bundles=org.eclipse.core.net@start,\
|
|||
org.eclipse.osgi.util,\
|
||||
org.tukaani.xz,\
|
||||
slf4j.api,\
|
||||
slf4j.jcl,\
|
||||
slf4j.jdk14,\
|
||||
bcpg,\
|
||||
bcutil,\
|
||||
bcprov
|
||||
bcprov,\
|
||||
org.osgi.service.cm,\
|
||||
org.osgi.service.component,\
|
||||
org.osgi.service.component.annotations,\
|
||||
org.osgi.service.coordinator,\
|
||||
org.osgi.service.device,\
|
||||
org.osgi.service.event,\
|
||||
org.osgi.service.log.stream,\
|
||||
org.osgi.service.metatype,\
|
||||
org.osgi.service.metatype.annotations,\
|
||||
org.osgi.service.prefs,\
|
||||
org.osgi.service.provisioning,\
|
||||
org.osgi.service.upnp,\
|
||||
org.osgi.service.useradmin,\
|
||||
org.osgi.service.wireadmin,\
|
||||
org.osgi.util.function,\
|
||||
org.osgi.util.measurement,\
|
||||
org.osgi.util.position,\
|
||||
org.osgi.util.promise,\
|
||||
org.osgi.util.pushstream,\
|
||||
org.osgi.util.tracker,\
|
||||
org.osgi.util.xml
|
||||
osgi.framework.extensions=
|
||||
osgi.bundles.defaultStartLevel=4
|
||||
eclipse.p2.profile=DefaultProfile
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="src" path="src/"/>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
|
|
|
@ -5,8 +5,8 @@ Bundle-SymbolicName: org.idempiere.felix.webconsole
|
|||
Bundle-Version: 11.0.0.qualifier
|
||||
Bundle-Activator: org.idempiere.felix.webconsole.Activator
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
|
||||
Import-Package: javax.servlet;version="2.5.0",
|
||||
javax.servlet.descriptor;version="3.1.0",
|
||||
javax.servlet.http;version="2.5.0",
|
||||
|
|
|
@ -5,3 +5,4 @@ bin.includes = META-INF/,\
|
|||
src.includes = WEB-INF/
|
||||
output.. = target/classes/
|
||||
source.. = src/
|
||||
jre.compilation.profile = JavaSE-17
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="src" path="src/"/>
|
||||
<classpathentry exported="true" kind="lib" path="lib/hazelcast-aws.jar"/>
|
||||
|
|
|
@ -25,8 +25,8 @@ Bundle-ClassPath: .,
|
|||
lib/hazelcast-aws.jar,
|
||||
lib/hazelcast.jar
|
||||
Service-Component: OSGI-INF/*.xml
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
|
||||
Require-Bundle: org.eclipse.osgi,
|
||||
org.adempiere.base;bundle-version="0.0.0"
|
||||
Automatic-Module-Name: org.idempiere.hazelcast.service
|
||||
|
|
|
@ -8,3 +8,4 @@ bin.includes = META-INF/,\
|
|||
lib/hazelcast-aws.jar,\
|
||||
lib/hazelcast.jar
|
||||
source.. = src/
|
||||
jre.compilation.profile = JavaSE-17
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17"/>
|
||||
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
|
||||
<classpathentry kind="output" path="target/classes"/>
|
||||
</classpath>
|
||||
|
|
|
@ -5,4 +5,4 @@ Bundle-SymbolicName: org.idempiere.javadoc;singleton:=true
|
|||
Bundle-Version: 11.0.0.qualifier
|
||||
Bundle-Vendor: iDempiere Community
|
||||
Automatic-Module-Name: org.idempiere.javadoc
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
|
||||
<attributes>
|
||||
<attribute name="module" value="true"/>
|
||||
</attributes>
|
||||
|
|
|
@ -5,6 +5,6 @@ Bundle-SymbolicName: org.idempiere.jetty.osgi.boot.fragment
|
|||
Bundle-Version: 11.0.0.qualifier
|
||||
Fragment-Host: org.eclipse.jetty.osgi.boot;bundle-version="10.0.7"
|
||||
Automatic-Module-Name: org.idempiere.jetty.logging.fragment
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Require-Bundle: org.adempiere.base;bundle-version="11.0.0"
|
||||
Bundle-Vendor: iDempiere.org
|
||||
|
|
|
@ -2,3 +2,4 @@ source.. = src/
|
|||
output.. = target/classes/
|
||||
bin.includes = META-INF/,\
|
||||
.
|
||||
jre.compilation.profile = JavaSE-17
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<classpath>
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
|
||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
|
||||
<attributes>
|
||||
<attribute name="module" value="true"/>
|
||||
<attribute name="maven.pomderived" value="true"/>
|
||||
|
|
|
@ -3,8 +3,8 @@ Bundle-ManifestVersion: 2
|
|||
Bundle-Name: zk keikai
|
||||
Bundle-SymbolicName: org.idempiere.keikai
|
||||
Bundle-Version: 11.0.0.qualifier
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-11
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=11))"
|
||||
Bundle-RequiredExecutionEnvironment: JavaSE-17
|
||||
Require-Capability: osgi.ee;filter:="(&(osgi.ee=JavaSE)(version>=17))"
|
||||
Bundle-ClassPath: .,
|
||||
lib/keikai-oss.jar,
|
||||
lib/keikai-model-oss.jar,
|
||||
|
|
|
@ -8,3 +8,4 @@ bin.includes = META-INF/,\
|
|||
OSGI-INF/,\
|
||||
lib/ooxml-schemas.jar,\
|
||||
lib/xmlbeans.jar
|
||||
jre.compilation.profile = JavaSE-17
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
* Using the feature project wizard, create a new feature for the target platform. You will remove this project at the end so just give it an arbitrary name.
|
||||
* In the plugin selection page, the plugins listed are the ones in your target platform together with your workspace plugin projects.
|
||||
* Select Initialize from the plugin list and Select all plugins.
|
||||
* De-select your workspace plugins(org.idempiere.*, org.adempiere.*, org.compiere.*, org.apache.ecs, etc).
|
||||
* De-select platform launcher plugins (macos, linux and win32).
|
||||
* De-select your workspace plugins(org.idempiere.*, org.adempiere.*, org.compiere.* and org.apache.ecs).
|
||||
* De-select platform launcher plugins (org.eclipse.equinox.launcher.* for macos, linux and win32).
|
||||
* At feature.xml editor, switch to Included Features tab and add org.eclipse.equinox.executable feature.
|
||||
* Replace includes and plugin entries in feature.xml with include and plugin entries from the newly created feature.xml.
|
||||
* Remove the newly created feature project.
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -5,11 +5,6 @@
|
|||
<projects>
|
||||
</projects>
|
||||
<buildSpec>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.jdt.core.javabuilder</name>
|
||||
<arguments>
|
||||
</arguments>
|
||||
</buildCommand>
|
||||
<buildCommand>
|
||||
<name>org.eclipse.m2e.core.maven2Builder</name>
|
||||
<arguments>
|
||||
|
@ -18,6 +13,5 @@
|
|||
</buildSpec>
|
||||
<natures>
|
||||
<nature>org.eclipse.m2e.core.maven2Nature</nature>
|
||||
<nature>org.eclipse.jdt.core.javanature</nature>
|
||||
</natures>
|
||||
</projectDescription>
|
||||
|
|
|
@ -0,0 +1,21 @@
|
|||
#How to Update Target Plaform
|
||||
* Install Target Platform DSL Editor from https://github.com/eclipse-cbi/targetplatform-dsl
|
||||
* Update maven.locations.xml (if needed)
|
||||
* Update org.idempiere.p2.targetplatform.tpd. Note that even if there's only update to maven.locations.xml, you should at minimum update the target timestamp (format is idempiere-yymmdd) value.
|
||||
* Turn off Project > Build Automatically
|
||||
* Right click on org.idempiere.p2.targetplatform.tpd and select "Create Target Definition File"
|
||||
* Open the updated org.idempiere.p2.targetplatform.target, switch to Source tab and copy location entries from maven.locations.xml
|
||||
* Switch back to Definition tab and wait for resolution of the target plaform. Check target platform state to verify there's no unresolve plugins except the platform launcher fragment (select "Show only unresolved plug-ins"). If resolution of target platform is very slow, you can try "rm .metadata/.plugins/org.eclipse.pde.core/.p2/org.eclipse.equinox.p2.engine/.settings/org.eclipse.equinox.p2.artifact.repository.prefs" (run at the root of your workspace folder) to speed it up.
|
||||
* If there are update to embedded jars, quit Eclipse, remove the embedded jars and execute "mvn clean verify -U"
|
||||
* Reload target platform
|
||||
* Turn on Project > Build Automatically
|
||||
* If there are features that give missing plugin warnings, try "Clean all projects" and rebuild the whole workspace
|
||||
* If necessary, update server.product (in org.idempiere.p2 and org.adempiere.server.feature), org.idempiere.eclipse.platform.feature/feature.xml and org.adempiere.server.feature/feature.xml
|
||||
* If necessary, update org.idempiere.server.feature/setup/configuration/config.ini and org.idempiere.equinox.p2.feature/director/configuration/config.ini
|
||||
* Validate all Eclipse application launch configuration is working.
|
||||
* Validate unit test launch configuration is working.
|
||||
* Validate application created by mvn verify is working as expected.
|
||||
* Update org.idempiere.p2.repository.target - open in target editor, switch to Content tab and update the list of selected bundle.
|
||||
* Update org.idempiere.p2.targetplatform.mirror.feature/feature.xml (Follow instructions in org.idempiere.p2.targetplatform.mirror.feature).
|
||||
* Update name and "idempiere.target.platform" setup task in utils_dev/oomph/idempiere.setup
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue