Fixing mixed up build files

diff --git a/.gitattributes b/.gitattributes
index 11f207a932fc60d903a6f95f347e043622ac49de..8a6f74f1b6fd60a674e9704f02d2521761a839f6 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -227,6 +227,7 @@ eu.etaxonomy.taxeditor.cdmlib/lib/opencsv-1.8.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.apache.commons.codec-1.3.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20100503.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.6.2.R36x_v20110210.jar -text
+eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.0.4.RELEASE.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.0.4.RELEASEsrc.zip -text
 eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.asm-3.0.4.RELEASE.jar -text
@@ -781,6 +782,7 @@ eu.etaxonomy.taxeditor.help/html/nameparser/nomenclatural_status_part.html -text
 eu.etaxonomy.taxeditor.help/html/nameparser/overview.html -text
 eu.etaxonomy.taxeditor.help/html/nameparser/reference_part.html -text
 eu.etaxonomy.taxeditor.help/original_document/Taxonomic_Editor_User_Manual_Version_4.doc -text
+eu.etaxonomy.taxeditor.help/p2.inf -text
 eu.etaxonomy.taxeditor.help/plugin.xml -text
 eu.etaxonomy.taxeditor.help/pom.xml -text
 eu.etaxonomy.taxeditor.help/src/eu/etaxonomy/taxeditor/help/Activator.java -text
@@ -855,6 +857,7 @@ eu.etaxonomy.taxeditor.printpublisher/.classpath -text
 eu.etaxonomy.taxeditor.printpublisher/.project -text
 eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF -text
 eu.etaxonomy.taxeditor.printpublisher/build.properties -text
+eu.etaxonomy.taxeditor.printpublisher/p2.inf -text
 eu.etaxonomy.taxeditor.printpublisher/plugin.xml -text
 eu.etaxonomy.taxeditor.printpublisher/pom.xml -text
 eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/PrintUtil.java -text

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/build.properties b/eu.etaxonomy.taxeditor.bulkeditor/build.properties
index a41e228dcfe1d6ffb0e29108af99a9fedef97e60..a78e9b43982761539c4a02f7e1b75d9981143088 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/build.properties
+++ b/eu.etaxonomy.taxeditor.bulkeditor/build.properties
@@ -4,5 +4,4 @@ bin.includes = META-INF/,\
                .,\\r
                icons/,\\r
                plugin.xml,\\r
-               build.properties,\\r
                p2.inf\r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar
new file mode 100644 (file)
index 0000000..25f1180
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar differ

diff --git a/eu.etaxonomy.taxeditor.feature/build.properties b/eu.etaxonomy.taxeditor.feature/build.properties
index f1201a6d35262e5656307d64f4e7729484c48ab6..30f68d152ce802dcfa0eb2399ee01c1a11018049 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/build.properties
+++ b/eu.etaxonomy.taxeditor.feature/build.properties
@@ -1,5 +1,4 @@
-bin.includes = plugin_customization.ini,\
-               feature.xml
+bin.includes = feature.xml
 
 category.id.eu.etaxonomy=EDIT
 category.description.eu.etaxonomy=EDIT Taxonomic Editor

diff --git a/eu.etaxonomy.taxeditor.help/build.properties b/eu.etaxonomy.taxeditor.help/build.properties
index 642e4204570021fdd27b8bb1a0b9193150441c66..31a2087326912132862891f0344a18f9a48ab3e5 100644 (file)
--- a/eu.etaxonomy.taxeditor.help/build.properties
+++ b/eu.etaxonomy.taxeditor.help/build.properties
@@ -4,4 +4,5 @@ bin.includes = plugin.xml,\
                META-INF/,\
                .,\
                html/,\
-               *.xml
+               *.xml,\
+               p2.inf

diff --git a/eu.etaxonomy.taxeditor.help/p2.inf b/eu.etaxonomy.taxeditor.help/p2.inf
new file mode 100644 (file)
index 0000000..cdeccf8
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.help/p2.inf
@@ -0,0 +1,3 @@
+instructions.configure=\
+       addRepository(type:0,location:http${#58}//wp5.e-taxonomy.eu/taxeditor/update);\
+       addRepository(type:1,location:http${#58}//wp5.e-taxonomy.eu/taxeditor/update);
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.printpublisher/build.properties b/eu.etaxonomy.taxeditor.printpublisher/build.properties
index 43cb29eda2afebb6dcaa675da2fd723ea55671c0..5589fdf944c710f9aece4c51cdced1f4baf7770c 100644 (file)
--- a/eu.etaxonomy.taxeditor.printpublisher/build.properties
+++ b/eu.etaxonomy.taxeditor.printpublisher/build.properties
@@ -1,4 +1,5 @@
 source.. = src/main/java/
 bin.includes = META-INF/,\
                .,\
-               plugin.xml
+               plugin.xml,\
+               p2.inf

diff --git a/eu.etaxonomy.taxeditor.printpublisher/p2.inf b/eu.etaxonomy.taxeditor.printpublisher/p2.inf
new file mode 100644 (file)
index 0000000..cdeccf8
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.printpublisher/p2.inf
@@ -0,0 +1,3 @@
+instructions.configure=\
+       addRepository(type:0,location:http${#58}//wp5.e-taxonomy.eu/taxeditor/update);\
+       addRepository(type:1,location:http${#58}//wp5.e-taxonomy.eu/taxeditor/update);
\ No newline at end of file