From 3f1d941305f3500a00a022c16862b9278d93e632 Mon Sep 17 00:00:00 2001
From: Heng Sin Low <hengsin@gmail.com>
Date: Fri, 27 May 2011 05:56:38 +0800
Subject: [PATCH] Fixed buckminster materialization and bundle version
 dependency issues. (transplanted from
 c6461faa371127b56d214c804a21b37ec90ce4cf)

---
 org.adempiere.geminiweb-feature/feature.xml      | 11 +++++------
 org.adempiere.install/install.app.launch         |  4 ++--
 org.adempiere.install/install.console.app.launch |  4 ++--
 org.adempiere.server/META-INF/MANIFEST.MF        |  1 +
 org.adempiere.ui.swing/META-INF/MANIFEST.MF      |  1 +
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/org.adempiere.geminiweb-feature/feature.xml b/org.adempiere.geminiweb-feature/feature.xml
index 51d9edf1b2..f05fb8a11f 100644
--- a/org.adempiere.geminiweb-feature/feature.xml
+++ b/org.adempiere.geminiweb-feature/feature.xml
@@ -42,7 +42,7 @@
          id="com.springsource.javax.el"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.0.0"
          unpack="false"/>
 
    <plugin
@@ -53,7 +53,7 @@
          unpack="false"/>
 
    <plugin
-         id="com.springsource.javax.persistence"
+         id="javax.persistence"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -102,7 +102,7 @@
          unpack="false"/>
 
    <plugin
-         id="com.springsource.javax.xml.stream"
+         id="javax.xml.stream"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -146,7 +146,7 @@
          unpack="false"/>
 
    <plugin
-         id="com.springsource.org.apache.commons.logging"
+         id="org.apache.commons.logging"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -191,13 +191,12 @@
 
    <plugin
          id="com.springsource.slf4j.api"
-         download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="com.springsource.slf4j.simple"
+         id="com.springsource.slf4j.jcl"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch
index f7f1df7e0d..b6da89543a 100644
--- a/org.adempiere.install/install.app.launch
+++ b/org.adempiere.install/install.app.launch
@@ -19,8 +19,8 @@
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
-<stringAttribute key="selected_target_plugins" value="com.springsource.org.apache.commons.collections@default:default,com.springsource.javax.management.j2ee@default:default,com.springsource.javax.servlet@default:default,org.apache.ant@default:default,com.springsource.org.apache.activemq@default:default,com.springsource.javax.ejb@default:default,org.eclipse.core.jobs@default:default,com.springsource.org.junit@default:default,com.springsource.org.apache.poi@default:default,com.springsource.javax.xml.soap@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.registry@default:default,com.springsource.org.apache.kahadb@default:default,org.eclipse.ant.core@default:default,com.springsource.javax.xml.rpc@default:default,org.eclipse.core.variables@default:default,com.springsource.net.sf.cglib@default:default,com.springsource.javax.jms@default:default,org.restlet@default:default,com.springsource.org.apache.commons.net@default:default,org.eclipse.osgi@-1:true,com.springsource.javax.mail@default:default,com.springsource.org.apache.commons.logging@default:default,org.eclipse.osgi.services@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,com.springsource.javax.activation@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.compiere.db.postgresql.provider@default:default,org.compiere.db.oracle.provider@default:default,org.adempiere.base@default:default,org.adempiere.install@default:true,org.adempiere.extend@default:false,org.apache.ecs@default:default"/>
+<stringAttribute key="selected_target_plugins" value="com.springsource.org.apache.activemq@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.runtime@default:true,com.springsource.org.junit@default:default,org.apache.commons.logging@default:default,com.springsource.org.apache.commons.net@default:default,com.springsource.javax.management.j2ee@default:default,com.springsource.javax.ejb@default:default,org.eclipse.equinox.app@default:default,com.springsource.javax.xml.soap@default:default,com.springsource.javax.servlet@default:default,org.eclipse.equinox.registry@default:default,com.springsource.net.sf.cglib@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.preferences@default:default,org.apache.ant@default:default,org.restlet@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.ant.core@default:default,com.springsource.org.apache.commons.collections@default:default,com.springsource.javax.xml.rpc@default:default,com.springsource.javax.mail@default:default,org.eclipse.core.variables@default:default,com.springsource.javax.jms@default:default,javax.xml@default:default,org.eclipse.equinox.common@2:true,com.springsource.org.apache.kahadb@default:default,com.springsource.javax.activation@default:default,org.eclipse.osgi.services@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default,org.adempiere.extend@default:false,org.apache.poi@default:default,org.apache.ecs@default:default,org.adempiere.install@default:true,org.adempiere.base@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
 <booleanAttribute key="tracing" value="false"/>
