java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 2914553dae4b00a5b5deed3fde057a213d19feb2
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 26 19:40:57 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.38-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index d1798c5..ea45c8c 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.37
+Version: 1.5.38
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -546,6 +546,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu May 26 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.38-1
+- 708083 - clone Red Hat errata, when associating them into a cloned channel
+ (tlestach(a)redhat.com)
+- create special symlink for f15 tomcat-juli.jar (tlestach(a)redhat.com)
+
* Thu May 26 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.37-1
- adding jaf build require for spacewalk-java (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 9931eff..efbde22 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.37-1 java/
+1.5.38-1 java/
12 years, 10 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java | 14 +++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
New commits:
commit 41c17c45df6d61be16847cdebd5a337714bb5a48
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 26 19:26:59 2011 +0200
708083 - clone Red Hat errata, when associating them into a cloned channel
diff --git a/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java b/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java
index 357c5a7..679e89c 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/NewChannelHelper.java
@@ -14,12 +14,16 @@
*/
package com.redhat.rhn.domain.channel;
+import com.redhat.rhn.domain.errata.Errata;
import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.manager.errata.ErrataManager;
import com.redhat.rhn.manager.user.UserManager;
import java.util.Date;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -120,7 +124,8 @@ public class NewChannelHelper {
}
else {
cloned.getPackages().addAll(toClone.getPackages());
- cloned.getErratas().addAll(toClone.getErratas());
+ ErrataManager.publishErrataToChannelAsync(cloned,
+ getErrataIds(toClone.getErratas()), user);
}
//adopt the channel into the org's channelfamily
@@ -133,6 +138,13 @@ public class NewChannelHelper {
return cloned;
}
+ private Set<Long> getErrataIds(Set<Errata> errata) {
+ Set<Long> ids = new HashSet();
+ for (Errata erratum : errata) {
+ ids.add(erratum.getId());
+ }
+ return ids;
+ }
/**
* Verifies a potential name for a channel
12 years, 10 months
java/spacewalk-java.spec
by Tomas Lestach
java/spacewalk-java.spec | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
New commits:
commit 1677d09cf8d5c8226f6884136a0dc36105cff75c
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 26 18:56:40 2011 +0200
create special symlink for f15 tomcat-juli.jar
adressing spacewalk-java buildlog:
taskdef A class needed by class com.redhat.rhn.internal.jasper2.JspfC cannot be found: org/apache/juli/logging/LogFactory
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b727fd4..d1798c5 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -272,10 +272,15 @@ This package contains the Java version of taskomatic.
%setup -q
# missing tomcat juli JAR (needed for JSP precompilation) - bug 661244
-if test -d /usr/share/tomcat6 -a ! -h /usr/share/java/tomcat6/tomcat-juli.jar; then
+if test -d /usr/share/tomcat6; then
mkdir -p build/build-lib
- ln -s /usr/share/tomcat6/bin/tomcat-juli.jar \
- build/build-lib/tomcat-juli.jar
+ if test ! -h /usr/share/java/tomcat6/tomcat-juli.jar; then
+ ln -s /usr/share/tomcat6/bin/tomcat-juli.jar \
+ build/build-lib/tomcat-juli.jar
+ else
+ ln -s /usr/share/java/tomcat6/tomcat-juli.jar \
+ build/build-lib/tomcat-juli.jar
+ fi
fi
12 years, 10 months
Changes to 'refs/tags/spacewalk-java-1.5.37-1'
by Tomas Lestach
Tag 'spacewalk-java-1.5.37-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-05-26 16:08 +0000
Tagging package [spacewalk-java] version [1.5.37-1] in directory [java/].
Changes since spacewalk-java-1.5.36-1:
Tomas Lestach (2):
adding jaf build require for spacewalk-java
Automatic commit of package [spacewalk-java] release [1.5.37-1].
---
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
12 years, 10 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 4319d5400d14f192fe6d54ce201842ec6c0c875a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 26 18:08:06 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.37-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 3bb2498..b727fd4 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.36
+Version: 1.5.37
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -541,6 +541,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu May 26 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.37-1
+- adding jaf build require for spacewalk-java (tlestach(a)redhat.com)
+
* Wed May 25 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.36-1
- 707658 - generate errata cache for the correct erratum (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index d8e0c74..9931eff 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.36-1 java/
+1.5.37-1 java/
12 years, 10 months
java/spacewalk-java.spec
by Tomas Lestach
java/spacewalk-java.spec | 1 +
1 file changed, 1 insertion(+)
New commits:
commit d0ab2d40a8b9166d8f713358d2f77e403e266cd1
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 26 17:47:20 2011 +0200
adding jaf build require for spacewalk-java
addressing error in f15 build log:
[exec] /usr/bin/build-jar-repository: error: Could not find jaf Java extension for this JVM
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 8508889..3bb2498 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -114,6 +114,7 @@ BuildRequires: concurrent
BuildRequires: cglib
BuildRequires: dom4j
BuildRequires: hibernate3
+BuildRequires: jaf
BuildRequires: jakarta-commons-cli
BuildRequires: jakarta-commons-codec
BuildRequires: jakarta-commons-collections
12 years, 10 months
Changes to 'refs/tags/spacewalk-java-1.5.36-1'
by Tomas Lestach
Tag 'spacewalk-java-1.5.36-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-05-25 16:33 +0000
Tagging package [spacewalk-java] version [1.5.36-1] in directory [java/].
Changes since spacewalk-backend-1.5.29-1:
Tomas Lestach (2):
707658 - generate errata cache for the correct erratum
Automatic commit of package [spacewalk-java] release [1.5.36-1].
---
java/code/src/com/redhat/rhn/frontend/events/CloneErrataAction.java | 3 ++-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
12 years, 10 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/events/CloneErrataAction.java | 3 ++-
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 74a9859ad4a75f8abc4214fdd6a7a77739c23982
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 25 18:33:00 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.36-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index d3e1159..8508889 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.35
+Version: 1.5.36
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -540,6 +540,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed May 25 2011 Tomas Lestach <tlestach(a)redhat.com> 1.5.36-1
+- 707658 - generate errata cache for the correct erratum (tlestach(a)redhat.com)
+
* Tue May 24 2011 Jan Pazdziora 1.5.35-1
- 703273 - check, whether subscription is possible (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 4d8632c..d8e0c74 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.35-1 java/
+1.5.36-1 java/
commit 6e2282aa431e12e66e6d202956695550822568e8
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed May 25 18:25:09 2011 +0200
707658 - generate errata cache for the correct erratum
diff --git a/java/code/src/com/redhat/rhn/frontend/events/CloneErrataAction.java b/java/code/src/com/redhat/rhn/frontend/events/CloneErrataAction.java
index 295cf4f..8bfbee5 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/CloneErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/CloneErrataAction.java
@@ -58,6 +58,7 @@ public class CloneErrataAction
Errata errata = ErrataFactory.lookupById(eid);
if (errata instanceof PublishedClonedErrata) {
errata.addChannel(currChan);
+ ErrataCacheManager.insertCacheForChannelErrata(cids, errata);
}
else {
Set<Channel> channelSet = new HashSet<Channel>();
@@ -70,6 +71,7 @@ public class CloneErrataAction
Errata published = PublishErrataHelper.cloneErrataFast(errata,
msg.getUser().getOrg());
published.setChannels(channelSet);
+ ErrataCacheManager.insertCacheForChannelErrata(cids, published);
}
else {
log.debug("Re-publishing clone");
@@ -78,7 +80,6 @@ public class CloneErrataAction
}
- ErrataCacheManager.insertCacheForChannelErrata(cids, errata);
}
}
12 years, 10 months
Changes to 'refs/tags/spacewalk-backend-1.5.29-1'
by Michael Mraka
Tag 'spacewalk-backend-1.5.29-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-25 13:57 +0000
Tagging package [spacewalk-backend] version [1.5.29-1] in directory [backend/].
Changes since spacewalk-web-1.5.13-1:
Michael Mraka (5):
channel timestamp expects YYYYMMDDHHMISS
fixed table aliases
errata timestamp expects YYYYMMDDHHMISS
package timestamp expects YYYYMMDDHHMISS
Automatic commit of package [spacewalk-backend] release [1.5.29-1].
Miroslav Suchý (1):
block python-hwdata
---
backend/server/repomd/mapper.py | 12 ++++++------
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
rel-eng/tito.props | 6 +++---
4 files changed, 15 insertions(+), 11 deletions(-)
---
12 years, 10 months
backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 3f9635b8cc71effdaf3b5caf89ac79b91065180e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed May 25 15:57:10 2011 +0200
Automatic commit of package [spacewalk-backend] release [1.5.29-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 6ec0c84..16fd4e4 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.5.28
+Version: 1.5.29
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -681,6 +681,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed May 25 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.29-1
+- timestamps expects YYYYMMDDHHMISS
+- fixed table aliases
+
* Tue May 24 2011 Jan Pazdziora 1.5.28-1
- We need to specifically check for None when calling decode.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index b8df06b..39bbbe7 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.5.28-1 backend/
+1.5.29-1 backend/
12 years, 10 months