[htrace/f20] Initial import

rrati rrati at fedoraproject.org
Wed Oct 30 15:58:53 UTC 2013


commit eda8c777f6125f1777f951c101aca59a99a13a37
Author: Robert Rati <rrati at redhat.com>
Date:   Wed Oct 30 11:32:24 2013 -0400

    Initial import

 .gitignore                |    1 +
 htrace-fedora-jetty.patch |   37 ++++++++++++++++++++++++++++
 htrace.spec               |   59 +++++++++++++++++++++++++++++++++++++++++++++
 sources                   |    1 +
 4 files changed, 98 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..b17a579 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/htrace-2.03-7e8fe1a.tar.gz
diff --git a/htrace-fedora-jetty.patch b/htrace-fedora-jetty.patch
new file mode 100644
index 0000000..b4182c0
--- /dev/null
+++ b/htrace-fedora-jetty.patch
@@ -0,0 +1,37 @@
+diff --git a/htrace-core/pom.xml b/htrace-core/pom.xml
+index f6e0c4d..dc21602 100644
+--- a/htrace-core/pom.xml
++++ b/htrace-core/pom.xml
+@@ -72,9 +72,9 @@ language governing permissions and limitations under the License. -->
+     </dependency>
+     <!-- core specific deps. -->
+     <dependency>
+-      <groupId>org.mortbay.jetty</groupId>
+-      <artifactId>jetty-util</artifactId>
+-      <version>6.1.26</version>
++      <groupId>org.eclipse.jetty</groupId>
++      <artifactId>jetty-util-ajax</artifactId>
++      <version>9.0.4.v20130625</version>
+     </dependency>
+   </dependencies>
+ </project>
+diff --git a/htrace-core/src/main/java/org/cloudera/htrace/impl/LocalFileSpanReceiver.java b/htrace-core/src/main/java/org/cloudera/htrace/impl/LocalFileSpanReceiver.java
+index ae6028f..5191744 100644
+--- a/htrace-core/src/main/java/org/cloudera/htrace/impl/LocalFileSpanReceiver.java
++++ b/htrace-core/src/main/java/org/cloudera/htrace/impl/LocalFileSpanReceiver.java
+@@ -21,7 +21,7 @@ import org.apache.commons.logging.LogFactory;
+ import org.cloudera.htrace.HTraceConfiguration;
+ import org.cloudera.htrace.Span;
+ import org.cloudera.htrace.SpanReceiver;
+-import org.mortbay.util.ajax.JSON;
++import org.eclipse.jetty.util.ajax.JSON;
+ 
+ import java.io.BufferedWriter;
+ import java.io.FileWriter;
+@@ -132,4 +132,4 @@ public class LocalFileSpanReceiver implements SpanReceiver {
+       LOG.error("Error closing bufferedwriter for file: " + file, e);
+     }
+   }
+-}
+\ No newline at end of file
++}
diff --git a/htrace.spec b/htrace.spec
new file mode 100644
index 0000000..f8f0d62
--- /dev/null
+++ b/htrace.spec
@@ -0,0 +1,59 @@
+%global commit 7e8fe1aa4983469f46cbbc5e6dd8e31753ba85f0
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
+Name: htrace
+Version: 2.03
+Release: 2%{?dist}
+Summary: Tracing framework for java based distributed systems
+License: ASL 2.0
+URL: http://github.com/cloudera/htrace
+Source0: https://github.com/cloudera/htrace/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
+Patch0: htrace-fedora-jetty.patch
+BuildRequires: java-devel
+BuildRequires: jetty-util-ajax
+BuildRequires: libthrift-java
+BuildRequires: maven-local
+Requires: java
+BuildArch: noarch
+
+%description
+HTrace is a tracing framework intended for use with distributed systems
+written in java. 
+
+%package javadoc
+Summary: Javadoc for %{name}
+
+%description javadoc
+This package contains javadoc for %{name}.
+
+%prep
+%setup -qn %{name}-%{commit}
+
+%patch0 -p1
+
+# Remove apache-rat-plugin because it causes build failure on xmvn generated
+# files
+%pom_remove_plugin org.apache.rat:apache-rat-plugin
+%pom_remove_plugin org.apache.rat:apache-rat-plugin htrace-core
+%pom_remove_plugin org.apache.rat:apache-rat-plugin htrace-zipkin
+
+%build
+%mvn_build
+
+%install
+%mvn_install
+
+%files -f .mfiles
+%doc LICENSE.txt
+%dir %{_javadir}/%{name}
+
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE.txt
+
+%changelog
+* Wed Oct 23 2013 Robert Rati <rrati at redhat> - 2.03-2
+- Added ownership jar directory
+- Added Require on java
+
+* Tue Oct  8 2013 Robert Rati <rrati at redhat> - 2.03-1
+- Initial rpm
diff --git a/sources b/sources
index e69de29..888377e 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+a5631bc8f6163eb58dee5fbb436a51b8  htrace-2.03-7e8fe1a.tar.gz


More information about the scm-commits mailing list