Fixed bundle dependency

(transplanted from 2fe1421186c69eadb24ba5136e4de91f016e00b8)

com.springsource.javax.xml.ws/.classpath

@@ -0,0 +1,7 @@
+<?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-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" kind="lib" path=""/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

com.springsource.javax.xml.ws/.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.springsource.javax.xml.ws</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

com.springsource.javax.xml.ws/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,8 @@
+#Wed May 25 00:04:18 MYT 2011
+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

com.springsource.javax.xml.ws/.settings/org.eclipse.pde.core.prefs

@@ -0,0 +1,4 @@
+#Wed May 25 00:04:18 MYT 2011
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false

com.springsource.javax.xml.ws/META-INF/MANIFEST.MF

@@ -0,0 +1,30 @@
+Manifest-Version: 1.0
+Export-Package: javax.xml.ws;version="2.1.1";uses:="javax.xml.bind,jav
+ ax.xml.namespace,javax.xml.transform,javax.xml.ws.handler,org.w3c.dom
+ ",javax.xml.ws.handler;version="2.1.1";uses:="javax.xml.namespace,jav
+ ax.xml.ws",javax.xml.ws.handler.soap;version="2.1.1";uses:="javax.xml
+ .bind,javax.xml.namespace,javax.xml.soap",javax.xml.ws.http;version="
+ 2.1.1",javax.xml.ws.soap;version="2.1.1";uses:="javax.xml.soap",javax
+ .xml.ws.spi;version="2.1.1";uses:="javax.xml.bind,javax.xml.namespace
+ ,javax.xml.transform,javax.xml.ws,javax.xml.ws.handler,javax.xml.ws.w
+ saddressing",javax.xml.ws.wsaddressing;version="2.1.1";uses:="javax.x
+ ml.bind,javax.xml.namespace,javax.xml.transform,org.w3c.dom"
+Implementation-Title: Java API for XML Web Services Standard Implement
+ ation
+Bundle-Classpath: .
+Bundle-Name: Java Web Services API
+Created-By: 1.5.0_06-b05 (Sun Microsystems Inc.)
+Bundle-Vendor: SpringSource
+Implementation-Vendor: Sun Microsystems, Inc.
+Ant-Version: Apache Ant 1.6.5
+Implementation-Vendor-Id: com.sun
+Bundle-Version: 2.1.1
+Bundle-ManifestVersion: 2
+Specification-Title: Java API for XML Web Services
+Bundle-SymbolicName: com.springsource.javax.xml.ws
+Specification-Version: 2.1
+Import-Package: javax.xml.bind;version="[2.0.0, 3.0.0)",javax.xml.bind
+ .annotation;version="[2.0.0, 3.0.0)",javax.xml.namespace,javax.xml.so
+ ap;version="[1.3.0, 2.0.0)",javax.xml.transform,javax.xml.transform.s
+ tream,org.w3c.dom
+Extension-Name: javax.xml.ws

com.springsource.javax.xml.ws/build.properties

@@ -0,0 +1,4 @@
+source.. = .
+output.. = .
+bin.includes = META-INF/,\
+               javax/

com.springsource.slf4j.api/.classpath

@@ -0,0 +1,7 @@
+<?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-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" kind="lib" path=""/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

com.springsource.slf4j.api/.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.springsource.slf4j.api</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

com.springsource.slf4j.api/.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,8 @@
+#Wed May 25 00:30:15 MYT 2011
+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

com.springsource.slf4j.api/META-INF/MANIFEST.MF

@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Export-Package: org.slf4j;version="1.6.1";uses:="org.slf4j.spi",org.sl
+ f4j.helpers;version="1.6.1";uses:="org.slf4j,org.slf4j.spi",org.slf4j
+ .spi;version="1.6.1";uses:="org.slf4j"
+Implementation-Title: slf4j-api
+Implementation-Version: 1.6.1
+Built-By: ceki
+Tool: Bundlor 1.0.0.RELEASE
+Bundle-Name: SLF4J API
+Created-By: Apache Maven
+Bundle-Vendor: SpringSource
+Build-Jdk: 1.6.0_16
+Bundle-Version: 1.6.1
+Bundle-ManifestVersion: 2
+Bundle-Description: The slf4j API
+Bundle-SymbolicName: com.springsource.slf4j.api
+Import-Package: org.slf4j.impl;version="[1.6.1, 2.0.0)"
+Archiver-Version: Plexus Archiver

com.springsource.slf4j.api/META-INF/maven/org.slf4j/slf4j-api/pom.properties

