From 6c7a25cb99b952d02dcdd6c349d9743e36948b07 Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Wed, 23 Apr 2014 14:40:06 +0200
Subject: [PATCH] removed unnecessary .classpath entries in
 org.openqa.selenium.osgi project; the MANIFEST.MF already references and
 exports all necessary stuff from lib/

---
 java/org.openqa.selenium.osgi/.classpath      | 38 +------------------
 .../META-INF/MANIFEST.MF                      | 16 +++++---
 .../org.openqa.selenium.osgi/build.properties |  4 +-
 3 files changed, 13 insertions(+), 45 deletions(-)

diff --git a/java/org.openqa.selenium.osgi/.classpath b/java/org.openqa.selenium.osgi/.classpath
index ba51e2993d9..7cb3744edb2 100644
--- a/java/org.openqa.selenium.osgi/.classpath
+++ b/java/org.openqa.selenium.osgi/.classpath
@@ -1,43 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/phantomjsdriver-1.1.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="selenium-java-2.40.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/apache-mime4j-0.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/bsh-1.3.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.1_3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-collections-3.2.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-exec-1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-io-2.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-jxpath-1.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-logging-1.1.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cssparser-0.9.11.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/guava-15.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hamcrest-core-1.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/hamcrest-library-1.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/htmlunit-2.13.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/htmlunit-core-js-2.13.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/httpclient-4.3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/httpcore-4.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/httpmime-4.3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/ini4j-0.5.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jcommander-1.29.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jetty-websocket-8.1.8.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jna-3.4.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jna-platform-3.4.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/json-20080701.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/junit-dep-4.11.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/nekohtml-1.9.19.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/netty-3.5.7.Final.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/operadriver-1.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/protobuf-java-2.4.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/sac-1.3.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/serializer-2.7.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/testng-6.8.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xalan-2.7.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xercesImpl-2.10.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xml-apis-1.4.01.jar"/>
+	<classpathentry exported="true" kind="lib" path="selenium-java-2.40.0.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
diff --git a/java/org.openqa.selenium.osgi/META-INF/MANIFEST.MF b/java/org.openqa.selenium.osgi/META-INF/MANIFEST.MF
index 5ec6954ee96..07ccc4e09d3 100644
--- a/java/org.openqa.selenium.osgi/META-INF/MANIFEST.MF
+++ b/java/org.openqa.selenium.osgi/META-INF/MANIFEST.MF
@@ -3,8 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Selenium
 Bundle-SymbolicName: org.openqa.selenium.osgi
 Bundle-Version: 2.40.0
-Bundle-ClassPath: selenium-java-2.40.0.jar,
- lib/apache-mime4j-0.6.jar,
+Bundle-ClassPath: lib/apache-mime4j-0.6.jar,
  lib/bsh-1.3.0.jar,
  lib/cglib-nodep-2.1_3.jar,
  lib/commons-codec-1.8.jar,
@@ -15,7 +14,6 @@ Bundle-ClassPath: selenium-java-2.40.0.jar,
  lib/commons-lang3-3.1.jar,
  lib/commons-logging-1.1.1.jar,
  lib/cssparser-0.9.11.jar,
- lib/guava-15.0.jar,
  lib/hamcrest-core-1.3.jar,
  lib/hamcrest-library-1.3.jar,
  lib/htmlunit-2.13.jar,
@@ -40,21 +38,29 @@ Bundle-ClassPath: selenium-java-2.40.0.jar,
  lib/testng-6.8.5.jar,
  lib/xalan-2.7.1.jar,
  lib/xercesImpl-2.10.0.jar,
- lib/xml-apis-1.4.01.jar
+ lib/xml-apis-1.4.01.jar,
+ selenium-java-2.40.0.jar,
+ lib/guava-15.0.jar
 Bundle-Vendor: openqa
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Export-Package: com.google.common.annotations,
  com.google.common.base,
  com.google.common.base.internal,
  com.google.common.cache,
  com.google.common.collect,
+ com.google.common.escape,
  com.google.common.eventbus,
  com.google.common.hash,
+ com.google.common.html,
  com.google.common.io,
  com.google.common.math,
  com.google.common.net,
  com.google.common.primitives,
  com.google.common.reflect,
  com.google.common.util.concurrent,
+ com.google.common.xml,
+ com.thoughtworks.selenium,
+ com.thoughtworks.selenium.condition,
  org.openqa.selenium,
  org.openqa.selenium.browserlaunchers,
  org.openqa.selenium.browserlaunchers.locators,
@@ -76,7 +82,6 @@ Export-Package: com.google.common.annotations,
  org.openqa.selenium.logging.profiler,
  org.openqa.selenium.net,
  org.openqa.selenium.os,
- org.openqa.selenium.phantomjs,
  org.openqa.selenium.remote,
  org.openqa.selenium.remote.html5,
  org.openqa.selenium.remote.internal,
@@ -89,4 +94,3 @@ Export-Package: com.google.common.annotations,
  org.openqa.selenium.support.pagefactory,
  org.openqa.selenium.support.pagefactory.internal,
  org.openqa.selenium.support.ui
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/java/org.openqa.selenium.osgi/build.properties b/java/org.openqa.selenium.osgi/build.properties
index ea974378c79..187121016ae 100644
--- a/java/org.openqa.selenium.osgi/build.properties
+++ b/java/org.openqa.selenium.osgi/build.properties
@@ -10,7 +10,6 @@ bin.includes = META-INF/,\
                lib/commons-lang3-3.1.jar,\
                lib/commons-logging-1.1.1.jar,\
                lib/cssparser-0.9.11.jar,\
-               lib/guava-15.0.jar,\
                lib/hamcrest-core-1.3.jar,\
                lib/hamcrest-library-1.3.jar,\
                lib/htmlunit-2.13.jar,\
@@ -35,5 +34,6 @@ bin.includes = META-INF/,\
                lib/xalan-2.7.1.jar,\
                lib/xercesImpl-2.10.0.jar,\
                lib/xml-apis-1.4.01.jar,\
+               lib/phantomjsdriver-1.1.0.jar,\
                selenium-java-2.40.0.jar,\
-               lib/phantomjsdriver-1.1.0.jar
+               lib/guava-15.0.jar