diff --git a/org.adempiere.install/install.console.app.launch b/org.adempiere.install/install.console.app.launch
index 109a8a1bdf..29f4142d8c 100644
--- a/org.adempiere.install/install.console.app.launch
+++ b/org.adempiere.install/install.console.app.launch
@@ -19,8 +19,8 @@
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.adempiere.server.server_product"/>
-<stringAttribute key="selected_target_plugins" value="com.springsource.org.apache.commons.collections@default:default,com.springsource.javax.management.j2ee@default:default,com.springsource.javax.servlet@default:default,org.apache.ant@default:default,com.springsource.org.apache.activemq@default:default,com.springsource.javax.ejb@default:default,org.eclipse.core.jobs@default:default,com.springsource.org.junit@default:default,com.springsource.org.apache.poi@default:default,com.springsource.javax.xml.soap@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.registry@default:default,com.springsource.org.apache.kahadb@default:default,org.eclipse.ant.core@default:default,com.springsource.javax.xml.rpc@default:default,org.eclipse.core.variables@default:default,com.springsource.net.sf.cglib@default:default,com.springsource.javax.jms@default:default,org.restlet@default:default,com.springsource.org.apache.commons.net@default:default,org.eclipse.osgi@-1:true,com.springsource.javax.mail@default:default,com.springsource.org.apache.commons.logging@default:default,org.eclipse.osgi.services@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,com.springsource.javax.activation@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.compiere.db.postgresql.provider@default:default,org.compiere.db.oracle.provider@default:default,org.adempiere.base@default:default,org.adempiere.install@default:true,org.adempiere.extend@default:false,org.apache.ecs@default:default"/>
+<stringAttribute key="selected_target_plugins" value="org.eclipse.core.jobs@default:default,org.eclipse.core.variables@default:default,com.springsource.net.sf.cglib@default:default,org.restlet@default:default,org.eclipse.osgi@-1:true,com.springsource.org.apache.activemq@default:default,org.eclipse.equinox.app@default:default,org.eclipse.core.contenttype@default:default,com.springsource.javax.management.j2ee@default:default,org.eclipse.ant.core@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.eclipse.equinox.registry@default:default,com.springsource.javax.activation@default:default,org.eclipse.core.runtime@default:true,com.springsource.org.junit@default:default,com.springsource.org.apache.kahadb@default:default,org.eclipse.equinox.common@2:true,com.springsource.javax.xml.rpc@default:default,com.springsource.org.apache.commons.collections@default:default,com.springsource.javax.servlet@default:default,com.springsource.javax.jms@default:default,com.springsource.org.apache.commons.net@default:default,org.apache.ant@default:default,org.eclipse.osgi.services@default:default,com.springsource.javax.ejb@default:default,javax.xml@default:default,com.springsource.javax.mail@default:default,com.springsource.javax.xml.soap@default:default,org.eclipse.equinox.preferences@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="org.apache.ecs@default:default,org.adempiere.install@default:true,org.adempiere.extend@default:false,org.adempiere.base@default:default,org.apache.poi@default:default,org.compiere.db.oracle.provider@default:default,org.compiere.db.postgresql.provider@default:default"/>
 <booleanAttribute key="show_selected_only" value="false"/>
 <stringAttribute key="templateConfig" value="${target_home}/configuration/config.ini"/>
 <booleanAttribute key="tracing" value="false"/>
diff --git a/org.adempiere.server/META-INF/MANIFEST.MF b/org.adempiere.server/META-INF/MANIFEST.MF
index af3c731e1f..7789c61e06 100644
--- a/org.adempiere.server/META-INF/MANIFEST.MF
+++ b/org.adempiere.server/META-INF/MANIFEST.MF
@@ -19,6 +19,7 @@ Import-Package: javax.jms;version="1.1.0",
  org.apache.commons.codec.binary;version="1.3.0",
  org.apache.ecs,
  org.apache.ecs.xhtml,
+ org.apache.poi.hssf.usermodel,
  org.restlet,
  org.restlet.data,
  org.restlet.ext.servlet,
diff --git a/org.adempiere.ui.swing/META-INF/MANIFEST.MF b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
index 78189dadf9..d82dc66800 100644
--- a/org.adempiere.ui.swing/META-INF/MANIFEST.MF
+++ b/org.adempiere.ui.swing/META-INF/MANIFEST.MF
@@ -68,6 +68,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.net.ssl,
  org.apache.ecs,
  org.apache.ecs.xhtml,
+ org.apache.poi.hssf.usermodel,
  org.eclipse.core.runtime;version="3.4.0",
  org.eclipse.equinox.app,
  org.osgi.framework;version="1.5.0",