From 44a323ff99d6fb16519983cddeae05a21ca32261 Mon Sep 17 00:00:00 2001 From: joergviola Date: Wed, 28 Apr 2010 20:59:00 +0000 Subject: [PATCH] Turned install into an equinox plugin providing an eclipse application Modified build script to deploy the equinox container https://sourceforge.net/tracker/?func=detail&aid=2700937&group_id=176962&atid=879334 --- install/.classpath | 1 + install/.project | 67 +++++++++++-------- install/Adempiere/RUN_setup.sh | 7 +- install/Adempiere/build.xml | 8 +-- install/META-INF/MANIFEST.MF | 19 ++++++ install/build.properties | 10 +++ install/build.xml | 28 ++++++-- install/plugin.xml | 12 ++++ .../src/org/compiere/install/Application.java | 16 +++++ .../compiere/install/ConfigurationPanel.java | 7 +- 10 files changed, 135 insertions(+), 40 deletions(-) create mode 100644 install/META-INF/MANIFEST.MF create mode 100644 install/build.properties create mode 100644 install/plugin.xml create mode 100644 install/src/org/compiere/install/Application.java diff --git a/install/.classpath b/install/.classpath index 3590689cb1..db61ac4f82 100644 --- a/install/.classpath +++ b/install/.classpath @@ -14,5 +14,6 @@ + diff --git a/install/.project b/install/.project index e7adf24f52..3dca82a6da 100644 --- a/install/.project +++ b/install/.project @@ -1,28 +1,39 @@ - - - install - - - base - client - dbPort - extend - jboss - looks - print - server - serverApps - serverRoot - tools - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - + + + install + + + base + client + dbPort + extend + jboss + looks + print + server + serverApps + serverRoot + tools + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.pde.ManifestBuilder + + + + + org.eclipse.pde.SchemaBuilder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.pde.PluginNature + + diff --git a/install/Adempiere/RUN_setup.sh b/install/Adempiere/RUN_setup.sh index 6b53ff082e..92bb165778 100644 --- a/install/Adempiere/RUN_setup.sh +++ b/install/Adempiere/RUN_setup.sh @@ -26,7 +26,10 @@ ARGS=CONFIG # To test the OCI driver, add -DTestOCI=Y to the command - example: # $JAVA -classpath $CP -DADEMPIERE_HOME=$ADEMPIERE_HOME -DTestOCI=Y org.compiere.install.Setup $ARGS -$JAVA -classpath $CP -DADEMPIERE_HOME=$ADEMPIERE_HOME org.compiere.install.Setup $ARGS +# $JAVA -classpath $CP -DADEMPIERE_HOME=$ADEMPIERE_HOME org.compiere.install.Setup $ARGS +# OSGi: +$JAVA -jar osgi/org.eclipse.osgi_3.5.0.v20090520.jar -clean -console -application org.adempiere.Install + #echo =================================== #echo Setup Adempiere Server Environment @@ -41,7 +44,7 @@ find . -name '*.sh' -exec chmod a+x '{}' \; # Sign database build cd utils -. ./RUN_SignDatabaseBuild.sh +#. ./RUN_SignDatabaseBuild.sh . ./RUN_UnixEnv.sh diff --git a/install/Adempiere/build.xml b/install/Adempiere/build.xml index 5bb8abc49c..f2a0d63e77 100644 --- a/install/Adempiere/build.xml +++ b/install/Adempiere/build.xml @@ -338,7 +338,7 @@ - @@ -349,7 +349,7 @@ - + @@ -515,7 +515,7 @@ - diff --git a/install/META-INF/MANIFEST.MF b/install/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..27b97b25a4 --- /dev/null +++ b/install/META-INF/MANIFEST.MF @@ -0,0 +1,19 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: install +Bundle-SymbolicName: org.adempiere.install;singleton:=true +Bundle-Version: 0.0.0.1 +Bundle-ClassPath: install.jar, + lib/ant.jar, + lib/ant-commons-net.jar, + lib/ant-launcher.jar, + lib/commons-net-1.4.0.jar, + lib/ocrs12.jar, + lib/ojdbc14.jar +Export-Package: images, + 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" +Bundle-Activator: org.compiere.install.Activator diff --git a/install/build.properties b/install/build.properties new file mode 100644 index 0000000000..f467f3ebcf --- /dev/null +++ b/install/build.properties @@ -0,0 +1,10 @@ +source.install.jar = src/,build/ +bin.includes = META-INF/,\ + lib/ant.jar,\ + lib/ant-commons-net.jar,\ + lib/ant-launcher.jar,\ + lib/commons-net-1.4.0.jar,\ + lib/ocrs12.jar,\ + lib/ojdbc14.jar,\ + install.jar,\ + plugin.xml diff --git a/install/build.xml b/install/build.xml index 3c9ff1bd8e..3d427721e2 100644 --- a/install/build.xml +++ b/install/build.xml @@ -16,6 +16,7 @@ + @@ -117,7 +118,7 @@ - - - + AdempiereHome - + + + + + + + + + + + + + @@ -264,6 +277,13 @@ + + + diff --git a/install/plugin.xml b/install/plugin.xml new file mode 100644 index 0000000000..4f264a6626 --- /dev/null +++ b/install/plugin.xml @@ -0,0 +1,12 @@ + + + + + + + + + + diff --git a/install/src/org/compiere/install/Application.java b/install/src/org/compiere/install/Application.java new file mode 100644 index 0000000000..e29ec94eac --- /dev/null +++ b/install/src/org/compiere/install/Application.java @@ -0,0 +1,16 @@ +package org.compiere.install; + +import org.eclipse.equinox.app.IApplication; +import org.eclipse.equinox.app.IApplicationContext; + +public class Application implements IApplication { + + public Object start(IApplicationContext arg0) throws Exception { + Setup.main(new String[]{}); + return null; + } + + public void stop() { + } + +} diff --git a/install/src/org/compiere/install/ConfigurationPanel.java b/install/src/org/compiere/install/ConfigurationPanel.java index e2d3be1e14..03013bcd5d 100644 --- a/install/src/org/compiere/install/ConfigurationPanel.java +++ b/install/src/org/compiere/install/ConfigurationPanel.java @@ -36,6 +36,7 @@ import javax.swing.JSeparator; import javax.swing.SwingUtilities; import javax.swing.border.TitledBorder; +import org.adempiere.base.Core; import org.apache.tools.ant.Main; import org.compiere.Adempiere; import org.compiere.swing.CButton; @@ -47,6 +48,8 @@ import org.compiere.swing.CPassword; import org.compiere.swing.CTextField; import org.compiere.util.CLogger; +import com.sfcommerce.jpaymentcomponent.ssl.Client; + /** * Configuration Panel @@ -98,8 +101,8 @@ public class ConfigurationPanel extends CPanel implements ActionListener private ConfigurationData m_data = new ConfigurationData(this); private static ImageIcon iOpen = new ImageIcon(ConfigurationPanel.class.getResource("openFile.gif")); - private static ImageIcon iSave = new ImageIcon(Adempiere.class.getResource("images/Save16.gif")); - private static ImageIcon iHelp = new ImageIcon(Adempiere.class.getResource("images/Help16.gif")); + private static ImageIcon iSave = new ImageIcon(Core.getResourceFinder().getResource("images/Save16.gif")); + private static ImageIcon iHelp = new ImageIcon(Core.getResourceFinder().getResource("images/Help16.gif")); // ------------- Static UI