set svn:ignore on lib dir and removed auto dounloaded webapp war file

diff --git a/.gitattributes b/.gitattributes
index da06ef73832f9c97f580b5d6dbd9f29963cffeef..97e2c4334b0290ed31278bd5b029b17c04e7821f 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1026,7 +1026,6 @@ eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/cdm/remote/ICdmRemote
 eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/taxeditor/remoting/RemotingTestPluginActivator.java -text
 eu.etaxonomy.taxeditor.remoting/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java -text
 eu.etaxonomy.taxeditor.remoting/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java -text
-eu.etaxonomy.taxeditor.remoting/src/main/resources/etc/jetty/cdmlib-remote-webapp.war -text
 eu.etaxonomy.taxeditor.remoting/src/main/resources/etc/jetty/jetty-runner-9.2.3.v20140905.jar -text
 eu.etaxonomy.taxeditor.remoting/src/main/resources/etc/jetty/start-9.2.3.v20140905.jar -text
 eu.etaxonomy.taxeditor.remoting/src/main/resources/eu/etaxonomy/cdm/config.properties -text

diff --git a/.gitignore b/.gitignore
index 791556fbba3370453b1bc63a64c30dd245af976c..15187a3bd1e92944a0cc4086f50ff556e3bb9f93 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@ eu.etaxonomy.taxeditor.navigation/.settings
 eu.etaxonomy.taxeditor.navigation/target
 eu.etaxonomy.taxeditor.printpublisher/.settings
 eu.etaxonomy.taxeditor.printpublisher/target
+eu.etaxonomy.taxeditor.remoting/lib/*
 eu.etaxonomy.taxeditor.remoting/target
 eu.etaxonomy.taxeditor.store/.settings
 eu.etaxonomy.taxeditor.store/hibernate.log

diff --git a/eu.etaxonomy.taxeditor.remoting/src/main/resources/etc/jetty/cdmlib-remote-webapp.war b/eu.etaxonomy.taxeditor.remoting/src/main/resources/etc/jetty/cdmlib-remote-webapp.war
deleted file mode 100644 (file)
index 31274a6..0000000
Binary files a/eu.etaxonomy.taxeditor.remoting/src/main/resources/etc/jetty/cdmlib-remote-webapp.war and /dev/null differ