Changes to 'refs/tags/spacewalk-java-1.10.34-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.10.34-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-03-28 14:18 +0000
Tagging package [spacewalk-java] version [1.10.34-1] in directory [java/].
Changes since spacewalk-schema-1.10.19-1:
Jan Pazdziora (6):
We use RHN::Form::ParsedForm so we should use it.
Making the ARM soft./hard. FP channel archs localizable.
The CATALINA_BASE seems to have logs/ symlink to proper place and we do not have to depend on CATALINA_HOME being exported.
Variable ctx not used, removing.
Automatic commit of package [spacewalk-web] release [1.10.16-1].
Automatic commit of package [spacewalk-java] release [1.10.34-1].
Stephen Herr (1):
updating c3p0 version in ivy
Tomas Kasparek (1):
681453 - throw exception instead of ISE if bad paramter is given
Tomas Lestach (1):
adding dwr to ivy list
---
java/code/src/com/redhat/rhn/frontend/action/satellite/CatalinaAction.java | 12 -----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 8 +++
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 24 ++++++++++
java/ivy.xml | 3 -
java/spacewalk-java.spec | 11 ++++
rel-eng/packages/spacewalk-java | 2
rel-eng/packages/spacewalk-web | 2
web/modules/sniglets/Sniglets/ChannelEditor.pm | 1
web/spacewalk-web.spec | 5 +-
9 files changed, 53 insertions(+), 15 deletions(-)
---
11 years
2 commits - java/spacewalk-java.spec rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora
java/spacewalk-java.spec | 11 ++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
4 files changed, 16 insertions(+), 4 deletions(-)
New commits:
commit 4c81d9abe605ca2ec15faece753d04f014396b94
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 28 15:18:32 2013 +0100
Automatic commit of package [spacewalk-java] release [1.10.34-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b025779..31b9878 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.33
+Version: 1.10.34
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -678,6 +678,15 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Mar 28 2013 Jan Pazdziora 1.10.34-1
+- Variable ctx not used, removing.
+- The CATALINA_BASE seems to have logs/ symlink to proper place and we do not
+ have to depend on CATALINA_HOME being exported.
+- adding dwr to ivy list
+- 681453 - throw exception instead of ISE if bad paramter is given
+- updating c3p0 version in ivy
+- Making the ARM soft./hard. FP channel archs localizable.
+
* Wed Mar 27 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.33-1
- we need at least c3p0 v.0.9.1 to support ConnectionCustomizer
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 946d2b9..83a587c 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.33-1 java/
+1.10.34-1 java/
commit 5dd315b57f50efdcb273c7965876aecd7d54c825
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 28 15:18:27 2013 +0100
Automatic commit of package [spacewalk-web] release [1.10.16-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 94360a2..b5af448 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.10.15-1 web/
+1.10.16-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index c32d911..83f3eaa 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -4,7 +4,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.10.15
+Version: 1.10.16
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -261,6 +261,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Mar 28 2013 Jan Pazdziora 1.10.16-1
+- We use RHN::Form::ParsedForm so we should use it.
+
* Tue Mar 26 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.15-1
- changing .spec to reflect changes
11 years
2 commits - java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/frontend/action/satellite/CatalinaAction.java | 12 +---------
1 file changed, 2 insertions(+), 10 deletions(-)
New commits:
commit 7cde95f886065849092df839ef80e0cdbab4b3ec
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 28 14:04:58 2013 +0100
Variable ctx not used, removing.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/CatalinaAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/CatalinaAction.java
index 97c22aa..2300bc4 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/CatalinaAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/CatalinaAction.java
@@ -16,7 +16,6 @@
package com.redhat.rhn.frontend.action.satellite;
import com.redhat.rhn.common.util.FileUtils;
-import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnAction;
import com.redhat.rhn.frontend.struts.RhnHelper;
@@ -39,7 +38,6 @@ public class CatalinaAction extends RhnAction {
ActionForm formIn,
HttpServletRequest request,
HttpServletResponse response) {
- RequestContext ctx = new RequestContext(request);
String catalina_base = System.getProperty("catalina.base");
commit 3d6fa3dfa5dedbd07a98d8ad07c92ab1f396577c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 28 14:04:29 2013 +0100
The CATALINA_BASE seems to have logs/ symlink to proper place and we do not have to depend on CATALINA_HOME being exported.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/CatalinaAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/CatalinaAction.java
index 9d4310e..97c22aa 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/CatalinaAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/CatalinaAction.java
@@ -24,9 +24,6 @@ import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -44,13 +41,10 @@ public class CatalinaAction extends RhnAction {
HttpServletResponse response) {
RequestContext ctx = new RequestContext(request);
- String catalina = System.getenv("CATALINA_HOME");
-
- Matcher m = Pattern.compile("/tomcat[0-9]*$").matcher(catalina);
- m.find();
+ String catalina_base = System.getProperty("catalina.base");
request.setAttribute("contents",
- FileUtils.readStringFromFile("/var/log" + m.group(0) + "/catalina.out"));
+ FileUtils.readStringFromFile(catalina_base + "/logs/catalina.out"));
return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
}
11 years
java/ivy.xml
by Tomas Lestach
java/ivy.xml | 1 +
1 file changed, 1 insertion(+)
New commits:
commit f625d1a5f29c5d7bdbfc11357d6168d5ec99a24f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Mar 28 14:55:45 2013 +0100
adding dwr to ivy list
diff --git a/java/ivy.xml b/java/ivy.xml
index 5506c86..73aec4f 100644
--- a/java/ivy.xml
+++ b/java/ivy.xml
@@ -24,6 +24,7 @@
<dependency org="redhat" name="commons-validator" rev="1.1.4" />
<dependency org="redhat" name="concurrent" rev="1.3.2" />
<dependency org="redhat" name="dom4j" rev="1.6.1" />
+ <dependency org="redhat" name="dwr" rev="3.0rc2" />
<dependency org="redhat" name="emma" rev="20040713" />
<dependency org="redhat" name="emma_ant" rev="20040713" />
<dependency org="redhat" name="hibernate3" rev="3.2.4.1" />
11 years
java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java | 24 ++++++++++
1 file changed, 24 insertions(+)
New commits:
commit 49e12a0cb36fc763bb9a894030e31c1e8a64e0d0
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Mar 28 13:07:15 2013 +0100
681453 - throw exception instead of ISE if bad paramter is given
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
index 713df2b..5d961f6 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/errata/ErrataHandler.java
@@ -372,9 +372,15 @@ public class ErrataHandler extends BaseHandler {
}
if (details.containsKey("synopsis")) {
+ if (StringUtils.isBlank((String)details.get("synopsis"))) {
+ throw new InvalidParameterException("Synopsis is required.");
+ }
errata.setSynopsis((String)details.get("synopsis"));
}
if (details.containsKey("advisory_name")) {
+ if (StringUtils.isBlank((String)details.get("advisory_name"))) {
+ throw new InvalidParameterException("Advisory name is required.");
+ }
errata.setAdvisoryName((String)details.get("advisory_name"));
}
if (details.containsKey("advisory_release")) {
@@ -385,21 +391,39 @@ public class ErrataHandler extends BaseHandler {
errata.setAdvisoryRel(rel);
}
if (details.containsKey("advisory_type")) {
+ String pea = "Product Enhancement Advisory"; // hack for checkstyle
+ if (!((String)details.get("advisory_type")).equals("Security Advisory") &&
+ !((String)details.get("advisory_type")).equals(pea) &&
+ !((String)details.get("advisory_type")).equals("Bug Fix Advisory")) {
+ throw new InvalidParameterException("Invalid advisory type");
+ }
errata.setAdvisoryType((String)details.get("advisory_type"));
}
if (details.containsKey("product")) {
+ if (StringUtils.isBlank((String)details.get("product"))) {
+ throw new InvalidParameterException("Product name is required.");
+ }
errata.setProduct((String)details.get("product"));
}
if (details.containsKey("errataFrom")) {
errata.setErrataFrom((String)details.get("errataFrom"));
}
if (details.containsKey("topic")) {
+ if (StringUtils.isBlank((String)details.get("topic"))) {
+ throw new InvalidParameterException("Topic is required.");
+ }
errata.setTopic((String)details.get("topic"));
}
if (details.containsKey("description")) {
+ if (StringUtils.isBlank((String)details.get("description"))) {
+ throw new InvalidParameterException("Description is required.");
+ }
errata.setDescription((String)details.get("description"));
}
if (details.containsKey("solution")) {
+ if (StringUtils.isBlank((String)details.get("solution"))) {
+ throw new InvalidParameterException("Solution is required.");
+ }
errata.setSolution((String)details.get("solution"));
}
if (details.containsKey("references")) {
11 years
java/ivy.xml
by StephenHerr
java/ivy.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d9af5e7c5afc3d0005fa20016bf7ec74b9458ffc
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Mar 28 08:58:12 2013 -0400
updating c3p0 version in ivy
diff --git a/java/ivy.xml b/java/ivy.xml
index 07335f6..5506c86 100644
--- a/java/ivy.xml
+++ b/java/ivy.xml
@@ -8,7 +8,7 @@
<dependency org="redhat" name="bcel" rev="5.1" />
<dependency org="redhat" name="bcpg" rev="1.37" />
<dependency org="redhat" name="bcprov" rev="1.37" />
- <dependency org="redhat" name="c3p0" rev="0.9.0" />
+ <dependency org="redhat" name="c3p0" rev="0.9.1.2" />
<dependency org="redhat" name="cglib" rev="2.1.3" />
<dependency org="redhat" name="checkstyle" rev="4.1" />
<dependency org="redhat" name="commons-beanutils" rev="1.7.0" />
11 years
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 8 ++++++++
1 file changed, 8 insertions(+)
New commits:
commit dd9b1324716bcd15629fbb40929d3ab477287fc7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 28 13:17:41 2013 +0100
Making the ARM soft./hard. FP channel archs localizable.
Addressing
ERROR com.redhat.rhn.common.localization.LocalizationService - *** ERROR: Message with id: [ARM soft. FP] not found.*** called by com.redhat.rhn.frontend.action.channel.PackageSearchAction.addOption(PackageSearchAction.java:367)
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index 34cf272..b17baa9 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -7298,6 +7298,14 @@ Follow this url to see the full list of inactive systems:
<source>PowerPC Debian</source>
<target>PowerPC Debian</target>
</trans-unit>
+ <trans-unit id="ARM soft. FP">
+ <source>ARM soft. FP</source>
+ <target>ARM soft. FP</target>
+ </trans-unit>
+ <trans-unit id="ARM hard. FP">
+ <source>ARM hard. FP</source>
+ <target>ARM hard. FP</target>
+ </trans-unit>
<trans-unit id="arm Debian">
<source>arm Debian</source>
<target>arm Debian</target>
11 years
web/modules
by Jan Pazdziora
web/modules/sniglets/Sniglets/ChannelEditor.pm | 1 +
1 file changed, 1 insertion(+)
New commits:
commit a8b5a8ddac0898e74e8c56ab8d8645f0ad38393b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 28 10:33:34 2013 +0100
We use RHN::Form::ParsedForm so we should use it.
Addressing
Can't locate object method "new" via package "RHN::Form::ParsedForm" (perhaps you forgot to load "RHN::Form::ParsedForm"?) at /usr/share/perl5/vendor_perl/Sniglets/ChannelEditor.pm line 386.
diff --git a/web/modules/sniglets/Sniglets/ChannelEditor.pm b/web/modules/sniglets/Sniglets/ChannelEditor.pm
index 847932d..f32367d 100644
--- a/web/modules/sniglets/Sniglets/ChannelEditor.pm
+++ b/web/modules/sniglets/Sniglets/ChannelEditor.pm
@@ -26,6 +26,7 @@ use Sniglets::Channel;
use RHN::DataSource::Package;
use RHN::DataSource::Channel;
use RHN::Form::Widget::RadiobuttonGroup;
+use RHN::Form::ParsedForm ();
sub register_tags {
my $class = shift;
11 years
Changes to 'refs/tags/spacewalk-schema-1.10.19-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.10.19-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2013-03-28 07:02 +0000
Tagging package [spacewalk-schema] version [1.10.19-1] in directory [schema/spacewalk/].
Changes since osad-5.11.22-1:
Jan Pazdziora (2):
Fixing type in schema upgrade.
Automatic commit of package [spacewalk-schema] release [1.10.19-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/012-rhnErrataFile-filename.sql.oracle | 1 +
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/012-rhnErrataFile-filename.sql.postgresql | 3 +++
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/12-rhnErrataFile-filename.sql.oracle | 1 -
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/12-rhnErrataFile-filename.sql.postgresql | 3 ---
6 files changed, 9 insertions(+), 6 deletions(-)
---
11 years
2 commits - rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/012-rhnErrataFile-filename.sql.oracle | 1 +
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/012-rhnErrataFile-filename.sql.postgresql | 3 +++
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/12-rhnErrataFile-filename.sql.oracle | 1 -
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/12-rhnErrataFile-filename.sql.postgresql | 3 ---
6 files changed, 9 insertions(+), 6 deletions(-)
New commits:
commit 99694eaba7f23b81c0c26f225994f4a318bc81ad
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 28 08:02:53 2013 +0100
Automatic commit of package [spacewalk-schema] release [1.10.19-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 649314c..a1379ef 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.10.18-1 schema/spacewalk/
+1.10.19-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index b401f44..6709df0 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -4,7 +4,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.10.18
+Version: 1.10.19
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Thu Mar 28 2013 Jan Pazdziora 1.10.19-1
+- Fixing type in schema upgrade.
+
* Wed Mar 27 2013 Jan Pazdziora 1.10.18-1
- Specify default for nrsocket during upgrade as well.
commit 373aec5b3f8b90c11904b4b7135d025e83a0484f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Mar 28 08:02:35 2013 +0100
Fixing type in schema upgrade.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/012-rhnErrataFile-filename.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/012-rhnErrataFile-filename.sql.oracle
new file mode 100644
index 0000000..70c59ec
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/012-rhnErrataFile-filename.sql.oracle
@@ -0,0 +1 @@
+ALTER TABLE rhnErrataFile MODIFY filename VARCHAR2(4000);
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/012-rhnErrataFile-filename.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/012-rhnErrataFile-filename.sql.postgresql
new file mode 100644
index 0000000..cd41005
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/012-rhnErrataFile-filename.sql.postgresql
@@ -0,0 +1,3 @@
+-- oracle equivalent source sha1 4b31d381dbcc089831cca7c15723fec986b1971e
+
+ALTER TABLE rhnErrataFile ALTER filename TYPE VARCHAR(4000);
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/12-rhnErrataFile-filename.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/12-rhnErrataFile-filename.sql.oracle
deleted file mode 100644
index 70c59ec..0000000
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/12-rhnErrataFile-filename.sql.oracle
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE rhnErrataFile MODIFY filename VARCHAR2(4000);
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/12-rhnErrataFile-filename.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/12-rhnErrataFile-filename.sql.postgresql
deleted file mode 100644
index f4ffe75..0000000
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/12-rhnErrataFile-filename.sql.postgresql
+++ /dev/null
@@ -1,3 +0,0 @@
--- oracle equivalent source sha1 4b31d381dbcc089831cca7c15723fec986b1971e
-
-ALTER TABLE rhnErrataFile ALTER filename TYPE VARCHAR2(4000);
11 years