@@ -0,0 +1,5 @@
+#Generated by Maven
+#Mon Jul 05 22:24:25 CEST 2010
+version=1.6.1
+groupId=org.slf4j
+artifactId=slf4j-api

com.springsource.slf4j.api/META-INF/maven/org.slf4j/slf4j-api/pom.xml

@@ -0,0 +1,101 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent>
+    <groupId>org.slf4j</groupId>
+    <artifactId>slf4j-parent</artifactId>
+    <version>1.6.1</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.slf4j</groupId>
+  <artifactId>slf4j-api</artifactId>
+  <packaging>jar</packaging>
+  <name>SLF4J API Module</name>
+
+  <url>http://www.slf4j.org</url>
+  <description>The slf4j API</description>
+
+  <dependencies>
+
+  </dependencies> 
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <forkMode>once</forkMode>
+          <reportFormat>plain</reportFormat>
+          <trimStackTrace>false</trimStackTrace>
+          <excludes>
+            <exclude>**/AllTest.java</exclude>
+            <exclude>**/PackageTest.java</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
+              <Bundle-Description>${project.description}</Bundle-Description>
+              <Implementation-Version>${project.version}</Implementation-Version>
+            </manifestEntries>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>
+        <executions>
+          <execution>
+            <id>bundle-test-jar</id>
+            <phase>package</phase>
+            <goals>
+              <goal>jar</goal>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>process-classes</phase>
+            <goals>
+             <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <tasks>
+            <echo>Removing slf4j-api's dummy StaticLoggerBinder and StaticMarkerBinder</echo>
+            <delete dir="target/classes/org/slf4j/impl"/>
+          </tasks>
+        </configuration>
+      </plugin>
+
+    </plugins>
+
+  </build>
+  
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>clirr-maven-plugin</artifactId>
+        <configuration>
+          <comparisonVersion>1.5.6</comparisonVersion>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
+
+</project>

com.springsource.slf4j.api/build.properties

@@ -0,0 +1,4 @@
+source.. = .
+output.. = .
+bin.includes = META-INF/,\
+               org/

org.adempiere.base-feature/feature.xml

@@ -199,7 +199,7 @@
          id="org.apache.commons.logging"
          download-size="0"
          install-size="0"
-         version="0.0.0"
+         version="1.1.1.v201101211721"
          unpack="false"/>
 
    <plugin
@@ -273,13 +273,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="com.springsource.org.apache.commons.logging"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.springsource.javax.el"
          download-size="0"

org.adempiere.base/META-INF/MANIFEST.MF

@@ -158,7 +158,7 @@ Import-Package: com.sun.mail.smtp;version="1.4.0",
  org.apache.commons.net.ftp,
  org.apache.ecs,
  org.apache.ecs.xhtml,
- org.apache.poi.hssf.usermodel;version="3.0.2.FINAL",
+ org.apache.poi.hssf.usermodel,
  org.apache.tools.ant,
  org.apache.tools.ant.taskdefs,
  org.eclipse.core.runtime;version="3.4.0",

org.adempiere.sdk-feature/adempiere.rmap

@@ -3,6 +3,8 @@
   <rm:locator pattern="^org\.eclipse(\..+)?" searchPathRef="equinox" failOnError="false"/>
   <rm:locator pattern="^org\.sat4j(\..+)?" searchPathRef="equinox"/>
   <rm:locator pattern="^javax\.xml(\..+)?" searchPathRef="orbit" failOnError="false"/>
+  <rm:locator pattern="^javax\.persistence(\..+)?" searchPathRef="orbit"/>
+  <rm:locator pattern="^org\.slf4j(\..+)?" searchPathRef="orbit"/>
   <rm:locator pattern="^org\.apache\.ant(\..+)?" searchPathRef="orbit"/>
   <rm:locator pattern="^org\.apache\.commons(\..+)?" searchPathRef="orbit"/>
   <rm:locator pattern="^org\.eclipse\.gemini(\..+)?" searchPathRef="gemini.maven" failOnError="false"/>
@@ -39,7 +41,7 @@
     <rm:provider componentTypes="osgi.bundle" readerType="p2" source="false" mutable="false">
       <rm:property key="buckminster.source" value="false"/>
       <rm:property key="buckminster.mutable" value="false"/>
-      <rm:uri format="http://download.eclipse.org/tools/orbit/downloads/drops/R20100519200754/updateSite"/>
+      <rm:uri format="http://download.eclipse.org/tools/orbit/downloads/drops/S20110521195923/repository/"/>
     </rm:provider>
   </rm:searchPath>
   <rm:searchPath name="gemini.maven">
