From: n.hoffmann <n.hoffmann@localhost>
Date: Fri, 12 Nov 2010 18:11:10 +0000 (+0000)
Subject: Removing buggy shellscripts for copying cdmlib resources. This is handled by maven... 
X-Git-Tag: rcp.ss-first-working-version~258
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/69780d80ff7ce77bb328dbb95d3b5af4b060f523

Removing buggy shellscripts for copying cdmlib resources. This is handled by maven from now on.
---

diff --git a/.gitattributes b/.gitattributes
index 130af5ec0..94797d383 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -116,8 +116,6 @@ taxeditor-cdmlib/.classpath -text
 taxeditor-cdmlib/.project -text
 taxeditor-cdmlib/META-INF/MANIFEST.MF -text
 taxeditor-cdmlib/README.txt -text
-taxeditor-cdmlib/_makeSources.bat -text
-taxeditor-cdmlib/_makeSources.sh -text
 taxeditor-cdmlib/build.properties -text
 taxeditor-cdmlib/lib/activation-1.1.jar -text
 taxeditor-cdmlib/lib/activation-1.1src.zip -text
diff --git a/.gitignore b/.gitignore
index 81316de13..ecfd39f15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,20 +39,28 @@ taxeditor-cdmlib/cdmlib-services-1.3src.zip
 taxeditor-cdmlib/cdmlib-services-2.0.jar
 taxeditor-cdmlib/cdmlib-services-2.0src.zip
 taxeditor-cdmlib/dist
+taxeditor-cdmlib/lib/cdmlib-commons-2.5-sources.jar
 taxeditor-cdmlib/lib/cdmlib-commons-2.5.jar
 taxeditor-cdmlib/lib/cdmlib-commons-2.5src.zip
+taxeditor-cdmlib/lib/cdmlib-ext-2.5-sources.jar
 taxeditor-cdmlib/lib/cdmlib-ext-2.5.jar
 taxeditor-cdmlib/lib/cdmlib-ext-2.5src.zip
+taxeditor-cdmlib/lib/cdmlib-io-2.5-sources.jar
 taxeditor-cdmlib/lib/cdmlib-io-2.5.jar
 taxeditor-cdmlib/lib/cdmlib-io-2.5src.zip
+taxeditor-cdmlib/lib/cdmlib-model-2.5-sources.jar
 taxeditor-cdmlib/lib/cdmlib-model-2.5.jar
 taxeditor-cdmlib/lib/cdmlib-model-2.5src.zip
+taxeditor-cdmlib/lib/cdmlib-persistence-2.5-sources.jar
 taxeditor-cdmlib/lib/cdmlib-persistence-2.5.jar
 taxeditor-cdmlib/lib/cdmlib-persistence-2.5src.zip
+taxeditor-cdmlib/lib/cdmlib-print-2.5-sources.jar
 taxeditor-cdmlib/lib/cdmlib-print-2.5.jar
 taxeditor-cdmlib/lib/cdmlib-print-2.5src.zip
+taxeditor-cdmlib/lib/cdmlib-remote-2.5-sources.jar
 taxeditor-cdmlib/lib/cdmlib-remote-2.5.jar
 taxeditor-cdmlib/lib/cdmlib-remote-2.5src.zip
+taxeditor-cdmlib/lib/cdmlib-services-2.5-sources.jar
 taxeditor-cdmlib/lib/cdmlib-services-2.5.jar
 taxeditor-cdmlib/lib/cdmlib-services-2.5src.zip
 taxeditor-cdmlib/log4j-1.2.14src.zip
