fixing dependency problems within tycho configuration

diff --git a/.gitignore b/.gitignore
index a6d296165a0dd60b43042f13427d792c16d182cd..6758ad418343601335fc10a128fe277c86f4893a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ eu.etaxonomy.taxeditor.cdmlib/target
 eu.etaxonomy.taxeditor.editor/.settings
 eu.etaxonomy.taxeditor.editor/target
 eu.etaxonomy.taxeditor.feature.platform/.settings
 eu.etaxonomy.taxeditor.editor/.settings
 eu.etaxonomy.taxeditor.editor/target
 eu.etaxonomy.taxeditor.feature.platform/.settings

+eu.etaxonomy.taxeditor.feature.platform/bin

 eu.etaxonomy.taxeditor.feature.platform/target
 eu.etaxonomy.taxeditor.feature/.settings
 eu.etaxonomy.taxeditor.feature/compile.eu.etaxonomy.taxeditor.product.feature.xml
 eu.etaxonomy.taxeditor.feature.platform/target
 eu.etaxonomy.taxeditor.feature/.settings
 eu.etaxonomy.taxeditor.feature/compile.eu.etaxonomy.taxeditor.product.feature.xml

diff --git a/eu.etaxonomy.taxeditor.feature.platform/.project b/eu.etaxonomy.taxeditor.feature.platform/.project
index 2b8857b444f01f979a6b907a30a63914282e8101..81724d3bb9d5ae5831f60957bfe7f1a09da75d03 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature.platform/.project
+++ b/eu.etaxonomy.taxeditor.feature.platform/.project
@@ -1,14 +1,16 @@
 <projectDescription>
   <name>eu.etaxonomy.taxeditor.feature.platform</name>
 <projectDescription>
   <name>eu.etaxonomy.taxeditor.feature.platform</name>

-  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-    <nature>org.eclipse.pde.PluginNature</nature>
-  </natures>
+  <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.pde.FeatureBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.FeatureNature</nature>
+       </natures>

 </projectDescription>
\ No newline at end of file
 </projectDescription>
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.feature.platform/feature.xml b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
index e4ff007070a37c15f8aa46a513dcf16b5d05c387..c9385f2ada84bfa2107ae6853e5f5f56af4341e8 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature.platform/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
@@ -846,4 +846,74 @@ Software distributed under the License is distributed on an "AS IS" ba
          fragment="true"
          unpack="false"/>
 
          fragment="true"
          unpack="false"/>
 

+   <plugin
+         id="org.hamcrest"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.hamcrest.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.lucene"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.lucene.analysis"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.help.base"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.help.webapp"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.apache.jasper"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.jsp.jasper.registry"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.http.registry"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.jdt.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+

 </feature>
 </feature>

diff --git a/eu.etaxonomy.taxeditor.feature/.project b/eu.etaxonomy.taxeditor.feature/.project
index 35ce558dcf28945b350b9a067d89e43bb7d5833d..7e46fa237167397c1f9a1b410ec60911d51a145d 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/.project
+++ b/eu.etaxonomy.taxeditor.feature/.project
@@ -1,6 +1,6 @@
 <projectDescription>
   <name>eu.etaxonomy.taxeditor.feature</name>
 <projectDescription>
   <name>eu.etaxonomy.taxeditor.feature</name>

-  <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
+  <comment></comment>

   <projects>
     <project>eu.etaxonomy.taxeditor.application</project>
     <project>eu.etaxonomy.taxeditor.bulkeditor</project>
   <projects>
     <project>eu.etaxonomy.taxeditor.application</project>
     <project>eu.etaxonomy.taxeditor.bulkeditor</project>


@@ -11,13 +11,14 @@
     <project>eu.etaxonomy.taxeditor.printpublisher</project>
     <project>eu.etaxonomy.taxeditor.store</project>
   </projects>
     <project>eu.etaxonomy.taxeditor.printpublisher</project>
     <project>eu.etaxonomy.taxeditor.store</project>
   </projects>

-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-    <nature>org.eclipse.pde.PluginNature</nature>
-  </natures>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.pde.FeatureBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.FeatureNature</nature>
+       </natures>

 </projectDescription>
\ No newline at end of file
 </projectDescription>
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
index 4983df81f37a3e2a195a6d3f471755df21b00df3..90d90577657d6603a293608f184d6279b8ed8da2 100644 (file)
--- a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
@@ -9,6 +9,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.help.ui,
  org.eclipse.help.webapp,
  org.eclipse.core.runtime,
  org.eclipse.help.ui,
  org.eclipse.help.webapp,

- org.hamcrest;bundle-version="1.1.0"
+ org.hamcrest

 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy

diff --git a/eu.etaxonomy.taxeditor.test/.classpath b/eu.etaxonomy.taxeditor.test/.classpath
index c45eced959697eb26c7cb9551e17a277b407fb1d..12d3a7cdd6d733338f1e108848d412f566620e95 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/.classpath
+++ b/eu.etaxonomy.taxeditor.test/.classpath
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="src" path="src/test/java"/>\r
-       <classpathentry kind="src" path="src/main/resources"/>\r
-       <classpathentry kind="output" path="target"/>\r
-</classpath>\r
+<?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 kind="src" path="src/test/java"/>
+       <classpathentry kind="src" path="src/main/resources"/>
+       <classpathentry kind="output" path="target/classes"/>
+</classpath>

diff --git a/pom.xml b/pom.xml
index a969dad8b0b2f12d5581ea68b0a1f9345481dda8..15f22ce9c0d519921f0069302a6226f00319f3a3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -95,6 +95,11 @@
                <repository>
       <id>eclipse-indigo</id>
       <layout>p2</layout>
                <repository>
       <id>eclipse-indigo</id>
       <layout>p2</layout>

+      <url>http://download.eclipse.org/technology/swtbot/helios/dev-build/update-site/</url>
+    </repository>
+    <repository>
+      <id>eclipse-swtbot</id>
+      <layout>p2</layout>

       <url>http://download.eclipse.org/releases/indigo</url>
     </repository>
        </repositories>
       <url>http://download.eclipse.org/releases/indigo</url>
     </repository>
        </repositories>