spacewalk-commits March 2012

spacewalk-commits@lists.fedorahosted.org

10 participants
371 discussions

java/code
by Tomas Lestach 16 Mar '12

16 Mar '12

java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 8 ++++++++ java/code/src/com/redhat/rhn/frontend/action/renderers/TasksRenderer.java | 3 ++- java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp | 3 ++- 3 files changed, 12 insertions(+), 2 deletions(-) New commits: commit eb799e2b038ff28d088c814b215258e0143957e9 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Mar 16 16:21:46 2012 +0100 800364 - hide documetation link diff --git a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java index 1abd800..7697139 100644 --- a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java +++ b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java @@ -524,4 +524,12 @@ public class ConfigDefaults { public boolean isPostgresql() { return DB_BACKEND_POSTGRESQL.equals(Config.get().getString(DB_BACKEND)); } + + /** + * is documentation available + * @return true if so + */ + public boolean isDocAvailable() { + return !isSpacewalk(); + } } diff --git a/java/code/src/com/redhat/rhn/frontend/action/renderers/TasksRenderer.java b/java/code/src/com/redhat/rhn/frontend/action/renderers/TasksRenderer.java index d2f2b81..c54b201 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/renderers/TasksRenderer.java +++ b/java/code/src/com/redhat/rhn/frontend/action/renderers/TasksRenderer.java @@ -15,6 +15,7 @@ package com.redhat.rhn.frontend.action.renderers; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.domain.user.User; import com.redhat.rhn.frontend.listview.PageControl; @@ -34,8 +35,8 @@ public class TasksRenderer extends BaseFragmentRenderer { */ protected void render(User user, PageControl pc, HttpServletRequest request) { request.setAttribute(TASKS, Boolean.TRUE); + request.setAttribute("documentation", ConfigDefaults.get().isDocAvailable()); RendererHelper.setTableStyle(request, null); - } /** diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp index 4c5c78b..a943231 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp +++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp @@ -41,12 +41,13 @@ </rhn:require> </rhn:require> +<c:if test="${documentation == 'true'}"> <tr class="list-row-odd"> <td style="text-align: left;" class="first-column last-column"><img style="margin-left: 4px;" src="/img/parent_node.gif" alt="<bean:message key="yourrhn.jsp.bullet.alttag"/>" /> <a href="/rhn/help/client-config/en-US/index.jsp"> <bean:message key="yourrhn.jsp.tasks.registersystem" /> </a></td></tr> - +</c:if> <rhn:require acl="org_entitlement(sw_mgr_enterprise); user_role(activation_key_admin)"> <tr class="list-row-odd">

1 0

Changes to 'refs/tags/spacewalk-backend-1.8.4-1'
by Jan Pazdziora 16 Mar '12

16 Mar '12

Tag 'spacewalk-backend-1.8.4-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-03-16 14:17 +0000 Tagging package [spacewalk-backend] version [1.8.4-1] in directory [backend/]. Changes since spacewalk-java-1.8.17-1: Jan Pazdziora (3): 802688 - Forcing empty strings to be Nones. 802688 - Forcing empty strings to be Nones. Automatic commit of package [spacewalk-backend] release [1.8.4-1]. Tomas Lestach (4): 726114 - update createOrUpradePath api documentation get rid of gsbase fix checkstyle issue 803644 - fix ISE --- backend/server/rhnServer/server_packages.py | 10 ++-- backend/server/rhnServer/server_solarispatches.py | 2 backend/spacewalk-backend.spec | 5 +- java/buildconf/build-props.xml | 6 +- java/code/src/com/redhat/rhn/domain/server/test/VirtualInstanceTest.java | 7 +- java/code/src/com/redhat/rhn/domain/test/LabelTest.java | 8 +-- java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java | 12 ++--- java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java | 13 ++--- java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 2 java/code/src/com/redhat/rhn/testing/TestUtils.java | 24 ++++++++++ java/ivy.xml | 1 java/spacewalk-java.spec | 2 rel-eng/packages/spacewalk-backend | 2 13 files changed, 62 insertions(+), 32 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora 16 Mar '12

16 Mar '12

backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 1e41b3573e76aa548920228662ef7704fdaefd49 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Mar 16 15:17:36 2012 +0100 Automatic commit of package [spacewalk-backend] release [1.8.4-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index d145cad..bfdaa39 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -12,7 +12,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 1.8.3 +Version: 1.8.4 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -688,6 +688,9 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Fri Mar 16 2012 Jan Pazdziora 1.8.4-1 +- 802688 - Forcing empty strings to be Nones. + * Wed Mar 14 2012 Jan Pazdziora 1.8.3-1 - 803230 - cast to string to force lookup_evr prototype. - 798401 - use --debug-level parameter (msuchy(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 1ea7d4f..e8876a7 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.8.3-1 backend/ +1.8.4-1 backend/

1 0

java/code
by Tomas Lestach 16 Mar '12

16 Mar '12

java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 339e648b02bf23ec444cb07253dd09f5ad9724e0 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Mar 16 14:59:48 2012 +0100 803644 - fix ISE do not reply the server always has a base channel 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 db91a9a..23be330 100644 --- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java +++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java @@ -1613,7 +1613,7 @@ public class SystemManager extends BaseManager { // just install libvirt for RHEL6 base channel Channel base = server.getBaseChannel(); - if (base.isCloned()) { + if (base != null && base.isCloned()) { ClonedChannel clonedBase = (ClonedChannel) base; base = clonedBase.getOriginal(); }

1 0

2 commits - backend/server
by Jan Pazdziora 16 Mar '12

16 Mar '12

backend/server/rhnServer/server_packages.py | 10 ++++++---- backend/server/rhnServer/server_solarispatches.py | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) New commits: commit b7d8b3172eb76cc3ed03f2adba43e5b8f00d8658 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Mar 16 13:14:05 2012 +0100 802688 - Forcing empty strings to be Nones. Addressing Traceback (most recent call last): File "/usr/lib/python2.6/site-packages/spacewalk/server/apacheRequest.py", line 122, in call_function response = apply(func, params) File "/usr/share/rhn/server/handlers/xmlrpc/registration.py", line 924, in update_packages server.save_packages() File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnServer/server_wrapper.py", line 75, in save_packages ret = self.save_packages_byid(self.server["id"], schedule=schedule) File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnServer/server_packages.py", line 240, in save_packages_byid update_errata_cache(sysid) File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnServer/server_packages.py", line 321, in update_errata_cache update_needed_cache(server_id) File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/driver_postgresql.py", line 115, in __call__ result = Function.__call__(self, *args) File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/driver_postgresql.py", line 92, in __call__ raise sql_base.SQLError(error_code, e.pgerror, e) SQLError: (99999, 'ERROR: invalid input syntax for integer: "None"\\nCONTEXT: PL/pgSQL function "vercmp" line 14 at assignment\\nPL/pgSQL function "evr_t_compare" line 2 at RETURN\\nPL/pgSQL function "evr_t_gt" line 2 at RETURN\\nPL/pgSQL function "evr_t_larger" line 2 at IF\\nSQL statement "insert into rhnServerNeededCache (server_id, errata_id, package_id) (select distinct server_id, errata_id, package_id from rhnServerNeededView where server_id = $1 )"\\nPL/pgSQL function "update_needed_cache" line 4 at SQL statement\\n', DataError('invalid input syntax for integer: "None"\\nCONTEXT: PL/pgSQL function "vercmp" line 14 at assignment\\nPL/pgSQL function "evr_t_compare" line 2 at RETURN\\nPL/pgSQL function "evr_t_gt" line 2 at RETURN\\nPL/pgSQL function "evr_t_larger" line 2 at IF\\nSQL statement "insert into rhnServerNeededCache (server_id, errata_id, package_id) (select distinct server_id, errata_id, package_id from rhnServerNeededView where server_id = $1 )"\\nPL/pgSQL function "update_needed_cache" line 4 at SQL statement\\n',)) diff --git a/backend/server/rhnServer/server_solarispatches.py b/backend/server/rhnServer/server_solarispatches.py index 92f6afb..82b2f53 100644 --- a/backend/server/rhnServer/server_solarispatches.py +++ b/backend/server/rhnServer/server_solarispatches.py @@ -52,6 +52,8 @@ class DBPatch(object): """[constructor] This method looks up the patch in the databse, the 'id' field is the rhnPackage id. The 'id' field will be None if the patch does not exist in the database""" + if patch['epoch'] == '': + patch['epoch'] == None self.id = get_package_id(patch) # solaris patches server class ------------------------------------------- commit 788ed1011b832297571ea5f41f37cb2797eb7f5d Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Mar 16 11:19:09 2012 +0100 802688 - Forcing empty strings to be Nones. Addressing Traceback (most recent call last): File "/usr/lib/python2.6/site-packages/spacewalk/server/apacheRequest.py", line 122, in call_function response = apply(func, params) File "/usr/share/rhn/server/handlers/xmlrpc/registration.py", line 923, in update_packages server.add_package(package) File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnServer/server_wrapper.py", line 62, in add_package SolarisPatches.add_patch(self, self.server.get("id"), entry) File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnServer/server_solarispatches.py", line 89, in add_patch self._patches[sysid].append(DBPatch(patch)) File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnServer/server_solarispatches.py", line 55, in __init__ self.id = get_package_id(patch) File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnServer/server_solarispatches.py", line 39, in get_packa ge_id handle.execute(name=p.n, epoch=p.e, ver=p.v, rel=p.r, arch=p.a) File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/sql_base.py", line 163, in execute return apply(self._execute_wrapper, (self._execute, ) + p, kw) File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/driver_postgresql.py", line 282, in _execute_wrappe r retval = apply(function, p, kw) File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/sql_base.py", line 217, in _execute return self._execute_(args, kwargs) File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/driver_postgresql.py", line 295, in _execute_ self._real_cursor.execute(self.sql, params) IntegrityError: new row for relation "rhnpackageevr" violates check constraint "vn_rhnpackageevr_epoch" CONTEXT: Error occurred on dblink connection named "unnamed": could not execute command. SQL statement "SELECT dblink_exec('at_conn', $1 , true)" PL/pgSQL function "pg_dblink_exec" line 4 at PERFORM SQL statement "SELECT pg_dblink_exec( 'insert into rhnPackageEVR(id, epoch, version, release, evr) values (' || $1 || ', ' || coalesce(quote_literal( $2 ), 'NULL') || ', ' || coalesce(quote_literal( $3 ), 'NULL') || ', ' || coalesce(quote_literal( $4 ), 'NULL') || ', ' || evr_t(coalesce(quote_literal( $2 ), 'NULL'), coalesce(quote_literal( $3 ), 'NULL'), coalesce(quote_literal( $4 ), 'NULL')) || ')' )" PL/pgSQL function "lookup_evr" line 14 at PERFORM diff --git a/backend/server/rhnServer/server_packages.py b/backend/server/rhnServer/server_packages.py index a738f34..31545d1 100644 --- a/backend/server/rhnServer/server_packages.py +++ b/backend/server/rhnServer/server_packages.py @@ -44,15 +44,17 @@ class dbPackage: return None if not pdict.has_key('arch') or pdict['arch'] is None: pdict['arch'] = "" - if string.lower(str(pdict['epoch'])) == "(none)" or pdict['epoch'] == None: - pdict['epoch'] = "" - for k in ('name', 'version', 'release', 'epoch', 'arch'): + if string.lower(str(pdict['epoch'])) == "(none)" or pdict['epoch'] == "" or pdict['epoch'] == None: + pdict['epoch'] = None + else: + pdict['epoch'] = str(pdict['epoch']) + for k in ('name', 'version', 'release', 'arch'): if pdict[k] == None: return None self.n = str(pdict['name']) self.v = str(pdict['version']) self.r = str(pdict['release']) - self.e = str(pdict['epoch']) + self.e = pdict['epoch'] self.a = str(pdict['arch']) if pdict.has_key('installtime'): self.installtime = pdict['installtime']

1 0

2 commits - java/buildconf java/code java/ivy.xml java/spacewalk-java.spec
by Tomas Lestach 16 Mar '12

16 Mar '12

java/buildconf/build-props.xml | 6 +- java/code/src/com/redhat/rhn/domain/server/test/VirtualInstanceTest.java | 7 +- java/code/src/com/redhat/rhn/domain/test/LabelTest.java | 8 +-- java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java | 3 - java/code/src/com/redhat/rhn/testing/TestUtils.java | 24 ++++++++++ java/ivy.xml | 1 java/spacewalk-java.spec | 2 7 files changed, 37 insertions(+), 14 deletions(-) New commits: commit b3d1461bb847f87d279f67963be3f21b4ce9ea06 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Mar 16 11:54:24 2012 +0100 fix checkstyle issue diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java index 957b6be..4a247f8 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java @@ -395,7 +395,8 @@ public class ConfigChannelHandler extends BaseHandler { * "Config file macro end delimiter. Use null or * empty string to accept the default. (only for non-directories)") * #prop_desc("int", "revision", "next revision number, auto increment for null") - * #prop_desc("boolean", "binary", "mark the binary content, (only for non-directories)") + * #prop_desc("boolean", "binary", "mark the binary content, + * (only for non-directories)") * * #struct_end() * @xmlrpc.returntype commit 140d86f65237a7cb7578ac98cfa4374e3fe4aa9d Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Mar 16 11:39:45 2012 +0100 get rid of gsbase diff --git a/java/buildconf/build-props.xml b/java/buildconf/build-props.xml index f49bd9f..024f387 100644 --- a/java/buildconf/build-props.xml +++ b/java/buildconf/build-props.xml @@ -72,12 +72,12 @@ <property name="test.build.jar.dependencies" value="junit log4j - regexp jmock jmock-cglib gsbase postgresql-jdbc" /> + regexp jmock jmock-cglib postgresql-jdbc" /> <property name="test.jar.dependencies" value="antlr checkstyle dom4j emma emma_ant jdom jta junit log4j - regexp jmock jmock-cglib gsbase ${jfreechart} + regexp jmock jmock-cglib ${jfreechart} postgresql-jdbc" /> <condition property="ant-contrib.path" value="ant/ant-contrib" else="ant-contrib"> @@ -98,7 +98,7 @@  + regexp jmock jmock-cglib strutstest" / --> <property name="install.build.jar.dependencies" value="ant ant/ant-junit ${ant-contrib.path} antlr ${jasper-jars} ${test.build.jar.dependencies} diff --git a/java/code/src/com/redhat/rhn/domain/server/test/VirtualInstanceTest.java b/java/code/src/com/redhat/rhn/domain/server/test/VirtualInstanceTest.java index d4d4a73..a8944b7 100644 --- a/java/code/src/com/redhat/rhn/domain/server/test/VirtualInstanceTest.java +++ b/java/code/src/com/redhat/rhn/domain/server/test/VirtualInstanceTest.java @@ -17,8 +17,7 @@ package com.redhat.rhn.domain.server.test; import com.redhat.rhn.domain.server.ServerFactory; import com.redhat.rhn.domain.server.VirtualInstance; import com.redhat.rhn.testing.Sequence; - -import com.gargoylesoftware.base.testing.EqualsTester; +import com.redhat.rhn.testing.TestUtils; import junit.framework.TestCase; @@ -58,7 +57,9 @@ public class VirtualInstanceTest extends TestCase { VirtualInstance guestB = new GuestStub(guestA.getId()); VirtualInstance guestC = new GuestStub(idSequence.nextLong()); - new EqualsTester(guestA, guestB, guestC, new Object()); + assertEquals(true, TestUtils.equalTest(guestA, guestB)); + assertEquals(false, TestUtils.equalTest(guestA, guestC)); + assertEquals(false, TestUtils.equalTest(guestA, new Object())); } public void testGetNullInfo() { diff --git a/java/code/src/com/redhat/rhn/domain/test/LabelTest.java b/java/code/src/com/redhat/rhn/domain/test/LabelTest.java index f11f1f6..67efac8 100644 --- a/java/code/src/com/redhat/rhn/domain/test/LabelTest.java +++ b/java/code/src/com/redhat/rhn/domain/test/LabelTest.java @@ -15,8 +15,7 @@ package com.redhat.rhn.domain.test; import com.redhat.rhn.domain.Label; - -import com.gargoylesoftware.base.testing.EqualsTester; +import com.redhat.rhn.testing.TestUtils; import junit.framework.TestCase; @@ -63,8 +62,9 @@ public class LabelTest extends TestCase { BeerLabel aprihop = new BeerLabel("Aprihop", "Aprihop....Dogfish Head bringing you America's finest beer"); - - new EqualsTester(negroModelo, anotherNegroModelo, aprihop, new Object()); + assertEquals(true, TestUtils.equalTest(negroModelo, anotherNegroModelo)); + assertEquals(false, TestUtils.equalTest(negroModelo, aprihop)); + assertEquals(false, TestUtils.equalTest(negroModelo, new Object())); } } diff --git a/java/code/src/com/redhat/rhn/testing/TestUtils.java b/java/code/src/com/redhat/rhn/testing/TestUtils.java index 194261f..408a773 100644 --- a/java/code/src/com/redhat/rhn/testing/TestUtils.java +++ b/java/code/src/com/redhat/rhn/testing/TestUtils.java @@ -516,6 +516,30 @@ public class TestUtils { return null; } + /** + * Used to test the equals contract on objects. + * The contract as specified by java.lang.Object states that if A.equals(B) is true + * then B.equals(A) is also true. It also specifies that if A.equals(B) is true + * then A.hashCode() will equals B.hashCode() + * @param o1 object1 + * @param o2 object2 + * @return both objects equal + */ + public static boolean equalTest(Object o1, Object o2) { + // both null + if (o1 == null && o2 == null) { + return true; + } + // just one null + if (o1 == null || o2 == null) { + return false; + } + + if (o1.equals(o2) != o2.equals(o1)) { + return false; + } + return o1.hashCode() == o2.hashCode(); + } } diff --git a/java/ivy.xml b/java/ivy.xml index f9c065e..159f947 100644 --- a/java/ivy.xml +++ b/java/ivy.xml @@ -45,7 +45,6 @@ <dependency org="redhat" name="mailapi" rev="1.3.1" /> <dependency org="redhat" name="redstone-xmlrpc" rev="1.1_20071120" /> <dependency org="redhat" name="redstone-xmlrpc-client" rev="1.1_20071120" /> - <dependency org="redhat" name="gsbase" rev="2.0.1" /> <dependency org="redhat" name="postgresql-jdbc" rev="8.1.407" /> <dependency org="redhat" name="mockobjects" rev="0.09" /> <dependency org="redhat" name="mockobjects-core" rev="0.09" /> diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 04629e1..f7e6b62 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -224,10 +224,8 @@ This package contains PostgreSQL database backend files for the Spacewalk Java. Summary: Test Classes for testing spacewalk-java Group: Applications/Internet -BuildRequires: gsbase BuildRequires: jmock Requires: jmock -Requires: gsbase %description tests This package contains testing files of spacewalk-java.

1 0

java/code
by Tomas Lestach 16 Mar '12

16 Mar '12

java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java | 11 +++----- java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java | 13 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) New commits: commit 8318f7ac448672c9a2e80070d3bafc1cc98dd426 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Mar 16 10:46:09 2012 +0100 726114 - update createOrUpradePath api documentation diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java index 85f1025..957b6be 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java @@ -380,9 +380,9 @@ public class ConfigChannelHandler extends BaseHandler { * #struct("path info") * #prop_desc("string","contents", * "Contents of the file (text or base64 encoded if binary). - * (ignored for directories)") + * (only for non-directories)") * #prop_desc("boolean","contents_enc64", "Identifies base64 encoded content - * (default: disabled).") + * (default: disabled, only for non-directories)") * #prop_desc("string", "owner", "Owner of the file/directory.") * #prop_desc("string", "group", "Group name of the file/directory.") * #prop_desc("string", "permissions", @@ -390,13 +390,12 @@ public class ConfigChannelHandler extends BaseHandler { * #prop_desc("string", "selinux_ctx", "SELinux Security context (optional)") * #prop_desc("string", "macro-start-delimiter", * "Config file macro start delimiter. Use null or empty - * string to accept the default. (ignored if working with a - * directory)") + * string to accept the default. (only for non-directories)") * #prop_desc("string", "macro-end-delimiter", * "Config file macro end delimiter. Use null or - * empty string to accept the default. (ignored if working with a directory)") + * empty string to accept the default. (only for non-directories)") * #prop_desc("int", "revision", "next revision number, auto increment for null") - * #prop_desc("boolean", "binary", "mark the binary content") + * #prop_desc("boolean", "binary", "mark the binary content, (only for non-directories)") * * #struct_end() * @xmlrpc.returntype diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java index e9b004d..78f9f37 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java @@ -130,24 +130,25 @@ public class ServerConfigHandler extends BaseHandler { * @xmlrpc.param * #struct("path info") * #prop_desc("string","contents", - * "Contents of the file (text or base64 encoded if binary). - * (ignored for directories)") + * "Contents of the file (text or base64 encoded if binary) + * ((only for non-directories)") * #prop_desc("boolean","contents_enc64", "Identifies base64 encoded content - * (default: disabled).") + * (default: disabled, only for non-directories).") * #prop_desc("string","owner", "Owner of the file/directory.") * #prop_desc("string","group", "Group name of the file/directory.") * #prop_desc("string","permissions", * "Octal file/directory permissions (eg: 644)") * #prop_desc("string","macro-start-delimiter", * "Config file macro end delimiter. Use null or empty string - * to accept the default. (ignored if working with a directory)") + * to accept the default. (only for non-directories)") * #prop_desc("string","macro-end-delimiter", * "Config file macro end delimiter. Use null or empty string - * to accept the default. (ignored if working with a directory)") + * to accept the default. (only for non-directories)") * #prop_desc("string","selinux_ctx", * "SeLinux context (optional)") * #prop_desc("int", "revision", "next revision number, auto increment for null") - * #prop_desc("boolean", "binary", "mark the binary content") + * #prop_desc("boolean", "binary", "mark the binary content, + * (only for non-directories)") * #struct_end() * @xmlrpc.param #param("int","commitToLocal") * #options()

1 0

Changes to 'refs/tags/spacewalk-java-1.8.17-1'
by Michael Mraka 16 Mar '12

16 Mar '12

Tag 'spacewalk-java-1.8.17-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-03-16 08:09 +0000 Tagging package [spacewalk-java] version [1.8.17-1] in directory [java/]. Changes since spacewalk-java-1.8.16-1: Michael Mraka (2): require checkstyle only if we run it Automatic commit of package [spacewalk-java] release [1.8.17-1]. --- java/spacewalk-java.spec | 15 ++++++++++++--- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) ---

1 0

2 commits - java/spacewalk-java.spec rel-eng/packages
by Michael Mraka 16 Mar '12

16 Mar '12

java/spacewalk-java.spec | 15 ++++++++++++--- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) New commits: commit 0796da50a517bd30d72d5ad5a079be1a295d64ca Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Mar 16 09:09:05 2012 +0100 Automatic commit of package [spacewalk-java] release [1.8.17-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index f363d80..04629e1 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.16 +Version: 1.8.17 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -595,6 +595,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Fri Mar 16 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.17-1 +- require checkstyle only if we run it + * Thu Mar 15 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.16-1 - rewrite unittest.xml (tlestach(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index d4ca009..48111c5 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.16-1 java/ +1.8.17-1 java/ commit a040bef0ff601ca0d649dcde7c32c9fcab9fa667 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Fri Mar 16 08:23:12 2012 +0100 require checkstyle only if we run it diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 3b5f9f7..f363d80 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -13,6 +13,11 @@ %define jardir %{_localstatedir}/lib/tomcat6/webapps/rhn/WEB-INF/lib %endif +%if 0%{?rhel} && 0%{?rhel} < 6 +# checkstyle is broken on Fedora 14 - we skip for now +%define run_checkstyle 1 +%endif + Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet @@ -99,7 +104,9 @@ BuildRequires: jpam BuildRequires: tanukiwrapper Requires: classpathx-mail BuildRequires: classpathx-mail +%if 0%{?run_checkstyle} BuildRequires: checkstyle +%endif # Sadly I need these to symlink the jars properly. BuildRequires: asm @@ -309,8 +316,7 @@ fi # compile only java sources (no packing here) ant -Dprefix=$RPM_BUILD_ROOT init-install compile -# checkstyle is broken on Fedora 14 - we skip for now -%if 0%{?rhel} && 0%{?rhel} < 6 +%if 0%{?run_checkstyle} echo "Running checkstyle on java main sources" export CLASSPATH="build/classes" export BASE_OPTIONS="-Djavadoc.method.scope=public \

1 0

Changes to 'refs/tags/spacewalk-java-1.8.16-1'
by Tomas Lestach 15 Mar '12

15 Mar '12

Tag 'spacewalk-java-1.8.16-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-03-15 18:24 +0000 Tagging package [spacewalk-java] version [1.8.16-1] in directory [java/]. Changes since spacewalk-java-1.8.15-1: Tomas Lestach (2): rewrite unittest.xml Automatic commit of package [spacewalk-java] release [1.8.16-1]. --- java/scripts/unittest.xml | 90 ++++++++++------------------------------ java/spacewalk-java.spec | 5 +- rel-eng/packages/spacewalk-java | 2 3 files changed, 29 insertions(+), 68 deletions(-) ---

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits March 2012