diff --git a/lib/com.springsource.slf4j.api/.classpath b/lib/com.springsource.slf4j.api/.classpath
deleted file mode 100644
index f2d414669d..0000000000
--- a/lib/com.springsource.slf4j.api/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
-
-
diff --git a/lib/com.springsource.slf4j.api/META-INF/MANIFEST.MF b/lib/com.springsource.slf4j.api/META-INF/MANIFEST.MF
deleted file mode 100644
index 4047a5c43c..0000000000
--- a/lib/com.springsource.slf4j.api/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-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
diff --git a/lib/com.springsource.slf4j.api/META-INF/maven/org.slf4j/slf4j-api/pom.properties b/lib/com.springsource.slf4j.api/META-INF/maven/org.slf4j/slf4j-api/pom.properties
deleted file mode 100644
index fc161018d8..0000000000
--- a/lib/com.springsource.slf4j.api/META-INF/maven/org.slf4j/slf4j-api/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Jul 05 22:24:25 CEST 2010
-version=1.6.1
-groupId=org.slf4j
-artifactId=slf4j-api
diff --git a/lib/com.springsource.slf4j.api/META-INF/maven/org.slf4j/slf4j-api/pom.xml b/lib/com.springsource.slf4j.api/META-INF/maven/org.slf4j/slf4j-api/pom.xml
deleted file mode 100644
index e7e09ff84f..0000000000
--- a/lib/com.springsource.slf4j.api/META-INF/maven/org.slf4j/slf4j-api/pom.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
-
- org.slf4j
- slf4j-parent
- 1.6.1
-
-
- 4.0.0
-
- org.slf4j
- slf4j-api
- jar
- SLF4J API Module
-
- http://www.slf4j.org
- The slf4j API
-
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- once
- plain
- false
-
- **/AllTest.java
- **/PackageTest.java
-
-
-
-
-
- org.apache.maven.plugins
- maven-jar-plugin
-
-
-
- ${parsedVersion.osgiVersion}
- ${project.description}
- ${project.version}
-
- ${project.build.outputDirectory}/META-INF/MANIFEST.MF
-
-
-
-
- bundle-test-jar
- package
-
- jar
- test-jar
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-antrun-plugin
-
-
- process-classes
-
- run
-
-
-
-
-
- Removing slf4j-api's dummy StaticLoggerBinder and StaticMarkerBinder
-
-
-
-
-
-
-
-
-
-
-
-
- org.codehaus.mojo
- clirr-maven-plugin
-
- 1.5.6
-
-
-
-
-
-
\ No newline at end of file
diff --git a/lib/com.springsource.slf4j.api/build.properties b/lib/com.springsource.slf4j.api/build.properties
deleted file mode 100644
index 876835f39c..0000000000
--- a/lib/com.springsource.slf4j.api/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = .
-output.. = .
-bin.includes = META-INF/,\
- org/
diff --git a/lib/com.springsource.slf4j.api/org/slf4j/ILoggerFactory.class b/lib/com.springsource.slf4j.api/org/slf4j/ILoggerFactory.class
deleted file mode 100644
index bcc14ccf98..0000000000
Binary files a/lib/com.springsource.slf4j.api/org/slf4j/ILoggerFactory.class and /dev/null differ
diff --git a/lib/com.springsource.slf4j.api/org/slf4j/IMarkerFactory.class b/lib/com.springsource.slf4j.api/org/slf4j/IMarkerFactory.class
deleted file mode 100644
index 682170b8b6..0000000000
Binary files a/lib/com.springsource.slf4j.api/org/slf4j/IMarkerFactory.class and /dev/null differ
diff --git a/lib/com.springsource.slf4j.api/org/slf4j/Logger.class b/lib/com.springsource.slf4j.api/org/slf4j/Logger.class
deleted file mode 100644
index e6a8e0dce8..0000000000
Binary files a/lib/com.springsource.slf4j.api/org/slf4j/Logger.class and /dev/null differ
diff --git a/lib/com.springsource.slf4j.api/org/slf4j/LoggerFactory.class b/lib/com.springsource.slf4j.api/org/slf4j/LoggerFactory.class
deleted file mode 100644
index 6a7e1798f7..0000000000
Binary files a/lib/com.springsource.slf4j.api/org/slf4j/LoggerFactory.class and /dev/null differ
diff --git a/lib/com.springsource.slf4j.api/org/slf4j/MDC.class b/lib/com.springsource.slf4j.api/org/slf4j/MDC.class
deleted file mode 100644
index b027c96ecb..0000000000
Binary files a/lib/com.springsource.slf4j.api/org/slf4j/MDC.class and /dev/null differ
diff --git a/lib/com.springsource.slf4j.api/org/slf4j/Marker.class b/lib/com.springsource.slf4j.api/org/slf4j/Marker.class
deleted file mode 100644
index bae7e8bc2a..0000000000
Binary files a/lib/com.springsource.slf4j.api/org/slf4j/Marker.class and /dev/null differ
diff --git a/lib/com.springsource.slf4j.api/org/slf4j/MarkerFactory.class b/lib/com.springsource.slf4j.api/org/slf4j/MarkerFactory.class
deleted file mode 100644
index f85bbe42e0..0000000000
Binary files a/lib/com.springsource.slf4j.api/org/slf4j/MarkerFactory.class and /dev/null differ
diff --git a/lib/com.springsource.slf4j.api/org/slf4j/helpers/BasicMDCAdapter.class b/lib/com.springsource.slf4j.api/org/slf4j/helpers/BasicMDCAdapter.class
deleted file mode 100644
index 5b302796c9..0000000000
Binary files a/lib/com.springsource.slf4j.api/org/slf4j/helpers/BasicMDCAdapter.class and /dev/null differ
diff --git a/lib/com.springsource.slf4j.api/org/slf4j/helpers/BasicMarker.class b/lib/com.springsource.slf4j.api/org/slf4j/helpers/BasicMarker.class
deleted file mode 100644
index fdb7fc646a..0000000000
Binary files a/lib/com.springsource.slf4j.api/org/slf4j/helpers/BasicMarker.class and /dev/null differ
diff --git a/lib/com.springsource.slf4j.api/org/slf4j/helpers/BasicMarkerFactory.class b/lib/com.springsource.slf4j.api/org/slf4j/helpers/BasicMarkerFactory.class
deleted file mode 100644
index 349565cd11..0000000000
Binary files a/lib/com.springsource.slf4j.api/org/slf4j/helpers/BasicMarkerFactory.class and /dev/null differ
diff --git a/lib/com.springsource.slf4j.api/org/slf4j/helpers/FormattingTuple.class b/lib/com.springsource.slf4j.api/org/slf4j/helpers/FormattingTuple.class
deleted file mode 100644
index 9254b122f4..0000000000
Binary files a/lib/com.springsource.slf4j.api/org/slf4j/helpers/FormattingTuple.class and /dev/null differ
diff --git a/lib/com.springsource.slf4j.api/org/slf4j/helpers/MarkerIgnoringBase.class b/lib/com.springsource.slf4j.api/org/slf4j/helpers/MarkerIgnoringBase.class
deleted file mode 100644
index 2179b2a7ec..0000000000
Binary files a/lib/com.springsource.slf4j.api/org/slf4j/helpers/MarkerIgnoringBase.class and /dev/null differ
diff --git a/lib/com.springsource.slf4j.api/org/slf4j/helpers/MessageFormatter.class b/lib/com.springsource.slf4j.api/org/slf4j/helpers/MessageFormatter.class
deleted file mode 100644
index 2f3462fcb9..0000000000
Binary files a/lib/com.springsource.slf4j.api/org/slf4j/helpers/MessageFormatter.class and /dev/null differ
diff --git a/lib/com.springsource.slf4j.api/org/slf4j/helpers/NOPLogger.class b/lib/com.springsource.slf4j.api/org/slf4j/helpers/NOPLogger.class
deleted file mode 100644
index 9a53e4002a..0000000000
Binary files a/lib/com.springsource.slf4j.api/org/slf4j/helpers/NOPLogger.class and /dev/null differ
diff --git a/lib/com.springsource.slf4j.api/org/slf4j/helpers/NOPLoggerFactory.class b/lib/com.springsource.slf4j.api/org/slf4j/helpers/NOPLoggerFactory.class
deleted file mode 100644
index 3044a188f9..0000000000
Binary files a/lib/com.springsource.slf4j.api/org/slf4j/helpers/NOPLoggerFactory.class and /dev/null differ
diff --git a/lib/com.springsource.slf4j.api/org/slf4j/helpers/NOPMDCAdapter.class b/lib/com.springsource.slf4j.api/org/slf4j/helpers/NOPMDCAdapter.class
deleted file mode 100644
index 8c7cfefdfc..0000000000
Binary files a/lib/com.springsource.slf4j.api/org/slf4j/helpers/NOPMDCAdapter.class and /dev/null differ
diff --git a/lib/com.springsource.slf4j.api/org/slf4j/helpers/NamedLoggerBase.class b/lib/com.springsource.slf4j.api/org/slf4j/helpers/NamedLoggerBase.class
deleted file mode 100644
index 5a5f485b76..0000000000
Binary files a/lib/com.springsource.slf4j.api/org/slf4j/helpers/NamedLoggerBase.class and /dev/null differ
diff --git a/lib/com.springsource.slf4j.api/org/slf4j/helpers/SubstituteLoggerFactory.class b/lib/com.springsource.slf4j.api/org/slf4j/helpers/SubstituteLoggerFactory.class
deleted file mode 100644
index c478678e0e..0000000000
Binary files a/lib/com.springsource.slf4j.api/org/slf4j/helpers/SubstituteLoggerFactory.class and /dev/null differ
diff --git a/lib/com.springsource.slf4j.api/org/slf4j/helpers/Util.class b/lib/com.springsource.slf4j.api/org/slf4j/helpers/Util.class
deleted file mode 100644
index 6d80e9fb16..0000000000
Binary files a/lib/com.springsource.slf4j.api/org/slf4j/helpers/Util.class and /dev/null differ
diff --git a/lib/com.springsource.slf4j.api/org/slf4j/spi/LocationAwareLogger.class b/lib/com.springsource.slf4j.api/org/slf4j/spi/LocationAwareLogger.class
deleted file mode 100644
index 83f3231111..0000000000
Binary files a/lib/com.springsource.slf4j.api/org/slf4j/spi/LocationAwareLogger.class and /dev/null differ
diff --git a/lib/com.springsource.slf4j.api/org/slf4j/spi/LoggerFactoryBinder.class b/lib/com.springsource.slf4j.api/org/slf4j/spi/LoggerFactoryBinder.class
deleted file mode 100644
index ea8df290ff..0000000000
Binary files a/lib/com.springsource.slf4j.api/org/slf4j/spi/LoggerFactoryBinder.class and /dev/null differ
diff --git a/lib/com.springsource.slf4j.api/org/slf4j/spi/MDCAdapter.class b/lib/com.springsource.slf4j.api/org/slf4j/spi/MDCAdapter.class
deleted file mode 100644
index 1d26da5a84..0000000000
Binary files a/lib/com.springsource.slf4j.api/org/slf4j/spi/MDCAdapter.class and /dev/null differ
diff --git a/lib/com.springsource.slf4j.api/org/slf4j/spi/MarkerFactoryBinder.class b/lib/com.springsource.slf4j.api/org/slf4j/spi/MarkerFactoryBinder.class
deleted file mode 100644
index f7f1f36b32..0000000000
Binary files a/lib/com.springsource.slf4j.api/org/slf4j/spi/MarkerFactoryBinder.class and /dev/null differ
diff --git a/org.adempiere.base-feature/feature.xml b/org.adempiere.base-feature/feature.xml
index 6b5f32a30a..c3e01c2a44 100644
--- a/org.adempiere.base-feature/feature.xml
+++ b/org.adempiere.base-feature/feature.xml
@@ -122,14 +122,14 @@
unpack="false"/>
+
+
diff --git a/org.adempiere.base-feature/model.generator.launch b/org.adempiere.base-feature/model.generator.launch
index a748d5f629..05abcc5fbc 100644
--- a/org.adempiere.base-feature/model.generator.launch
+++ b/org.adempiere.base-feature/model.generator.launch
@@ -12,7 +12,7 @@
-
+
@@ -20,8 +20,8 @@
-
-
+
+
diff --git a/org.adempiere.base.process/META-INF/MANIFEST.MF b/org.adempiere.base.process/META-INF/MANIFEST.MF
index 58df9847ef..6c942099e0 100644
--- a/org.adempiere.base.process/META-INF/MANIFEST.MF
+++ b/org.adempiere.base.process/META-INF/MANIFEST.MF
@@ -10,5 +10,5 @@ Import-Package: javax.mail;version="1.4.0",
javax.mail.internet;version="1.4.0",
javax.servlet;version="2.5.0",
javax.servlet.http;version="2.5.0",
- org.apache.commons.collections.keyvalue;version="3.2.1"
+ org.apache.commons.collections.keyvalue;version="3.2.0"
Eclipse-RegisterBuddy: org.adempiere.base
diff --git a/org.adempiere.base/META-INF/MANIFEST.MF b/org.adempiere.base/META-INF/MANIFEST.MF
index 669c3520ed..9eea7ec60d 100644
--- a/org.adempiere.base/META-INF/MANIFEST.MF
+++ b/org.adempiere.base/META-INF/MANIFEST.MF
@@ -152,8 +152,8 @@ Import-Package: com.sun.mail.smtp;version="1.4.0",
junit.textui;version="3.8.2",
net.sf.cglib.proxy,
org.apache.activemq;version="5.3.0",
- org.apache.commons.collections;version="3.2.1",
- org.apache.commons.collections.keyvalue;version="3.2.1",
+ org.apache.commons.collections;version="3.2.0",
+ org.apache.commons.collections.keyvalue;version="3.2.0",
org.apache.commons.net;version="2.0.0",
org.apache.commons.net.ftp,
org.apache.ecs,
diff --git a/org.adempiere.base/build.properties b/org.adempiere.base/build.properties
index 9087d4ce8c..8459b36d9a 100644
--- a/org.adempiere.base/build.properties
+++ b/org.adempiere.base/build.properties
@@ -13,7 +13,7 @@ bin.includes = META-INF/,\
jcommon-1.0.16.jar,\
jfreechart-1.0.13.jar,\
jnlp.jar,\
- OSGI-INF/eventmanager.xml
+ OSGI-INF/
output.base.jar = build/
source.base.jar = src/
src.includes = schema/
diff --git a/org.adempiere.bundles.external-feature/feature.xml b/org.adempiere.bundles.external-feature/feature.xml
index cd4e497c34..13a2d829e0 100644
--- a/org.adempiere.bundles.external-feature/feature.xml
+++ b/org.adempiere.bundles.external-feature/feature.xml
@@ -25,21 +25,14 @@
unpack="false"/>
-
-
-
-
+
+
-
- org.adempiere.geminiweb-feature
-
-
-
-
-
- org.eclipse.pde.FeatureBuilder
-
-
-
-
-
- org.eclipse.pde.FeatureNature
-
-
diff --git a/org.adempiere.geminiweb-feature/build.properties b/org.adempiere.geminiweb-feature/build.properties
deleted file mode 100644
index 64f93a9f0b..0000000000
--- a/org.adempiere.geminiweb-feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/org.adempiere.geminiweb-feature/feature.xml b/org.adempiere.geminiweb-feature/feature.xml
deleted file mode 100644
index f05fb8a11f..0000000000
--- a/org.adempiere.geminiweb-feature/feature.xml
+++ /dev/null
@@ -1,304 +0,0 @@
-
-
-
-
- [Enter Feature Description here.]
-
-
-
- [Enter Copyright Description here.]
-
-
-
- [Enter License Description here.]
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch
index 851f6f6c6b..13ba2d1018 100644
--- a/org.adempiere.install/install.app.launch
+++ b/org.adempiere.install/install.app.launch
@@ -19,8 +19,8 @@
-
-
+
+
diff --git a/org.adempiere.install/install.console.app.launch b/org.adempiere.install/install.console.app.launch
index e4b607b53a..7edccbfa72 100644
--- a/org.adempiere.install/install.console.app.launch
+++ b/org.adempiere.install/install.console.app.launch
@@ -19,8 +19,8 @@
-
-
+
+
diff --git a/org.adempiere.pipo/META-INF/MANIFEST.MF b/org.adempiere.pipo/META-INF/MANIFEST.MF
index 26b5a0c477..0771926de6 100644
--- a/org.adempiere.pipo/META-INF/MANIFEST.MF
+++ b/org.adempiere.pipo/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.apache.tools.ant,
org.apache.tools.ant.taskdefs,
- org.apache.xerces.jaxp;version="2.9.1",
+ org.apache.xerces.jaxp;version="2.9.0",
org.osgi.framework
Export-Package: org.adempiere.pipo.srv,
org.adempiere.pipo2,
diff --git a/org.adempiere.replication/build.properties b/org.adempiere.replication/build.properties
index e9863e281e..34d2e4d2da 100644
--- a/org.adempiere.replication/build.properties
+++ b/org.adempiere.replication/build.properties
@@ -1,5 +1,4 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .,\
- plugin.xml
+ .
diff --git a/org.adempiere.report.jasper.webapp/build.properties b/org.adempiere.report.jasper.webapp/build.properties
index 0c0ae088eb..598106c60b 100644
--- a/org.adempiere.report.jasper.webapp/build.properties
+++ b/org.adempiere.report.jasper.webapp/build.properties
@@ -6,7 +6,6 @@ bin.excludes = src/**,\
.settings/**,\
.classpath,\
.project,\
- build.properties,\
- build.xml
+ build.properties
source.. = src/
output.. = build/
diff --git a/org.adempiere.sdk-feature/adempiere.cquery b/org.adempiere.sdk-feature/adempiere.cquery
index d9cbdbef7a..e6ebf79f90 100644
--- a/org.adempiere.sdk-feature/adempiere.cquery
+++ b/org.adempiere.sdk-feature/adempiere.cquery
@@ -2,52 +2,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/org.adempiere.sdk-feature/adempiere.mspec b/org.adempiere.sdk-feature/adempiere.mspec
new file mode 100644
index 0000000000..27df57a75e
--- /dev/null
+++ b/org.adempiere.sdk-feature/adempiere.mspec
@@ -0,0 +1,3 @@
+
+
+
diff --git a/org.adempiere.sdk-feature/adempiere.rmap b/org.adempiere.sdk-feature/adempiere.rmap
index 5b800a14ef..c36a7909b7 100644
--- a/org.adempiere.sdk-feature/adempiere.rmap
+++ b/org.adempiere.sdk-feature/adempiere.rmap
@@ -1,29 +1,27 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
-
+
@@ -60,86 +58,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -154,4 +75,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/org.adempiere.sdk-feature/sdk-target-platform.target b/org.adempiere.sdk-feature/sdk-target-platform.target
deleted file mode 100644
index 69edb9beea..0000000000
--- a/org.adempiere.sdk-feature/sdk-target-platform.target
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-*
-*
-*
-en_US
-
-
diff --git a/org.adempiere.server-feature/adempiere-server.bat b/org.adempiere.server-feature/adempiere-server.bat
index aeb868e1b1..68d08e7f29 100644
--- a/org.adempiere.server-feature/adempiere-server.bat
+++ b/org.adempiere.server-feature/adempiere-server.bat
@@ -17,4 +17,4 @@ goto START
@Echo Starting Adempiere Server ...
@Echo =======================================
-@"%JAVA%" -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_1.1.1.R36x_v20101122_1400.jar -console -application org.adempiere.server.application
+@"%JAVA%" -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar -console -application org.adempiere.server.application
diff --git a/org.adempiere.server-feature/adempiere-server.sh b/org.adempiere.server-feature/adempiere-server.sh
index 914153a818..3dbd4709a0 100644
--- a/org.adempiere.server-feature/adempiere-server.sh
+++ b/org.adempiere.server-feature/adempiere-server.sh
@@ -13,4 +13,4 @@ echo ===================================
echo Starting Adempiere Server
echo ===================================
-$JAVA -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_1.1.1.R36x_v20101122_1400.jar -console -application org.adempiere.server.application
+$JAVA -Dosgi.compatibility.bootdelegation=true -Dosgi.noShutdown=true -Dosgi.framework.activeThreadType=normal -XX:MaxPermSize=192m -jar plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar -console -application org.adempiere.server.application
diff --git a/org.adempiere.server-feature/buckminster.cspec b/org.adempiere.server-feature/buckminster.cspec
index 4c425b2dda..361c7d57c9 100644
--- a/org.adempiere.server-feature/buckminster.cspec
+++ b/org.adempiere.server-feature/buckminster.cspec
@@ -1,25 +1,23 @@
-
-
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
+
@@ -31,8 +29,11 @@
+
+
+
@@ -48,7 +49,6 @@
-
@@ -68,25 +68,23 @@
-
-
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
+
@@ -98,8 +96,10 @@
+
+
@@ -117,18 +117,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
@@ -180,6 +208,7 @@
+
@@ -230,6 +259,7 @@
+
@@ -255,25 +285,23 @@
-
-
-
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
+
+
+
@@ -285,8 +313,10 @@
+
+
@@ -317,22 +347,24 @@
+
+
+
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
@@ -353,17 +385,18 @@
-
-
+
+
-
-
+
+
+
@@ -374,18 +407,17 @@
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
+
+
+
@@ -406,17 +438,18 @@
-
-
+
+
-
-
+
+
+
@@ -429,6 +462,7 @@
+
diff --git a/org.adempiere.server-feature/feature.xml b/org.adempiere.server-feature/feature.xml
index 454ea33292..ef21f72fd4 100644
--- a/org.adempiere.server-feature/feature.xml
+++ b/org.adempiere.server-feature/feature.xml
@@ -28,33 +28,30 @@
id="org.adempiere.webstore"
version="0.0.0"/>
+
+
-
-
-
-
+
+
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index bb27287ecc..6887154d2a 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -21,8 +21,8 @@
-
-
+
+
diff --git a/org.adempiere.server-feature/setup-alt.bat b/org.adempiere.server-feature/setup-alt.bat
index 671b3b6df5..a096bf3635 100644
--- a/org.adempiere.server-feature/setup-alt.bat
+++ b/org.adempiere.server-feature/setup-alt.bat
@@ -18,7 +18,7 @@ goto START
:START
@REM Setup Adempiere.properties and AdempiereEnv.properties
-@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.6.2.R36x_v20110210.jar -application org.adempiere.install.application -consoleLog
+@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar -application org.adempiere.install.application -consoleLog
@Echo ErrorLevel = %ERRORLEVEL%
@IF NOT ERRORLEVEL = 1 GOTO NEXT
@@ -31,7 +31,7 @@ goto START
:NEXT
@REM setup tomcat
@Echo ... Setup Tomcat
-@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.6.2.R36x_v20110210.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml
+@"%JAVA%" -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml
@Echo ...
@Echo For problems, check log file in base directory
diff --git a/org.adempiere.server-feature/setup-alt.sh b/org.adempiere.server-feature/setup-alt.sh
index 8dc778f1c9..b06eea1a27 100644
--- a/org.adempiere.server-feature/setup-alt.sh
+++ b/org.adempiere.server-feature/setup-alt.sh
@@ -15,11 +15,11 @@ else
fi
#setup Adempiere.properties and AdempiereEnv.propertiess
-$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.6.2.R36x_v20110210.jar -application org.adempiere.install.application -consoleLog
+$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar -application org.adempiere.install.application -consoleLog
echo ... Setup Tomcat
#setup tomcat
-$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.6.2.R36x_v20110210.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml
+$JAVA -Dosgi.noShutdown=false -Dosgi.compatibility.bootdelegation=true -Dosgi.install.area=setup -jar plugins/org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar -application org.eclipse.ant.core.antRunner -buildfile build.xml
echo ... Make .sh executable
chmod -R a+x *.sh
diff --git a/org.adempiere.server-feature/setup.ini b/org.adempiere.server-feature/setup.ini
index 2045f741fc..6eba40fcbc 100644
--- a/org.adempiere.server-feature/setup.ini
+++ b/org.adempiere.server-feature/setup.ini
@@ -1,9 +1,9 @@
-startup
-plugins/org.eclipse.equinox.launcher_1.1.1.R36x_v20101122_1400.jar
+plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar
-install
setup
--launcher.library
-plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.2.R36x_v20101019_1345
+plugins/org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.100.v20110505
--launcher.XXMaxPermSize
192m
-vmargs
diff --git a/org.adempiere.server-feature/setup/configuration/config.ini b/org.adempiere.server-feature/setup/configuration/config.ini
index 1523b872aa..50fc6e5e16 100644
--- a/org.adempiere.server-feature/setup/configuration/config.ini
+++ b/org.adempiere.server-feature/setup/configuration/config.ini
@@ -1,5 +1,5 @@
-osgi.framework=file\:../plugins/org.eclipse.osgi_3.6.2.R36x_v20110210.jar
+osgi.framework=file\:../plugins/org.eclipse.osgi_3.7.1.R37x_v20110808-1106.jar
equinox.use.ds=true
-osgi.bundles=org.eclipse.core.variables,org.eclipse.ant.core,org.eclipse.core.runtime@start,org.adempiere.base@start,org.compiere.db.oracle.provider,org.compiere.db.postgresql.provider,com.springsource.org.junit,org.adempiere.install,org.restlet,com.springsource.net.sf.cglib,com.springsource.javax.mail,com.springsource.org.apache.activemq,com.springsource.org.apache.kahadb,com.springsource.org.apache.commons.collections,org.apache.ant,com.springsource.javax.servlet,com.springsource.javax.jms,org.apache.ecs,com.springsource.org.apache.commons.net,org.eclipse.equinox.app,org.eclipse.equinox.registry,org.eclipse.equinox.common@2:start,org.eclipse.core.contenttype,org.apache.poi,org.eclipse.core.jobs,org.eclipse.equinox.preferences,org.apache.commons.logging,com.springsource.javax.management.j2ee,org.eclipse.osgi.services,com.springsource.javax.ejb,com.springsource.javax.xml.rpc,com.springsource.javax.xml.soap,com.springsource.javax.activation,javax.xml
+osgi.bundles=org.eclipse.core.variables,org.eclipse.ant.core,org.eclipse.core.runtime@start,org.adempiere.base@start,org.compiere.db.oracle.provider,org.compiere.db.postgresql.provider,org.hamcrest.core,org.junit,org.adempiere.install,org.restlet,com.springsource.net.sf.cglib,com.springsource.javax.mail,com.springsource.org.apache.activemq,com.springsource.org.apache.kahadb,org.apache.commons.collections,org.apache.ant,javax.servlet,com.springsource.javax.jms,org.apache.ecs,org.apache.commons.net,org.eclipse.equinox.app,org.eclipse.equinox.registry,org.eclipse.equinox.common@2:start,org.eclipse.core.contenttype,org.apache.poi,org.eclipse.core.jobs,org.eclipse.equinox.preferences,org.apache.commons.logging,com.springsource.org.apache.commons.logging,com.springsource.javax.management.j2ee,org.eclipse.osgi.services,com.springsource.javax.ejb,com.springsource.javax.xml.rpc,com.springsource.javax.xml.soap,com.springsource.javax.activation,javax.xml
osgi.framework.extensions=
osgi.bundles.defaultStartLevel=4
diff --git a/org.adempiere.server/build.properties b/org.adempiere.server/build.properties
index 360c1b2a6c..4dc9108aee 100644
--- a/org.adempiere.server/build.properties
+++ b/org.adempiere.server/build.properties
@@ -31,8 +31,7 @@ bin.excludes = src/**,\
.settings/**,\
.classpath,\
.project,\
- build.properties,\
- build.xml
+ build.properties
source.. = src/main/server/,\
src/main/servlet/
output.. = build/classes/
diff --git a/org.adempiere.target.platform-feature/feature.xml b/org.adempiere.target.platform-feature/feature.xml
index 537135d13b..857b81d0e4 100644
--- a/org.adempiere.target.platform-feature/feature.xml
+++ b/org.adempiere.target.platform-feature/feature.xml
@@ -33,11 +33,11 @@
version="0.0.0"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/org.adempiere.tomcat.config/META-INF/tomcat/server.dev.xml b/org.adempiere.tomcat.config/META-INF/tomcat/server.dev.xml
index 2531ba32ea..23ff2f1d5e 100644
--- a/org.adempiere.tomcat.config/META-INF/tomcat/server.dev.xml
+++ b/org.adempiere.tomcat.config/META-INF/tomcat/server.dev.xml
@@ -25,9 +25,6 @@
-
-
-
-