Changes to 'refs/tags/spacewalk-java-1.10.118-1'
by Tomáš Kašpárek
Tag 'spacewalk-java-1.10.118-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-07-04 17:37 +0000
Tagging package [spacewalk-java] version [1.10.118-1] in directory [java/].
Changes since spacewalk-java-1.10.117-1:
Tomas Kasparek (2):
skip xliff checks for fedora 19
Automatic commit of package [spacewalk-java] release [1.10.118-1].
---
java/spacewalk-java.spec | 15 ++++++++++++---
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 13 insertions(+), 4 deletions(-)
---
10 years, 11 months
java/spacewalk-java.spec rel-eng/packages
by Tomáš Kašpárek
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 50a1b8570606e4fb8bd814227a8829908da1a69b
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Jul 4 19:37:04 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.118-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index c05003b..abef9be 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.10.117
+Version: 1.10.118
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -761,6 +761,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jul 04 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.118-1
+- skip xliff checks for fedora 19
+
* Thu Jul 04 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.117-1
- build spacewalk-java on fedora19
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 0439f7b..e6b0a3e 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.117-1 java/
+1.10.118-1 java/
10 years, 11 months
java/spacewalk-java.spec
by Tomáš Kašpárek
java/spacewalk-java.spec | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
New commits:
commit d86b745411040ca249fd638e6af9ecadc5d1d2ff
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Jul 4 19:24:46 2013 +0200
skip xliff checks for fedora 19
it's somehow broken, when I will have more time I will investigate
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 0607d5b..c05003b 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -378,7 +378,13 @@ if test -d /usr/share/tomcat6; then
fi
fi
-%if ! 0%{?omit_tests} > 0
+%if 0%{?fedora} && 0%{?fedora} >= 19
+# checkstyle is broken on Fedoras - we skip for now
+# RHEL5 checkstyle4 is incompatible with checkstyle5
+%define skip_xliff 1
+%endif
+
+%if ! 0%{?omit_tests} > 0 && ! 0%{?skip_xliff}
find . -name 'StringResource_*.xml' | while read i ;
do echo $i
# check for common localizations issues
@@ -628,7 +634,7 @@ fi
%{jardir}/hibernate-jpa-2.0-api.jar
%{jardir}/javassist.jar
%if 0%{?fedora} && 0%{?fedora} > 18
-%{jardir}/jboss-logging/jboss-logging.jar
+%{jardir}/jboss-logging_jboss-logging.jar
%else
%{jardir}/jboss-logging.jar
%endif
10 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.10.117-1'
by Tomáš Kašpárek
Tag 'spacewalk-java-1.10.117-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-07-04 16:48 +0000
Tagging package [spacewalk-java] version [1.10.117-1] in directory [java/].
Changes since spacewalk-java-1.10.116-1:
Tomas Kasparek (2):
build spacewalk-java on fedora19
Automatic commit of package [spacewalk-java] release [1.10.117-1].
---
java/buildconf/build-props.xml | 8 +++++++-
java/spacewalk-java.spec | 15 ++++++++-------
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 16 insertions(+), 9 deletions(-)
---
10 years, 11 months
java/spacewalk-java.spec rel-eng/packages
by Tomáš Kašpárek
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit ba5331b986a934eab1284bfb794c87cf68e93f76
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Jul 4 18:48:46 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.117-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 46dfa35..0607d5b 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.10.116
+Version: 1.10.117
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -755,6 +755,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jul 04 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.117-1
+- build spacewalk-java on fedora19
+
* Thu Jul 04 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.116-1
- Avoid relying on types returned by Hibernate
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 5b537b7..0439f7b 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.116-1 java/
+1.10.117-1 java/
10 years, 11 months
java/buildconf java/spacewalk-java.spec
by Tomáš Kašpárek
java/buildconf/build-props.xml | 8 +++++++-
java/spacewalk-java.spec | 10 ++++------
2 files changed, 11 insertions(+), 7 deletions(-)
New commits:
commit b04414c61b9ebe938af61fffad300f4942d61f55
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Jul 4 18:35:52 2013 +0200
build spacewalk-java on fedora19
diff --git a/java/buildconf/build-props.xml b/java/buildconf/build-props.xml
index daabc74..9cc596a 100644
--- a/java/buildconf/build-props.xml
+++ b/java/buildconf/build-props.xml
@@ -58,7 +58,13 @@
<property name="hibernate3.2deps" value="hibernate3"/>
- <property name="hibernate3.6deps" value="hibernate3/hibernate-ehcache-3 hibernate3/hibernate-c3p0-3 hibernate3/hibernate-core-3 hibernate/hibernate-commons-annotations slf4j/api jboss-logging javassist slf4j/log4j12 ehcache-core hibernate-jpa-2.0-api"/>
+ <condition property="jboss-logging-jars"
+ value="jboss-logging/jboss-logging"
+ else="jboss-logging">
+ <available file="/usr/share/java/jboss-logging/jboss-logging.jar" />
+ </condition>
+
+ <property name="hibernate3.6deps" value="hibernate3/hibernate-ehcache-3 hibernate3/hibernate-c3p0-3 hibernate3/hibernate-core-3 hibernate/hibernate-commons-annotations slf4j/api ${jboss-logging-jars} javassist slf4j/log4j12 ehcache-core hibernate-jpa-2.0-api"/>
<condition property="hibernate"
value="${hibernate3.2deps}"
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 932b432..46dfa35 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -440,12 +440,6 @@ ln -s -f %{_javadir}/hibernate3/hibernate-c3p0.jar $RPM_BUILD_ROOT%{_javadir}/hi
ln -s -f %{_javadir}/hibernate3/hibernate-ehcache.jar $RPM_BUILD_ROOT%{_javadir}/hibernate3/hibernate-ehcache-3.jar
%endif
-#jboss-logging has moved its jars on fedora19
-%if 0%{?fedora} && 0%{?fedora} > 18
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-ln -s -f %{_javadir}/jboss-logging/jboss-logging.jar $RPM_BUILD_ROOT%{_javadir}/jboss-logging.jar
-%endif
-
%if 0%{?rhel} && 0%{?rhel} < 6
ant -Dprefix=$RPM_BUILD_ROOT install-tomcat5
install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}/tomcat5/Catalina/localhost/
@@ -633,7 +627,11 @@ fi
%{jardir}/hibernate_hibernate-commons-annotations.jar
%{jardir}/hibernate-jpa-2.0-api.jar
%{jardir}/javassist.jar
+%if 0%{?fedora} && 0%{?fedora} > 18
+%{jardir}/jboss-logging/jboss-logging.jar
+%else
%{jardir}/jboss-logging.jar
+%endif
%{jardir}/slf4j_api.jar
%{jardir}/slf4j_log4j12.jar
%endif
10 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.10.116-1'
by Tomas Lestach
Tag 'spacewalk-java-1.10.116-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-07-04 14:25 +0000
Tagging package [spacewalk-java] version [1.10.116-1] in directory [java/].
Changes since spacewalk-java-1.10.115-1:
Silvio Moioli (1):
Avoid relying on types returned by Hibernate
Tomas Lestach (1):
Automatic commit of package [spacewalk-java] release [1.10.116-1].
---
java/code/src/com/redhat/rhn/domain/channel/Channel.java | 7 +++++++
java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java | 1 +
java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java | 3 +--
java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddAction.java | 3 +--
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 7 ++-----
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 4 +---
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
8 files changed, 18 insertions(+), 14 deletions(-)
---
10 years, 11 months
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/channel/Channel.java | 7 +++++++
java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java | 1 +
java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java | 3 +--
java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddAction.java | 3 +--
java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java | 7 ++-----
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 4 +---
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
8 files changed, 18 insertions(+), 14 deletions(-)
New commits:
commit b65e5a476e43d93bb7cb404d2b23e8e941380275
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Jul 4 16:25:45 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.116-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 34a9cbd..932b432 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.10.115
+Version: 1.10.116
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -757,6 +757,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jul 04 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.116-1
+- Avoid relying on types returned by Hibernate
+
* Thu Jul 04 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.115-1
- make dirs if they don't exist yet
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index fd1e4a6..5b537b7 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.115-1 java/
+1.10.116-1 java/
commit f7044a01be5211f00a2acd7b845e36da61357d63
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jun 7 16:02:00 2013 +0200
Avoid relying on types returned by Hibernate
diff --git a/java/code/src/com/redhat/rhn/domain/channel/Channel.java b/java/code/src/com/redhat/rhn/domain/channel/Channel.java
index f091476..bcb06fa 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/Channel.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/Channel.java
@@ -836,4 +836,11 @@ public class Channel extends BaseDomainHelper implements Comparable {
}
return checksumType.getLabel();
}
+
+ /**
+ * @return the original Channel the channel was cloned from
+ */
+ public Channel getOriginal() {
+ throw new UnsupportedOperationException();
+ }
}
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java b/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java
index 22b7e85..c130dd9 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ClonedChannel.java
@@ -27,6 +27,7 @@ public class ClonedChannel extends Channel {
/**
* @return the original Channel the channel was cloned from
*/
+ @Override
public Channel getOriginal() {
return original;
}
diff --git a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
index d4ce27d..d3f5d15 100644
--- a/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/errata/ErrataFactory.java
@@ -24,7 +24,6 @@ import com.redhat.rhn.common.hibernate.HibernateFactory;
import com.redhat.rhn.common.hibernate.HibernateRuntimeException;
import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.channel.ChannelFactory;
-import com.redhat.rhn.domain.channel.ClonedChannel;
import com.redhat.rhn.domain.common.ChecksumFactory;
import com.redhat.rhn.domain.errata.impl.PublishedBug;
import com.redhat.rhn.domain.errata.impl.PublishedClonedErrata;
@@ -263,7 +262,7 @@ public class ErrataFactory extends HibernateFactory {
throw new InvalidChannelException("Cloned channel expected: " +
chan.getLabel());
}
- Channel original = ((ClonedChannel) chan).getOriginal();
+ Channel original = chan.getOriginal();
// see BZ 805714, if we are a clone of a clone the 1st clone
// may not have the errata we want
while (original.isCloned() &&
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddAction.java
index b074956..4a731d5 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/ChannelPackagesAddAction.java
@@ -19,7 +19,6 @@ import com.redhat.rhn.common.localization.LocalizationService;
import com.redhat.rhn.common.security.PermissionException;
import com.redhat.rhn.domain.channel.Channel;
import com.redhat.rhn.domain.channel.ChannelFactory;
-import com.redhat.rhn.domain.channel.ClonedChannel;
import com.redhat.rhn.domain.channel.SelectableChannel;
import com.redhat.rhn.domain.rhnset.RhnSet;
import com.redhat.rhn.domain.role.RoleFactory;
@@ -116,7 +115,7 @@ public class ChannelPackagesAddAction extends RhnAction {
//If a channel isn't selected, select one smartly
if (selectedChan == null) {
if (chan.isCloned()) {
- selectedChan = ((ClonedChannel) chan).getOriginal().getId().toString();
+ selectedChan = chan.getOriginal().getId().toString();
}
else {
selectedChan = ORPHAN_PACKAGES;
diff --git a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
index d72d220..c4e4861 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/ChannelManager.java
@@ -34,7 +34,6 @@ import com.redhat.rhn.domain.channel.ChannelFactory;
import com.redhat.rhn.domain.channel.ChannelFamily;
import com.redhat.rhn.domain.channel.ChannelFamilyFactory;
import com.redhat.rhn.domain.channel.ChannelVersion;
-import com.redhat.rhn.domain.channel.ClonedChannel;
import com.redhat.rhn.domain.channel.DistChannelMap;
import com.redhat.rhn.domain.channel.InvalidChannelRoleException;
import com.redhat.rhn.domain.channel.ProductName;
@@ -2570,8 +2569,7 @@ public class ChannelManager extends BaseManager {
if (c.isCloned()) {
Map params = new HashMap();
params.put("cid", c.getId());
- ClonedChannel cc = (ClonedChannel) c;
- params.put("ocid", cc.getOriginal().getId());
+ params.put("ocid", c.getOriginal().getId());
SelectMode m = ModeFactory.getMode("Errata_queries",
"list_errata_needing_sync");
return m.execute(params);
@@ -2595,8 +2593,7 @@ public class ChannelManager extends BaseManager {
Map params = new HashMap();
params.put("cid", c.getId());
params.put("set_label", setLabel);
- ClonedChannel cc = (ClonedChannel) c;
- params.put("ocid", cc.getOriginal().getId());
+ params.put("ocid", c.getOriginal().getId());
SelectMode m = ModeFactory.getMode("Errata_queries",
"list_packages_needing_sync_from_set");
return m.execute(params);
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index 3df7720..a70b1f0 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -31,7 +31,6 @@ import com.redhat.rhn.common.validator.ValidatorError;
import com.redhat.rhn.common.validator.ValidatorResult;
import com.redhat.rhn.common.validator.ValidatorWarning;
import com.redhat.rhn.domain.channel.Channel;
-import com.redhat.rhn.domain.channel.ClonedChannel;
import com.redhat.rhn.domain.channel.ChannelFamily;
import com.redhat.rhn.domain.entitlement.Entitlement;
import com.redhat.rhn.domain.entitlement.VirtualizationEntitlement;
@@ -1704,8 +1703,7 @@ public class SystemManager extends BaseManager {
Channel base = server.getBaseChannel();
if (base != null && base.isCloned()) {
- ClonedChannel clonedBase = (ClonedChannel) base;
- base = clonedBase.getOriginal();
+ base = base.getOriginal();
}
if ((base != null) &&
10 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.10.115-1'
by Tomáš Kašpárek
Tag 'spacewalk-java-1.10.115-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-07-04 13:56 +0000
Tagging package [spacewalk-java] version [1.10.115-1] in directory [java/].
Changes since spacewalk-java-1.10.114-1:
Tomas Kasparek (2):
make dirs if they don't exist yet
Automatic commit of package [spacewalk-java] release [1.10.115-1].
---
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
10 years, 11 months
java/spacewalk-java.spec rel-eng/packages
by Tomáš Kašpárek
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit cd0eefd9a862349e67ad48dadef3d562dbd566a5
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Jul 4 15:56:01 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.115-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index ca04c17..34a9cbd 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.10.114
+Version: 1.10.115
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -757,6 +757,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Jul 04 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.115-1
+- make dirs if they don't exist yet
+
* Thu Jul 04 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.114-1
- rewrite /network/software/channels/managers.pxt page to java
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 11d2dd0..fd1e4a6 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.114-1 java/
+1.10.115-1 java/
10 years, 11 months