diff --git a/taxeditor-cdmlib/_makeSources.bat b/taxeditor-cdmlib/_makeSources.bat
deleted file mode 100644
index bfe608233..000000000
--- a/taxeditor-cdmlib/_makeSources.bat
+++ /dev/null
@@ -1,52 +0,0 @@
-set version=2.5
-
-del cdmlib-commons-%version%src.zip
-del cdmlib-commons-%version%.jar
-
-del cdmlib-model-%version%src.zip
-del cdmlib-model-%version%.jar
-
-del cdmlib-persistence-%version%src.zip
-del cdmlib-persistence-%version%.jar
-
-del cdmlib-services-%version%src.zip
-del cdmlib-services-%version%.jar
-
-del cdmlib-io-%version%src.zip
-del cdmlib-io-%version%.jar
-
-del cdmlib-remote-%version%src.zip
-del cdmlib-remote-%version%.jar
-
-del cdmlib-ext-%version%src.zip
-del cdmlib-ext-%version%.jar
-
-del cdmlib-print-%version%src.zip
-del cdmlib-print-%version%.jar
-
-copy  "%HOMEDRIVE%%HOMEPATH%\.m2\repository\eu\etaxonomy\cdmlib-commons\%version%\cdmlib-commons-%version%.jar" "lib\cdmlib-commons-%version%.jar"
-copy  "%HOMEDRIVE%%HOMEPATH%\.m2\repository\eu\etaxonomy\cdmlib-commons\%version%\cdmlib-commons-%version%-sources.jar" "lib\cdmlib-commons-%version%src.zip"
-
-copy  "%HOMEDRIVE%%HOMEPATH%\.m2\repository\eu\etaxonomy\cdmlib-model\%version%\cdmlib-model-%version%.jar" lib\cdmlib-model-%version%.jar
-copy "%HOMEDRIVE%%HOMEPATH%\.m2\repository\eu\etaxonomy\cdmlib-model\%version%\cdmlib-model-%version%-sources.jar" lib\cdmlib-model-%version%src.zip
-     
-copy "%HOMEDRIVE%%HOMEPATH%\.m2\repository\eu\etaxonomy\cdmlib-persistence\%version%\cdmlib-persistence-%version%.jar" lib\cdmlib-persistence-%version%.jar
-copy "%HOMEDRIVE%%HOMEPATH%\.m2\repository\eu\etaxonomy\cdmlib-persistence\%version%\cdmlib-persistence-%version%-sources.jar" lib\cdmlib-persistence-%version%src.zip
-     
-copy "%HOMEDRIVE%%HOMEPATH%\.m2\repository\eu\etaxonomy\cdmlib-services\%version%\cdmlib-services-%version%.jar" lib\cdmlib-services-%version%.jar
-copy "%HOMEDRIVE%%HOMEPATH%\.m2\repository\eu\etaxonomy\cdmlib-services\%version%\cdmlib-services-%version%-sources.jar" lib\cdmlib-services-%version%src.zip
-     
-copy "%HOMEDRIVE%%HOMEPATH%\.m2\repository\eu\etaxonomy\cdmlib-io\%version%\cdmlib-io-%version%.jar" lib\cdmlib-io-%version%.jar
-copy "%HOMEDRIVE%%HOMEPATH%\.m2\repository\eu\etaxonomy\cdmlib-io\%version%\cdmlib-io-%version%-sources.jar" lib\cdmlib-io-%version%src.zip
-     
-copy "%HOMEDRIVE%%HOMEPATH%\.m2\repository\eu\etaxonomy\cdmlib-remote\%version%\cdmlib-remote-%version%.jar" lib\cdmlib-remote-%version%.jar
-copy "%HOMEDRIVE%%HOMEPATH%\.m2\repository\eu\etaxonomy\cdmlib-remote\%version%\cdmlib-remote-%version%-sources.jar" lib\cdmlib-remote-%version%src.zip
-     
-copy "%HOMEDRIVE%%HOMEPATH%\.m2\repository\eu\etaxonomy\cdmlib-ext\%version%\cdmlib-ext-%version%.jar" lib\cdmlib-ext-%version%.jar
-copy "%HOMEDRIVE%%HOMEPATH%\.m2\repository\eu\etaxonomy\cdmlib-ext\%version%\cdmlib-ext-%version%-sources.jar" lib\cdmlib-ext-%version%src.zip
-     
-copy "%HOMEDRIVE%%HOMEPATH%\.m2\repository\eu\etaxonomy\cdmlib-print\%version%\cdmlib-print-%version%.jar" lib\cdmlib-print-%version%.jar
-copy "%HOMEDRIVE%%HOMEPATH%\.m2\repository\eu\etaxonomy\cdmlib-print\%version%\cdmlib-print-%version%-sources.jar" lib\cdmlib-print-%version%src.zip
-
-pause
-
diff --git a/taxeditor-cdmlib/_makeSources.sh b/taxeditor-cdmlib/_makeSources.sh
deleted file mode 100755
index c8e9fd1ac..000000000
--- a/taxeditor-cdmlib/_makeSources.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh
-
-LIBDIR=~/.m2/repository/eu/etaxonomy
-VERSION="2.5"
-
-#rm ./cdmlib-commons-$VERSION\src.zip ./cdmlib-commons-$VERSION.jar ./cdmlib-model-$VERSION\src.zip \
-# ./cdmlib-model-$VERSION.jar ./cdmlib-persistence-$VERSION\src.zip ./cdmlib-persistence-$VERSION.jar \
-# ./cdmlib-services-$VERSION\src.zip ./cdmlib-services-$VERSION.jar \
-# ./cdmlib-io-$VERSION\src.zip ./cdmlib-io-$VERSION.jar \
-# ./cdmlib-print-$VERSION\src.zip ./cdmlib-print-$VERSION.jar
-# ./cdmlib-remote-$VERSION\src.zip ./cdmlib-remote-$VERSION.jar ./cdmlib-ext-$VERSION\src.zip ./cdmlib-ext-$VERSION.jar > /dev/null 2>&1 
-
-
-cp $LIBDIR/cdmlib-commons/$VERSION/cdmlib-commons-$VERSION.jar ./lib/
-cp $LIBDIR/cdmlib-commons/$VERSION/cdmlib-commons-$VERSION-sources.jar ./lib/cdmlib-commons-$VERSION\src.zip
-
-cp $LIBDIR/cdmlib-model/$VERSION/cdmlib-model-$VERSION.jar ./lib/
-cp $LIBDIR/cdmlib-model/$VERSION/cdmlib-model-$VERSION-sources.jar ./lib/cdmlib-model-$VERSION\src.zip
-
-cp $LIBDIR/cdmlib-persistence/$VERSION/cdmlib-persistence-$VERSION.jar ./lib/
-cp $LIBDIR/cdmlib-persistence/$VERSION/cdmlib-persistence-$VERSION-sources.jar ./lib/cdmlib-persistence-$VERSION\src.zip
-
-cp $LIBDIR/cdmlib-services/$VERSION/cdmlib-services-$VERSION.jar ./lib/
-cp $LIBDIR/cdmlib-services/$VERSION/cdmlib-services-$VERSION-sources.jar ./lib/cdmlib-services-$VERSION\src.zip
-
-cp $LIBDIR/cdmlib-io/$VERSION/cdmlib-io-$VERSION.jar ./lib/
-cp $LIBDIR/cdmlib-io/$VERSION/cdmlib-io-$VERSION-sources.jar ./lib/cdmlib-io-$VERSION\src.zip
-
-cp $LIBDIR/cdmlib-remote/$VERSION/cdmlib-remote-$VERSION.jar ./lib/
-cp $LIBDIR/cdmlib-remote/$VERSION/cdmlib-remote-$VERSION-sources.jar ./lib/cdmlib-remote-$VERSION\src.zip
-
-cp $LIBDIR/cdmlib-ext/$VERSION/cdmlib-ext-$VERSION.jar ./lib/
-cp $LIBDIR/cdmlib-ext/$VERSION/cdmlib-ext-$VERSION-sources.jar ./lib/cdmlib-ext-$VERSION\src.zip
-
-cp $LIBDIR/cdmlib-print/$VERSION/cdmlib-print-$VERSION.jar ./lib/
-cp $LIBDIR/cdmlib-print/$VERSION/cdmlib-print-$VERSION-sources.jar ./lib/cdmlib-print-$VERSION\src.zip
diff --git a/taxeditor-cdmlib/pom.xml b/taxeditor-cdmlib/pom.xml
index 31e55d746..7bcd94423 100644
--- a/taxeditor-cdmlib/pom.xml
+++ b/taxeditor-cdmlib/pom.xml
@@ -22,7 +22,6 @@
 	            <phase>validate</phase>
 	            <goals>
 	              <goal>copy-dependencies</goal>
-	              <goal>sources</goal>
 	            </goals>
 	            <configuration>
 	              <excludeArtifactIds>junit,log4j,unitils</excludeArtifactIds>
@@ -32,6 +31,21 @@
 	              <excludeTransitive>true</excludeTransitive>
 	            </configuration>
 	          </execution>
+	          <execution>
+	            <id>copy-dependencies-sources</id>
+	            <phase>validate</phase>
+	            <goals>
+	              <goal>copy-dependencies</goal>
+	            </goals>
+	            <configuration>
+	              <classifier>sources</classifier>
+	              <excludeArtifactIds>junit,log4j,unitils</excludeArtifactIds>
+	              <outputDirectory>lib</outputDirectory>
+	              <overWriteReleases>true</overWriteReleases>
+	              <overWriteSnapshots>true</overWriteSnapshots>
+	              <excludeTransitive>true</excludeTransitive>
+	            </configuration>
+	          </execution>
 	        </executions>
 	      </plugin>
 	    </plugins>