o property for the conversion properties

o update the conversion script to use the property
o rename the properties used for conversion to be clear
o get rid of the java.net stuff until they clean their stuff up

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@481124 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/maven-meeper/src/bin/m1-m2-conversion/conversion.properties b/maven-meeper/src/bin/m1-m2-conversion/conversion.properties
new file mode 100644 (file)
index 0000000..c58c68a
--- /dev/null
+++ b/maven-meeper/src/bin/m1-m2-conversion/conversion.properties
@@ -0,0 +1,3 @@
+sourceRepositoryPath=/home/maven/repository-staging/to-ibiblio/maven
+targetRepositoryPath=/home/maven/repository-staging/to-ibiblio/maven2-converted-from-maven1
+blacklistedPatterns=**/*.pom,**/activation/**,**/javamail/**,**/jaxm/**,**/jaxp/**,**/jaxrpc/**,**/jca/**,**/jce/**,**/jdbc/**,**/jdo/**,**/jms/**,**/jndi/**,**/saaj/**

diff --git a/maven-meeper/src/bin/m1-m2-conversion/convert-m1-m2.sh b/maven-meeper/src/bin/m1-m2-conversion/convert-m1-m2.sh
index 1db947a2dcda1cc84ead16ff677baf6fbba0879e..51dfcda8c56b99211504a8c6672cf6bf2ed90880 100755 (executable)
--- a/maven-meeper/src/bin/m1-m2-conversion/convert-m1-m2.sh
+++ b/maven-meeper/src/bin/m1-m2-conversion/convert-m1-m2.sh
@@ -4,7 +4,7 @@ syncProperties=$1
 
 . $syncProperties
 
-$JAVA -jar archiva-cli-1.0-SNAPSHOT-cli.jar -c synchronize.properties
+$JAVA -jar archiva-cli-1.0-SNAPSHOT-cli.jar -c $CONVERSION_PROPERTIES
 
 dir=/home/maven/repository-staging/to-ibiblio
 src=$dir/maven2-converted-from-maven1

diff --git a/maven-meeper/src/bin/m1-m2-conversion/synchronize-java.net.properties b/maven-meeper/src/bin/m1-m2-conversion/synchronize-java.net.properties
deleted file mode 100644 (file)
index 702a9f6..0000000
--- a/maven-meeper/src/bin/m1-m2-conversion/synchronize-java.net.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-sourceRepositoryPath=/home/maven/repository-staging/to-ibiblio/maven-java.net
-targetRepositoryPath=/home/maven/repository-staging/to-ibiblio/maven2-repoclean
-blacklistedPatterns=**/*.pom

diff --git a/maven-meeper/src/bin/m1-m2-conversion/synchronize.properties b/maven-meeper/src/bin/m1-m2-conversion/synchronize.properties
deleted file mode 100644 (file)
index c58c68a..0000000
--- a/maven-meeper/src/bin/m1-m2-conversion/synchronize.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-sourceRepositoryPath=/home/maven/repository-staging/to-ibiblio/maven
-targetRepositoryPath=/home/maven/repository-staging/to-ibiblio/maven2-converted-from-maven1
-blacklistedPatterns=**/*.pom,**/activation/**,**/javamail/**,**/jaxm/**,**/jaxp/**,**/jaxrpc/**,**/jca/**,**/jce/**,**/jdbc/**,**/jdo/**,**/jms/**,**/jndi/**,**/saaj/**

diff --git a/maven-meeper/src/bin/synchronize.properties b/maven-meeper/src/bin/synchronize.properties
index fc3fac2719dc8a925b12c76f17354b1766897bba..3bb9cde397fccd9ff432e80991cbfe102bb94f02 100644 (file)
--- a/maven-meeper/src/bin/synchronize.properties
+++ b/maven-meeper/src/bin/synchronize.properties
@@ -6,6 +6,7 @@ export SYNC_TOOLS=$TOOLS_BASE/synchronize
 export SYNCOPATE=$SYNC_TOOLS/syncopate
 export M2_SYNC=$SYNC_TOOLS/m2-sync
 export REPOCLEAN=$TOOLS_BASE/m1-m2-conversion
+export CONVERSION_PROPERTIES=$REPOCLEAN/conversion.properties
 export M1_M2_REWRITE_RULES=$SYNC_TOOLS/m1-m2-mod-rewrite-rules.txt
 export SYNC_REPORTS=$HOME/repository-staging/to-ibiblio/reports/sync
 export IBIBLIO_SYNC_HOST=login.ibiblio.org