* use -Dosgi.compatibility.bootdelegation=true to make classes from vm other than java.* visible to bundle.

* development and build changes.
This commit is contained in:
Heng Sin Low 2010-07-15 03:10:57 +08:00
parent f379b187f8
commit ef657c6cee
6 changed files with 25 additions and 8 deletions

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="build"/>
</classpath>

View File

@ -0,0 +1,8 @@
#Wed Jul 14 16:17:19 MYT 2010
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6

View File

@ -20,7 +20,7 @@ echo Setup Dialog
echo ===================================
# OSGi:
$JAVA -jar osgi/org.eclipse.osgi_3.6.0.v20100517.jar -clean -console -install osgi -configuration osgi/client -application org.adempiere.Install
$JAVA -Dosgi.compatibility.bootdelegation=true -jar osgi/org.eclipse.osgi_3.6.0.v20100517.jar -clean -console -install osgi -configuration osgi/client -application org.adempiere.Install
echo ===================================

View File

@ -46,7 +46,10 @@
<condition property="isWindows">
<os family="windows" />
</condition>
<echo message="Windows=${isWindows} JBoss=${isAppsJBoss} Glassfish=${isAppsGlassfish}" />
<echo message="Windows=${isWindows}" />
<copy file="osgi/plugins/org.adempiere.tomcat.config/META-INF/tomcat/serverTemplate.xml"
tofile="osgi/plugins/org.adempiere.tomcat.config/META-INF/tomcat/server.xml" filtering="yes" overwrite="yes"/>
</target>

View File

@ -2,11 +2,11 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: install
Bundle-SymbolicName: org.adempiere.install;singleton:=true
Bundle-Version: 0.0.0.1
Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: install.jar
Export-Package: org.compiere.install
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0",
org.adempiere.base;bundle-version="0.0.0",
org.adempiere.client;bundle-version="0.0.0",
org.adempiere.tools;bundle-version="0.0.0"
Require-Bundle: org.adempiere.base;bundle-version="1.0.0",
org.adempiere.client;bundle-version="1.0.0",
org.adempiere.tools;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.eclipse.equinox.app

View File

@ -122,6 +122,7 @@
</fileset>
<fileset dir="../lib">
<include name="plugins/**/*"/>
<exclude name="plugins/org.adempiere.tomcat.config*"/>
</fileset>
</copy>
<copy overwrite="true" todir="${build.dir}/Adempiere/osgi/client" >
@ -134,6 +135,11 @@
<include name="*.ini"/>
</fileset>
</copy>
<unjar dest="${build.dir}/Adempiere/osgi/plugins/org.adempiere.tomcat.config" overwrite="true">
<fileset dir="../lib/plugins">
<include name="org.adempiere.tomcat.config*.jar"/>
</fileset>
</unjar>
<delete dir="${build.dir}/Adempiere/lib/plugins"/>
<!-- Utils Directory -->