Complete restructuring of equinox-target, equinox-bridge no longer used.
https://sourceforge.net/tracker/?func=detail&aid=2700937&group_id=176962&atid=879334
This commit is contained in:
parent
52edb1d22a
commit
a93cb8db5f
|
@ -1,5 +0,0 @@
|
||||||
Currently this is a template.
|
|
||||||
Copy this folder to somewhere and use it there.
|
|
||||||
|
|
||||||
Reason: This is the runtime environment.
|
|
||||||
Lots of files are created in various places, which are not supposed to be committed to svn.
|
|
|
@ -0,0 +1,72 @@
|
||||||
|
<!--
|
||||||
|
The equinox target project holds the equinox framework components and has
|
||||||
|
the following responsibilities:
|
||||||
|
- acting as an equinox-target for the eclipse dev environment
|
||||||
|
- providing setup for an OSGi container for developing swing client in OSGi
|
||||||
|
- providing setup for a servlet bridge webapp for developing web clients in OSGi
|
||||||
|
- providing setup for a webstart jnlp for developing webstart clients in OSGi
|
||||||
|
- installing equinox runtime components in the ADempiere install process
|
||||||
|
-->
|
||||||
|
|
||||||
|
<project name="equinox-target" basedir="." default="all">
|
||||||
|
|
||||||
|
<property name="src" value="." />
|
||||||
|
<property name="dist" value="./dist" />
|
||||||
|
<property name="dist-standalone" value="${dist}/standalone" />
|
||||||
|
<property name="dist-web" value="${dist}/web" />
|
||||||
|
<property name="dist-webstart" value="${dist}/webstart" />
|
||||||
|
<property name="osgi-runtime" value="org.eclipse.osgi_3.5.0.v20090520.jar" />
|
||||||
|
<property name="adempiere-client" value="org.adempiere.client_0.0.0.2.jar" />
|
||||||
|
|
||||||
|
<target name="all" depends="clean,dist-standalone,dist-web,dist-webstart"/>
|
||||||
|
|
||||||
|
<target name="clean">
|
||||||
|
<delete dir="${dist}"/>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="dist-standalone">
|
||||||
|
<mkdir dir="${dist-standalone}"/>
|
||||||
|
<copy overwrite="true" todir="${dist-standalone}" >
|
||||||
|
<fileset dir="${src}">
|
||||||
|
<include name="configuration/**/*"/>
|
||||||
|
<include name="plugins/**/*"/>
|
||||||
|
<include name="${osgi-runtime}"/>
|
||||||
|
<include name="org.eclipse.equinox.common_*.jar"/>
|
||||||
|
<include name="org.eclipse.update.configurator_*.jar"/>
|
||||||
|
</fileset>
|
||||||
|
</copy>
|
||||||
|
<echo message="Remember: Copy client bundle into ${dist-standalone}."/>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="run-standalone">
|
||||||
|
<move failonerror="false" file="${dist-standalone}/plugins/${adempiere-client}" todir="${dist-standalone}" />
|
||||||
|
<java dir="${dist-standalone}" fork="true" jvmversion="1.6" jar="${dist-standalone}/${osgi-runtime}">
|
||||||
|
<arg value="-console"/>
|
||||||
|
<arg value="-clean"/>
|
||||||
|
</java>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="dist-web">
|
||||||
|
<mkdir dir="${dist-web}"/>
|
||||||
|
<copy overwrite="true" todir="${dist-web}" >
|
||||||
|
<fileset dir="${src}/webapp">
|
||||||
|
<include name="**/*"/>
|
||||||
|
</fileset>
|
||||||
|
</copy>
|
||||||
|
<copy overwrite="true" todir="${dist-web}/WEB-INF/eclipse/plugins" >
|
||||||
|
<fileset dir="${src}/plugins">
|
||||||
|
<include name="**/*"/>
|
||||||
|
</fileset>
|
||||||
|
</copy>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="dist-webstart">
|
||||||
|
<mkdir dir="${dist-webstart}"/>
|
||||||
|
<copy overwrite="true" todir="${dist-webstart}" >
|
||||||
|
<fileset dir="${src}/webstart">
|
||||||
|
<include name="**/*"/>
|
||||||
|
</fileset>
|
||||||
|
</copy>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
</project>
|
|
@ -1,3 +1,3 @@
|
||||||
org.osgi.framework.bootdelegation=*
|
org.osgi.framework.bootdelegation=*
|
||||||
osgi.bundles=org.eclipse.equinox.common@2:start, org.eclipse.update.configurator@3:start, org.eclipse.core.runtime@4:start, org.adempiere.client@5:start
|
osgi.bundles=org.eclipse.equinox.common@2:start, org.eclipse.update.configurator@3:start, org.eclipse.core.runtime@4:start, org.adempiere.client@start
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,49 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
|
||||||
|
<web-app id="WebApp">
|
||||||
|
<servlet id="bridge">
|
||||||
|
<servlet-name>equinoxbridgeservlet</servlet-name>
|
||||||
|
<display-name>Equinox Bridge Servlet</display-name>
|
||||||
|
<description>Equinox Bridge Servlet</description>
|
||||||
|
<servlet-class>org.eclipse.equinox.servletbridge.BridgeServlet</servlet-class>
|
||||||
|
<init-param>
|
||||||
|
<param-name>commandline</param-name>
|
||||||
|
<param-value>-console -clean</param-value>
|
||||||
|
</init-param>
|
||||||
|
<init-param>
|
||||||
|
<param-name>enableFrameworkControls</param-name>
|
||||||
|
<param-value>true</param-value>
|
||||||
|
</init-param>
|
||||||
|
<!--
|
||||||
|
org.eclipse.equinox.servletbridge and the Servlet API are exported automatically to the underlying OSGi framework.
|
||||||
|
The extendedFrameworkExports parameter allows the specification of additional java package exports.
|
||||||
|
The format is a comma separated list of exports as specified by the "Export-Package" bundle manifest header.
|
||||||
|
For example: com.mycompany.exports; version=1.0.0, com.mycompany.otherexports; version=1.0.0
|
||||||
|
-->
|
||||||
|
<init-param>
|
||||||
|
<param-name>extendedFrameworkExports</param-name>
|
||||||
|
<param-value></param-value>
|
||||||
|
</init-param>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
You can specify your own framework launcher here.
|
||||||
|
The default is: org.eclipse.equinox.servletbridge.FrameworkLauncher
|
||||||
|
<init-param>
|
||||||
|
<param-name>frameworkLauncherClass</param-name>
|
||||||
|
<param-value>org.eclipse.equinox.servletbridge.FrameworkLauncher</param-value>
|
||||||
|
</init-param>
|
||||||
|
-->
|
||||||
|
<load-on-startup>1</load-on-startup>
|
||||||
|
</servlet>
|
||||||
|
<servlet-mapping>
|
||||||
|
<servlet-name>equinoxbridgeservlet</servlet-name>
|
||||||
|
<url-pattern>/*</url-pattern>
|
||||||
|
</servlet-mapping>
|
||||||
|
<!--
|
||||||
|
This is required if your application bundles expose JSPs.
|
||||||
|
-->
|
||||||
|
<servlet-mapping>
|
||||||
|
<servlet-name>equinoxbridgeservlet</servlet-name>
|
||||||
|
<url-pattern>*.jsp</url-pattern>
|
||||||
|
</servlet-mapping>
|
||||||
|
</web-app>
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<jnlp
|
<jnlp
|
||||||
spec="1.0+"
|
spec="1.0+"
|
||||||
codebase="file:///Users/viola/Workspaces/adempiere/adempiereTrunk/equinox-target"
|
codebase="http://localhost:8080/webstart"
|
||||||
href="adempiere-equinox.jnlp"> <!-- URL to the site containing the jnlp application. It should match the value used on export. Href, the name of this file -->
|
href="adempiere-equinox.jnlp"> <!-- URL to the site containing the jnlp application. It should match the value used on export. Href, the name of this file -->
|
||||||
<information>
|
<information>
|
||||||
<title>Adempiere Client 3.5.4a</title>
|
<title>Adempiere Client 3.5.4a</title>
|
Loading…
Reference in New Issue