[amplab-tachyon/f21] update webapp path
by Huamin Chen
commit fa1aed405442a81836f97c82d7c775739d9cf2ef
Author: Huamin Chen <hchen(a)redhat.com>
Date: Fri Sep 5 15:55:52 2014 -0400
update webapp path
Signed-off-by: Huamin Chen <hchen(a)redhat.com>
amplab-tachyon.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/amplab-tachyon.spec b/amplab-tachyon.spec
index 767b198..87b63fd 100644
--- a/amplab-tachyon.spec
+++ b/amplab-tachyon.spec
@@ -146,7 +146,7 @@ mkdir -p -m0755 %{buildroot}%{_var}/lib/%{shortname}/journal
#######################
mkdir -p -m0755 %{buildroot}/%{_datadir}/%{shortname}/web
-cp -rf main/src/main/webapp %{buildroot}/%{_datadir}/%{shortname}/web
+cp -rf core/src/main/webapp %{buildroot}/%{_datadir}/%{shortname}/web
#######################
# NOTE: The following is plugging into hadoop without
9 years, 9 months
[amplab-tachyon/f21] Changelog cleaning
by tstclair
commit 880f7a6e977fa3d2528e1ed4f05f58cd9dcbd151
Author: Timothy St. Clair <tstclair(a)redhat.com>
Date: Fri Sep 5 14:38:35 2014 -0500
Changelog cleaning
amplab-tachyon.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/amplab-tachyon.spec b/amplab-tachyon.spec
index bacc674..767b198 100644
--- a/amplab-tachyon.spec
+++ b/amplab-tachyon.spec
@@ -195,7 +195,7 @@ mkdir -p -m0755 %{buildroot}/%{_datadir}/hadoop/common/lib
%systemd_postun_with_restart %{shortname}-slave.service %{shortname}-master.service
%changelog
-* Wed May 28 2014 Timothy St. Clair <tstclair(a)redhat.com> - 0.5.0-2.5c054ca
+* Fri Sep 5 2014 Timothy St. Clair <tstclair(a)redhat.com> - 0.5.0-2.5c054ca
- Update to 0.5.0 official
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.5.0-2.SNAPSHOT.fc8d2fd
9 years, 9 months
[amplab-tachyon/f21] Update for f21 only
by tstclair
commit 857c785ef691ef8cf8e80c3853092cff6fd234df
Author: Timothy St. Clair <tstclair(a)redhat.com>
Date: Fri Sep 5 14:36:10 2014 -0500
Update for f21 only
amplab-tachyon.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/amplab-tachyon.spec b/amplab-tachyon.spec
index 9c118f7..bacc674 100644
--- a/amplab-tachyon.spec
+++ b/amplab-tachyon.spec
@@ -6,7 +6,7 @@ Name: amplab-%{shortname}
# Given the naming conflicts with other packages, and eventually this will
# switch to apache-tachyon should
Version: 0.5.0
-Release: 2.SNAPSHOT.%{shortcommit}%{?dist}
+Release: 2.%{shortcommit}%{?dist}
Summary: Reliable file sharing at memory speed across cluster frameworks
License: ASL 2.0
URL: http://tachyon-project.org/
@@ -47,7 +47,7 @@ BuildRequires: mvn(org.slf4j:slf4j-log4j12)
BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.powermock:powermock-module-junit4)
BuildRequires: mvn(org.powermock:powermock-api-mockito)
-BuildRequires: mvn(org.apache.hadoop.fs.glusterfs:glusterfs)
+BuildRequires: mvn(org.apache.hadoop.fs.glusterfs:glusterfs-hadoop)
BuildRequires: mvn(org.eclipse.jetty:jetty-jsp)
# Test deps
@@ -195,6 +195,9 @@ mkdir -p -m0755 %{buildroot}/%{_datadir}/hadoop/common/lib
%systemd_postun_with_restart %{shortname}-slave.service %{shortname}-master.service
%changelog
+* Wed May 28 2014 Timothy St. Clair <tstclair(a)redhat.com> - 0.5.0-2.5c054ca
+- Update to 0.5.0 official
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.5.0-2.SNAPSHOT.fc8d2fd
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
9 years, 9 months
[tycho] Debundle tycho-bundles-external and tycho-standalone-p2-director.
by Roland Grunberg
commit 793ac795c5202b40886f158ad18272f50590d355
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Mon Aug 18 17:01:03 2014 -0400
Debundle tycho-bundles-external and tycho-standalone-p2-director.
- Resolves: rhbz#789272
tycho-bootstrap.sh | 143 +--------------------------------------------
tycho-debundle.sh | 22 +++++++
tycho-scripts.sh | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++
tycho.spec | 21 +++++--
4 files changed, 204 insertions(+), 147 deletions(-)
---
diff --git a/tycho-bootstrap.sh b/tycho-bootstrap.sh
index 164114f..d6e23c4 100755
--- a/tycho-bootstrap.sh
+++ b/tycho-bootstrap.sh
@@ -1,147 +1,6 @@
#! /bin/bash
-function minibuild () {
-
-basedir=$1
-
-src=`cat "${basedir}/build.properties" | grep 'source..' | cut -d'=' -f2 | tr ' ' '\0'`
-output=`cat "${basedir}/build.properties" | grep 'output..' | cut -d'=' -f2 | tr ' ' '\0'`
-bName=`cat "${basedir}/META-INF/MANIFEST.MF" | grep 'Bundle-SymbolicName:' | sed 's/Bundle-SymbolicName: \([a-zA-Z0-9_.-]*\)\(;\)\?.*/\1/'`
-artifactId=`cat "${basedir}/pom.xml" | sed '/<parent>/,/<\/parent>/ d' | grep "<artifactId>" | sed 's/.*<artifactId>\(.*\)<\/artifactId>.*/\1/'`
-version=`cat "${basedir}/pom.xml" | grep "<version>" | sed 's/.*<version>\(.*\)<\/version>.*/\1/'`
-
-# External (System) dependencies
-if [ $# -eq 3 ]; then
- mkdir -p "${basedir}/target/externalDeps"
- copyBundles $3 "${basedir}/target/externalDeps"
-else
- mkdir -p "${basedir}/target"
-fi
-
-mkdir -p "${basedir}/${output}"
-
-# Compile
-cp=
-if [ $# -gt 1 ]; then
- cp='-classpath '$2':'"${basedir}"'/target/externalDeps/*'
-fi
-
-javac -d "${basedir}/${output}" \
- $(for file in `find "${basedir}/${src}" -name "*.java"`; \
- do echo -n "${file} "; \
- done;) \
- ${cp}
-
-# Package
-pushd ${basedir}
-pushd ${output}
-classfiles=`for file in $(find . -name "*.class"); do echo -n ' -C '${output} ${file} ; done;`
-popd
-jar -cfmv "target/${bName}-${version}.jar" 'META-INF/MANIFEST.MF' 'OSGI-INF' 'plugin.xml' 'about.html' 'plugin.properties' ${classfiles}
-popd
-
-# Install
-loc=".m2/org/eclipse/tycho/${artifactId}/${version}"
-mkdir -p ${loc}
-cp "${basedir}/target/${bName}-${version}.jar" ${loc}
-cp "${basedir}/pom.xml" "${loc}/${bName}-${version}.pom"
-
-}
-
-
-function copyBundles () {
-
-osgiLocations=( '/usr/share/java' '/usr/lib/java' '/usr/lib*/eclipse' )
-
-if [ ${eclipse_bootstrap} -eq 1 ]; then
-prefix="$(pwd)/bootstrap"
-osgiLocations=( ${osgiLocations[@]/#/${prefix}} )
-osgiLocations+=( ${osgiLocations[@]/${prefix}/} )
-fi
-
-wantedBundles=`echo $1 | tr ',' ' '`
-destDir=$2
-
-for loc in ${osgiLocations[@]} $(pwd)/bootstrap/extras ; do
- for jar in `find ${loc} -name "*.jar"`; do
- bsn=`readBSN ${jar}`
- versionline=`unzip -p ${jar} 'META-INF/MANIFEST.MF' | grep 'Bundle-Version:'`
- if [ -n "${bsn}" ]; then
- vers=`echo "${versionline}" | sed 's/Bundle-Version: \([a-zA-Z0-9_.-]*\).*/\1/'`
- echo ${wantedBundles} | grep -q "${bsn}"
- if [ $? -eq 0 ]; then
- cp ${jar} "${destDir}/${bsn}_${vers}.jar"
- wantedBundles=`removeFromList "${wantedBundles}" "${bsn}"`
- fi
- fi
- done
-done
-
-}
-
-function removeFromList () {
-arr=( ${1} )
-for (( i=0; i < ${#arr[@]}; i++ )); do
- if [ "${arr[${i}]}" = "$2" ]; then
- arr[${i}]=
- fi
-done
-echo ${arr[@]}
-}
-
-function isolateProject () {
-
-sed -i '/<parent>/,/<\/parent>/ d' "$1/pom.xml"
-sed -i "/<modelVersion>/ a <groupId>org.eclipse.tycho<\/groupId><version>${v}<\/version>" "$1/pom.xml"
-
-sed -i "/<artifactId>org.eclipse.osgi<\/artifactId>/ a <version>${osgiV}</version>" "$1/pom.xml"
-sed -i "/<artifactId>org.eclipse.osgi.compatibility.state<\/artifactId>/ a <version>${osgiV}</version>" "$1/pom.xml"
-}
-
-function unifyProject () {
-
-aid=$(basename $(dirname $1))
-if [ "${aid}" = '.' ]; then
- aid='tycho'
-fi
-sed -i "/<groupId>org.eclipse.tycho<\/groupId><version>${v}<\/version>/ d" "$1/pom.xml"
-sed -i "/<modelVersion>/ a <parent>\n<groupId>org.eclipse.tycho<\/groupId>\n<artifactId>${aid}<\/artifactId>\n<version>${preV}<\/version>\n<\/parent>" "$1/pom.xml"
-
-sed -i "/<version>${osgiV}<\/version>/ d" "$1/pom.xml"
-
-}
-
-function readBSN () {
-
-bsn=
-manEntryPat="^[a-zA-Z-]*:"
-foundBSNLine=0
-
-while read line; do
-if [ ${foundBSNLine} -eq 1 ]; then
- echo ${line} | grep -qE ${manEntryPat}
- if [ $? -eq 0 ]; then
- break
- else
- bsn=${bsn}"`echo ${line} | sed 's/\([a-zA-Z0-9_.-]*\)\(;\)\?.*/\1/'`"
- fi
-fi
-
-echo ${line} | grep -q "Bundle-SymbolicName:"
-if [ $? -eq 0 ]; then
- bsn=`echo ${line} | grep 'Bundle-SymbolicName:' | sed 's/Bundle-SymbolicName: \([a-zA-Z0-9_.-]*\)\(;\)\?.*/\1/'`
- echo ${line} | grep "Bundle-SymbolicName:" | grep -q ";"
- if [ $? -eq 0 ]; then
- break
- fi
- foundBSNLine=1
-fi
-done < <(unzip -p $1 'META-INF/MANIFEST.MF')
-
-echo ${bsn}
-
-}
-
+. $(pwd)/tycho-scripts.sh
eclipse_bootstrap=$1
preV='0.21.0'
diff --git a/tycho-debundle.sh b/tycho-debundle.sh
new file mode 100755
index 0000000..e9f8994
--- /dev/null
+++ b/tycho-debundle.sh
@@ -0,0 +1,22 @@
+#! /bin/bash
+
+. $(pwd)/tycho-scripts.sh
+
+projLoc=$1
+zipLoc=$2
+
+zipDir=`dirname ${zipLoc}`
+zipFile=`basename ${zipLoc}`
+tmpDir=${zipDir}/tmp
+
+mkdir -p ${tmpDir}
+unzip -d ${tmpDir} ${zipLoc}
+wantedBundles=`sed 's/ fragment=\"true\"//' ${projLoc}/*.product | sed -n 's/.*<plugin id=\"\(.*\)\"\/>.*/\1/ p'`
+pushd ${tmpDir}
+pluginsDir=`find . -type d -name plugins`
+pushd ${pluginsDir} && rm -rf *
+symlinkBundles "${wantedBundles}"
+popd
+zip -ry ${zipFile} *
+popd
+mv ${tmpDir}/${zipFile} ${zipLoc}
diff --git a/tycho-scripts.sh b/tycho-scripts.sh
new file mode 100755
index 0000000..4787fcd
--- /dev/null
+++ b/tycho-scripts.sh
@@ -0,0 +1,165 @@
+#! /bin/bash
+
+function minibuild () {
+
+basedir=$1
+
+src=`cat "${basedir}/build.properties" | grep 'source..' | cut -d'=' -f2 | tr ' ' '\0'`
+output=`cat "${basedir}/build.properties" | grep 'output..' | cut -d'=' -f2 | tr ' ' '\0'`
+bName=`cat "${basedir}/META-INF/MANIFEST.MF" | grep 'Bundle-SymbolicName:' | sed 's/Bundle-SymbolicName: \([a-zA-Z0-9_.-]*\)\(;\)\?.*/\1/'`
+artifactId=`cat "${basedir}/pom.xml" | sed '/<parent>/,/<\/parent>/ d' | grep "<artifactId>" | sed 's/.*<artifactId>\(.*\)<\/artifactId>.*/\1/'`
+version=`cat "${basedir}/pom.xml" | grep "<version>" | sed 's/.*<version>\(.*\)<\/version>.*/\1/'`
+
+# External (System) dependencies
+if [ $# -eq 3 ]; then
+ mkdir -p "${basedir}/target/externalDeps"
+ copyBundles $3 "${basedir}/target/externalDeps"
+else
+ mkdir -p "${basedir}/target"
+fi
+
+mkdir -p "${basedir}/${output}"
+
+# Compile
+cp=
+if [ $# -gt 1 ]; then
+ cp='-classpath '$2':'"${basedir}"'/target/externalDeps/*'
+fi
+
+javac -d "${basedir}/${output}" \
+ $(for file in `find "${basedir}/${src}" -name "*.java"`; \
+ do echo -n "${file} "; \
+ done;) \
+ ${cp}
+
+# Package
+pushd ${basedir}
+pushd ${output}
+classfiles=`for file in $(find . -name "*.class"); do echo -n ' -C '${output} ${file} ; done;`
+popd
+jar -cfmv "target/${bName}-${version}.jar" 'META-INF/MANIFEST.MF' 'OSGI-INF' 'plugin.xml' 'about.html' 'plugin.properties' ${classfiles}
+popd
+
+# Install
+loc=".m2/org/eclipse/tycho/${artifactId}/${version}"
+mkdir -p ${loc}
+cp "${basedir}/target/${bName}-${version}.jar" ${loc}
+cp "${basedir}/pom.xml" "${loc}/${bName}-${version}.pom"
+
+}
+
+
+function copyBundles () {
+
+osgiLocations=( '/usr/share/java' '/usr/lib/java' '/usr/lib*/eclipse' )
+
+if [ ${eclipse_bootstrap} -eq 1 ]; then
+prefix="$(pwd)/bootstrap"
+osgiLocations=( ${osgiLocations[@]/#/${prefix}} )
+osgiLocations+=( ${osgiLocations[@]/${prefix}/} )
+fi
+
+wantedBundles=`echo $1 | tr ',' ' '`
+destDir=$2
+
+for loc in ${osgiLocations[@]} ; do
+ for jar in `find ${loc} -name "*.jar"`; do
+ bsn=`readBSN ${jar}`
+ versionline=`unzip -p ${jar} 'META-INF/MANIFEST.MF' | grep 'Bundle-Version:'`
+ if [ -n "${bsn}" ]; then
+ vers=`echo "${versionline}" | sed 's/Bundle-Version: \([a-zA-Z0-9_.-]*\).*/\1/'`
+ echo ${wantedBundles} | grep -q "${bsn}"
+ if [ $? -eq 0 ]; then
+ cp ${jar} "${destDir}/${bsn}_${vers}.jar"
+ wantedBundles=`removeFromList "${wantedBundles}" "${bsn}"`
+ fi
+ fi
+ done
+done
+
+}
+
+function symlinkBundles () {
+
+osgiLocations=( '/usr/share/java' '/usr/lib/java' '/usr/lib*/eclipse' )
+
+wantedBundles=`echo $1 | tr ',' ' '`
+
+for loc in ${osgiLocations[@]} ; do
+ for jar in `find ${loc} -name "*.jar"`; do
+ bsn=`readBSN ${jar}`
+ versionline=`unzip -p ${jar} 'META-INF/MANIFEST.MF' | grep 'Bundle-Version:'`
+ if [ -n "${bsn}" ]; then
+ vers=`echo "${versionline}" | sed 's/Bundle-Version: \([a-zA-Z0-9_.-]*\).*/\1/'`
+ echo ${wantedBundles} | grep -q "${bsn}"
+ if [ $? -eq 0 ]; then
+ ln -s ${jar} "${bsn}_${vers}.jar"
+ wantedBundles=`removeFromList "${wantedBundles}" "${bsn}"`
+ fi
+ fi
+ done
+done
+}
+
+function removeFromList () {
+arr=( ${1} )
+for (( i=0; i < ${#arr[@]}; i++ )); do
+ if [ "${arr[${i}]}" = "$2" ]; then
+ arr[${i}]=
+ fi
+done
+echo ${arr[@]}
+}
+
+function isolateProject () {
+
+sed -i '/<parent>/,/<\/parent>/ d' "$1/pom.xml"
+sed -i "/<modelVersion>/ a <groupId>org.eclipse.tycho<\/groupId><version>${v}<\/version>" "$1/pom.xml"
+
+sed -i "/<artifactId>org.eclipse.osgi<\/artifactId>/ a <version>${osgiV}</version>" "$1/pom.xml"
+sed -i "/<artifactId>org.eclipse.osgi.compatibility.state<\/artifactId>/ a <version>${osgiV}</version>" "$1/pom.xml"
+}
+
+function unifyProject () {
+
+aid=$(basename $(dirname $1))
+if [ "${aid}" = '.' ]; then
+ aid='tycho'
+fi
+sed -i "/<groupId>org.eclipse.tycho<\/groupId><version>${v}<\/version>/ d" "$1/pom.xml"
+sed -i "/<modelVersion>/ a <parent>\n<groupId>org.eclipse.tycho<\/groupId>\n<artifactId>${aid}<\/artifactId>\n<version>${preV}<\/version>\n<\/parent>" "$1/pom.xml"
+
+sed -i "/<version>${osgiV}<\/version>/ d" "$1/pom.xml"
+
+}
+
+function readBSN () {
+
+bsn=
+manEntryPat="^[a-zA-Z-]*:"
+foundBSNLine=0
+
+while read line; do
+if [ ${foundBSNLine} -eq 1 ]; then
+ echo ${line} | grep -qE ${manEntryPat}
+ if [ $? -eq 0 ]; then
+ break
+ else
+ bsn=${bsn}"`echo ${line} | sed 's/\([a-zA-Z0-9_.-]*\)\(;\)\?.*/\1/'`"
+ fi
+fi
+
+echo ${line} | grep -q "Bundle-SymbolicName:"
+if [ $? -eq 0 ]; then
+ bsn=`echo ${line} | grep 'Bundle-SymbolicName:' | sed 's/Bundle-SymbolicName: \([a-zA-Z0-9_.-]*\)\(;\)\?.*/\1/'`
+ echo ${line} | grep "Bundle-SymbolicName:" | grep -q ";"
+ if [ $? -eq 0 ]; then
+ break
+ fi
+ foundBSNLine=1
+fi
+done < <(unzip -p $1 'META-INF/MANIFEST.MF')
+
+echo ${bsn}
+
+}
diff --git a/tycho.spec b/tycho.spec
index 277dd39..f2d8ba0 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -23,7 +23,7 @@
Name: tycho
Version: 0.21.0
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -36,10 +36,12 @@ Source0: http://git.eclipse.org/c/tycho/org.eclipse.tycho.git/snapshot/ty
# version 2.4.3 (impossible to have empty mojo created as aggregate). This
# should be fixed upstream properly
Source1: EmptyMojo.java
-Source2: %{name}-bootstrap.sh
+Source2: %{name}-scripts.sh
+Source3: %{name}-bootstrap.sh
+Source4: %{name}-debundle.sh
# Fedora Eclipse bundles (needed when Eclipse not present) to build Tycho
%if %{eclipse_bootstrap}
-Source4: eclipse-bootstrap.tar.xz
+Source5: eclipse-bootstrap.tar.xz
%endif
# Eclipse Plugin Project supporting filesystem as p2 repository
# https://github.com/rgrunber/fedoraproject-p2
@@ -211,7 +213,7 @@ sed -i '/^<unit id=.*$/d' tycho-bundles/tycho-bundles-target/tycho-bundles-targe
# Bootstrap Build
%if %{eclipse_bootstrap}
-tar -xf %{SOURCE4}
+tar -xf %{SOURCE5}
%endif
%if %{tycho_bootstrap}
@@ -219,7 +221,8 @@ tar -xf %{SOURCE4}
%patch5 -p1
# Perform the 'minimal' (bootstrap) build of Tycho
-%{SOURCE2} %{eclipse_bootstrap}
+cp %{SOURCE2} %{SOURCE3} .
+./%{name}-bootstrap.sh %{eclipse_bootstrap}
%patch5 -p1 -R
@@ -275,6 +278,8 @@ clean install org.apache.maven.plugins:maven-javadoc-plugin:aggregate
%install
+cp %{SOURCE2} %{SOURCE4} .
+
mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
@@ -318,6 +323,7 @@ done
# p2 runtime
dir=.m2/org/eclipse/tycho/tycho-bundles-external/%{version}%{snap}
+./%{name}-debundle.sh tycho-bundles/tycho-bundles-external/ $dir/tycho-bundles-external-%{version}*.zip
install -pm 644 $dir/tycho-bundles-external-%{version}*.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-tycho-bundles-external.pom
install -m 644 $dir/tycho-bundles-external-%{version}*.zip $RPM_BUILD_ROOT%{_javadir}/%{name}/tycho-bundles-external.zip
%add_maven_depmap JPP.%{name}-tycho-bundles-external.pom %{name}/tycho-bundles-external.zip -a "org.eclipse.tycho:tycho-bundles-external"
@@ -327,6 +333,7 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-main.pom
%add_maven_depmap JPP.%{name}-main.pom
# standalone p2 director
+./%{name}-debundle.sh tycho-bundles/tycho-standalone-p2-director/ .m2/org/eclipse/tycho/tycho-standalone-p2-director/%{version}%{snap}/tycho-standalone-p2-director-%{version}*.zip
pushd .m2/org/eclipse/tycho/tycho-standalone-p2-director/%{version}%{snap}/
install -m 644 tycho-standalone-p2-director-%{version}*.zip $RPM_BUILD_ROOT%{_javadir}/%{name}/tycho-standalone-p2-director.zip
install -pm 644 tycho-standalone-p2-director-%{version}*.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-tycho-standalone-p2-director.pom
@@ -379,6 +386,10 @@ install -m 644 $osgiStateJarPath $RPM_BUILD_ROOT%{_javadir}/%{name}/osgi.compati
%{_javadocdir}/%{name}
%changelog
+* Fri Sep 05 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.21.0-7
+- Debundle tycho-bundles-external and tycho-standalone-p2-director.
+- Resolves: rhbz#789272
+
* Thu Sep 04 2014 Roland Grunberg <rgrunber(a)redhat.com> - 0.21.0-6
- Use fedoraproject-p2 to do OSGi bundle discovery.
9 years, 9 months
[amplab-tachyon/f21] patch against last source
by Huamin Chen
commit f52f22b8cf73ef0ee16fe87dfded1419567f54be
Author: Huamin Chen <hchen(a)redhat.com>
Date: Fri Sep 5 14:03:36 2014 -0400
patch against last source
Signed-off-by: Huamin Chen <hchen(a)redhat.com>
amplab-tachyon.spec | 10 +++++-
tachyon-0.5.0-defaults.patch | 66 ++++++++++++++++++++++++++++++++++++++++++
tachyon-env.sh | 16 ++++++++--
3 files changed, 87 insertions(+), 5 deletions(-)
---
diff --git a/amplab-tachyon.spec b/amplab-tachyon.spec
index 66ae518..9c118f7 100644
--- a/amplab-tachyon.spec
+++ b/amplab-tachyon.spec
@@ -18,12 +18,17 @@ Source4: %{shortname}-layout.sh
Source5: %{shortname}-env.sh
Patch0: tachyon-0.4.0-SNAPSHOT-log4props.patch
-Patch1: tachyon-0.4.0-defaults.patch
+Patch1: tachyon-0.5.0-defaults.patch
BuildRequires: java-devel
BuildRequires: mvn(commons-io:commons-io)
-BuildRequires: log4j12
+%if 0%{?fedora} >= 21
+BuildRequires: mvn(org.slf4j:slf4j-log4j12)
+%else
+BuildRequires: mvn(log4j:log4j)
+%endif
+
BuildRequires: mvn(org.apache.ant:ant)
BuildRequires: mvn(org.apache.commons:commons-lang3)
@@ -43,6 +48,7 @@ BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.powermock:powermock-module-junit4)
BuildRequires: mvn(org.powermock:powermock-api-mockito)
BuildRequires: mvn(org.apache.hadoop.fs.glusterfs:glusterfs)
+BuildRequires: mvn(org.eclipse.jetty:jetty-jsp)
# Test deps
BuildRequires: mvn(junit:junit)
diff --git a/tachyon-0.5.0-defaults.patch b/tachyon-0.5.0-defaults.patch
new file mode 100644
index 0000000..ad54cc9
--- /dev/null
+++ b/tachyon-0.5.0-defaults.patch
@@ -0,0 +1,66 @@
+diff --git a/bin/tachyon b/bin/tachyon
+index e40214b..bdf92c0 100755
+--- a/bin/tachyon
++++ b/bin/tachyon
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env bash
+
+ function printUsage {
+- echo "Usage: tachyon COMMAND "
++ echo "Usage: tachyon.sh COMMAND "
+ echo "where COMMAND is one of:"
+ echo -e " format [-s] \t Format Tachyon (if -s specified, only format if underfs doesn't exist)"
+ echo -e " bootstrap-conf\t Generate a config file if one doesn't exist"
+@@ -32,7 +32,7 @@ TACHYON_LIBEXEC_DIR=${TACHYON_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR}
+ . $TACHYON_LIBEXEC_DIR/tachyon-config.sh
+
+ function runTest {
+- Usage="Usage: tachyon runTest <Basic|BasicRawTable> <MUST_CACHE|TRY_CACHE|CACHE_THROUGH|THROUGH|ASYNC_THROUGH>"
++ Usage="Usage: tachyon.sh runTest <Basic|BasicRawTable> <MUST_CACHE|TRY_CACHE|CACHE_THROUGH|THROUGH|ASYNC_THROUGH>"
+
+ if [ "$#" -ne 2 ]; then
+ echo $Usage
+@@ -45,15 +45,15 @@ function runTest {
+ fi
+
+ if [[ "$1" == "Basic" ]]; then
+- $bin/tachyon tfs rm /BasicFile_$2
++ $bin/tachyon.sh tfs rm /BasicFile_$2
+ $JAVA -cp $TACHYON_CONF_DIR/:$TACHYON_JAR $TACHYON_JAVA_OPTS tachyon.examples.BasicOperations tachyon://$MASTER_ADDRESS:19998 /BasicFile_$2 $2
+ exit 0
+ elif [[ "$1" == "BasicRawTable" ]]; then
+- $bin/tachyon tfs rm /BasicRawTable_$2
++ $bin/tachyon.sh tfs rm /BasicRawTable_$2
+ $JAVA -cp $TACHYON_CONF_DIR/:$TACHYON_JAR $TACHYON_JAVA_OPTS tachyon.examples.BasicRawTableOperations tachyon://$MASTER_ADDRESS:19998 /BasicRawTable_$2 $2
+ exit 0
+ elif [[ "$1" == "BasicCheckpoint" ]]; then
+- $bin/tachyon tfs rm /BasicCheckpoint
++ $bin/tachyon.sh tfs rm /BasicCheckpoint
+ $JAVA -cp $TACHYON_CONF_DIR/:$TACHYON_JAR $TACHYON_JAVA_OPTS tachyon.examples.BasicCheckpoint tachyon://$MASTER_ADDRESS:19998 /BasicCheckpoint 10
+ exit 0
+ fi
+@@ -150,7 +150,7 @@ if [ "$COMMAND" == "format" ]; then
+ TACHYON_MASTER_ADDRESS=localhost
+ fi
+
+- $bin/tachyon-slaves.sh $bin/tachyon formatWorker
++ $bin/tachyon-slaves.sh $bin/tachyon.sh formatWorker
+
+ echo "Formatting Tachyon Master @ $TACHYON_MASTER_ADDRESS"
+ CLASS=tachyon.Format
+@@ -174,10 +174,10 @@ elif [ "$COMMAND" == "runTests" ]; then
+
+ for op in ${opArr[@]}
+ do
+- echo $bin/tachyon runTest Basic $op
+- $bin/tachyon runTest Basic $op
+- echo $bin/tachyon runTest BasicRawTable $op
+- $bin/tachyon runTest BasicRawTable $op
++ echo $bin/tachyon.sh runTest Basic $op
++ $bin/tachyon.sh runTest Basic $op
++ echo $bin/tachyon.sh runTest BasicRawTable $op
++ $bin/tachyon.sh runTest BasicRawTable $op
+ done
+
+ exit 0
+
diff --git a/tachyon-env.sh b/tachyon-env.sh
index 257008f..a0fc884 100644
--- a/tachyon-env.sh
+++ b/tachyon-env.sh
@@ -16,21 +16,31 @@
export TACHYON_RAM_FOLDER=/mnt/ramdisk
export TACHYON_MASTER_ADDRESS=localhost
+export TACHYON_UNDERFS_ADDRESS=$TACHYON_HOME/underfs
export TACHYON_UNDERFS_ADDRESS=hdfs://localhost:8020
export TACHYON_WORKER_MEMORY_SIZE=1GB
+export TACHYON_UNDERFS_HDFS_IMPL=org.apache.hadoop.hdfs.DistributedFileSystem
CONF_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
export TACHYON_JAVA_OPTS+="
-Dlog4j.configuration=file:$CONF_DIR/log4j.properties
- -Dhadoop.home.dir=/usr
- -Dtachyon.web.resources=/usr/share/tachyon/web/resources
-Dtachyon.debug=false
-Dtachyon.underfs.address=$TACHYON_UNDERFS_ADDRESS
+ -Dtachyon.underfs.hdfs.impl=$TACHYON_UNDERFS_HDFS_IMPL
+ -Dtachyon.data.folder=$TACHYON_UNDERFS_ADDRESS/tmp/tachyon/data
+ -Dtachyon.workers.folder=$TACHYON_UNDERFS_ADDRESS/tmp/tachyon/workers
-Dtachyon.worker.memory.size=$TACHYON_WORKER_MEMORY_SIZE
-Dtachyon.worker.data.folder=$TACHYON_RAM_FOLDER/tachyonworker/
-Dtachyon.master.worker.timeout.ms=60000
-Dtachyon.master.hostname=$TACHYON_MASTER_ADDRESS
-Dtachyon.master.journal.folder=$TACHYON_HOME/journal/
- -Dtachyon.master.pinlist=/pinfiles;/pindata
+ -Dorg.apache.jasper.compiler.disablejsr199=true
+ -Djava.net.preferIPv4Stack=true
"
+
+# Master specific parameters. Default to TACHYON_JAVA_OPTS.
+export TACHYON_MASTER_JAVA_OPTS="$TACHYON_JAVA_OPTS"
+
+# Worker specific parameters that will be shared to all workers. Default to TACHYON_JAVA_OPTS.
+export TACHYON_WORKER_JAVA_OPTS="$TACHYON_JAVA_OPTS"
9 years, 9 months
[amplab-tachyon/f21] update to rev 5c054cadf88a5bbdd846142637c27b87936ab6ef
by Huamin Chen
commit f90899eb268dfa501b23d6293d6cddb251994c9c
Author: Huamin Chen <hchen(a)redhat.com>
Date: Fri Sep 5 11:08:24 2014 -0400
update to rev 5c054cadf88a5bbdd846142637c27b87936ab6ef
Signed-off-by: hchen <hchen(a)fedora.redhat.com>
.gitignore | 1 +
amplab-tachyon.spec | 2 +-
sources | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7448851..bd5605f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/tachyon-0.4.0-515c2c8.tar.gz
/tachyon-0.4.0-e5cba5b.tar.gz
/tachyon-0.4.1-4b9c806.tar.gz
+/tachyon-0.5.0-5c054ca.tar.gz
diff --git a/amplab-tachyon.spec b/amplab-tachyon.spec
index ea1a1c7..66ae518 100644
--- a/amplab-tachyon.spec
+++ b/amplab-tachyon.spec
@@ -1,4 +1,4 @@
-%global commit fc8d2fdd3f49738216619babaf85a4bdcd56dbe8
+%global commit 5c054cadf88a5bbdd846142637c27b87936ab6ef
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global shortname tachyon
diff --git a/sources b/sources
index ed5574f..711f2b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2ea3541e3778661379d57b8f7eb67948 tachyon-0.5.0-fc8d2fd.tar.gz
+d32a40267fda6e4861f57c74f4146368 tachyon-0.5.0-5c054ca.tar.gz
9 years, 9 months
[solr] update to 4.10.0
by gil
commit 5c6191b8e3bcb7e9dffc7e511296f6a0333e6845
Author: gil <puntogil(a)libero.it>
Date: Fri Sep 5 16:48:22 2014 +0200
update to 4.10.0
.gitignore | 2 ++
solr.spec | 12 +++++++-----
sources | 4 ++--
3 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b4ec1d3..5cd2a5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@
/sorl-poms-4.8.0.tar.xz
/solr-4.8.1-src.tgz
/sorl-poms-4.8.1.tar.xz
+/solr-4.10.0-src.tgz
+/sorl-poms-4.10.0.tar.xz
diff --git a/solr.spec b/solr.spec
index d5d2e66..ceff1ef 100644
--- a/solr.spec
+++ b/solr.spec
@@ -11,7 +11,7 @@
%bcond_with kite
%endif
Name: solr
-Version: 4.8.1
+Version: 4.10.0
Release: 1%{?dist}
Summary: Ultra-fast Lucene-based Search Server
# MIT/X11 (BSD like) solr/contrib/map-reduce/src/java/org/apache/solr/hadoop/AlphaNumericComparator.java
@@ -23,20 +23,19 @@ Source0: http://www.apache.org/dist/lucene/solr/%{version}/%{name}-%{versi
Source1: sorl-poms-%{version}.tar.xz
Source2: solr-get-poms.sh
-BuildRequires: java-devel
-
BuildRequires: mvn(com.cybozu.labs:langdetect)
BuildRequires: mvn(com.google.guava:guava)
BuildRequires: mvn(com.googlecode.concurrentlinkedhashmap:concurrentlinkedhashmap-lru)
BuildRequires: mvn(com.ibm.icu:icu4j)
BuildRequires: mvn(com.spatial4j:spatial4j)
+BuildRequires: mvn(com.sun.mail:gimap)
+BuildRequires: mvn(com.sun.mail:javax.mail)
BuildRequires: mvn(commons-cli:commons-cli)
BuildRequires: mvn(commons-codec:commons-codec)
BuildRequires: mvn(commons-fileupload:commons-fileupload)
BuildRequires: mvn(commons-io:commons-io)
BuildRequires: mvn(commons-lang:commons-lang)
BuildRequires: mvn(jakarta-regexp:jakarta-regexp)
-BuildRequires: mvn(javax.mail:mail)
BuildRequires: mvn(javax.servlet:servlet-api)
BuildRequires: mvn(joda-time:joda-time)
BuildRequires: mvn(log4j:log4j:1.2.17)
@@ -322,7 +321,7 @@ done
%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.woodstox']/pom:artifactId" woodstox-core-asl solr/contrib/uima
%pom_xpath_set "pom:dependencies/pom:dependency[pom:groupId = 'org.codehaus.woodstox']/pom:artifactId" woodstox-core-asl solr/contrib/velocity
# Use system jvm apis
-%pom_remove_dep javax.activation:activation solr/contrib/dataimporthandler
+#%%pom_remove_dep javax.activation:activation solr/contrib/dataimporthandler
%pom_remove_dep javax.activation:activation solr/contrib/dataimporthandler-extras
# Remove fake BR
%pom_remove_dep com.googlecode.mp4parser:isoparser
@@ -384,6 +383,9 @@ done
%doc LICENSE.txt NOTICE.txt
%changelog
+* Fri Sep 05 2014 gil cattaneo <puntogil(a)libero.it> 4.10.0-1
+- update to 4.10.0
+
* Wed Jun 11 2014 gil cattaneo <puntogil(a)libero.it> 4.8.1-1
- update to 4.8.1
diff --git a/sources b/sources
index 0da1603..3e3a89b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-77a24f5ac60045be8b167e0551c302a0 sorl-poms-4.8.1.tar.xz
-f8b7611ae094c31cd52d441839aca684 solr-4.8.1-src.tgz
+225663d76bc66ee9a47960b8f79a050f solr-4.10.0-src.tgz
+7115dc6aed1b3aac3b18a2d8e6cddd3f sorl-poms-4.10.0.tar.xz
9 years, 9 months