diff --git a/maven-model/build.sh b/maven-model/build.sh deleted file mode 100755 index 9290369a56..0000000000 --- a/maven-model/build.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -rm -rf target - -model=maven.mdo.new - -# Generate the sources from the model -modello --model=$model --version=4.0.0 --mode=java --dir=target/generated-sources -ret=$?; if [ $ret != 0 ]; then exit $ret; fi - -# Generate the source for the xpp3 marshaller and unmarshaller -modello --model=$model --version=4.0.0 --mode=xpp3 --dir=target/generated-sources -ret=$?; if [ $ret != 0 ]; then exit $ret; fi - -# Generate the 3.0.0 source from the model -modello --model=$model --version=3.0.0 --mode=java --dir=target/generated-sources --package-with-version -ret=$?; if [ $ret != 0 ]; then exit $ret; fi - -# Generate the 3.0.0 source for the xpp3 marshaller and unmarshaller -modello --model=$model --version=3.0.0 --mode=xpp3 --dir=target/generated-sources --package-with-version -ret=$?; if [ $ret != 0 ]; then exit $ret; fi - -# Generate XML Schema -modello --model=$model --version=4.0.0 --mode=xsd --dir=. -ret=$?; if [ $ret != 0 ]; then exit $ret; fi - -# Generate XDoc -modello --model=$model --version=4.0.0 --mode=xdoc --dir=target/generated-xdocs -ret=$?; if [ $ret != 0 ]; then exit $ret; fi - -# Build the sources -mboot --install -ret=$?; if [ $ret != 0 ]; then exit $ret; fi diff --git a/maven-model/build_maven_1_1.sh b/maven-model/build_maven_1_1.sh deleted file mode 100755 index 886d5c1161..0000000000 --- a/maven-model/build_maven_1_1.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh - -rm -rf target - -model=maven.mdo -repoLocal=`egrep '^maven.repo.local=' $HOME/build.properties | sed 's/maven.repo.local=//'` -packageWithVersion=false -dir=target/generated-sources -model_version=3.0.0 -classesDir=target/classes - -echo Repository: $repoLocal - -mkdir -p $dir - -if $cygwin; then - repoLocal=`cygpath -pu "$repoLocal"` -fi - -CP=$repoLocal/modello/jars/modello-1.0-SNAPSHOT.jar:$repoLocal/xstream/jars/xstream-1.0-SNAPSHOT.jar:$repoLocal/xpp3/jars/xpp3-1.1.3.3.jar - -if $cygwin; then - CP=`cygpath -pw "$CP"` -fi - -java -classpath "$CP" org.codehaus.modello.Modello $model java "$dir" "$model_version" "$package_with_version" -ret=$?; if [ $ret != 0 ]; then exit $ret; fi -java -classpath "$CP" org.codehaus.modello.Modello $model xpp3 "$dir" "$model_version" "$package_with_version" -ret=$?; if [ $ret != 0 ]; then exit $ret; fi - -# TODO: remove after I can fix modello -patch target/generated-sources/org/apache/maven/model/io/xpp3/MavenXpp3Writer.java tmp - mv tmp $i -done - -mkdir -p $classesDir -javac -classpath $CP -d $classesDir -sourcepath $dir `find . -name '*.java' -type f` -ret=$?; if [ $ret != 0 ]; then exit $ret; fi - -( - cd $classesDir - jar cf ../maven-model-1.1-SNAPSHOT.jar * - ret=$?; if [ $ret != 0 ]; then exit $ret; fi -) -ret=$?; if [ $ret != 0 ]; then exit $ret; fi - -cp target/maven-model-1.1-SNAPSHOT.jar $repoLocal/maven/jars diff --git a/maven-model/properties-patch.diff b/maven-model/properties-patch.diff deleted file mode 100644 index 62b3232dde..0000000000 --- a/maven-model/properties-patch.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- target/generated-sources/org/apache/maven/model/v300/io/xpp3/MavenXpp3Writer.java 2004-09-20 18:09:09.228374400 +1000 -+++ target-prev/generated-sources/org/apache/maven/model/v300/io/xpp3/MavenXpp3Writer.java 2004-09-20 18:07:53.439395200 +1000 -@@ -286,6 +286,15 @@ - { - serializer.startTag( NAMESPACE, "type" ).text( dependency.getType() ).endTag( NAMESPACE, "type" ); - } -+ if (dependency.getProperties() != null) { -+ serializer.startTag( NAMESPACE, "properties" ); -+ for (java.util.Iterator i = dependency.getProperties().keySet().iterator(); i.hasNext(); ) -+ { -+ String key = ( String ) i.next(); -+ serializer.startTag( NAMESPACE, key ).text( dependency.getProperty(key) ).endTag( NAMESPACE, key ); -+ } -+ serializer.endTag( NAMESPACE, "properties" ); -+ } - serializer.endTag( NAMESPACE, "dependency" ); - } - serializer.endTag( NAMESPACE, "dependencies" );