Remove mockito and wsdl4j from codebase

* Plugins are available from the jbosstools requirements update sites * teiid-designer.target.pl * mockito is not available by default in multiple.target but is available in the orbit mirror. * Adds the mockito unit to the orbit bundles in the multiple.target so that eclipse IDE will compile. * Mockito downgraded to 1.8.4 which is available in target platform
Teiid-Designer · Dec 19, 2012 · 2838b59 · 2838b59
1 parent c6e2e71
commit 2838b59
Show file tree

Hide file tree

Showing 41 changed files with 21 additions and 1,460 deletions.
diff --git a/features/org.teiid.designer.test.feature/feature.xml b/features/org.teiid.designer.test.feature/feature.xml
@@ -20,7 +20,7 @@
    </license>
 
    <requires>
-      <import plugin="org.mockito" version="1.9.0" match="compatible"/>
+      <import plugin="org.mockito" version="1.8.4" match="compatible"/>
       <import plugin="org.eclipse.core.resources" version="3.8.0" match="compatible"/>
       <import plugin="org.eclipse.core.runtime" version="3.8.0" match="compatible"/>
       <import plugin="org.teiid.core.designer" version="8.0.0" match="compatible"/>
@@ -63,7 +63,6 @@
       <import plugin="org.teiid.designer.vdb"/>
       <import plugin="org.teiid.8-2" version="8.0.0" match="compatible"/>
       <import plugin="org.teiid.7-7-2" version="8.0.0" match="compatible"/>
-      <import plugin="org.mockito" version="1.9.0" match="greaterOrEqual"/>
       <import plugin="org.junit4" version="4.8.1" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui" version="3.103.0" match="compatible"/>
       <import plugin="org.teiid.designer.ui.common" version="8.0.0" match="compatible"/>

diff --git a/plugins/org.mockito/.classpath b/plugins/org.mockito/.classpath
diff --git a/plugins/org.mockito/.project b/plugins/org.mockito/.project
diff --git a/plugins/org.mockito/LICENSE b/plugins/org.mockito/LICENSE
diff --git a/plugins/org.mockito/META-INF/MANIFEST.MF b/plugins/org.mockito/META-INF/MANIFEST.MF
diff --git a/plugins/org.mockito/NOTICE b/plugins/org.mockito/NOTICE
diff --git a/plugins/org.mockito/build.properties b/plugins/org.mockito/build.properties
diff --git a/plugins/org.mockito/com.springsource.org.objenesis-1.0.0.jar b/plugins/org.mockito/com.springsource.org.objenesis-1.0.0.jar
diff --git a/plugins/org.mockito/jars-info.txt b/plugins/org.mockito/jars-info.txt
diff --git a/plugins/org.mockito/mockito-core-1.9.0.jar b/plugins/org.mockito/mockito-core-1.9.0.jar
diff --git a/plugins/org.mockito/plugin.properties b/plugins/org.mockito/plugin.properties
diff --git a/plugins/org.mockito/pom.xml b/plugins/org.mockito/pom.xml
diff --git a/plugins/org.teiid.designer.modelgenerator.salesforce/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.modelgenerator.salesforce/META-INF/MANIFEST.MF
@@ -22,7 +22,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
  org.apache.commons.codec;bundle-version="[1.3.0,2.0.0)",
  org.apache.commons.discovery;bundle-version="[0.2.0,1.0.0)",
  javax.xml.rpc;bundle-version="[1.1.0,2.0.0)",
- org.wsdl4j;bundle-version="[1.4.0,2.0.0)",
+ javax.wsdl;bundle-version="[1.6.2,2.0.0)",
  org.teiid.designer.extension;bundle-version="[8.0.0,9.0.0)",
  org.teiid.designer.spi;bundle-version="[8.0.0,9.0.0)"
 Bundle-ActivationPolicy: lazy

diff --git a/plugins/org.teiid.designer.modelgenerator.wsdl/META-INF/MANIFEST.MF b/plugins/org.teiid.designer.modelgenerator.wsdl/META-INF/MANIFEST.MF
@@ -29,7 +29,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.8.0,4.0.0)",
  org.teiid.core.designer;bundle-version="[8.0.0,9.0.0)",
  org.eclipse.wst.wsdl.validation;bundle-version="[1.1.600,2.0.0)",
  org.jaxen;bundle-version="[1.0.7,2.0.0)",
- org.wsdl4j;bundle-version="[1.4.0,2.0.0)",
+ javax.wsdl;bundle-version="[1.6.2,2.0.0)",
  org.teiid.designer.modelgenerator.xml;bundle-version="[8.0.0,9.0.0)",
  org.jdom;bundle-version="[1.1.1,2.0.0)",
  org.teiid.designer.datatools;bundle-version="[8.0.0,9.0.0)",

diff --git a/plugins/org.wsdl4j/.classpath b/plugins/org.wsdl4j/.classpath
diff --git a/plugins/org.wsdl4j/.project b/plugins/org.wsdl4j/.project
diff --git a/plugins/org.wsdl4j/LEGAL.txt b/plugins/org.wsdl4j/LEGAL.txt
diff --git a/plugins/org.wsdl4j/META-INF/MANIFEST.MF b/plugins/org.wsdl4j/META-INF/MANIFEST.MF
diff --git a/plugins/org.wsdl4j/build.properties b/plugins/org.wsdl4j/build.properties
diff --git a/plugins/org.wsdl4j/lib/wsdl4j.jar b/plugins/org.wsdl4j/lib/wsdl4j.jar
diff --git a/plugins/org.wsdl4j/plugin.properties b/plugins/org.wsdl4j/plugin.properties
diff --git a/plugins/org.wsdl4j/pom.xml b/plugins/org.wsdl4j/pom.xml