From: n.hoffmann <n.hoffmann@localhost>
Date: Wed, 14 Mar 2012 12:47:00 +0000 (+0000)
Subject: Fixing mixed up build files
X-Git-Tag: 3.6.0~1087
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/d597412265a53722f89927b041c091fec19f8b3c

Fixing mixed up build files
---

diff --git a/.gitattributes b/.gitattributes
index 11f207a93..8a6f74f1b 100644
--- 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 a41e228dc..a78e9b439 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/build.properties
+++ b/eu.etaxonomy.taxeditor.bulkeditor/build.properties
@@ -4,5 +4,4 @@ bin.includes = META-INF/,\
                .,\
                icons/,\
                plugin.xml,\
-               build.properties,\
                p2.inf
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
index 000000000..25f118068
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 f1201a6d3..30f68d152 100644
--- 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 642e42045..31a208732 100644
--- 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
index 000000000..cdeccf81b
--- /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 43cb29eda..5589fdf94 100644
--- 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
index 000000000..cdeccf81b
--- /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