Changes to 'refs/tags/spacewalk-java-1.9.25-1'
by Tomas Lestach
Tag 'spacewalk-java-1.9.25-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-11-30 15:32 +0000
Tagging package [spacewalk-java] version [1.9.25-1] in directory [java/].
Changes since spacewalk-java-1.9.24-1:
Tomas Lestach (3):
remove embedded dwr from spacewalk-java and start using dwr package
do not include engine.js twice
Automatic commit of package [spacewalk-java] release [1.9.25-1].
---
dev/null |binary
java/buildconf/build-props.xml | 2 +-
java/code/webapp/WEB-INF/pages/yourrhn.jsp | 1 -
java/conf/eclipse/rhn_eclipse_libraries.xml | 1 +
java/ivy.xml | 1 -
java/spacewalk-java.spec | 13 ++++++++++---
rel-eng/packages/spacewalk-java | 2 +-
7 files changed, 13 insertions(+), 7 deletions(-)
---
10 years, 6 months
3 commits - java/buildconf java/code java/conf java/ivy.xml java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
dev/null |binary
java/buildconf/build-props.xml | 2 +-
java/code/webapp/WEB-INF/pages/yourrhn.jsp | 1 -
java/conf/eclipse/rhn_eclipse_libraries.xml | 1 +
java/ivy.xml | 1 -
java/spacewalk-java.spec | 13 ++++++++++---
rel-eng/packages/spacewalk-java | 2 +-
7 files changed, 13 insertions(+), 7 deletions(-)
New commits:
commit 4869bc8349e296ca6258e486657b5db1d3a92e20
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 30 16:32:36 2012 +0100
Automatic commit of package [spacewalk-java] release [1.9.25-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index c461c38..81fad6f 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.9.24
+Version: 1.9.25
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -620,6 +620,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Nov 30 2012 Tomas Lestach <tlestach(a)redhat.com> 1.9.25-1
+- do not include engine.js twice
+- remove embedded dwr from spacewalk-java and start using dwr package
+
* Fri Nov 30 2012 Jan Pazdziora 1.9.24-1
- Do not use Java keywords.
- 851942 - copy GPG information from the original channel within
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 1589f3a..f964c42 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.24-1 java/
+1.9.25-1 java/
commit 1ba857273324cc8ae969edd7f17465a6b8adc75d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 30 16:31:29 2012 +0100
do not include engine.js twice
causes:
Incomplete reply from server [alert]
diff --git a/java/code/webapp/WEB-INF/pages/yourrhn.jsp b/java/code/webapp/WEB-INF/pages/yourrhn.jsp
index 9c7eea4..0413b50 100644
--- a/java/code/webapp/WEB-INF/pages/yourrhn.jsp
+++ b/java/code/webapp/WEB-INF/pages/yourrhn.jsp
@@ -33,7 +33,6 @@
<script type="text/javascript" src="/rhn/dwr/interface/SystemGroupsRenderer.js"></script>
</c:if>
<script type="text/javascript" src="/javascript/scriptaculous.js"></script>
-<script type="text/javascript" src="/rhn/dwr/engine.js"></script>
<script type="text/javascript" src="/javascript/render.js"></script>
</head>
<body>
commit 0378cf83d93a92d067ec30605f87887a336f224a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Nov 29 17:43:26 2012 +0100
remove embedded dwr from spacewalk-java and start using dwr package
diff --git a/java/buildconf/build-props.xml b/java/buildconf/build-props.xml
index a0c8c1d..e3cf661 100644
--- a/java/buildconf/build-props.xml
+++ b/java/buildconf/build-props.xml
@@ -105,7 +105,7 @@
${install.common.jar.dependencies} tanukiwrapper" />
<property name="install.run.jar.dependencies"
- value="antlr ${asm} cglib c3p0 commons-discovery dom4j jaf jta
+ value="antlr ${asm} cglib c3p0 commons-discovery dom4j dwr jaf jta
oscache sitemesh taglibs-standard xalan-j2 xerces-j2
xml-commons-apis ${install.common.jar.dependencies}" />
diff --git a/java/buildconf/tempjars/dwr-2.0.2.jar b/java/buildconf/tempjars/dwr-2.0.2.jar
deleted file mode 100644
index 8b32cf7..0000000
Binary files a/java/buildconf/tempjars/dwr-2.0.2.jar and /dev/null differ
diff --git a/java/conf/eclipse/rhn_eclipse_libraries.xml b/java/conf/eclipse/rhn_eclipse_libraries.xml
index 23e9f97..15b9b7d 100644
--- a/java/conf/eclipse/rhn_eclipse_libraries.xml
+++ b/java/conf/eclipse/rhn_eclipse_libraries.xml
@@ -39,6 +39,7 @@
<archive path="/usr/share/java/oscache.jar"/>
<archive path="/usr/share/java/jdom.jar" source="/rhn-java/code/libsrc/jdom-1.0-src.jar" />
<archive path="/usr/share/java/c3p0.jar"/>
+ <archive path="/usr/share/java/dwr.jar"/>
<archive path="/usr/share/java/jmock.jar"/>
<archive path="/usr/share/java/jmock-cglib.jar"/>
<archive path="/usr/share/java/jpam.jar"/>
diff --git a/java/ivy.xml b/java/ivy.xml
index 60b5fde..07335f6 100644
--- a/java/ivy.xml
+++ b/java/ivy.xml
@@ -71,7 +71,6 @@
<dependency org="redhat" name="xalan-j2" rev="2.6.0" />
<dependency org="redhat" name="xerces-j2" rev="2.6.2" />
<dependency org="redhat" name="xml-commons-apis" rev="1.0" />
- <dependency org="redhat" name="dwr" rev="2.0.2" />
<dependency org="redhat" name="slf4j-api" rev="1.5.10" />
<dependency org="redhat" name="slf4j-log4j12" rev="1.5.10" />
<dependency org="redhat" name="velocity" rev="1.5" />
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b4d8c18..c461c38 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -47,6 +47,7 @@ Requires: jfreechart >= 1.0.9
Requires: bcel
Requires: c3p0
+Requires: dwr
Requires: hibernate3 = 0:3.2.4
Requires: java >= 1:1.6.0
Requires: java-devel >= 1:1.6.0
@@ -122,6 +123,7 @@ BuildRequires: c3p0
BuildRequires: concurrent
BuildRequires: cglib
BuildRequires: dom4j
+BuildRequires: dwr
BuildRequires: hibernate3 = 0:3.2.4
BuildRequires: jaf
BuildRequires: jakarta-commons-cli
@@ -415,6 +417,7 @@ install -m 644 conf/cobbler/snippets/redhat_register $RPM_BUILD_ROOT%{cobdirsni
ln -s -f /usr/sbin/tanukiwrapper $RPM_BUILD_ROOT%{_bindir}/taskomaticd
ln -s -f %{_javadir}/ojdbc14.jar $RPM_BUILD_ROOT%{jardir}/ojdbc14.jar
+ln -s -f %{_javadir}/dwr.jar $RPM_BUILD_ROOT%{jardir}/dwr.jar
install -d -m 755 $RPM_BUILD_ROOT%{realcobsnippetsdir}
ln -s -f %{cobdirsnippets} $RPM_BUILD_ROOT%{realcobsnippetsdir}/spacewalk
touch $RPM_BUILD_ROOT%{_var}/spacewalk/systemlogs/audit-review.log
@@ -490,7 +493,7 @@ fi
%{appdir}/rhn/WEB-INF/pages
%{appdir}/rhn/WEB-INF/*.xml
# list of all jar symlinks without any version numbers
-# and wildcards (except non-symlinks dwr and velocity)
+# and wildcards (except non-symlink velocity)
%{jardir}/antlr.jar
%{jardir}/bcel.jar
%{jardir}/c3p0.jar
@@ -509,7 +512,7 @@ fi
%{jardir}/commons-validator.jar
%{jardir}/concurrent.jar
%{jardir}/dom4j.jar
-%{jardir}/dwr-*.jar
+%{jardir}/dwr.jar
%{jardir}/hibernate3*
%{jardir}/jaf.jar
%{jardir}/javamail.jar
10 years, 6 months
Changes to 'refs/tags/spacewalk-java-1.9.24-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.9.24-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-11-30 15:01 +0000
Tagging package [spacewalk-java] version [1.9.24-1] in directory [java/].
Changes since rhncfg-5.10.39-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.9.24-1].
---
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
---
10 years, 6 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit aa0d3d55f3bc0e2e3da3d80281c7fe929d013098
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 30 16:01:52 2012 +0100
Automatic commit of package [spacewalk-java] release [1.9.24-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 853d194..b4d8c18 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.9.23
+Version: 1.9.24
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -617,6 +617,13 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Nov 30 2012 Jan Pazdziora 1.9.24-1
+- Do not use Java keywords.
+- 851942 - copy GPG information from the original channel within
+ channel.software.clone API, when the user omits it
+- OrgSoftwareSubscribtions CSV export
+- removing @Override annotation from methods that aren't overriden
+
* Thu Nov 29 2012 Tomas Lestach <tlestach(a)redhat.com> 1.9.23-1
- fix checkstyle issue
- Some more type-safety / checkstyle fixes
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 3ef4ff1..1589f3a 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.9.23-1 java/
+1.9.24-1 java/
10 years, 6 months
Changes to 'refs/tags/yum-rhn-plugin-1.9.2-1'
by Jan Pazdziora
Tag 'yum-rhn-plugin-1.9.2-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-11-30 14:59 +0000
Tagging package [yum-rhn-plugin] version [1.9.2-1] in directory [client/rhel/yum-rhn-plugin/].
Changes since rhn-client-tools-1.9.6-1:
Jan Pazdziora (1):
Automatic commit of package [yum-rhn-plugin] release [1.9.2-1].
---
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 5 ++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
10 years, 6 months
Changes to 'refs/tags/rhnsd-5.0.8-1'
by Jan Pazdziora
Tag 'rhnsd-5.0.8-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-11-30 14:59 +0000
Tagging package [rhnsd] version [5.0.8-1] in directory [client/rhel/rhnsd/].
Changes since rhn-client-tools-1.9.6-1:
Jan Pazdziora (2):
Automatic commit of package [yum-rhn-plugin] release [1.9.2-1].
Automatic commit of package [rhnsd] release [5.0.8-1].
---
client/rhel/rhnsd/rhnsd.spec | 5 ++++-
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 5 ++++-
rel-eng/packages/rhnsd | 2 +-
rel-eng/packages/yum-rhn-plugin | 2 +-
4 files changed, 10 insertions(+), 4 deletions(-)
---
10 years, 6 months
Changes to 'refs/tags/rhncfg-5.10.39-1'
by Jan Pazdziora
Tag 'rhncfg-5.10.39-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-11-30 14:59 +0000
Tagging package [rhncfg] version [5.10.39-1] in directory [client/tools/rhncfg/].
Changes since rhn-client-tools-1.9.6-1:
Jan Pazdziora (3):
Automatic commit of package [yum-rhn-plugin] release [1.9.2-1].
Automatic commit of package [rhnsd] release [5.0.8-1].
Automatic commit of package [rhncfg] release [5.10.39-1].
---
client/rhel/rhnsd/rhnsd.spec | 5 ++++-
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 5 ++++-
client/tools/rhncfg/rhncfg.spec | 5 ++++-
rel-eng/packages/rhncfg | 2 +-
rel-eng/packages/rhnsd | 2 +-
rel-eng/packages/yum-rhn-plugin | 2 +-
6 files changed, 15 insertions(+), 6 deletions(-)
---
10 years, 6 months
Changes to 'refs/tags/rhn-client-tools-1.9.6-1'
by Jan Pazdziora
Tag 'rhn-client-tools-1.9.6-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-11-30 14:59 +0000
Tagging package [rhn-client-tools] version [1.9.6-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-backend-1.9.10-1:
Jan Pazdziora (1):
Automatic commit of package [rhn-client-tools] release [1.9.6-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
10 years, 6 months
4 commits - client/rhel client/tools rel-eng/packages
by Jan Pazdziora
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++-
client/rhel/rhnsd/rhnsd.spec | 5 ++++-
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 5 ++++-
client/tools/rhncfg/rhncfg.spec | 5 ++++-
rel-eng/packages/rhn-client-tools | 2 +-
rel-eng/packages/rhncfg | 2 +-
rel-eng/packages/rhnsd | 2 +-
rel-eng/packages/yum-rhn-plugin | 2 +-
8 files changed, 21 insertions(+), 8 deletions(-)
New commits:
commit 922b6d6b7bc911ebb47040122c80cfaa067d7660
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 30 15:59:53 2012 +0100
Automatic commit of package [rhncfg] release [5.10.39-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index 627719e..f49565c 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.10.38
+Version: 5.10.39
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -112,6 +112,9 @@ fi
# $Id$
%changelog
+* Fri Nov 30 2012 Jan Pazdziora 5.10.39-1
+- 879299 - statinfo needs to be defined even if file does not exist
+
* Tue Nov 20 2012 Stephen Herr <sherr(a)redhat.com> 5.10.38-1
- 878216 - fixing typo in manpage
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index 5bb472a..1d273c0 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.10.38-1 client/tools/rhncfg/
+5.10.39-1 client/tools/rhncfg/
commit 8e0c0eeaf80e072d149aa0a89fc9ce7f4fa94f97
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 30 15:59:42 2012 +0100
Automatic commit of package [rhnsd] release [5.0.8-1].
diff --git a/client/rhel/rhnsd/rhnsd.spec b/client/rhel/rhnsd/rhnsd.spec
index 905bcda..72de783 100644
--- a/client/rhel/rhnsd/rhnsd.spec
+++ b/client/rhel/rhnsd/rhnsd.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhnsd
-Version: 5.0.7
+Version: 5.0.8
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -123,6 +123,9 @@ rm -fr $RPM_BUILD_ROOT
%doc LICENSE
%changelog
+* Fri Nov 30 2012 Jan Pazdziora 5.0.8-1
+- Revert "876328 - updating rhel client tools translations"
+
* Mon Nov 19 2012 Jan Pazdziora 5.0.7-1
- Only run chkconfig if we are in the SysV world.
- rhnsd needs to be marked as forking.
diff --git a/rel-eng/packages/rhnsd b/rel-eng/packages/rhnsd
index 054ca2c..dc0c21e 100644
--- a/rel-eng/packages/rhnsd
+++ b/rel-eng/packages/rhnsd
@@ -1 +1 @@
-5.0.7-1 client/rhel/rhnsd/
+5.0.8-1 client/rhel/rhnsd/
commit 4e6ce9dd85532116662d81999b06b1bbef902f4e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 30 15:59:36 2012 +0100
Automatic commit of package [yum-rhn-plugin] release [1.9.2-1].
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index 66139d1..a5f0326 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -1,6 +1,6 @@
Summary: RHN support for yum
Name: yum-rhn-plugin
-Version: 1.9.1
+Version: 1.9.2
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
@@ -70,6 +70,9 @@ fi
%doc LICENSE
%changelog
+* Fri Nov 30 2012 Jan Pazdziora 1.9.2-1
+- Revert "876328 - updating rhel client tools translations"
+
* Fri Nov 16 2012 Jan Pazdziora 1.9.1-1
- 876328 - updating rhel client tools translations
diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin
index 686fbe1..34b74c9 100644
--- a/rel-eng/packages/yum-rhn-plugin
+++ b/rel-eng/packages/yum-rhn-plugin
@@ -1 +1 @@
-1.9.1-1 client/rhel/yum-rhn-plugin/
+1.9.2-1 client/rhel/yum-rhn-plugin/
commit 97755777f9bd1409509e4f9ba36a5d0a68de8ff4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Nov 30 15:59:31 2012 +0100
Automatic commit of package [rhn-client-tools] release [1.9.6-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 82fbeaa..d080843 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.9.5
+Version: 1.9.6
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -339,6 +339,10 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Fri Nov 30 2012 Jan Pazdziora 1.9.6-1
+- 876740 - fix typo
+- 876740 - server url auto-corrects common mistakes, messages say "Satellite"
+
* Wed Nov 21 2012 Jan Pazdziora 1.9.5-1
- 876328 - Merging the new translation work form RHEL 6.4
- Revert "876328 - updating rhel client tools translations"
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 25c3218..3e4c3bf7 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.9.5-1 client/rhel/rhn-client-tools/
+1.9.6-1 client/rhel/rhn-client-tools/
10 years, 6 months
Changes to 'refs/tags/spacewalk-backend-1.9.10-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.9.10-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-11-30 14:56 +0000
Tagging package [spacewalk-backend] version [1.9.10-1] in directory [backend/].
Changes since spacewalk-schema-1.9.8-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-backend] release [1.9.10-1].
---
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
10 years, 6 months