[jetty/f17] Add forgotten service file
by Stanislav Ochotnicky
commit 44b141f4b3695a85580570f968dc0c054683d56d
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Feb 23 17:26:38 2012 +0100
Add forgotten service file
jetty.service | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
---
diff --git a/jetty.service b/jetty.service
new file mode 100644
index 0000000..97652c1
--- /dev/null
+++ b/jetty.service
@@ -0,0 +1,17 @@
+# Systemd unit file for jetty
+#
+# Multiple copies of this service (i.e. multiple concurrently running
+# jetty servers) are not supported right now. Expect this to come with
+# future updates
+
+[Unit]
+Description=Jetty Web Application Server
+After=syslog.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/jetty start
+ExecStop=/usr/bin/jetty stop
+
+[Install]
+WantedBy=multi-user.target
12 years, 2 months
[jetty/f17] Fix web server running example webapp
by Stanislav Ochotnicky
commit d1e4b3602fff48b8133bd311a922ce7281e21a77
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Feb 23 16:35:47 2012 +0100
Fix web server running example webapp
- Add systemd unit file and conversion scriptlets
jetty.spec | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index 53c6883..3a1ebb9 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -44,7 +44,7 @@
Name: jetty
Version: 8.1.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Java Webserver and Servlet Container
Group: Applications/Internet
@@ -55,6 +55,7 @@ Source1: djetty.script
Source2: jetty.init
Source3: jetty.logrotate
Source4: %{name}-depmap.xml
+Source5: %{name}.service
Patch0: 0001-Remove-javadoc-execution.patch
Patch1: 0002-Cleaup-distribution-generation.patch
Patch2: 0003-Disable-test-artifacts.patch
@@ -80,7 +81,8 @@ BuildRequires: eclipse-platform
BuildRequires: jakarta-taglibs-standard
BuildRequires: mongo-java-driver >= 2.6.5-4
BuildRequires: objectweb-asm
-BuildRequires: fedora-usermgmt-devel
+BuildRequires: fedora-usermgmt-devel
+BuildRequires: systemd-units
# we want javamail not classpathx-javamail
BuildRequires: %{_javadir}/javamail/mail.jar
@@ -114,6 +116,8 @@ Requires: jakarta-taglibs-standard
Requires: objectweb-asm
%{?FE_USERADD_REQ}
+Requires(post): systemd-sysv
+
Provides: group(%username) = %jtuid
Provides: user(%username) = %jtuid
@@ -189,6 +193,11 @@ install -dm 755 %{buildroot}%{logdir}
install -dm 755 %{buildroot}%{rundir}
install -dm 755 %{buildroot}%{tempdir}
install -dm 755 %{buildroot}%{appdir}
+install -dm 755 %{buildroot}%{_unitdir}
+
+# systemd unit file
+cp %{SOURCE5} %{buildroot}%{_unitdir}/
+
# main pkg
tar xvf jetty-distribution/target/%{name}-distribution-%{version}.%{addver}.tar.gz -C %{buildroot}%{homedir}
mv %{buildroot}%{homedir}/%{name}-distribution-%{version}.%{addver}/* %{buildroot}%{homedir}/
@@ -252,19 +261,19 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-project.pom
%add_maven_depmap JPP.%{name}-project.pom
# recreat tarball structure in lib
-ln -sf $(build-classpath tomcat-servlet-3.0-api) %{buildroot}%{homedir}/lib
+ln -sf $(build-classpath tomcat-servlet-3.0-api) \
+ %{buildroot}%{homedir}/lib/servlet-api-3.0.jar
-ln -sf $(build-classpath objectweb-asm/asm-all) \
- %{buildroot}%{homedir}/lib/annotations/
+build-jar-repository %{buildroot}%{homedir}/lib/annotations \
+ objectweb-asm/asm-all geronimo-annotation
-ln -sf $(build-classpath javamail/mail) \
- %{buildroot}%{homedir}/lib/jndi/
+build-jar-repository %{buildroot}%{homedir}/lib/jndi javamail/mail
+
+build-jar-repository %{buildroot}%{homedir}/lib/jsp tomcat-el-2.2-api \
+ taglibs-core taglibs-standard tomcat/jasper-el eclipse-ecj \
+ tomcat/jasper tomcat/tomcat-api tomcat/tomcat-jsp-2.2-api \
+ tomcat/tomcat-juli
-for jar in tomcat-el-2.2-api taglibs-core taglibs-standard \
- tomcat/jasper tomcat/jasper-el eclipse-ecj; do
- ln -sf $(build-classpath $jar) \
- %{buildroot}%{homedir}/lib/jsp/
-done
ln -sf $(build-classpath geronimo-jta) \
%{buildroot}%{homedir}/lib/jta/
@@ -347,6 +356,19 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%__fe_groupdel %username &>/dev/null || :
+%triggerun -- jetty < 8.1.0-3
+# Save the current service runlevel info
+# User must manually run systemd-sysv-convert --apply httpd
+# to migrate them to systemd targets
+/usr/bin/systemd-sysv-convert --save jetty >/dev/null 2>&1 ||:
+
+# If the package is allowed to autostart:
+/bin/systemctl --no-reload enable jetty.service >/dev/null 2>&1 ||:
+
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del jetty >/dev/null 2>&1 || :
+/bin/systemctl try-restart jetty.service >/dev/null 2>&1 || :
+
%preun
if [ $1 = 0 ]; then
[ -f /var/lock/subsys/%{name} ] && %{_initrddir}/%{name} stop
@@ -373,12 +395,17 @@ fi
%ghost %dir %attr(755, jetty, jetty) %{rundir}
%{appdir}
%{_initrddir}/%{name}
+%{_unitdir}/%{name}.service
%files javadoc
%doc LICENSE*
%doc %{_javadocdir}/%{name}
%changelog
+* Thu Feb 23 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 8.1.0-3
+- Fix web server running example webapp
+- Add systemd unit file and conversion scriptlets
+
* Wed Feb 22 2012 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 8.1.0-2
- Fix #794913 - missing user management utils during install
12 years, 2 months
[maven-changelog-plugin] fixed for jdk7
by jiri vanek
commit 6e6eb01ffdfd8c679ffed9ec9d91fbb3345c2517
Author: Jiri Vanek <jvanek(a)jvanek.redhat>
Date: Thu Feb 23 15:27:22 2012 +0100
fixed for jdk7
ChangeLog.java.patch | 12 ++++++++++++
maven-changelog-plugin.spec | 13 ++++++++++++-
pom.patch | 18 ++++++++++++++++++
3 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog.java.patch b/ChangeLog.java.patch
new file mode 100644
index 0000000..f064590
--- /dev/null
+++ b/ChangeLog.java.patch
@@ -0,0 +1,12 @@
+diff -r 702e2ba1693d maven-changelog-plugin-2.2/src/main/java/org/apache/maven/plugin/changelog/ChangeLog.java
+--- a/maven-changelog-plugin-2.2/src/main/java/org/apache/maven/plugin/changelog/ChangeLog.java Tue Feb 21 14:37:24 2012 +0100
++++ b/maven-changelog-plugin-2.2/src/main/java/org/apache/maven/plugin/changelog/ChangeLog.java Tue Feb 21 14:43:27 2012 +0100
+@@ -43,7 +43,7 @@
+ * @author <a href="mailto:dion@multitask.com.au">dIon Gillard</a>
+ * @author <a href="mailto:bodewig@apache.org">Stefan Bodewig</a>
+ * @author <a href="mailto:peter@apache.org">Peter Donald</a>
+- * @version $Id:ChangeLog.java 437762 2006-08-28 19:29:49 +0200 (må, 28 aug 2006) dennisl $
++ * @version $Id:ChangeLog.java 437762 2006-08-28 19:29:49 +0200 (m\u00E0, 28 aug 2006) dennisl $
+ */
+ public class ChangeLog
+ {
diff --git a/maven-changelog-plugin.spec b/maven-changelog-plugin.spec
index fc5eb99..b29cb1e 100644
--- a/maven-changelog-plugin.spec
+++ b/maven-changelog-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-changelog-plugin
Version: 2.2
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Produce SCM changelog reports
Group: Development/Libraries
@@ -9,6 +9,8 @@ URL: http://maven.apache.org/plugins/maven-changelog-plugin/
#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-changelog-plugin...
#tar jcf maven-changelog-plugin-2.2.tar.bz2 maven-changelog-plugin-2.2/
Source0: %{name}-%{version}.tar.bz2
+Patch0: pom.patch
+Patch1: ChangeLog.java.patch
BuildArch: noarch
@@ -22,6 +24,7 @@ BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-plugin
+BuildRequires: maven-site-plugin
BuildRequires: maven-shared
BuildRequires: maven-doxia
BuildRequires: maven-scm
@@ -59,6 +62,8 @@ API documentation for %{name}.
%prep
%setup -q
+%patch0 -p0
+%patch1 -p2
%build
mvn-rpmbuild \
@@ -96,6 +101,12 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}
%changelog
+
+* Tue Feb 21 2012 Jiri Vanek <jvanek(a)redhat.com> 2.2-9
+- Added patch0 pom.patch to remove unused and from-fedora-removed maven cvsjava plugin
+ and patch1 ChangeLog.java.patch which is fixing invalid character uncompileable by JDK7
+- Added build requires maven-site-plugin to fix one maven warning
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/pom.patch b/pom.patch
new file mode 100644
index 0000000..547bc89
--- /dev/null
+++ b/pom.patch
@@ -0,0 +1,18 @@
+--- pom.xml 2010-05-25 21:21:07.000000000 +0200
++++ pom.xml 2012-02-21 14:28:35.364369751 +0100
+@@ -222,15 +222,10 @@
+ <artifactId>maven-scm-provider-cvsexe</artifactId>
+ <version>${maven-scm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+- <artifactId>maven-scm-provider-cvsjava</artifactId>
+- <version>${maven-scm.version}</version>
+- </dependency>
+- <dependency>
+- <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-local</artifactId>
+ <version>${maven-scm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
12 years, 2 months
[maven-changelog-plugin/f17] Fixed changelog
by jiri vanek
commit b08b5bc2f15a8a73b833138a16c6162d221da0ad
Author: Jiri Vanek <jvanek(a)jvanek.redhat>
Date: Thu Feb 23 15:21:42 2012 +0100
Fixed changelog
maven-changelog-plugin.spec | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/maven-changelog-plugin.spec b/maven-changelog-plugin.spec
index ade67cc..b29cb1e 100644
--- a/maven-changelog-plugin.spec
+++ b/maven-changelog-plugin.spec
@@ -102,7 +102,7 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%changelog
-* Tue Feb 21 2012 Alexander Kurtakov <akurtako(a)redhat.com> 2.2-9
+* Tue Feb 21 2012 Jiri Vanek <jvanek(a)redhat.com> 2.2-9
- Added patch0 pom.patch to remove unused and from-fedora-removed maven cvsjava plugin
and patch1 ChangeLog.java.patch which is fixing invalid character uncompileable by JDK7
- Added build requires maven-site-plugin to fix one maven warning
12 years, 2 months
[maven-changelog-plugin/f17] Fixed for jdk7
by jiri vanek
commit 37e3356bc9ab1ec855d4571ef9e87249ba7d5aaa
Author: Jiri Vanek <jvanek(a)jvanek.redhat>
Date: Wed Feb 22 16:31:04 2012 +0100
Fixed for jdk7
ChangeLog.java.patch | 12 ++++++++++++
maven-changelog-plugin.spec | 13 ++++++++++++-
pom.patch | 18 ++++++++++++++++++
3 files changed, 42 insertions(+), 1 deletions(-)
---
diff --git a/ChangeLog.java.patch b/ChangeLog.java.patch
new file mode 100644
index 0000000..f064590
--- /dev/null
+++ b/ChangeLog.java.patch
@@ -0,0 +1,12 @@
+diff -r 702e2ba1693d maven-changelog-plugin-2.2/src/main/java/org/apache/maven/plugin/changelog/ChangeLog.java
+--- a/maven-changelog-plugin-2.2/src/main/java/org/apache/maven/plugin/changelog/ChangeLog.java Tue Feb 21 14:37:24 2012 +0100
++++ b/maven-changelog-plugin-2.2/src/main/java/org/apache/maven/plugin/changelog/ChangeLog.java Tue Feb 21 14:43:27 2012 +0100
+@@ -43,7 +43,7 @@
+ * @author <a href="mailto:dion@multitask.com.au">dIon Gillard</a>
+ * @author <a href="mailto:bodewig@apache.org">Stefan Bodewig</a>
+ * @author <a href="mailto:peter@apache.org">Peter Donald</a>
+- * @version $Id:ChangeLog.java 437762 2006-08-28 19:29:49 +0200 (må, 28 aug 2006) dennisl $
++ * @version $Id:ChangeLog.java 437762 2006-08-28 19:29:49 +0200 (m\u00E0, 28 aug 2006) dennisl $
+ */
+ public class ChangeLog
+ {
diff --git a/maven-changelog-plugin.spec b/maven-changelog-plugin.spec
index fc5eb99..ade67cc 100644
--- a/maven-changelog-plugin.spec
+++ b/maven-changelog-plugin.spec
@@ -1,6 +1,6 @@
Name: maven-changelog-plugin
Version: 2.2
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Produce SCM changelog reports
Group: Development/Libraries
@@ -9,6 +9,8 @@ URL: http://maven.apache.org/plugins/maven-changelog-plugin/
#svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-changelog-plugin...
#tar jcf maven-changelog-plugin-2.2.tar.bz2 maven-changelog-plugin-2.2/
Source0: %{name}-%{version}.tar.bz2
+Patch0: pom.patch
+Patch1: ChangeLog.java.patch
BuildArch: noarch
@@ -22,6 +24,7 @@ BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-resources-plugin
BuildRequires: maven-surefire-plugin
+BuildRequires: maven-site-plugin
BuildRequires: maven-shared
BuildRequires: maven-doxia
BuildRequires: maven-scm
@@ -59,6 +62,8 @@ API documentation for %{name}.
%prep
%setup -q
+%patch0 -p0
+%patch1 -p2
%build
mvn-rpmbuild \
@@ -96,6 +101,12 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
%{_javadocdir}/%{name}
%changelog
+
+* Tue Feb 21 2012 Alexander Kurtakov <akurtako(a)redhat.com> 2.2-9
+- Added patch0 pom.patch to remove unused and from-fedora-removed maven cvsjava plugin
+ and patch1 ChangeLog.java.patch which is fixing invalid character uncompileable by JDK7
+- Added build requires maven-site-plugin to fix one maven warning
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/pom.patch b/pom.patch
new file mode 100644
index 0000000..547bc89
--- /dev/null
+++ b/pom.patch
@@ -0,0 +1,18 @@
+--- pom.xml 2010-05-25 21:21:07.000000000 +0200
++++ pom.xml 2012-02-21 14:28:35.364369751 +0100
+@@ -222,15 +222,10 @@
+ <artifactId>maven-scm-provider-cvsexe</artifactId>
+ <version>${maven-scm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+- <artifactId>maven-scm-provider-cvsjava</artifactId>
+- <version>${maven-scm.version}</version>
+- </dependency>
+- <dependency>
+- <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-local</artifactId>
+ <version>${maven-scm.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
12 years, 2 months
[objenesis/f17] fixed for JDK7
by jiri vanek
commit 53ca3bc768313f12c5d2604dce0ffd2d2ea7dd78
Author: Jiri Vanek <jvanek(a)jvanek.redhat>
Date: Wed Feb 22 16:48:23 2012 +0100
fixed for JDK7
JRockitInstantntiatorCharacters.patch | 24 ++++++++++++++++++++++++
objenesis.spec | 10 +++++++++-
2 files changed, 33 insertions(+), 1 deletions(-)
---
diff --git a/JRockitInstantntiatorCharacters.patch b/JRockitInstantntiatorCharacters.patch
new file mode 100644
index 0000000..19d8e48
--- /dev/null
+++ b/JRockitInstantntiatorCharacters.patch
@@ -0,0 +1,24 @@
+diff -r a6eb6f4f2a1b objenesis-1.2/main/src/org/objenesis/instantiator/jrockit/JRockit131Instantiator.java
+--- a/objenesis-1.2/main/src/org/objenesis/instantiator/jrockit/JRockit131Instantiator.java Mon Feb 20 09:13:19 2012 +0100
++++ b/objenesis-1.2/main/src/org/objenesis/instantiator/jrockit/JRockit131Instantiator.java Mon Feb 20 09:15:05 2012 +0100
+@@ -7,7 +7,7 @@
+ *
+ * BEA does not guarantee that the code works, and provides no support for it. Use at your own risk.
+ *
+- * Originally developed by Leonardo Mesquita. Copyright notice added by Henrik St�hl, BEA JRockit Product Manager.
++ * Originally developed by Leonardo Mesquita. Copyright notice added by Henrik St\u00E0hl, BEA JRockit Product Manager.
+ *
+ */
+ package org.objenesis.instantiator.jrockit;
+diff -r a6eb6f4f2a1b objenesis-1.2/main/src/org/objenesis/instantiator/jrockit/JRockitLegacyInstantiator.java
+--- a/objenesis-1.2/main/src/org/objenesis/instantiator/jrockit/JRockitLegacyInstantiator.java Mon Feb 20 09:13:19 2012 +0100
++++ b/objenesis-1.2/main/src/org/objenesis/instantiator/jrockit/JRockitLegacyInstantiator.java Mon Feb 20 09:15:05 2012 +0100
+@@ -7,7 +7,7 @@
+ *
+ * BEA does not guarantee that the code works, and provides no support for it. Use at your own risk.
+ *
+- * Originally developed by Leonardo Mesquita. Copyright notice added by Henrik St�hl, BEA JRockit Product Manager.
++ * Originally developed by Leonardo Mesquita. Copyright notice added by Henrik St\u00E0hl, BEA JRockit Product Manager.
+ *
+ */
+
diff --git a/objenesis.spec b/objenesis.spec
index 8a3bc75..c80033d 100644
--- a/objenesis.spec
+++ b/objenesis.spec
@@ -31,7 +31,7 @@
Summary: A library for instantiating Java objects
Name: objenesis
Version: 1.2
-Release: 8%{dist}
+Release: 9%{dist}
Group: Development/Libraries
License: ASL 2.0
URL: http://objenesis.googlecode.com/svn/docs/index.html
@@ -45,6 +45,7 @@ Source0: %{name}-%{version}.tar.xz
# Remove deps for test scope (unavailable); fix
# maven-license-plugin groupID to latest version available.
Patch1: 001-objenesis-fix-build.patch
+Patch2: JRockitInstantntiatorCharacters.patch
BuildRequires: jpackage-utils
BuildRequires: java-devel
@@ -58,6 +59,7 @@ BuildRequires: maven-install-plugin
BuildRequires: maven-jar-plugin
BuildRequires: maven-javadoc-plugin
BuildRequires: maven-resources-plugin
+BuildRequires: maven-remote-resources-plugin
BuildRequires: maven-site-plugin
BuildRequires: maven-shade-plugin
BuildRequires: maven-source-plugin
@@ -66,6 +68,7 @@ BuildRequires: maven-license-plugin
BuildRequires: maven-timestamp-plugin
BuildRequires: xpp3-minimal
BuildRequires: asm2
+BuildRequires: apache-resource-bundles
Requires: java
BuildRequires: jpackage-utils
@@ -120,6 +123,7 @@ This package contains the API documentation for %{name}.
%setup -q
#%%patch0 -b .sav0
%patch1 -p1
+%patch2 -p2
%build
@@ -180,6 +184,10 @@ cp -pr tck/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}/tck
%changelog
+* Mon Feb 20 2012 Jiri Vanek <jvanek(a)redhat.com> 1.2-9
+- Added patch2 - JRockitInstantntiatorCharacters.patch to fix unmappable characters
+- Added build requires apache-resource-bundles and maven-remote-resources-plugin
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
12 years, 2 months