[javapackages/xmvn-0.4.x: 9/9] Update xmvn root location in %mvn_install
by Mikolaj Izdebski
commit 2f13366e47a0a687160fe3c555e5588af49a7566
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Mar 6 13:01:15 2013 +0100
Update xmvn root location in %mvn_install
macros.xmvn | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/macros.xmvn b/macros.xmvn
index 08308dd..0b7769b 100644
--- a/macros.xmvn
+++ b/macros.xmvn
@@ -102,7 +102,7 @@
# buildroot. It is intended to be placed in %install section of spec file.
#
%mvn_install() \
-[ -d .root ] && cp -pr .root/* $RPM_BUILD_ROOT \
+[ -d .xmvn/root ] && cp -pr .xmvn/root/* $RPM_BUILD_ROOT \
if [ -d target/site/apidocs ]; then \
install -dm755 $RPM_BUILD_ROOT/%{_javadocdir}/%{name} \
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} \
11 years, 2 months
[javapackages/xmvn-0.4.x: 8/9] Add <installRoot> to system-configuration.xml
by Mikolaj Izdebski
commit b132f6d0354e04f2885ed4aa91bef598d2f09afc
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Mar 6 12:33:56 2013 +0100
Add <installRoot> to system-configuration.xml
configs/system-configuration.xml | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
---
diff --git a/configs/system-configuration.xml b/configs/system-configuration.xml
index 40aa034..edb9555 100644
--- a/configs/system-configuration.xml
+++ b/configs/system-configuration.xml
@@ -47,5 +47,6 @@
<jniDir>usr/lib/java</jniDir>
<pomDir>usr/share/maven-poms</pomDir>
<metadataDir>usr/share/maven-fragments</metadataDir>
+ <installRoot>.xmvn/root</installRoot>
</installerSettings>
</configuration>
11 years, 2 months
[javapackages/xmvn-0.4.x: 7/9] In configuration use <artifactGlob> instead of <artifact>
by Mikolaj Izdebski
commit 0cb70a4adaf20a775e4010cbc51b4d4683d93807
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Mar 6 11:39:21 2013 +0100
In configuration use <artifactGlob> instead of <artifact>
scripts/mvn-alias | 4 ++--
scripts/mvn-build | 4 ++--
scripts/mvn-file | 4 ++--
scripts/mvn-package | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/scripts/mvn-alias b/scripts/mvn-alias
index 4421ee4..e1e6d61 100755
--- a/scripts/mvn-alias
+++ b/scripts/mvn-alias
@@ -50,11 +50,11 @@ while [ $# -gt 0 ]; do
</alias>"
done
-xml="<artifact>
+xml="<artifactGlob>
<groupId>${pattern[0]}</groupId>
<artifactId>${pattern[1]}</artifactId>
<version>${pattern[2]}</version>
- </artifact>
+ </artifactGlob>
<aliases>$aliases
</aliases>"
diff --git a/scripts/mvn-build b/scripts/mvn-build
index a2a5580..e51eee2 100755
--- a/scripts/mvn-build
+++ b/scripts/mvn-build
@@ -147,9 +147,9 @@ done
if $singleton; then
- _write_xmvn_config "%mvn_build macro (--singleton option)" "artifactManagement" "rule" "<artifact>
+ _write_xmvn_config "%mvn_build macro (--singleton option)" "artifactManagement" "rule" "<artifactGlob>
<artifactId>{*}</artifactId>
- </artifact>
+ </artifactGlob>
<targetPackage>@1</targetPackage>"
fi
diff --git a/scripts/mvn-file b/scripts/mvn-file
index 9ed57fa..c88e978 100755
--- a/scripts/mvn-file
+++ b/scripts/mvn-file
@@ -45,11 +45,11 @@ while [ $# -gt 0 ]; do
shift
done
-xml="<artifact>
+xml="<artifactGlob>
<groupId>${pattern[0]}</groupId>
<artifactId>${pattern[1]}</artifactId>
<version>${pattern[2]}</version>
- </artifact>
+ </artifactGlob>
<files>$files
</files>"
diff --git a/scripts/mvn-package b/scripts/mvn-package
index e80ebda..798c20d 100755
--- a/scripts/mvn-package
+++ b/scripts/mvn-package
@@ -37,11 +37,11 @@ fi
IFS=: read -a pattern <<<"$1"
-xml="<artifact>
+xml="<artifactGlob>
<groupId>${pattern[0]}</groupId>
<artifactId>${pattern[1]}</artifactId>
<version>${pattern[2]}</version>
- </artifact>
+ </artifactGlob>
<targetPackage>$2</targetPackage>"
. /usr/share/java-utils/xmvn_config_editor.sh
11 years, 2 months
[javapackages/xmvn-0.4.x: 6/9] Use absolute path to xmvn_config_editor.sh
by Mikolaj Izdebski
commit ac0da51b88b71573aacfdac367e0d6ca838437c6
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Mar 6 11:31:22 2013 +0100
Use absolute path to xmvn_config_editor.sh
scripts/mvn-alias | 2 +-
scripts/mvn-build | 2 +-
scripts/mvn-file | 2 +-
scripts/mvn-package | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/scripts/mvn-alias b/scripts/mvn-alias
index 3301cd6..4421ee4 100755
--- a/scripts/mvn-alias
+++ b/scripts/mvn-alias
@@ -58,6 +58,6 @@ xml="<artifact>
<aliases>$aliases
</aliases>"
-. scripts/xmvn_config_editor.sh
+. /usr/share/java-utils/xmvn_config_editor.sh
_write_xmvn_config "%mvn_alias macro" "artifactManagement" "rule" "$xml"
exit 0
diff --git a/scripts/mvn-build b/scripts/mvn-build
index 4ee1459..a2a5580 100755
--- a/scripts/mvn-build
+++ b/scripts/mvn-build
@@ -30,7 +30,7 @@
#
# Authors: Mikolaj Izdebski <mizdebsk(a)redhat.com>
-. ./scripts/xmvn_config_editor.sh
+. /usr/share/java-utils/xmvn_config_editor.sh
need_arg()
diff --git a/scripts/mvn-file b/scripts/mvn-file
index 8323cbc..9ed57fa 100755
--- a/scripts/mvn-file
+++ b/scripts/mvn-file
@@ -53,6 +53,6 @@ xml="<artifact>
<files>$files
</files>"
-. scripts/xmvn_config_editor.sh
+. /usr/share/java-utils/xmvn_config_editor.sh
_write_xmvn_config "%mvn_file macro" "artifactManagement" "rule" "$xml"
exit 0
diff --git a/scripts/mvn-package b/scripts/mvn-package
index e6f0d8d..e80ebda 100755
--- a/scripts/mvn-package
+++ b/scripts/mvn-package
@@ -44,6 +44,6 @@ xml="<artifact>
</artifact>
<targetPackage>$2</targetPackage>"
-. scripts/xmvn_config_editor.sh
+. /usr/share/java-utils/xmvn_config_editor.sh
_write_xmvn_config "%mvn_package macro" "artifactManagement" "rule" "$xml"
exit 0
11 years, 2 months
[javapackages/xmvn-0.4.x: 5/9] Update configuration to newer format
by Mikolaj Izdebski
commit 1070218b728700390da0ded332a44135b5dba603
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Mar 6 11:25:13 2013 +0100
Update configuration to newer format
configs/system-configuration.xml | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/configs/system-configuration.xml b/configs/system-configuration.xml
index 33827dc..40aa034 100644
--- a/configs/system-configuration.xml
+++ b/configs/system-configuration.xml
@@ -6,40 +6,40 @@
<resolverSettings>
<debug>true</debug>
<localRepositories>
- <localRepository>.xm2</localRepository>
+ <repository>.xm2</repository>
</localRepositories>
<jarRepositories>
- <jarRepository>/usr/share/java</jarRepository>
- <jarRepository>/usr/lib/java</jarRepository>
+ <repository>/usr/share/java</repository>
+ <repository>/usr/lib/java</repository>
</jarRepositories>
<pomRepositories>
- <pomRepository>/usr/share/maven-poms</pomRepository>
- <pomRepository>/usr/share/maven/poms</pomRepository>
- <pomRepository>/usr/share/maven2/poms</pomRepository>
+ <repository>/usr/share/maven-poms</repository>
+ <repository>/usr/share/maven/poms</repository>
+ <repository>/usr/share/maven2/poms</repository>
</pomRepositories>
<metadataRepositories>
- <metadataRepository>/usr/share/maven-fragments</metadataRepository>
+ <repository>/usr/share/maven-fragments</repository>
</metadataRepositories>
<prefixes>
<prefix>/</prefix>
</prefixes>
<blacklist>
- <blacklist>
+ <artifact>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
- </blacklist>
- <blacklist>
+ </artifact>
+ <artifact>
<groupId>org.eclipse.jetty.orbit</groupId>
<artifactId>javax.activation</artifactId>
- </blacklist>
- <blacklist>
+ </artifact>
+ <artifact>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav</artifactId>
- </blacklist>
- <blacklist>
+ </artifact>
+ <artifact>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
- </blacklist>
+ </artifact>
</blacklist>
</resolverSettings>
<installerSettings>
11 years, 2 months
[javapackages/xmvn-0.4.x: 4/9] Update mvn-rpmbuild to support XMvn 0.4.0
by Mikolaj Izdebski
commit 2f9257426482df83e76df2137dbc60a0f05bc7ba
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Mar 6 11:11:39 2013 +0100
Update mvn-rpmbuild to support XMvn 0.4.0
scripts/mvn-local | 3 +++
scripts/mvn-rpmbuild | 26 ++++++++++++++++++--------
2 files changed, 21 insertions(+), 8 deletions(-)
---
diff --git a/scripts/mvn-local b/scripts/mvn-local
index 3dc0b09..c278c30 100755
--- a/scripts/mvn-local
+++ b/scripts/mvn-local
@@ -35,4 +35,7 @@ export TYCHO_MVN_LOCAL=true
unset TYCHO_MVN_RPMBUILD
export TYCHO_MVN_RPMBUILD
+# Maven needs to have M2_HOME exported. See: rhbz#912333
+export M2_HOME=/usr/share/maven
+
exec xmvn "${@}"
diff --git a/scripts/mvn-rpmbuild b/scripts/mvn-rpmbuild
index f370793..26dcb55 100755
--- a/scripts/mvn-rpmbuild
+++ b/scripts/mvn-rpmbuild
@@ -30,24 +30,34 @@
#
# Authors: Mikolaj Izdebski <mizdebsk(a)redhat.com>
-# XMvn default repo location is .xm2, but for backwards-compatibility
-# we use .m2 if called as mvn-rpmbuild.
-: "${XMVN_REPO_LOCAL:=.m2}"
-export XMVN_REPO_LOCAL
-
# A marker informing Tycho that mvn-rpmbuild was ran.
export TYCHO_MVN_RPMBUILD=true
unset TYCHO_MVN_LOCAL
export TYCHO_MVN_LOCAL
# Support local depmaps
-XMVN_RESOLV_DEPMAPS=,
+depmap=/some/nonexistent/path
for arg in "$@"; do
if egrep -q '^-Dmaven\.local\.depmap\.file=' <<<"$arg"; then
- XMVN_RESOLV_DEPMAPS="$XMVN_RESOLV_DEPMAPS,"$(sed 's/[^=]*=//' <<<"$arg")
+ depmap="$XMVN_RESOLV_DEPMAPS,"$(sed 's/[^=]*=//' <<<"$arg")
fi
done
-export XMVN_RESOLV_DEPMAPS
+
+mkdir -p .xmvn/config.d
+cat >>.xmvn/config.d/mvn-rpmbuild-config.xml <<EOF
+<configuration>
+ <resolverSettings>
+ <!-- XMvn default repo location is .xm2, but for backwards-compatibility
+ we use .m2 if called as mvn-rpmbuild. -->
+ <localRepositories>
+ <repository>.m2</repository>
+ <localRepositories>
+ <metadataRepositories>
+ <repository>$depmap</repository>
+ </metadataRepositories>
+ </resolverSettings>
+</configuration>
+EOF
# Install maven metadata for plugins in groups org.apache.maven.plugins
# and org.codehaus.mojo. This is to allow plugins in these groups to be
11 years, 2 months
[javapackages/xmvn-0.4.x: 3/9] Update mvn-* scripts to be compatible with XMvn 0.4.0
by Mikolaj Izdebski
commit d6ef20efd4a5209214a8020fb19581021c72c4ae
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Mar 6 10:56:55 2013 +0100
Update mvn-* scripts to be compatible with XMvn 0.4.0
scripts/mvn-alias | 24 ++++++++++++++---
scripts/mvn-build | 27 ++++++++-----------
scripts/mvn-file | 19 +++++++++++---
scripts/mvn-package | 13 +++++++--
scripts/xmvn_config_editor.sh | 57 +++++++++++++++++++++++++++++++----------
5 files changed, 100 insertions(+), 40 deletions(-)
---
diff --git a/scripts/mvn-alias b/scripts/mvn-alias
index 88d778c..3301cd6 100755
--- a/scripts/mvn-alias
+++ b/scripts/mvn-alias
@@ -35,13 +35,29 @@ if [ $# -lt 2 ]; then
exit 1
fi
-pattern="$1" shift
+IFS=: read -a pattern <<<"$1"
+shift
+aliases=
while [ $# -gt 0 ]; do
- echo "export XMVN_INSTALL_DEPMAPS=\"\$XMVN_INSTALL_DEPMAPS\"'$pattern
-$1
-'" >>.xmvnrc
+ IFS=: read -a alias <<<"$1"
shift
+ aliases="$aliases
+ <alias>
+ <groupId>${alias[0]}</groupId>
+ <artifactId>${alias[1]}</artifactId>
+ <version>${alias[2]}</version>
+ </alias>"
done
+xml="<artifact>
+ <groupId>${pattern[0]}</groupId>
+ <artifactId>${pattern[1]}</artifactId>
+ <version>${pattern[2]}</version>
+ </artifact>
+ <aliases>$aliases
+ </aliases>"
+
+. scripts/xmvn_config_editor.sh
+_write_xmvn_config "%mvn_alias macro" "artifactManagement" "rule" "$xml"
exit 0
diff --git a/scripts/mvn-build b/scripts/mvn-build
index eee9e60..4ee1459 100755
--- a/scripts/mvn-build
+++ b/scripts/mvn-build
@@ -30,8 +30,8 @@
#
# Authors: Mikolaj Izdebski <mizdebsk(a)redhat.com>
-# For now enable debugging by default.
-export XMVN_DEBUG=1
+. ./scripts/xmvn_config_editor.sh
+
need_arg()
{
@@ -87,9 +87,7 @@ pre_goals=
post_goals=
if [ -n "$RPM_PACKAGE_NAME" ]; then
- export XMVN_INSTALL_NAME="$RPM_PACKAGE_NAME"
-else
- export XMVN_INSTALL_NAME=$(basename "$PWD")
+ _write_xmvn_config "%mvn_build macro (default)" "installerSettings" "packageName" "$RPM_PACKAGE_NAME"
fi
while [ $# -gt 0 ]; do
@@ -99,7 +97,8 @@ while [ $# -gt 0 ]; do
break
;;
-d|--xmvn-debug)
- export XMVN_DEBUG=1
+ _write_xmvn_config "%mvn_build macro (--xmvn-debug option)" "resolverSettings" "debug" "true"
+ _write_xmvn_config "%mvn_build macro (--xmvn-debug option)" "installerSettings" "debug" "true"
;;
-f|--force|--skip-tests)
base_goal=package
@@ -130,11 +129,12 @@ while [ $# -gt 0 ]; do
;;
-v|--compat-version)
need_arg "$@"
- export XMVN_INSTALL_VERSIONS="$XMVN_INSTALL_VERSIONS,$2"
+ echo "$0: Option: $1 is not supported for now." >&2
shift
;;
-X|--debug)
- export XMVN_DEBUG=1
+ _write_xmvn_config "%mvn_build macro (--debug option)" "resolverSettings" "debug" "true"
+ _write_xmvn_config "%mvn_build macro (--debug option)" "installerSettings" "debug" "true"
debug=-X
;;
*)
@@ -146,14 +146,11 @@ while [ $# -gt 0 ]; do
done
-if [ -f .xmvnrc ]; then
- . ./.xmvnrc
-fi
-
if $singleton; then
- export XMVN_INSTALL_LAYOUT="$XMVN_INSTALL_LAYOUT"':{*}
-@1
-'
+ _write_xmvn_config "%mvn_build macro (--singleton option)" "artifactManagement" "rule" "<artifact>
+ <artifactId>{*}</artifactId>
+ </artifact>
+ <targetPackage>@1</targetPackage>"
fi
diff --git a/scripts/mvn-file b/scripts/mvn-file
index 93cc8da..8323cbc 100755
--- a/scripts/mvn-file
+++ b/scripts/mvn-file
@@ -35,13 +35,24 @@ if [ $# -lt 2 ]; then
exit 1
fi
-pattern="$1" shift
+IFS=: read -a pattern <<<"$1"
+shift
+files=
while [ $# -gt 0 ]; do
- echo "export XMVN_INSTALL_FILES=\"\$XMVN_INSTALL_FILES\"'$pattern
-$1
-'" >>.xmvnrc
+ files="$files
+ <file>$1</file>"
shift
done
+xml="<artifact>
+ <groupId>${pattern[0]}</groupId>
+ <artifactId>${pattern[1]}</artifactId>
+ <version>${pattern[2]}</version>
+ </artifact>
+ <files>$files
+ </files>"
+
+. scripts/xmvn_config_editor.sh
+_write_xmvn_config "%mvn_file macro" "artifactManagement" "rule" "$xml"
exit 0
diff --git a/scripts/mvn-package b/scripts/mvn-package
index fa3dc6b..e6f0d8d 100755
--- a/scripts/mvn-package
+++ b/scripts/mvn-package
@@ -35,8 +35,15 @@ if [ $# -ne 2 ]; then
exit 1
fi
-echo "export XMVN_INSTALL_LAYOUT=\"\$XMVN_INSTALL_LAYOUT\"'$1
-$2
-'" >>.xmvnrc
+IFS=: read -a pattern <<<"$1"
+xml="<artifact>
+ <groupId>${pattern[0]}</groupId>
+ <artifactId>${pattern[1]}</artifactId>
+ <version>${pattern[2]}</version>
+ </artifact>
+ <targetPackage>$2</targetPackage>"
+
+. scripts/xmvn_config_editor.sh
+_write_xmvn_config "%mvn_package macro" "artifactManagement" "rule" "$xml"
exit 0
diff --git a/scripts/xmvn_config_editor.sh b/scripts/xmvn_config_editor.sh
index 5b9964e..204e785 100644
--- a/scripts/xmvn_config_editor.sh
+++ b/scripts/xmvn_config_editor.sh
@@ -31,23 +31,52 @@
# Authors: Mikolaj Izdebski <mizdebsk(a)redhat.com>
-# Create skeleton XMvn reactor configuration file if it doesn't exist
-# yet.
-_xmvn_init_config()
+# Write XMvn reactor configuration file.
+# $1 - name of the macro or script that generated the config file
+# (for documentation purposes only)
+# $2 - 2nd leven major XML tag name (eg. resolverSettings)
+# $3 - 3rd level minor XML tag name (eg. jarRepositories)
+# $4 (optional) - 4th level micro XML tag name (eg. repository)
+# $5 (or $4 if micro tag is not specified) - XML contents
+_write_xmvn_config()
{
- mkdir -p .xmvn
- if ! [[ -e .xmvn/reactor-configuration.xml ]]; then
- cat >.xmvn/reactor-configuration.xml <<EOF
+ mkdir -p .xmvn/config.d
+
+ # index := ++index_file
+ local index_file=.xmvn/javapackages-rule-index
+ local index=$(($(cat $index_file 2>/dev/null || :) + 1))
+ echo $index >$index_file
+
+ # Write common header
+ cat >.xmvn/config.d/javapackages-config-$index.xml <<EOF
<?xml version="1.0" encoding="US-ASCII"?>
-<configuration>
- <artifactManagement>
- <artifactManagement>
- </artifactManagement>
- </artifactManagement>
- <installerSettings>
- <packageName>${RPM_PACKAGE_NAME}</packageName>
- </installerSettings>
+<!-- XMvn configuration file generated with $1
+ from maven-local package (part of javapackages-tools). -->
+<configuration xmlns="http://fedorahosted.org/xmvn/CONFIG/0.4.0">
+EOF
+
+ if [[ $# -eq 4 ]]; then
+ cat >>.xmvn/config.d/javapackages-config-$index.xml <<EOF
+ <$2>
+ <$3>
+ $4
+ </$3>
+ </$2>
+</configuration>
+EOF
+ elif [[ $# -eq 5 ]]; then
+ cat >>.xmvn/config.d/javapackages-config-$index.xml <<EOF
+ <$2>
+ <$3>
+ <$4>
+ $5
+ </$4>
+ </$3>
+ </$2>
</configuration>
EOF
+ else
+ echo "_write_xmvn_config(): Requires either 4 or 5 arguments"
+ exit 1
fi
}
11 years, 2 months
[javapackages/xmvn-0.4.x: 2/9] Start implementing xmvn_config_editor.sh
by Mikolaj Izdebski
commit d6bc714628232028f81c134b4b37e0ab583a0805
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Feb 18 15:33:49 2013 +0100
Start implementing xmvn_config_editor.sh
scripts/xmvn_config_editor.sh | 53 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 53 insertions(+), 0 deletions(-)
---
diff --git a/scripts/xmvn_config_editor.sh b/scripts/xmvn_config_editor.sh
new file mode 100644
index 0000000..5b9964e
--- /dev/null
+++ b/scripts/xmvn_config_editor.sh
@@ -0,0 +1,53 @@
+#!/bin/bash -e
+# Copyright (c) 2013, Red Hat, Inc
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the
+# distribution.
+# 3. Neither the name of Red Hat nor the names of its
+# contributors may be used to endorse or promote products derived
+# from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+# Authors: Mikolaj Izdebski <mizdebsk(a)redhat.com>
+
+
+# Create skeleton XMvn reactor configuration file if it doesn't exist
+# yet.
+_xmvn_init_config()
+{
+ mkdir -p .xmvn
+ if ! [[ -e .xmvn/reactor-configuration.xml ]]; then
+ cat >.xmvn/reactor-configuration.xml <<EOF
+<?xml version="1.0" encoding="US-ASCII"?>
+<configuration>
+ <artifactManagement>
+ <artifactManagement>
+ </artifactManagement>
+ </artifactManagement>
+ <installerSettings>
+ <packageName>${RPM_PACKAGE_NAME}</packageName>
+ </installerSettings>
+</configuration>
+EOF
+ fi
+}
11 years, 2 months
[javapackages/xmvn-0.4.x: 1/9] Import initial system-configuration.xml
by Mikolaj Izdebski
commit 35b800c3a4dd2c2c57a0606407494b772881426b
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Feb 18 14:19:36 2013 +0100
Import initial system-configuration.xml
configs/system-configuration.xml | 51 ++++++++++++++++++++++++++++++++++++++
1 files changed, 51 insertions(+), 0 deletions(-)
---
diff --git a/configs/system-configuration.xml b/configs/system-configuration.xml
new file mode 100644
index 0000000..33827dc
--- /dev/null
+++ b/configs/system-configuration.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="US-ASCII"?>
+<configuration>
+ <buildSettings>
+ <debug>true</debug>
+ </buildSettings>
+ <resolverSettings>
+ <debug>true</debug>
+ <localRepositories>
+ <localRepository>.xm2</localRepository>
+ </localRepositories>
+ <jarRepositories>
+ <jarRepository>/usr/share/java</jarRepository>
+ <jarRepository>/usr/lib/java</jarRepository>
+ </jarRepositories>
+ <pomRepositories>
+ <pomRepository>/usr/share/maven-poms</pomRepository>
+ <pomRepository>/usr/share/maven/poms</pomRepository>
+ <pomRepository>/usr/share/maven2/poms</pomRepository>
+ </pomRepositories>
+ <metadataRepositories>
+ <metadataRepository>/usr/share/maven-fragments</metadataRepository>
+ </metadataRepositories>
+ <prefixes>
+ <prefix>/</prefix>
+ </prefixes>
+ <blacklist>
+ <blacklist>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </blacklist>
+ <blacklist>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.activation</artifactId>
+ </blacklist>
+ <blacklist>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav</artifactId>
+ </blacklist>
+ <blacklist>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav-jackrabbit</artifactId>
+ </blacklist>
+ </blacklist>
+ </resolverSettings>
+ <installerSettings>
+ <jarDir>usr/share/java</jarDir>
+ <jniDir>usr/lib/java</jniDir>
+ <pomDir>usr/share/maven-poms</pomDir>
+ <metadataDir>usr/share/maven-fragments</metadataDir>
+ </installerSettings>
+</configuration>
11 years, 2 months
[javapackages] (9 commits) Created branch xmvn-0.4.x
by Mikolaj Izdebski
The branch 'xmvn-0.4.x' was created.
Summary of new commits:
35b800c... Import initial system-configuration.xml
d6bc714... Start implementing xmvn_config_editor.sh
d6ef20e... Update mvn-* scripts to be compatible with XMvn 0.4.0
2f92574... Update mvn-rpmbuild to support XMvn 0.4.0
1070218... Update configuration to newer format
ac0da51... Use absolute path to xmvn_config_editor.sh
0cb70a4... In configuration use <artifactGlob> instead of <artifact>
b132f6d... Add <installRoot> to system-configuration.xml
2f13366... Update xmvn root location in %mvn_install
11 years, 2 months