Branch 'VADER' - java/spacewalk-java.spec
by Partha Aji
java/spacewalk-java.spec | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
New commits:
commit 6bf67aa2175cb8d66afd392ad1d616bd51f171c5
Author: Partha Aji <paji(a)redhat.com>
Date: Mon Jun 29 15:57:40 2009 -0400
508736 - Corrected spec to properly set the cobbler/snippets/spacewalk symlink
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 6c8f28e..48648b9 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -3,6 +3,7 @@
%define cobprofdirup %{_localstatedir}/lib/rhn/kickstarts/upload
%define cobprofdirwiz %{_localstatedir}/lib/rhn/kickstarts/wizard
%define cobdirsnippets %{_localstatedir}/lib/rhn/kickstarts/snippets
+%define realcobsnippetsdir %{_localstatedir}/lib/cobbler/snippets
%define appdir %{_localstatedir}/lib/tomcat5/webapps
%define jardir %{_localstatedir}/lib/tomcat5/webapps/rhn/WEB-INF/lib
%define jars antlr asm bcel c3p0 cglib commons-beanutils commons-cli commons-codec commons-digester commons-discovery commons-el commons-io commons-fileupload commons-lang commons-logging commons-validator concurrent dom4j hibernate3 jaf jasper5-compiler jasper5-runtime javamail jcommon jdom jfreechart jspapi jpam log4j redstone-xmlrpc redstone-xmlrpc-client ojdbc14 oro oscache sitemesh struts taglibs-core taglibs-standard xalan-j2 xerces-j2 xml-commons-apis commons-collections
@@ -208,16 +209,14 @@ install -m 644 build/webapp/rhnjava/WEB-INF/lib/rhn.jar $RPM_BUILD_ROOT/%{_datad
install -m 644 conf/log4j.properties.taskomatic $RPM_BUILD_ROOT/%{_datadir}/rhn/classes/log4j.properties
ln -s -f /usr/sbin/tanukiwrapper $RPM_BUILD_ROOT/%{_bindir}/taskomaticd
ln -s -f %{_javadir}/ojdbc14.jar $RPM_BUILD_ROOT%{jardir}/ojdbc14.jar
-
+mkdir -p $RPM_BUILD_ROOT/%{realcobsnippetsdir}
+ln -s -f %{cobdirsnippets} $RPM_BUILD_ROOT/%{realcobsnippetsdir}/spacewalk
%clean
rm -rf $RPM_BUILD_ROOT
-%postun
-rm -f /var/lib/cobbler/snippets/spacewalk
-
-%post
-ln -s -f %{cobdirsnippets} /var/lib/cobbler/snippets/spacewalk
+%pre
+rm -f %{realcobsnippetsdir}/spacewalk
%post -n spacewalk-taskomatic
# This adds the proper /etc/rc*.d links for the script
@@ -238,6 +237,7 @@ fi
%dir %{cobdirsnippets}
%{appdir}/*
%config(noreplace) %{_sysconfdir}/tomcat5/Catalina/localhost/rhn.xml
+%{realcobsnippetsdir}/spacewalk
%files -n spacewalk-taskomatic
%attr(755, root, root) %{_initrddir}/taskomatic
14 years, 10 months
java/spacewalk-java.spec
by Partha Aji
java/spacewalk-java.spec | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
New commits:
commit f221ed3961b8e98dc2ec1089e0cb1e07837c8cc1
Author: Partha Aji <paji(a)redhat.com>
Date: Mon Jun 29 15:57:40 2009 -0400
508736 - Corrected spec to properly set the cobbler/snippets/spacewalk symlink
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 4a19631..22e3f09 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -3,6 +3,7 @@
%define cobprofdirup %{_localstatedir}/lib/rhn/kickstarts/upload
%define cobprofdirwiz %{_localstatedir}/lib/rhn/kickstarts/wizard
%define cobdirsnippets %{_localstatedir}/lib/rhn/kickstarts/snippets
+%define realcobsnippetsdir %{_localstatedir}/lib/cobbler/snippets
%define appdir %{_localstatedir}/lib/tomcat5/webapps
%define jardir %{_localstatedir}/lib/tomcat5/webapps/rhn/WEB-INF/lib
%define jars antlr asm bcel c3p0 cglib commons-beanutils commons-cli commons-codec commons-digester commons-discovery commons-el commons-io commons-fileupload commons-lang commons-logging commons-validator concurrent dom4j hibernate3 jaf jasper5-compiler jasper5-runtime javamail jcommon jdom jfreechart jspapi jpam log4j redstone-xmlrpc redstone-xmlrpc-client ojdbc14 oro oscache sitemesh struts taglibs-core taglibs-standard xalan-j2 xerces-j2 xml-commons-apis commons-collections
@@ -202,16 +203,14 @@ install -m 644 build/webapp/rhnjava/WEB-INF/lib/rhn.jar $RPM_BUILD_ROOT/%{_datad
install -m 644 conf/log4j.properties.taskomatic $RPM_BUILD_ROOT/%{_datadir}/rhn/classes/log4j.properties
ln -s -f /usr/sbin/tanukiwrapper $RPM_BUILD_ROOT/%{_bindir}/taskomaticd
ln -s -f %{_javadir}/ojdbc14.jar $RPM_BUILD_ROOT%{jardir}/ojdbc14.jar
-
+mkdir -p $RPM_BUILD_ROOT/%{realcobsnippetsdir}
+ln -s -f %{cobdirsnippets} $RPM_BUILD_ROOT/%{realcobsnippetsdir}/spacewalk
%clean
rm -rf $RPM_BUILD_ROOT
-%postun
-rm -f /var/lib/cobbler/snippets/spacewalk
-
-%post
-ln -s -f %{cobdirsnippets} /var/lib/cobbler/snippets/spacewalk
+%pre
+rm -f %{realcobsnippetsdir}/spacewalk
%post -n spacewalk-taskomatic
# This adds the proper /etc/rc*.d links for the script
@@ -232,6 +231,7 @@ fi
%dir %{cobdirsnippets}
%{appdir}/*
%config(noreplace) %{_sysconfdir}/tomcat5/Catalina/localhost/rhn.xml
+%{realcobsnippetsdir}/spacewalk
%files -n spacewalk-taskomatic
%attr(755, root, root) %{_initrddir}/taskomatic
@@ -497,6 +497,7 @@ fi
code had been ripped out, so i converted it to java (jsherril(a)redhat.com)
- 491361 - Added note to error messages to check the log for error messages. (jason.dobies(a)redhat.com)
- 500891 - fixed an unescaped string on snippets delete confirm page (paji(a)redhat.com)
+dually.rdu.redhat.com,10.11.228.46 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAt3L3QI0h+nKNrRIrd/Qj/l2aaPAtSk1O7smalVJZYLx8JCwmYLd+XzWc9b951l6zevxMIHfHRFjA2EwoJWKVzffNE/91RVs9jQ3M5289YX5VZbu6g/9PZ6gj5JG7EN+Q6h29iDhJ/LBrZb62ytXru+jBGMcoBoZggQ+nAtjZstZcOwlIOZ0ldLMJycsWV2aKXwhbVgowtE/evPuF+lF68Z4Fdfi/ScznuF7mQlHAnxQNEQCQojjqf37fgW8dQENIxoaFOJXOFjeW57X2HIgz0XX3ux3kgtGgmKvQanVRpISnUBnlEEXtDvYxO73mlTen+eS+wbyhF0Wkpg3OEWaTOQ==
- 500887 -Fix to not escape contents in cobbler snippet detials page (paji(a)redhat.com)
- 5/14 update of webui translation strings (shughes(a)redhat.com)
- 500727 - Just noticed this was flagged as NOTABUG since we don't want to
14 years, 10 months
Branch 'VADER' - java/code
by Brad Buckingham
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 5 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabilityException.java | 10 ++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java | 9 +++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java | 21 ++++++++--
4 files changed, 39 insertions(+), 6 deletions(-)
New commits:
commit d4ca5991386fbdfa060d95758fdece11f1a6909a
Author: Brad Buckingham <bbuckingham(a)redhat.com>
Date: Fri Jun 26 17:44:11 2009 -0400
508141 - api - system.config.deployAll updated w/ better exception when system not config capable
Updated the logic of the deployAll api to provide an error message consistent
with what the UI provides when the user attempts to deploy config files
to a system that is not capable of deploying files to. E.g. system
doesn't have tools channel and rhncfg* packages installed.
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 8db5c8a..a1d65ac 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
@@ -7676,7 +7676,10 @@ Follow this url to see the full list of inactive systems:
<source>Invalid profile label specified: {0}</source>
</trans-unit>
-
+ <trans-unit id="api.system.missingCapabilities">
+ <source>The server {0} does not have the {1} client capability. Please enable the capability before proceeding with the operation.</source>
+ </trans-unit>
+
<trans-unit id="api.systemgroup.serverNotInGroup">
<source>The specified server is not a member of the specified group</source>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabilityException.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabilityException.java
index 78ce5a9..ad7a01a 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabilityException.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabilityException.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.frontend.xmlrpc;
import com.redhat.rhn.FaultException;
+import com.redhat.rhn.domain.server.Server;
/**
* MissingCapabilityException
@@ -40,4 +41,13 @@ public class MissingCapabilityException extends FaultException {
super(2401, "missingCapability" , "Missing capability");
}
+ /**
+ * Constructor for exception on missing capability on a server.
+ * @param missingCapability the missing capability.
+ * @param incapableServer the server missing the capability
+ */
+ public MissingCapabilityException(String missingCapability, Server incapableServer) {
+ super(2401, "missingCapability", "api.system.missingCapabilities",
+ new Object[] {incapableServer.getHostname(), missingCapability});
+ }
}
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 886d8fc..cc738de 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
@@ -37,6 +37,7 @@ import com.redhat.rhn.frontend.xmlrpc.BaseHandler;
import com.redhat.rhn.frontend.xmlrpc.configchannel.XmlRpcConfigChannelHelper;
import com.redhat.rhn.frontend.xmlrpc.serializer.ConfigFileNameDtoSerializer;
import com.redhat.rhn.frontend.xmlrpc.system.XmlRpcSystemHelper;
+import com.redhat.rhn.manager.MissingCapabilityException;
import com.redhat.rhn.manager.configuration.ConfigurationManager;
@@ -318,7 +319,13 @@ public class ServerConfigHandler extends BaseHandler {
servers.add(helper.lookupServer(loggedInUser, sid));
}
ConfigurationManager manager = ConfigurationManager.getInstance();
- manager.deployConfiguration(loggedInUser, servers, date);
+ try {
+ manager.deployConfiguration(loggedInUser, servers, date);
+ }
+ catch (MissingCapabilityException e) {
+ throw new com.redhat.rhn.frontend.xmlrpc.MissingCapabilityException(
+ e.getCapability(), e.getServer());
+ }
return 1;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java
index 6559418..5510057 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java
@@ -73,9 +73,7 @@ public class ServerConfigHandlerTest extends BaseHandlerTestCase {
// gcc1 only
Server srv1 = ServerFactoryTest.createTestServer(regular, true,
ServerConstants.getServerGroupTypeProvisioningEntitled());
- SystemManagerTest.giveCapability(srv1.getId(),
- SystemManager.CAP_CONFIGFILES_DEPLOY, ver);
-
+
srv1.subscribe(gcc1);
srv1.subscribe(gcc2);
@@ -108,7 +106,22 @@ public class ServerConfigHandlerTest extends BaseHandlerTestCase {
// System 1 - both g1f1 and g1f2 should deploy here
List<Number> systems = new ArrayList<Number>();
systems.add(srv1.getId());
- Date date = new Date();
+ Date date = new Date();
+
+ try {
+ // validate that system must have config deployment capability
+ // in order to deploy config files... (e.g. rhncfg* pkgs installed)
+ handler.deployAll(regularKey, systems, date);
+
+ fail("Shouldn't be permitted to deploy without config deploy capability.");
+ }
+ catch (Exception e) {
+ // Success
+ }
+
+ SystemManagerTest.giveCapability(srv1.getId(),
+ SystemManager.CAP_CONFIGFILES_DEPLOY, ver);
+
handler.deployAll(regularKey, systems, date);
DataResult<ScheduledAction> actions = ActionManager.
14 years, 10 months
java/code
by Brad Buckingham
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 5 +-
java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabilityException.java | 10 ++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java | 9 +++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java | 21 ++++++++--
4 files changed, 39 insertions(+), 6 deletions(-)
New commits:
commit 3bc4c571c889c85bd038a06f08bed865f3aeff0f
Author: Brad Buckingham <bbuckingham(a)redhat.com>
Date: Fri Jun 26 17:44:11 2009 -0400
508141 - api - system.config.deployAll updated w/ better exception when system not config capable
Updated the logic of the deployAll api to provide an error message consistent
with what the UI provides when the user attempts to deploy config files
to a system that is not capable of deploying files to. E.g. system
doesn't have tools channel and rhncfg* packages installed.
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 8db5c8a..a1d65ac 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
@@ -7676,7 +7676,10 @@ Follow this url to see the full list of inactive systems:
<source>Invalid profile label specified: {0}</source>
</trans-unit>
-
+ <trans-unit id="api.system.missingCapabilities">
+ <source>The server {0} does not have the {1} client capability. Please enable the capability before proceeding with the operation.</source>
+ </trans-unit>
+
<trans-unit id="api.systemgroup.serverNotInGroup">
<source>The specified server is not a member of the specified group</source>
</trans-unit>
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabilityException.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabilityException.java
index 78ce5a9..ad7a01a 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabilityException.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/MissingCapabilityException.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.frontend.xmlrpc;
import com.redhat.rhn.FaultException;
+import com.redhat.rhn.domain.server.Server;
/**
* MissingCapabilityException
@@ -40,4 +41,13 @@ public class MissingCapabilityException extends FaultException {
super(2401, "missingCapability" , "Missing capability");
}
+ /**
+ * Constructor for exception on missing capability on a server.
+ * @param missingCapability the missing capability.
+ * @param incapableServer the server missing the capability
+ */
+ public MissingCapabilityException(String missingCapability, Server incapableServer) {
+ super(2401, "missingCapability", "api.system.missingCapabilities",
+ new Object[] {incapableServer.getHostname(), missingCapability});
+ }
}
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 886d8fc..cc738de 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
@@ -37,6 +37,7 @@ import com.redhat.rhn.frontend.xmlrpc.BaseHandler;
import com.redhat.rhn.frontend.xmlrpc.configchannel.XmlRpcConfigChannelHelper;
import com.redhat.rhn.frontend.xmlrpc.serializer.ConfigFileNameDtoSerializer;
import com.redhat.rhn.frontend.xmlrpc.system.XmlRpcSystemHelper;
+import com.redhat.rhn.manager.MissingCapabilityException;
import com.redhat.rhn.manager.configuration.ConfigurationManager;
@@ -318,7 +319,13 @@ public class ServerConfigHandler extends BaseHandler {
servers.add(helper.lookupServer(loggedInUser, sid));
}
ConfigurationManager manager = ConfigurationManager.getInstance();
- manager.deployConfiguration(loggedInUser, servers, date);
+ try {
+ manager.deployConfiguration(loggedInUser, servers, date);
+ }
+ catch (MissingCapabilityException e) {
+ throw new com.redhat.rhn.frontend.xmlrpc.MissingCapabilityException(
+ e.getCapability(), e.getServer());
+ }
return 1;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java
index 6559418..5510057 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/test/ServerConfigHandlerTest.java
@@ -73,9 +73,7 @@ public class ServerConfigHandlerTest extends BaseHandlerTestCase {
// gcc1 only
Server srv1 = ServerFactoryTest.createTestServer(regular, true,
ServerConstants.getServerGroupTypeProvisioningEntitled());
- SystemManagerTest.giveCapability(srv1.getId(),
- SystemManager.CAP_CONFIGFILES_DEPLOY, ver);
-
+
srv1.subscribe(gcc1);
srv1.subscribe(gcc2);
@@ -108,7 +106,22 @@ public class ServerConfigHandlerTest extends BaseHandlerTestCase {
// System 1 - both g1f1 and g1f2 should deploy here
List<Number> systems = new ArrayList<Number>();
systems.add(srv1.getId());
- Date date = new Date();
+ Date date = new Date();
+
+ try {
+ // validate that system must have config deployment capability
+ // in order to deploy config files... (e.g. rhncfg* pkgs installed)
+ handler.deployAll(regularKey, systems, date);
+
+ fail("Shouldn't be permitted to deploy without config deploy capability.");
+ }
+ catch (Exception e) {
+ // Success
+ }
+
+ SystemManagerTest.giveCapability(srv1.getId(),
+ SystemManager.CAP_CONFIGFILES_DEPLOY, ver);
+
handler.deployAll(regularKey, systems, date);
DataResult<ScheduledAction> actions = ActionManager.
14 years, 10 months
Branch 'sha256-support' - schema/spacewalk
by Pradeep Kilambi
schema/spacewalk/rhnsat/tables/rhnPackageFile.sql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/125-rhnChecksumType_data.sql | 2 --
schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/126-rhnpackage_checksum.sql | 2 --
schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/127-rhnPackageChecksum.sql | 1 -
4 files changed, 1 insertion(+), 6 deletions(-)
New commits:
commit e781fd425048e6310a1a765a1bbb13db2badc433
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Fri Jun 26 12:48:39 2009 -0400
Altering rhnPackageFile
- Rename md5 to checksum
- change the length to 128
diff --git a/schema/spacewalk/rhnsat/tables/rhnPackageFile.sql b/schema/spacewalk/rhnsat/tables/rhnPackageFile.sql
index 99de065..e4e3ec3 100644
--- a/schema/spacewalk/rhnsat/tables/rhnPackageFile.sql
+++ b/schema/spacewalk/rhnsat/tables/rhnPackageFile.sql
@@ -45,7 +45,7 @@ rhnPackageFile
constraint rhn_package_file_size_nn not null,
mtime date
constraint rhn_package_file_mtime_nn not null,
- md5 varchar2(32),
+ checksum varchar2(128),
linkto varchar2(256),
flags number
constraint rhn_package_file_flags_nn not null,
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/125-rhnChecksumType_data.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/125-rhnChecksumType_data.sql
index 990755b..53e4efc 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/125-rhnChecksumType_data.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/125-rhnChecksumType_data.sql
@@ -12,8 +12,6 @@ insert into rhnChecksumType (id, label, description) values
insert into rhnChecksumType (id, label, description) values
(rhn_checksum_id_seq.nextval, 'sha512', 'sha512' );
-commit;
-
--
--
-- Revision 1.1 2009/06/26 11:00:17 pkilambi
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/126-rhnpackage_checksum.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/126-rhnpackage_checksum.sql
index 3c74f2f..e0a887b 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/126-rhnpackage_checksum.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/126-rhnpackage_checksum.sql
@@ -2,5 +2,3 @@
drop index rhn_package_md5_oid_uq;
alter table rhnPackage drop column md5sum;
-show errors
-
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/127-rhnPackageChecksum.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/127-rhnPackageChecksum.sql
index 461888b..48b0de1 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/127-rhnPackageChecksum.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/127-rhnPackageChecksum.sql
@@ -40,7 +40,6 @@ create index rhn_pkgcsum_id_n_idx
alter table rhnPackageChecksum add constraint rhn_pkgcs_id_pk primary key ( package_id);
alter table rhnPackageChecksum add constraint rhn_pkgcs_id_uq unique ( package_id, checksum_type_id);
-
--
-- Revision 1.1 2009/06/26 10:37:16 pkilambi
--
14 years, 10 months
Branch 'sha256-support' - schema/spacewalk
by Pradeep Kilambi
schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/128-rhnPackageFile.sql | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit e8fbd9f9e95697369f70de285193066f46fee3d6
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Fri Jun 26 12:45:30 2009 -0400
Altering rhnPackageFile
- Rename md5 to checksum
- change the length to 128
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/128-rhnPackageFile.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/128-rhnPackageFile.sql
new file mode 100644
index 0000000..b57d281
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/128-rhnPackageFile.sql
@@ -0,0 +1,4 @@
+ALTER TABLE rhnPackageFile RENAME COLUMN md5 TO checksum;
+ALTER TABLE rhnPackageFile MODIFY checksum varchar(128);
+/
+show errors
14 years, 10 months
Branch 'VADER' - java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java | 3 ++-
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSystemCommand.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 7f194d40c841269a38edd90ee1cbdf1ae8d7d11b
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Jun 26 12:10:46 2009 -0400
508323 - fixing issue with creating cobbler system records with spaces (which would fail)
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
index 0ad2ca1..e6e3869 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
@@ -298,7 +298,8 @@ public class CobblerSystemCreateCommand extends CobblerCommand {
* @return String name of cobbler system record.
*/
public String getCobblerSystemRecordName() {
- return this.server.getName() + ":" +
+ String name = this.server.getName().replace(' ', '_');
+ return name + ":" +
this.server.getOrg().getId();
}
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSystemCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSystemCommand.java
index 69adcd2..0c265ae 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSystemCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSystemCommand.java
@@ -91,7 +91,7 @@ public class CobblerVirtualSystemCommand extends CobblerSystemCreateCommand {
*/
@Override
public String getCobblerSystemRecordName() {
- return super.getCobblerSystemRecordName() + ":" + guestName;
+ return super.getCobblerSystemRecordName() + ":" + guestName.replace(' ', '_');
}
@Override
14 years, 10 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java | 3 ++-
java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSystemCommand.java | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit a4fb92cb3a4b5a7b5761ed5c6cb8a8a36a55d4da
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Jun 26 12:10:46 2009 -0400
508323 - fixing issue with creating cobbler system records with spaces (which would fail)
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
index 0ad2ca1..e6e3869 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java
@@ -298,7 +298,8 @@ public class CobblerSystemCreateCommand extends CobblerCommand {
* @return String name of cobbler system record.
*/
public String getCobblerSystemRecordName() {
- return this.server.getName() + ":" +
+ String name = this.server.getName().replace(' ', '_');
+ return name + ":" +
this.server.getOrg().getId();
}
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSystemCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSystemCommand.java
index 69adcd2..0c265ae 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSystemCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerVirtualSystemCommand.java
@@ -91,7 +91,7 @@ public class CobblerVirtualSystemCommand extends CobblerSystemCreateCommand {
*/
@Override
public String getCobblerSystemRecordName() {
- return super.getCobblerSystemRecordName() + ":" + guestName;
+ return super.getCobblerSystemRecordName() + ":" + guestName.replace(' ', '_');
}
@Override
14 years, 10 months
Branch 'sha256-support' - schema/spacewalk
by Pradeep Kilambi
schema/spacewalk/rhnsat/tables/rhnChecksumType.sql | 61 ++++++++++
schema/spacewalk/rhnsat/tables/rhnChecksumType_data.sql | 38 ++++++
schema/spacewalk/rhnsat/tables/rhnPackage.sql | 9 -
schema/spacewalk/rhnsat/tables/rhnPackageChecksum.sql | 26 ++--
schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/124-rhnChecksumType.sql | 44 +++++++
schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/124-rhnPackageChecksum.sql | 27 ----
schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/125-rhnChecksumType_data.sql | 20 +++
schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/126-rhnpackage_checksum.sql | 4
schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/127-rhnPackageChecksum.sql | 46 +++++++
9 files changed, 225 insertions(+), 50 deletions(-)
New commits:
commit 35f393934af9b6eb0c73e4e5f3aa7a692598cd93
Author: Pradeep Kilambi <pkilambi(a)redhat.com>
Date: Fri Jun 26 11:55:14 2009 -0400
Schema changes for sha256 support
- New rhnChecksumtype to lookup the type of checksum
- New rhnPackageChecksum to associate package_id to hceksum type and cheksum
- Drop md5sum from rhnPackage and index on oergid and md5sum
diff --git a/schema/spacewalk/rhnsat/tables/rhnChecksumType.sql b/schema/spacewalk/rhnsat/tables/rhnChecksumType.sql
new file mode 100644
index 0000000..0132f65
--- /dev/null
+++ b/schema/spacewalk/rhnsat/tables/rhnChecksumType.sql
@@ -0,0 +1,61 @@
+--
+-- Copyright (c) 2009 Red Hat, Inc.
+--
+-- This software is licensed to you under the GNU General Public License,
+-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
+-- implied, including the implied warranties of MERCHANTABILITY or FITNESS
+-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+-- along with this software; if not, see
+-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+--
+-- Red Hat trademarks are not licensed under GPLv2. No permission is
+-- granted to use or replicate Red Hat trademarks that are incorporated
+-- in this software or its documentation.
+--
+--
+--
+--
+
+create sequence rhn_checksum_id_seq;
+
+create table
+rhnChecksumType
+(
+ id number
+ constraint rhn_checksumtype_id_nn not null,
+ label varchar2(32)
+ constraint rhn_checksumtype_label_nn not null,
+ description varchar2(64)
+ constraint rhn_checksumtype_desc_nn not null,
+ created date default(sysdate)
+ constraint rhn_checksumtype_creat_nn not null,
+ modified date default(sysdate)
+ constraint rhn_checksumtype_mod_nn not null
+)
+ enable row movement
+ ;
+
+create index rhn_checksumtype_label_id_idx
+ on rhnChecksumType( label, id )
+ tablespace [[64k_tbs]]
+ ;
+alter table rhnChecksumType add constraint rhn_checksumtype_id_pk
+ primary key ( id );
+alter table rhnChecksumType add constraint rhn_checksumtype_label_uq
+ unique ( label );
+
+create or replace trigger
+rhn_checksumtype_mod_trig
+before insert or update on rhnChecksumType
+for each row
+begin
+ :new.modified := sysdate;
+end;
+/
+show errors
+
+--
+--
+-- Revision 1.1 2009/06/26 10:39:17 pkilambi
+-- add schema to hold checksum types
+--
diff --git a/schema/spacewalk/rhnsat/tables/rhnChecksumType_data.sql b/schema/spacewalk/rhnsat/tables/rhnChecksumType_data.sql
new file mode 100644
index 0000000..106fa52
--- /dev/null
+++ b/schema/spacewalk/rhnsat/tables/rhnChecksumType_data.sql
@@ -0,0 +1,38 @@
+--
+-- Copyright (c) 2008 Red Hat, Inc.
+--
+-- This software is licensed to you under the GNU General Public License,
+-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
+-- implied, including the implied warranties of MERCHANTABILITY or FITNESS
+-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+-- along with this software; if not, see
+-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+--
+-- Red Hat trademarks are not licensed under GPLv2. No permission is
+-- granted to use or replicate Red Hat trademarks that are incorporated
+-- in this software or its documentation.
+--
+--
+--
+--
+
+
+insert into rhnChecksumType (id, label, description) values
+ (rhn_checksum_id_seq.nextval, 'md5', 'md5sum' );
+insert into rhnChecksumType (id, label, description) values
+ (rhn_checksum_id_seq.nextval, 'sha1', 'sha1' );
+insert into rhnChecksumType (id, label, description) values
+ (rhn_checksum_id_seq.nextval, 'sha224', 'sha224' );
+insert into rhnChecksumType (id, label, description) values
+ (rhn_checksum_id_seq.nextval, 'sha256', 'sha256' );
+insert into rhnChecksumType (id, label, description) values
+ (rhn_checksum_id_seq.nextval, 'sha384', 'sha384' );
+insert into rhnChecksumType (id, label, description) values
+ (rhn_checksum_id_seq.nextval, 'sha512', 'sha512' );
+
+commit;
+
+--
+--
+-- Revision 1.1 2009/06/26 11:00:17 pkilambi
+--
diff --git a/schema/spacewalk/rhnsat/tables/rhnPackage.sql b/schema/spacewalk/rhnsat/tables/rhnPackage.sql
index 96e2741..36db8d2 100644
--- a/schema/spacewalk/rhnsat/tables/rhnPackage.sql
+++ b/schema/spacewalk/rhnsat/tables/rhnPackage.sql
@@ -54,10 +54,6 @@ rhnPackage
source_rpm_id number
constraint rhn_package_srcrpmid_fk
references rhnSourceRPM(id),
- md5sum varchar2(64)
- constraint rhn_package_md5_nn not null,
- sha256 varchar2(256)
- constraint rhn_package_sha256_nn not null,
vendor varchar2(64)
constraint rhn_package_vendor_nn not null,
payload_format varchar2(32),
@@ -87,11 +83,6 @@ rhnPackage
create sequence rhn_package_id_seq;
-create unique index rhn_package_md5_oid_uq
- on rhnPackage(md5sum, org_id)
- tablespace [[2m_tbs]]
- ;
-
create index rhn_package_oid_id_idx
on rhnPackage(org_id, id)
tablespace [[64k_tbs]]
diff --git a/schema/spacewalk/rhnsat/tables/rhnPackageChecksum.sql b/schema/spacewalk/rhnsat/tables/rhnPackageChecksum.sql
index cc4b1e3..461888b 100644
--- a/schema/spacewalk/rhnsat/tables/rhnPackageChecksum.sql
+++ b/schema/spacewalk/rhnsat/tables/rhnPackageChecksum.sql
@@ -20,25 +20,27 @@
create table
rhnPackageChecksum
(
- package_id number
- constraint rhn_pkgcs_nn not null
- constraint rhn_pkgcs_id_fk
- references rhnPackage(id),
- md5sum varchar2(64)
- constraint rhn_pkgcs_md5_nn not null,
- sha256 varchar2(128)
- constraint rhn_pkgcs_sha256_nn not null
+ package_id number
+ constraint rhn_pkgcs_nn not null
+ constraint rhn_pkgcs_id_fk
+ references rhnPackage(id),
+ checksum_type_id number
+ constraint rhn_pkg_checksum_type_nn not null
+ constraint rhn_pkg_checksum_type_id_fk
+ references rhnChecksumType(id),
+ checksum varchar2(128)
+ constraint rhn_pkg_checksum_nn not null
)
enable row movement
;
-create index rhn_pkg_id_n_idx
- on rhnPackageChecksum (package_id, md5sum, sha256)
+create index rhn_pkgcsum_id_n_idx
+ on rhnPackageChecksum (package_id, checksum_type_id)
tablespace [[64k_tbs]];
alter table rhnPackageChecksum add constraint rhn_pkgcs_id_pk primary key ( package_id);
-alter table rhnPackageChecksum add constraint rhn_pkgcs_id_uq unique ( package_id, md5sum, sha256 );
+alter table rhnPackageChecksum add constraint rhn_pkgcs_id_uq unique ( package_id, checksum_type_id);
--
--- Revision 1.1 2009/06/19 00:37:16 pkilambi
+-- Revision 1.1 2009/06/26 10:37:16 pkilambi
--
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/124-rhnChecksumType.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/124-rhnChecksumType.sql
new file mode 100644
index 0000000..0467d6e
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/124-rhnChecksumType.sql
@@ -0,0 +1,44 @@
+
+create sequence rhn_checksum_id_seq;
+
+create table
+rhnChecksumType
+(
+ id number
+ constraint rhn_checksumtype_id_nn not null,
+ label varchar2(32)
+ constraint rhn_checksumtype_label_nn not null,
+ description varchar2(64)
+ constraint rhn_checksumtype_desc_nn not null,
+ created date default(sysdate)
+ constraint rhn_checksumtype_creat_nn not null,
+ modified date default(sysdate)
+ constraint rhn_checksumtype_mod_nn not null
+)
+ enable row movement
+ ;
+
+create index rhn_checksumtype_label_id_idx
+ on rhnChecksumType( label, id )
+ tablespace [[64k_tbs]]
+ ;
+alter table rhnChecksumType add constraint rhn_checksumtype_id_pk
+ primary key ( id );
+alter table rhnChecksumType add constraint rhn_checksumtype_label_uq
+ unique ( label );
+
+create or replace trigger
+rhn_checksumtype_mod_trig
+before insert or update on rhnChecksumType
+for each row
+begin
+ :new.modified := sysdate;
+end;
+/
+show errors
+
+--
+--
+-- Revision 1.1 2009/06/26 10:39:17 pkilambi
+-- add schema to hold checksum types
+--
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/124-rhnPackageChecksum.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/124-rhnPackageChecksum.sql
deleted file mode 100644
index f09ab87..0000000
--- a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/124-rhnPackageChecksum.sql
+++ /dev/null
@@ -1,27 +0,0 @@
--- The types of checksum associated with a package... md5sum, sha1, sha256...?
-
-create table
-rhnPackageChecksum
-(
- package_id number
- constraint rhn_pkgcs_nn not null
- constraint rhn_pkgcs_id_fk
- references rhnPackage(id),
- md5sum varchar2(64)
- constraint rhn_pkgcs_md5_nn not null,
- sha256 varchar2(128)
- constraint rhn_pkgcs_sha256_nn not null
-)
- enable row movement
- ;
-
-create index rhn_pkg_id_n_idx
- on rhnPackageChecksum (package_id, md5sum, sha256)
- tablespace [[64k_tbs]];
-
-alter table rhnPackageChecksum add constraint rhn_pkgcs_id_pk primary key ( package_id);
-alter table rhnPackageChecksum add constraint rhn_pkgcs_id_uq unique ( package_id, md5sum, sha256 );
-
---
--- Revision 1.1 2009/06/19 00:37:16 pkilambi
---
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/125-rhnChecksumType_data.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/125-rhnChecksumType_data.sql
new file mode 100644
index 0000000..990755b
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/125-rhnChecksumType_data.sql
@@ -0,0 +1,20 @@
+
+insert into rhnChecksumType (id, label, description) values
+ (rhn_checksum_id_seq.nextval, 'md5', 'md5sum' );
+insert into rhnChecksumType (id, label, description) values
+ (rhn_checksum_id_seq.nextval, 'sha1', 'sha1' );
+insert into rhnChecksumType (id, label, description) values
+ (rhn_checksum_id_seq.nextval, 'sha224', 'sha224' );
+insert into rhnChecksumType (id, label, description) values
+ (rhn_checksum_id_seq.nextval, 'sha256', 'sha256' );
+insert into rhnChecksumType (id, label, description) values
+ (rhn_checksum_id_seq.nextval, 'sha384', 'sha384' );
+insert into rhnChecksumType (id, label, description) values
+ (rhn_checksum_id_seq.nextval, 'sha512', 'sha512' );
+
+commit;
+
+--
+--
+-- Revision 1.1 2009/06/26 11:00:17 pkilambi
+--
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/126-rhnpackage_checksum.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/126-rhnpackage_checksum.sql
index b3a5ae1..3c74f2f 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/126-rhnpackage_checksum.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/126-rhnpackage_checksum.sql
@@ -1,6 +1,6 @@
-alter table rhnPackage add sha256 VARCHAR(128)
-CONSTRAINT rhn_package_sha256_nn not null;
+drop index rhn_package_md5_oid_uq;
+alter table rhnPackage drop column md5sum;
show errors
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/127-rhnPackageChecksum.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/127-rhnPackageChecksum.sql
new file mode 100644
index 0000000..461888b
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/127-rhnPackageChecksum.sql
@@ -0,0 +1,46 @@
+--
+-- Copyright (c) 2008 Red Hat, Inc.
+--
+-- This software is licensed to you under the GNU General Public License,
+-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
+-- implied, including the implied warranties of MERCHANTABILITY or FITNESS
+-- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+-- along with this software; if not, see
+-- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+--
+-- Red Hat trademarks are not licensed under GPLv2. No permission is
+-- granted to use or replicate Red Hat trademarks that are incorporated
+-- in this software or its documentation.
+--
+--
+--
+--
+-- The types of checksum associated with a package... md5sum, sha1, sha256...?
+
+create table
+rhnPackageChecksum
+(
+ package_id number
+ constraint rhn_pkgcs_nn not null
+ constraint rhn_pkgcs_id_fk
+ references rhnPackage(id),
+ checksum_type_id number
+ constraint rhn_pkg_checksum_type_nn not null
+ constraint rhn_pkg_checksum_type_id_fk
+ references rhnChecksumType(id),
+ checksum varchar2(128)
+ constraint rhn_pkg_checksum_nn not null
+)
+ enable row movement
+ ;
+
+create index rhn_pkgcsum_id_n_idx
+ on rhnPackageChecksum (package_id, checksum_type_id)
+ tablespace [[64k_tbs]];
+
+alter table rhnPackageChecksum add constraint rhn_pkgcs_id_pk primary key ( package_id);
+alter table rhnPackageChecksum add constraint rhn_pkgcs_id_uq unique ( package_id, checksum_type_id);
+
+--
+-- Revision 1.1 2009/06/26 10:37:16 pkilambi
+--
14 years, 10 months
Branch 'VADER' - java/code
by Shannon Hughes
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 969ddbe65f6a8ed70b381b4531a4790f1a5c365d
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Fri Jun 26 09:38:16 2009 -0400
508220 - fixed channel sharing syntax error on english side
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 7d7c840..5ad2ea2 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -11555,7 +11555,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro
</trans-unit>
<trans-unit id="channels.shared.jsp.header1">
- <source>The software channels listed below my be shared by your organization.</source>
+ <source>The software channels listed below may be shared by your organization.</source>
</trans-unit>
<trans-unit id="channels.custom.jsp.header1">
14 years, 10 months