@@ -82,7 +84,6 @@
       <maven:mappings>
         <maven:entry artifactId="com.springsource.slf4j.api" groupId="org.slf4j" name="com.springsource.slf4j.api"/>
         <maven:entry artifactId="com.springsource.org.apache.xml.resolver" groupId="org.apache.xml" name="com.springsource.org.apache.xml.resolver"/>
-        <maven:entry artifactId="com.springsource.org.apache.xmlcommons" groupId="org.apache.xmlcommons" name="com.springsource.org.apache.xmlcommons"/>
         <maven:entry artifactId="com.springsource.org.apache.xml.serializer" groupId="org.apache.xalan" name="com.springsource.org.apache.xml.serializer"/>
         <maven:entry artifactId="com.springsource.javax.management.j2ee" groupId="org.apache.geronimo.specs" name="com.springsource.javax.management.j2ee"/>
         <maven:entry artifactId="com.springsource.net.sf.cglib" groupId="net.sourceforge.cglib" name="com.springsource.net.sf.cglib"/>
@@ -102,14 +103,13 @@
         <maven:entry artifactId="com.springsource.org.apache.jasper.springsource" groupId="org.apache.jasper.springsource" name="com.springsource.org.apache.jasper.springsource"/>
         <maven:entry artifactId="com.springsource.org.apache.juli.extras.springsource" groupId="org.apache.juli.springsource" name="com.springsource.org.apache.juli.extras.springsource"/>
         <maven:entry artifactId="com.springsource.org.eclipse.jdt.core.compiler.batch" groupId="org.eclipse.jdt" name="com.springsource.org.eclipse.jdt.core.compiler.batch"/>
-        <maven:entry artifactId="com.springsource.javax.xml.ws" groupId="javax.xml.ws" name="com.springsource.javax.xml.ws"/>
         <maven:entry artifactId="com.springsource.javax.ejb" groupId="javax.ejb" name="com.springsource.javax.ejb"/>
         <maven:entry artifactId="com.springsource.javax.el" groupId="javax.el" name="com.springsource.javax.el"/>
         <maven:entry artifactId="com.springsource.javax.mail" groupId="javax.mail" name="com.springsource.javax.mail"/>
         <maven:entry artifactId="com.springsource.org.apache.commons.collections" groupId="org.apache.commons" name="com.springsource.org.apache.commons.collections"/>
         <maven:entry artifactId="com.springsource.org.apache.commons.net" groupId="org.apache.commons" name="com.springsource.org.apache.commons.net"/>
         <maven:entry artifactId="com.springsource.org.apache.commons.logging" groupId="org.apache.commons" name="com.springsource.org.apache.commons.logging"/>
-        <maven:entry artifactId="com.springsource.slf4j.simple" groupId="org.slf4j" name="com.springsource.slf4j.simple"/>
+        <maven:entry artifactId="com.springsource.slf4j.jcl" groupId="org.slf4j" name="com.springsource.slf4j.jcl"/>
         <maven:entry artifactId="com.springsource.org.apache.el.springsource" groupId="org.apache.el.springsource" name="com.springsource.org.apache.el.springsource"/>
         <maven:entry artifactId="com.springsource.javax.xml.rpc" groupId="javax.xml.rpc" name="com.springsource.javax.xml.rpc"/>
         <maven:entry artifactId="com.springsource.javax.xml.bind" groupId="javax.xml.bind" name="com.springsource.javax.xml.bind"/>

org.apache.poi/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Apache POI
 Bundle-SymbolicName: org.apache.poi
-Bundle-Version: 3.7.0.20101029
+Bundle-Version: 3.7.0.v20101029
 Bundle-Vendor: Apache
 Export-Package: org.apache.poi,
  org.apache.poi.common.usermodel,
@@ -53,13 +53,13 @@ Export-Package: org.apache.poi,
  org.apache.poi.util
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: javax.imageio,
- javax.xml.transform; version="1.3.4",
+ javax.xml.transform,
  javax.crypto.spec,
  javax.crypto,
- org.apache.commons.logging; version="1.0.4",
+ org.apache.commons.logging; version="1.1.1",
  javax.imageio.metadata,
  javax.imageio.stream,
  javax.swing,
- javax.xml.parsers; version="1.3.4",
- javax.xml.transform.stream; version="1.3.4",
+ javax.xml.parsers,
+ javax.xml.transform.stream,
  org.w3c.dom; version="1.3.4"