[amplab-tachyon] Update includes fixed for hadoop
by tstclair
commit 3368fcbdf5c6df1955455e1d26b4bbd06959875d
Author: Timothy St. Clair <tstclair(a)redhat.com>
Date: Wed Feb 5 10:44:26 2014 -0600
Update includes fixed for hadoop
amplab-tachyon.spec | 15 ++++++++++-----
tachyon-0.4.0-defaults.patch | 20 ++++++++++++++++++++
tachyon-env.sh | 1 +
3 files changed, 31 insertions(+), 5 deletions(-)
---
diff --git a/amplab-tachyon.spec b/amplab-tachyon.spec
index 4604c64..974ad08 100644
--- a/amplab-tachyon.spec
+++ b/amplab-tachyon.spec
@@ -96,8 +96,8 @@ sed -i "s|<artifactId>hadoop-client|<artifactId>hadoop-mapreduce-client-core|" p
%pom_add_dep org.apache.hadoop:hadoop-common
%pom_add_dep org.apache.hadoop:hadoop-hdfs
-# This is required to update to the latest thrift.
-./bin/tachyon thriftGen
+# Disabled b/c upstream has updated to 0.9.0
+# ./bin/tachyon thriftGen
%build
@@ -137,6 +137,10 @@ mkdir -p -m0755 %{buildroot}/%{_var}/log/%{shortname}
mkdir -p -m0755 %{buildroot}%{_var}/lib/%{shortname}/journal
#######################
+mkdir -p -m0755 %{buildroot}/%{_datadir}/%{shortname}/web
+cp -rf src/main/java/tachyon/web/resources %{buildroot}/%{_datadir}/%{shortname}/web
+
+#######################
# NOTE: The following is plugging into hadoop without
# having administrative steps.
mkdir -p -m0755 %{buildroot}/%{_datadir}/hadoop/common/lib
@@ -158,16 +162,17 @@ mkdir -p -m0755 %{buildroot}/%{_datadir}/hadoop/common/lib
%attr(0755,hdfs,hdfs) %dir %{_var}/lib/%{shortname}/journal
%{_datadir}/hadoop/common/lib/%{shortname}.jar
%{_datadir}/hadoop/common/lib/libthrift.jar
+%{_datadir}/%{shortname}
%files javadoc -f .mfiles-javadoc
%doc LICENSE
############################################
-#%pre
+#%%pre
#getent group tachyon >/dev/null || groupadd -f -r tachyon
#if ! getent passwd tachyon >/dev/null ; then
-# useradd -r -g tachyon -d %{_sharedstatedir}/%{shortname} -s /sbin/nologin \
-# -c "%{shortname} daemon account" tachyon
+# useradd -r -g tachyon -d %%{_sharedstatedir}/%%{shortname} -s /sbin/nologin \
+# -c "%%{shortname} daemon account" tachyon
#fi
#exit 0
diff --git a/tachyon-0.4.0-defaults.patch b/tachyon-0.4.0-defaults.patch
index eb9197d..45ebb37 100644
--- a/tachyon-0.4.0-defaults.patch
+++ b/tachyon-0.4.0-defaults.patch
@@ -74,3 +74,23 @@ index b3c6974..6e3af0a 100644
UNDERFS_ADDRESS = getProperty("tachyon.underfs.address", TACHYON_HOME + "/underfs");
UNDERFS_DATA_FOLDER = getProperty("tachyon.data.folder", UNDERFS_ADDRESS + "/tachyon/data");
UNDERFS_WORKERS_FOLDER =
+diff --git a/src/main/java/tachyon/web/UIWebServer.java b/src/main/java/tachyon/web/UIWebServer.java
+index 6d31515..b6f2c3b 100644
+--- a/src/main/java/tachyon/web/UIWebServer.java
++++ b/src/main/java/tachyon/web/UIWebServer.java
+@@ -58,7 +58,7 @@ public class UIWebServer {
+ WebAppContext webappcontext = new WebAppContext();
+
+ webappcontext.setContextPath("/");
+- File warPath = new File(CommonConf.get().TACHYON_HOME + "/src/main/java/tachyon/web/resources");
++ File warPath = new File("/usr/share/tachyon/web/resources");
+ webappcontext.setWar(warPath.getAbsolutePath());
+ HandlerList handlers = new HandlerList();
+ webappcontext.addServlet(
+@@ -90,4 +90,4 @@ public class UIWebServer {
+ public void shutdownWebServer() throws Exception {
+ mServer.stop();
+ }
+-}
+\ No newline at end of file
++}
diff --git a/tachyon-env.sh b/tachyon-env.sh
index eacd5d5..78e7e50 100644
--- a/tachyon-env.sh
+++ b/tachyon-env.sh
@@ -23,6 +23,7 @@ CONF_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
export TACHYON_JAVA_OPTS+="
-Dlog4j.configuration=file:$CONF_DIR/log4j.properties
+ -Dhadoop.home.dir=/usr
-Dtachyon.debug=false
-Dtachyon.underfs.address=$TACHYON_UNDERFS_ADDRESS
-Dtachyon.worker.memory.size=$TACHYON_WORKER_MEMORY_SIZE
10 years, 3 months
[jetty8] Add maven-dependency-plugin, jetty-test-policy deps
by Peter MacKinnon
commit c1e4cfc292c9405724d39c77c8d654dd585e2fa4
Author: Peter MacKinnon <pmackinn(a)redhat.com>
Date: Tue Feb 4 18:47:13 2014 -0500
Add maven-dependency-plugin, jetty-test-policy deps
jetty8.spec | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/jetty8.spec b/jetty8.spec
index ff3af6f..67379ff 100644
--- a/jetty8.spec
+++ b/jetty8.spec
@@ -2,7 +2,7 @@
Name: jetty8
Version: 8.1.14
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Java Webserver and Servlet Container
# Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
# some MIT-licensed code (from Utf8Appendable) is used too
@@ -17,7 +17,9 @@ BuildRequires: jetty-artifact-remote-resources
BuildRequires: jetty-assembly-descriptors
BuildRequires: jetty-build-support
BuildRequires: jetty-version-maven-plugin
+BuildRequires: jetty-test-policy
BuildRequires: maven-assembly-plugin
+BuildRequires: maven-dependency-plugin
BuildRequires: maven-enforcer-plugin
BuildRequires: maven-license-plugin
BuildRequires: maven-plugin-build-helper
@@ -88,6 +90,9 @@ mv LICENSE-CONTRIBUTOR/CDDLv1.0.txt{.con,}
%doc NOTICE.txt LICENSE*
%changelog
+* Tue Feb 4 2014 Peter MacKinnon <pmackinn(a)redhat.com> - 8.1.14-4
+- Add maven-dependency-plugin, jetty-test-policy deps
+
* Tue Feb 4 2014 Peter MacKinnon <pmackinn(a)redhat.com> - 8.1.14-3
- Enable rewrite, client modules
10 years, 3 months
[jetty8] Enable rewrite, client modules
by Peter MacKinnon
commit a4e96234eba34e2bb356e97946be9373f251d796
Author: Peter MacKinnon <pmackinn(a)redhat.com>
Date: Tue Feb 4 18:12:31 2014 -0500
Enable rewrite, client modules
jetty8.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/jetty8.spec b/jetty8.spec
index afe0e8f..ff3af6f 100644
--- a/jetty8.spec
+++ b/jetty8.spec
@@ -2,7 +2,7 @@
Name: jetty8
Version: 8.1.14
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Java Webserver and Servlet Container
# Jetty is dual licensed under both ASL 2.0 and EPL 1.0, see NOTICE.txt
# some MIT-licensed code (from Utf8Appendable) is used too
@@ -57,7 +57,7 @@ find -name "*.class" -delete
# minimal set of modules are being built.
%pom_xpath_remove "pom:modules"
%pom_xpath_inject "pom:project" "<modules/>"
-for mod in continuation http io jmx security server servlet util webapp websocket xml; do
+for mod in continuation http io jmx security server servlet util webapp websocket xml client rewrite; do
%pom_xpath_inject pom:modules "<module>jetty-$mod</module>"
done
@@ -88,6 +88,9 @@ mv LICENSE-CONTRIBUTOR/CDDLv1.0.txt{.con,}
%doc NOTICE.txt LICENSE*
%changelog
+* Tue Feb 4 2014 Peter MacKinnon <pmackinn(a)redhat.com> - 8.1.14-3
+- Enable rewrite, client modules
+
* Fri Jan 31 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 8.1.14-2
- Enable websocket module
10 years, 3 months
[uima-addons] Initial import (#1005792).
by gil
commit e18da96c6349773abc9066a0c4d37c2f09f764df
Author: gil <puntogil(a)libero.it>
Date: Tue Feb 4 18:22:23 2014 +0100
Initial import (#1005792).
.gitignore | 1 +
sources | 1 +
...ddons-2.3.1-disable-embedded-dependencies.patch | 20 +++
uima-addons-2.3.1-httpclient.patch | 21 +++
uima-addons.spec | 146 ++++++++++++++++++++
5 files changed, 189 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..814280a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/uima-addons-2.3.1-source-release.zip
diff --git a/sources b/sources
index e69de29..d904fc5 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+23294846e8b8aa42ce9383fbd84fd047 uima-addons-2.3.1-source-release.zip
diff --git a/uima-addons-2.3.1-disable-embedded-dependencies.patch b/uima-addons-2.3.1-disable-embedded-dependencies.patch
new file mode 100644
index 0000000..7ea8067
--- /dev/null
+++ b/uima-addons-2.3.1-disable-embedded-dependencies.patch
@@ -0,0 +1,20 @@
+--- uima-addons-parent/pom.xml 2011-08-24 09:50:02.000000000 +0200
++++ uima-addons-parent/pom.xml-gil 2013-09-09 13:24:26.636180564 +0200
+@@ -456,15 +456,11 @@
+ <buildDirectory>${project.build.directory}/osgi</buildDirectory>
+ <manifestLocation>${project.build.directory}/osgi/META-INF</manifestLocation>
+ <instructions>
+- <Import-Package>org.apache.log.*;resolution:=optional</Import-Package>
+- <Embed-Dependency>*;scope=compile;</Embed-Dependency>
+- <Embed-Directory>lib</Embed-Directory>
++ <Import-Package>*;resolution:=optional</Import-Package>
+ <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+ <Eclipse-ExtensibleAPI>true</Eclipse-ExtensibleAPI>
+- <Bundle-ClassPath>.,lib/${project.build.finalName}.jar,{maven-dependencies},lib/uimaj-core-${uimaDependencyVersion}.jar</Bundle-ClassPath>
+ <Include-Resource>
+- {maven-resources}, {maven-dependencies},
+- lib/uimaj-core-${uimaDependencyVersion}.jar=${settings.localRepository}/org/apache/uima/uimaj-core/${uimaDependencyVersion}/uimaj-core-${uimaDependencyVersion}.jar
++ {maven-resources}
+ </Include-Resource>
+ <Bundle-Version>${parsedVersion.osgiVersion}</Bundle-Version>
+ <Bundle-SymbolicName>${project.groupId}.${project.artifactId};singleton:=true</Bundle-SymbolicName>
diff --git a/uima-addons-2.3.1-httpclient.patch b/uima-addons-2.3.1-httpclient.patch
new file mode 100644
index 0000000..ccd2d7a
--- /dev/null
+++ b/uima-addons-2.3.1-httpclient.patch
@@ -0,0 +1,21 @@
+--- SimpleServer/src/main/java/org/apache/uima/simpleserver/util/HttpClientUtils.java 2011-08-24 09:50:00.000000000 +0200
++++ SimpleServer/src/main/java/org/apache/uima/simpleserver/util/HttpClientUtils.java-gil 2013-09-09 15:46:38.106704930 +0200
+@@ -44,13 +44,13 @@
+ url = new URL("http", host, port, file);
+ method = new HttpGet(url.toString());
+ HttpResponse response = null;
+- try {
++// try {
+ response = httpClient.execute(method);
+- } catch (InterruptedException e) {
++// } catch (InterruptedException e) {
+ // If we get here, something's seriously wrong
+- e.printStackTrace();
+- return null;
+- }
++// e.printStackTrace();
++// return null;
++// }
+ return response;
+ }
+
diff --git a/uima-addons.spec b/uima-addons.spec
new file mode 100644
index 0000000..b6b8558
--- /dev/null
+++ b/uima-addons.spec
@@ -0,0 +1,146 @@
+Name: uima-addons
+Version: 2.3.1
+Release: 1%{?dist}
+Summary: Apache UIMA Addons components
+License: ASL 2.0
+URL: http://uima.apache.org/sandbox.html
+Source0: http://www.apache.org/dist/uima/%{name}-%{version}-source-release.zip
+# fix bundle plugin configuration
+Patch0: %{name}-%{version}-disable-embedded-dependencies.patch
+# fix build for httpclient > 4.0
+Patch1: %{name}-%{version}-httpclient.patch
+
+BuildRequires: java-devel
+
+BuildRequires: mvn(bsf:bsf)
+BuildRequires: mvn(commons-digester:commons-digester)
+BuildRequires: mvn(commons-io:commons-io)
+BuildRequires: mvn(commons-lang:commons-lang)
+BuildRequires: mvn(commons-logging:commons-logging-api)
+BuildRequires: mvn(javax.servlet:servlet-api)
+BuildRequires: mvn(javax.xml.stream:stax-api)
+BuildRequires: mvn(log4j:log4j)
+BuildRequires: mvn(org.apache.ant:ant)
+BuildRequires: mvn(org.apache.httpcomponents:httpclient)
+BuildRequires: mvn(org.apache.uima:parent-pom)
+BuildRequires: mvn(org.apache.uima:uimaj-core)
+BuildRequires: mvn(org.apache.uima:uimaj-document-annotation)
+BuildRequires: mvn(org.apache.xmlbeans:xmlbeans)
+BuildRequires: mvn(org.beanshell:bsh)
+BuildRequires: mvn(org.tartarus:snowball)
+BuildRequires: mvn(rhino:js)
+
+%if 0
+# Unavailable build deps **
+BuildRequires: mvn(org.apache.lucene:lucene-snowball:2.9.3)
+BuildRequires: mvn(org.apache.solr:solr-core:3.1.0)
+BuildRequires: mvn(org.apache.solr:solr-solrj:3.1.0)
+BuildRequires: mvn(org.apache.tika:tika-core:0.7)
+BuildRequires: mvn(org.apache.tika:tika-parsers:0.7)
+BuildRequires: mvn(org.apache.uima:uimaj-examples:2.3.1)
+BuildRequires: mvn(org.eclipse.emf.ecore:xmi:2.3.0-v200706262000)
+BuildRequires: mvn(org.eclipse.emf:common:2.3.0-v200706262000)
+BuildRequires: mvn(org.eclipse.emf:ecore:2.3.0-v200706262000)
+BuildRequires: mvn(org.mortbay.jetty:jetty:6.1.8)
+%endif
+
+# Test deps
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.apache.uima:uimaj-test-util)
+BuildRequires: mvn(org.apache.uima:uimaj-component-test-util)
+
+BuildRequires: maven-local
+BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-remote-resources-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-site-plugin)
+BuildRequires: mvn(org.apache.uima:PearPackagingMavenPlugin)
+BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
+BuildRequires: mvn(org.codehaus.mojo:javacc-maven-plugin)
+BuildRequires: mvn(org.codehaus.mojo:xmlbeans-maven-plugin)
+BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
+BuildRequires: mvn(ant-contrib:ant-contrib)
+BuildRequires: mvn(org.apache.ant:ant-apache-regexp)
+
+BuildArch: noarch
+
+%description
+UIMA Addons is a collection of Annotators extracted for
+sandbox for official distribution. It also provides
+Simple Server and Pear packaging tools.
+
+%package javadoc
+Summary: Javadoc for %{name}
+
+%description javadoc
+This package contains javadoc for %{name}.
+
+%prep
+%setup -q
+
+%patch0 -p0
+%patch1 -p0
+
+# Disable unneeded (only for eclipse) OSGi artefacts
+%pom_remove_plugin :maven-assembly-plugin uima-addons-parent
+%pom_remove_plugin :maven-dependency-plugin uima-addons-parent
+%pom_remove_plugin :maven-resources-plugin uima-addons-parent
+
+# Unavailable or too old build deps **
+%pom_disable_module ConfigurableFeatureExtractor
+%pom_disable_module Lucas
+%pom_disable_module Solrcas
+%pom_disable_module TikaAnnotator
+
+%pom_remove_dep org.mortbay.jetty:jetty SimpleServer
+rm -r SimpleServer/src/main/java/org/apache/uima/simpleserver/util/JettyUtils.java \
+ SimpleServer/src/test/java/org/apache/uima/simpleserver/test/ServerFailureTest.java \
+ SimpleServer/src/test/java/org/apache/uima/simpleserver/test/ServerTest.java
+
+# Fail with XMvn if aId is different by finalName
+for p in AlchemyAPIAnnotator BSFAnnotator ConceptMapper DictionaryAnnotator \
+ FsVariables OpenCalaisAnnotator PearPackagingAntTask RegularExpressionAnnotator \
+ SimpleServer SnowballAnnotator Tagger WhitespaceTokenizer; do
+%pom_xpath_remove "pom:project/pom:build/pom:finalName" ${p}
+done
+
+for m in ConfigurableFeatureExtractor DictionaryAnnotator RegularExpressionAnnotator SimpleServer; do
+%pom_remove_dep org.apache.geronimo.specs:geronimo-stax-api_1.0_spec ${m}
+%pom_add_dep javax.xml.stream:stax-api:1.0.1 ${m}
+done
+
+rm -r SnowballAnnotator/src/main/java/org/tartarus
+%pom_add_dep org.tartarus:snowball SnowballAnnotator
+
+# java.lang.AssertionError: null
+rm -r AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/TextRankedEntityExtractionAnnotatorTest.java
+
+sed -i 's/\r//' LICENSE NOTICE
+
+# requires web access
+rm -r AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/SimpleTest.java \
+ AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/HtmlMicroformatsAnnotatorTest.java \
+ AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/TextCategorizationAnnotatorTest.java \
+ AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/TextConceptTaggingAnnotatorTest.java \
+ AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/TextKeywordExtractionAnnotatorTest.java \
+ AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/TextLanguageDetectionAnnotatorTest.java \
+ AlchemyAPIAnnotator/src/test/java/org/apache/uima/alchemy/annotator/TextSentimentAnalysisAnnotatorTest.java \
+ OpenCalaisAnnotator/src/test/java/org/apache/uima/annotator/calais/OpenCalaisAnnotatorTest.java
+
+%build
+
+%mvn_build
+
+%install
+%mvn_install
+
+%files -f .mfiles
+%dir %{_javadir}/%{name}
+%doc LICENSE NOTICE RELEASE_NOTES.html
+
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE NOTICE
+
+%changelog
+* Mon Sep 02 2013 gil cattaneo <puntogil(a)libero.it> 2.3.1-1
+- initial rpm
\ No newline at end of file
10 years, 3 months
[javapackages] [doc] Fix macros file placement documentation and link
by Stanislav Ochotnicky
commit 37f2926ed5dc97fa51e0d457a2e0624ff477ffc5
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Tue Feb 4 11:11:02 2014 +0100
[doc] Fix macros file placement documentation and link
doc/pom_macros.txt | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/doc/pom_macros.txt b/doc/pom_macros.txt
index 8b26610..9bb9f6c 100644
--- a/doc/pom_macros.txt
+++ b/doc/pom_macros.txt
@@ -4,9 +4,9 @@ changes, but package maintainers should use `%pom_*` macros developed
specially to ease this task.
These macros are designed to be called from `%prep` section of spec
-files. They are documented in `/etc/rpm/macros.fjava` configuration
+files. They are documented in `/usr/lib/rpm/macros.d/macros.fjava` configuration
file, which is also
-link:https://git.fedorahosted.org/cgit/javapackages.git/plain/etc/macros.fjava[available
+link:https://git.fedorahosted.org/cgit/javapackages.git/plain/macros.d/macros.fjava[available
online] and all the macros also have their own manual page. See the
manual pages for technical details how to use them.
@@ -159,4 +159,3 @@ macros.
<artifactId>antlr</artifactId>
</exclusion>"
--------
-
10 years, 3 months