Branch 'master-bootstrap-css-fixes' - 25 commits - backend/satellite_tools backend/spacewalk-backend.spec branding/spacewalk-branding.spec java/code java/spacewalk-java.spec rel-eng/packages spacewalk/setup spec-tree/susestudio-java-client
by Silvio Moioli
backend/satellite_tools/repo_plugins/yum_src.py | 24 +
backend/satellite_tools/spacewalk-remove-channel | 20 -
backend/spacewalk-backend.spec | 5
branding/spacewalk-branding.spec | 7
java/code/src/com/redhat/rhn/domain/image/Image.java | 6
java/code/src/com/redhat/rhn/frontend/action/renderers/ImagesRenderer.java | 6
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 4
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4
java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 24 +
java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp | 8
java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp | 50 ++--
java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp | 12
java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp | 6
java/code/webapp/WEB-INF/pages/ssm/systems/errata-list-fragment.jspf | 104 ++++----
java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp | 2
java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp | 64 -----
java/code/webapp/WEB-INF/pages/systems/overview.jsp | 4
java/spacewalk-java.spec | 12
rel-eng/packages/spacewalk-backend | 2
rel-eng/packages/spacewalk-branding | 2
rel-eng/packages/spacewalk-java | 2
rel-eng/packages/spacewalk-setup | 2
rel-eng/packages/susestudio-java-client | 2
spacewalk/setup/lib/Spacewalk/Setup.pm | 90 -------
spacewalk/setup/share/oracle/install-db.sh | 96 -------
spacewalk/setup/share/oracle/remove-db.sh | 54 ----
spacewalk/setup/share/oracle/upgrade-db.sh | 121 ----------
spacewalk/setup/spacewalk-setup.spec | 11
spec-tree/susestudio-java-client/susestudio-java-client.spec | 19 -
44 files changed, 229 insertions(+), 592 deletions(-)
New commits:
commit aea5fa79d249ac46c75695a36fa353641c5d0819
Merge: e6f14aa 3ab093b
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Feb 6 15:57:35 2014 +0100
Merge branch 'master' into master-bootstrap-css-fixes
commit 3ab093bbe626be3052e80c2fe5763bbbb4444736
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Feb 6 11:06:13 2014 +0100
remove html formatting in other languages
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
index 5ec40f0..ae13b28 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
@@ -4854,11 +4854,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>সিস্টেমের আইকন</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> সিস্টেম দল প্রদর্শন </div> </a></target>
+ <target>সিস্টেম দল প্রদর্শন </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
index 8f1351c..cccd641 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
@@ -5402,11 +5402,11 @@ für diese Berechtigung, mit Ausnahme des Verbrauchs der Standardorganisation.</
<target>System-Icon</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> Systemgruppen ansehen </div> </a></target>
+ <target>Systemgruppen ansehen </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index 52c2a6a..9e31510 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -5401,11 +5401,11 @@ para este derecho, excluyendo el consumo de la organización predeterminada.</ta
<target>Icono de Sistema</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> Ver grupos de sistemas </div> </a></target>
+ <target>Ver grupos de sistemas </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
index 631e71b..c86a7b5 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
@@ -5402,11 +5402,11 @@ pour ce droit d'accès, moins la consommation par défaut de l'organisation.</ta
<target>Icône Système</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> Afficher les groupes de systèmes </div> </a></target>
+ <target>Afficher les groupes de systèmes </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
index 7fc60a9..d9c2cc6 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
@@ -4854,11 +4854,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>સિસ્ટમ ચિહ્ન</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> સિસ્ટમ જૂથો જુઓ </div> </a></target>
+ <target>સિસ્ટમ જૂથો જુઓ </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
index aa7b874..4943faa 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
@@ -4854,11 +4854,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>सिस्टम प्रतीक चिह्न</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> सिस्टम समूह देखें </div> </a></target>
+ <target>सिस्टम समूह देखें </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
index d527162..0dd09b7 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
@@ -5401,11 +5401,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>Icona sistema</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> Visualizza Gruppi di sistemi </div> </a></target>
+ <target>Visualizza Gruppi di sistemi </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
index 1e3e9f0..f0494f4 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
@@ -5403,11 +5403,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>システムアイコン</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> システムグループの表示 </div> </a></target>
+ <target>システムグループの表示 </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
index ee1eaef..231fcaf 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
@@ -5400,11 +5400,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>시스템 아이콘</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> 시스템 그룹 보기 </div> </a></target>
+ <target>시스템 그룹 보기 </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
index 60dd4e6..7434a89 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
@@ -4854,11 +4854,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>ਸਿਸਟਮ ਆਈਕਾਨ</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> ਸਿਸਟਮ ਗਰੁੱਪ ਵੇਖਾਓ </div> </a></target>
+ <target>ਸਿਸਟਮ ਗਰੁੱਪ ਵੇਖਾਓ </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
index 8737d43..68afda6 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
@@ -5399,11 +5399,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>Ícone Sistema</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> Ver Grupos de Sistemas </div> </a></target>
+ <target>Ver Grupos de Sistemas </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
index 1dedf1d..041f087 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
@@ -5398,11 +5398,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>Значок системы</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> Группы систем </div> </a></target>
+ <target>Группы систем </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
index 55fa52d..3bcc175 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
@@ -4854,11 +4854,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>கணினி சின்னம்</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> கணினி குழுக்களை பார்வையிடுதல் </div> </a></target>
+ <target>கணினி குழுக்களை பார்வையிடுதல் </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
index b930b6d..3ba18ca 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
@@ -5401,11 +5401,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>系统图标</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> 查看系统组群 </div> </a></target>
+ <target>查看系统组群 </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
index af0be3a..209b3ff 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
@@ -5398,11 +5398,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>系統圖示</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> 檢視系統群組 </div> </a></target>
+ <target>檢視系統群組 </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
commit 767df70a7db09c7d38f3c01122711e4c585ba1ec
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Feb 6 10:46:49 2014 +0100
remove html formatting from StringResources
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 3f5208c..1a453b2 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
@@ -4739,13 +4739,13 @@ value for this entitlement, excluding the default organization's consumption.</s
</context-group>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
</trans-unit>
<trans-unit id="overview.jsp.groups">
- <source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
+ <source>View Systems</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
diff --git a/java/code/webapp/WEB-INF/pages/systems/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/overview.jsp
index 16ea7bf..2004f64 100644
--- a/java/code/webapp/WEB-INF/pages/systems/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/overview.jsp
@@ -20,12 +20,12 @@
<rhn:csrf />
<rhn:submitted />
<c:if test="${not groups}">
- <bean:message key="overview.jsp.systems"/>
+ <a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <rhn:icon type="header-system-groups" /> <bean:message key="overview.jsp.systems"/> </div> </a>
<%@ include file="/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf" %>
</c:if>
<c:if test="${groups}">
- <h2><bean:message key="overview.jsp.groups"/></h2>
+ <a href="/rhn/systems/Overview.do?showgroups=false"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <rhn:icon type="header-system" /> <bean:message key="overview.jsp.groups"/> </div> </a>
<%@ include file="/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf" %>
</c:if>
</rl:listset>
commit 3e9d084838a1bc23646384040c353aac5fdd3afb
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Feb 6 10:30:10 2014 +0100
fix checkstyle
f72f426327a1006e215ab5e7cb39b7b3b24da410 caused the trouble
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index 8e27f61..ba76c0a 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -704,14 +704,16 @@ public class SystemHandler extends BaseHandler {
CPU cpu = server.getCpu();
if (cpu == null) {
m.put("cpu_info", new HashMap<String, String>());
- } else {
+ }
+ else {
m.put("cpu_info", cpu);
}
Dmi dmi = server.getDmi();
if (dmi == null) {
m.put("dmi_info", new HashMap<String, String>());
- } else {
+ }
+ else {
m.put("dmi_info", dmi);
}
commit 13dd9aa39c6cbcd874733a97d93c5423238e30be
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Wed Feb 5 15:48:56 2014 +0100
870990 - sw-rm-ch -l when satellite-sync runs.
diff --git a/backend/satellite_tools/spacewalk-remove-channel b/backend/satellite_tools/spacewalk-remove-channel
index 3ca931d..5b5380f 100755
--- a/backend/satellite_tools/spacewalk-remove-channel
+++ b/backend/satellite_tools/spacewalk-remove-channel
@@ -65,16 +65,6 @@ def main():
sys.stderr.write('ERROR: must be root to execute\n')
sys.exit(8)
- for command in ['spacewalk-remove-channel', 'satellite-sync',
- 'spacewalk-repo-sync']:
- try:
- LOCK.append(rhnLockfile.Lockfile(
- os.path.join(LOCK_DIR, "%s.pid" % command)))
- except rhnLockfile.LockfileLockedException:
- print("ERROR: An instance of %s is running, exiting." % command)
- sys.exit(-1)
-
-
global options_table
parser = OptionParser(option_list=options_table)
@@ -89,6 +79,16 @@ def main():
sys.stderr.write("Nothing to do\n")
sys.exit(0)
+ if not options.list:
+ for command in ['spacewalk-remove-channel', 'satellite-sync',
+ 'spacewalk-repo-sync']:
+ try:
+ LOCK.append(rhnLockfile.Lockfile(
+ os.path.join(LOCK_DIR, "%s.pid" % command)))
+ except rhnLockfile.LockfileLockedException:
+ print("ERROR: An instance of %s is running, exiting." % command)
+ sys.exit(-1)
+
initCFG('server')
initLOG("stdout", options.verbose or 0)
commit 4c4d0f5705374876e3d5180dcabda9aa19332adf
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Feb 6 09:42:41 2014 +0100
Automatic commit of package [spacewalk-setup] release [2.1.14-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 20b5986..34ef8b6 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-2.1.13-1 spacewalk/setup/
+2.1.14-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 6bcb109..10db632 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,7 +1,7 @@
%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
Name: spacewalk-setup
-Version: 2.1.13
+Version: 2.1.14
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -107,6 +107,9 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Thu Feb 06 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.14-1
+- removed embedded oracle code
+
* Wed Jan 29 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.13-1
- fixed typo in library path
- tomcat on RHEL5 and RHEL6 needs more parameters
commit 9be2a49e7aa531fc3ec0a7baca30ad7d6c8b0c17
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Feb 6 09:39:07 2014 +0100
removed embedded oracle code
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 32d3e74..5d3a475 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -1283,7 +1283,6 @@ sub oracle_setup_db {
oracle_check_for_users_and_groups($opts);
print loc("* Setting up database.\n");
- oracle_setup_embedded_db($opts, $answers);
oracle_setup_db_connection($opts, $answers);
oracle_test_db_settings($opts, $answers);
write_rhn_conf($answers, 'db-backend', 'db-name', 'db-user', 'db-password');
@@ -1302,95 +1301,6 @@ sub oracle_check_for_users_and_groups {
}
}
-sub oracle_setup_embedded_db {
- my $opts = shift;
- my $answers = shift;
-
- if (not is_embedded_db($opts)) {
- return 0;
- } else {
- $answers->{'db-user'} = 'rhnsat' if not defined $answers->{'db-user'};
- $answers->{'db-password'} = 'rhnsat' if not defined $answers->{'db-password'};
- $answers->{'db-name'} = 'rhnsat.world';
- $answers->{'db-host'} = 'localhost';
- $answers->{'db-port'} = 1521;
- }
-
-
- if ($opts->{'upgrade'}) {
- printf loc(<<EOQ, DB_UPGRADE_LOG_FILE);
-** Database: Upgrading the database server to latest Oracle 10g:
-** Database: This is a long process that is logged in:
-** Database: %s
-EOQ
- print_progress(-init_message => "*** Progress: #",
- -log_file_name => DB_UPGRADE_LOG_FILE,
- -log_file_size => DB_UPGRADE_LOG_SIZE,
- -err_message => "Could not upgrade database.\n",
- -err_code => 15,
- -system_opts => ['/sbin/runuser', 'oracle', '-c',
- SHARED_DIR . '/oracle/upgrade-db.sh' .
- " --user $answers->{'db-user'}"]);
-
- system_or_exit(['service', 'oracle', 'restart'], 41,
- 'Could not restart oracle service');
-
- return 0;
- }
-
- if ($opts->{"skip-db-install"} || $opts->{"upgrade"}) {
- print loc("** Database: Embedded database installation SKIPPED.\n");
-
- return 0;
- }
-
- if (-d "/rhnsat/data") {
- my $shared_dir = SHARED_DIR;
- print loc(<<EOQ);
-The embedded database appears to be already installed. Either rerun
-this script with the --skip-db-install option, or use the
-'$shared_dir/oracle/remove-db.sh' script to remove the embedded database and try
-again.
-EOQ
-
- exit 13;
- }
-
- if (not $opts->{"skip-db-diskspace-check"}) {
- system_or_exit(['python', SHARED_DIR .
- '/embedded_diskspace_check.py'], 14,
- 'There is not enough space available for the embedded database.');
- }
- else {
- print loc("** Database: Embedded database diskspace check SKIPPED!\n");
- }
-
- printf loc(<<EOQ, DB_INSTALL_LOG_FILE);
-** Database: Installing the database:
-** Database: This is a long process that is logged in:
-** Database: %s
-EOQ
-
- if (have_selinux()) {
- local *X; open X, '>', DB_INSTALL_LOG_FILE and close X;
- system('/sbin/restorecon', DB_INSTALL_LOG_FILE);
- }
- print_progress(-init_message => "*** Progress: #",
- -log_file_name => DB_INSTALL_LOG_FILE,
- -log_file_size => DB_INSTALL_LOG_SIZE,
- -err_message => "Could not install database.\n",
- -err_code => 15,
- -system_opts => [ SHARED_DIR . "/oracle/install-db.sh",
- "--user", $answers->{'db-user'}, "--password", $answers->{'db-password'}]);
-
- print loc("** Database: Installation complete.\n");
-
- sleep(5); # We need to sleep because sometimes the database doesn't
- # come back up fast enough.
-
- return 1;
-}
-
sub oracle_setup_db_connection {
my $opts = shift;
my $answers = shift;
diff --git a/spacewalk/setup/share/oracle/install-db.sh b/spacewalk/setup/share/oracle/install-db.sh
deleted file mode 100644
index 4a83eb8..0000000
--- a/spacewalk/setup/share/oracle/install-db.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-#
-# Installs/creates the RHN embedded database at mountpoint /rhnsat
-#
-#
-#
-# Copyright (c) 2008--2012 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.
-
-
-set -x
-
-# exit if anything fails
-set -e
-
-DB_NAME="rhnsat"
-DB_USER="rhnsat"
-DB_PASSWORD="rhnsat"
-
-if [ ${#} -gt 0 ]; then
- while [ -n "$1" ] ; do
- case $1 in
- -d | --db | --database )
- shift
- DB_NAME=$1
- ;;
- -u | --user* )
- shift
- DB_USER=$1
- ;;
- -p | --password )
- shift
- DB_PASSWORD=$1
- ;;
- * )
- exit -1
- ;;
- esac
- shift
- done
-fi
-
-# set oracle environment to embedded server
-ORAENV_ASK=NO
-ORACLE_SID=embedded
-export ORAENV_ASK ORACLE_SID
-. oraenv
-
-mkdir -p /rhnsat/data /rhnsat/admin
-chown -RL oracle:dba /rhnsat
-if selinuxenabled && semodule -l | grep '^oracle-rhnsat\b' ; then
- restorecon -rv /rhnsat
- RUNRESTORECON=--run-restorecon
-fi
-
-ORACLE_ADMIN_DIR=/opt/apps/oracle/admin/10.2.0
-export ORACLE_ADMIN_DIR
-
-/sbin/runuser - oracle -c "$ORACLE_ADMIN_DIR/create-db.sh --db $DB_NAME --user $DB_USER --password $DB_PASSWORD --datadir /rhnsat/data/rhnsat --admindir /rhnsat/admin/rhnsat --template $ORACLE_ADMIN_DIR/embedded-createdb.tmpl $RUNRESTORECON"
-
-LISTFILE=$ORACLE_HOME/network/admin/listener.ora
-
-cat > $LISTFILE <<EOF
-LISTENER=
- (DESCRIPTION=
- (ADDRESS_LIST=
- (ADDRESS = (PROTOCOL = TCP)(HOST = 127.0.0.1)(PORT = 1521))
- ))
-SID_LIST_LISTENER=
- (SID_LIST=
- (SID_DESC=
- (GLOBAL_DBNAME=$DB_NAME.world)
- (ORACLE_HOME=$ORACLE_HOME)
- (SID_NAME=$DB_NAME))
- )
-EOF
-
-chown oracle:dba $LISTFILE
-
-# add the service
-chkconfig --add oracle
-
-service oracle restart
-
-set +x
-
diff --git a/spacewalk/setup/share/oracle/remove-db.sh b/spacewalk/setup/share/oracle/remove-db.sh
deleted file mode 100644
index 1053d70..0000000
--- a/spacewalk/setup/share/oracle/remove-db.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# simply stop the oracle instance, nuke all the data associated with it,
-# and then remove the daemon
-#
-# WARNING: mere mortals should not use this script!
-#
-# usage: /bin/bash remove-db.sh
-#
-#
-#
-# 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.
-
-
-set -x
-
-# shut down the instance; stop the listener
-/sbin/service oracle stop
-
-# wipeout the data directories
-rm -rfv /rhnsat
-find ~oracle/config/ -type f | grep -i rhnsat | xargs rm -rfv
-
-# remove the service
-/sbin/chkconfig --del oracle
-
-# let's get violent! Kill all oracle processes!
-/sbin/runuser - oracle -c 'kill -9 -1'
-sleep 1
-
-# removing any remaining Semaphore Arrays (see ipcs -s)
-ipcs -s | perl -l -a -n -e 'print $F[1] if $F[2] =~ /oracle/ and $F[1] =~ /^[0-9]/ ' | xargs -n 1 -r ipcrm -s
-
-# removing any remaining Shared Memory Segments (see ipcs -m)
-ipcs -m | perl -l -a -n -e 'print $F[1] if $F[2] =~ /oracle/ and $F[1] =~ /^[0-9]/' | xargs -n 1 -r ipcrm -m
-
-set +x
-
-echo
-echo "WARNING: you may want to double check that shared memory and semaphore"
-echo " resources are cleared out for oracle via the ipcs and ipcrm"
-echo " commands"
-
diff --git a/spacewalk/setup/share/oracle/upgrade-db.sh b/spacewalk/setup/share/oracle/upgrade-db.sh
deleted file mode 100644
index 50f4202..0000000
--- a/spacewalk/setup/share/oracle/upgrade-db.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/sh
-# Upgrades RHN embedded database at mountpoint /rhnsat
-#
-# Copyright (c) 2008--2012 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.
-
-set -x
-
-# exit if anything fails
-set -e
-set -o pipefail
-
-DB_NAME="rhnsat"
-DB_USER="rhnsat"
-
-if [ ${#} -gt 0 ]; then
- while [ -n "$1" ] ; do
- case $1 in
- -d | --db | --database )
- shift
- DB_NAME=$1
- ;;
- -u | --user* )
- shift
- DB_USER=$1
- ;;
- * )
- exit -1
- ;;
- esac
- shift
- done
-fi
-
-if [ -r "$(dbhome embedded)/dbs/spfilerhnsat.ora" ]; then
- MAJOR_DB_UPGRADE=0
-else
- MAJOR_DB_UPGRADE=1
-fi
-
-# set oracle environment to embedded server
-ORAENV_ASK=NO
-ORACLE_SID=embedded
-ORACLE_BASE=/opt/apps/oracle
-. oraenv
-
-ORACLE_9I_HOME=$(echo $ORACLE_HOME | sed 's|10\.2\.0/db_1|9.2.0|')
-ORACLE_ADMIN_DIR=$ORACLE_BASE/admin/10.2.0
-ORACLE_ADMIN_9I_DIR=$ORACLE_BASE/admin/9.2.0
-ORACLE_CONFIG_DIR=$ORACLE_BASE/config/10.2.0
-ORACLE_CONFIG_9I_DIR=$ORACLE_BASE/config/9.2.0
-
-# change env to rhnsat instance
-export ORACLE_SID=$DB_NAME
-
-# If the record for satellite database exists, substitute it with new value.
-# Otherwise create a new record.
-if grep -q "^$ORACLE_SID:.*$" /etc/oratab; then
- # We cannot do in-place edit, since we're running under oracle user and
- # do not have write access to /etc
- oratab=$(sed "s;^$ORACLE_SID:.*$;$ORACLE_SID:$ORACLE_HOME:Y;" /etc/oratab)
- echo "$oratab" > /etc/oratab
-else
- echo "$ORACLE_SID:$ORACLE_HOME:Y" >> /etc/oratab
-fi
-
-. oraenv
-
-# modify listener
-LISTENER_ORA=network/admin/listener.ora
-[ -f $ORACLE_HOME/$LISTENER_ORA ] || \
-sed "s|\(ORACLE_HOME=.*\)|(ORACLE_HOME=$ORACLE_HOME)|" \
- $ORACLE_9I_HOME/$LISTENER_ORA >$ORACLE_HOME/$LISTENER_ORA
-
-# for 9i -> 10g upgrades, modify db init files
-if [ $MAJOR_DB_UPGRADE -gt 0 ]; then
- cp -a $ORACLE_CONFIG_9I_DIR/* $ORACLE_CONFIG_DIR/
- UPGRADE_PFILE=$ORACLE_CONFIG_DIR/upgrade-init$ORACLE_SID.ora
- cat $ORACLE_ADMIN_DIR/init-params.ora >$UPGRADE_PFILE
- grep --text -E -f - $ORACLE_CONFIG_9I_DIR/spfile$ORACLE_SID.ora \
- >>$UPGRADE_PFILE <<EOPATTERNS
-audit_file_dest
-background_dump_dest
-control_files
-core_dump_dest
-db_domain
-db_name
-instance_name
-user_dump_dest
-EOPATTERNS
- echo "compatible=10.2.0.4.0" >>$UPGRADE_PFILE
- $ORACLE_ADMIN_DIR/oracle-compute-sga.sh >>$UPGRADE_PFILE
-fi
-
-# upgrade the database
-if [ $MAJOR_DB_UPGRADE -gt 0 ]; then
- UPGRADE_TMPL=$ORACLE_ADMIN_DIR/embedded-upgradedb.tmpl
-else
- UPGRADE_TMPL=$ORACLE_ADMIN_DIR/embedded-upgradedb-10g.tmpl
-fi
-
-# sqlplus ... | cat ... is here to fool selinux, since oracle_sqlplus_t
-m4 -I$ORACLE_ADMIN_DIR \
- --define RHNORA_DBNAME=$ORACLE_SID \
- --define RHNORA_DATA_PATH=/rhnsat/data/rhnsat \
- --define RHNORA_DB_USER=$DB_USER \
- $UPGRADE_TMPL \
- | $ORACLE_HOME/bin/sqlplus /nolog \
- | cat -
-
-set +x
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index de3c12a..6bcb109 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -76,12 +76,6 @@ install -m 0644 share/defaults.d/defaults.conf %{buildroot}/%{_datadir}/spacewal
install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/cobbler
install -m 0644 share/cobbler/* %{buildroot}/%{_datadir}/spacewalk/setup/cobbler/
-# Oracle specific stuff, possible candidate for sub-package down the road:
-install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/oracle/
-install -m 0755 share/oracle/install-db.sh %{buildroot}/%{_datadir}/spacewalk/setup/oracle
-install -m 0755 share/oracle/remove-db.sh %{buildroot}/%{_datadir}/spacewalk/setup/oracle
-install -m 0755 share/oracle/upgrade-db.sh %{buildroot}/%{_datadir}/spacewalk/setup/oracle
-
# create a directory for misc. Spacewalk things
install -d -m 755 %{buildroot}/%{_var}/spacewalk
commit 06951de91ac6b28c3d86e6da5acc417c2ed4ccc6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Feb 6 08:50:31 2014 +0100
Automatic commit of package [spacewalk-branding] release [2.1.26-1].
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index c3f8ed6..3afea03 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -9,7 +9,7 @@
%endif
Name: spacewalk-branding
-Version: 2.1.25
+Version: 2.1.26
Release: 1%{?dist}
Summary: Spacewalk branding data
@@ -87,6 +87,11 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Thu Feb 06 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.26-1
+- fixed create probe page aligning
+- required field marker used to be red
+- password meter needs pwstrength-bootstrap
+
* Tue Feb 04 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.25-1
- help links are already hidden via spacewalk-help-link class
- move toolbar items right for all header levels
diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding
index 2b73635..389225b 100644
--- a/rel-eng/packages/spacewalk-branding
+++ b/rel-eng/packages/spacewalk-branding
@@ -1 +1 @@
-2.1.25-1 branding/
+2.1.26-1 branding/
commit 9b9fc68f02401500631292ae39320fa9aa039b90
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Feb 6 08:50:05 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.146-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b5b8d19..d6d0303 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: 2.1.145
+Version: 2.1.146
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Feb 06 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.146-1
+- patch to handle systems registered with the --nohardware flag
+- Patch code to build against susestudio-java-client version 0.1.4
+- render <thead> and <tr> in UnpagedListDisplayTag
+
* Wed Feb 05 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.145-1
- page layout fixes
- Generalized code so it can be used both with and without selectable column
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 893333a..3ce8d7a 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.145-1 java/
+2.1.146-1 java/
commit f72f426327a1006e215ab5e7cb39b7b3b24da410
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Wed Feb 5 17:39:55 2014 -0500
patch to handle systems registered with the --nohardware flag
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index d437a0b..8e27f61 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -697,10 +697,24 @@ public class SystemHandler extends BaseHandler {
m.put("id", server.getId());
m.put("name", server.getName());
m.put("last_checkin", convertLocalToUtc(server.getLastCheckin()));
- m.put("ram", server.getRam());
- m.put("swap", server.getSwap());
- m.put("cpu_info", server.getCpu());
- m.put("dmi_info", server.getDmi());
+
+ m.put("ram", new Long(server.getRam()));
+ m.put("swap", new Long(server.getSwap()));
+
+ CPU cpu = server.getCpu();
+ if (cpu == null) {
+ m.put("cpu_info", new HashMap<String, String>());
+ } else {
+ m.put("cpu_info", cpu);
+ }
+
+ Dmi dmi = server.getDmi();
+ if (dmi == null) {
+ m.put("dmi_info", new HashMap<String, String>());
+ } else {
+ m.put("dmi_info", dmi);
+ }
+
m.put("network_devices",
new ArrayList<NetworkInterface>(server
.getNetworkInterfaces()));
commit 0adf948720e345a215bebd37907182dd7e5cee50
Author: Aron Parsons <parsonsa(a)bit-sys.com>
Date: Wed Feb 5 14:22:33 2014 -0500
Automatic commit of package [spacewalk-backend] release [2.1.48-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 5eb9f0a..3715c99 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 2.1.47
+Version: 2.1.48
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -628,6 +628,9 @@ rm -f %{rhnconf}/rhnSecret.py*
%{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py*
%changelog
+* Wed Feb 05 2014 Aron Parsons <parsonsa(a)bit-sys.com> 2.1.48-1
+- apply exclude filters to dependencies in repo-sync
+
* Fri Jan 31 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.47-1
- 1058431 - don't remove files referenced from other distributions/trees
- 1058431 - propagate --skip-kickstart-trees to delete_channels()
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 8b88e28..a7d5481 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-2.1.47-1 backend/
+2.1.48-1 backend/
commit 469c698832a64541c5c99f3ad049b2803f542864
Author: Aron Parsons <parsonsa(a)bit-sys.com>
Date: Wed Feb 5 13:38:58 2014 -0500
apply exclude filters to dependencies in repo-sync
diff --git a/backend/satellite_tools/repo_plugins/yum_src.py b/backend/satellite_tools/repo_plugins/yum_src.py
index e4244e6..7c9bf8b 100644
--- a/backend/satellite_tools/repo_plugins/yum_src.py
+++ b/backend/satellite_tools/repo_plugins/yum_src.py
@@ -170,6 +170,9 @@ class ContentSource(object):
if filters:
pkglist = self._filter_packages(pkglist, filters)
pkglist = self._get_package_dependencies(self.sack, pkglist)
+
+ # do not pull in dependencies if they're explicitly excluded
+ pkglist = self._filter_packages(pkglist, filters, True)
self.num_excluded = self.num_packages - len(pkglist)
to_return = []
for pack in pkglist:
@@ -186,7 +189,7 @@ class ContentSource(object):
to_return.append(new_pack)
return to_return
- def _filter_packages(self, packages, filters):
+ def _filter_packages(self, packages, filters, exclude_only = False):
""" implement include / exclude logic
filters are: [ ('+', includelist1), ('-', excludelist1),
('+', includelist2), ... ]
@@ -196,7 +199,7 @@ class ContentSource(object):
selected = []
excluded = []
- if filters[0][0] == '-':
+ if exclude_only or filters[0][0] == '-':
# first filter is exclude, start with full package list
# and then exclude from it
selected = packages
@@ -206,14 +209,15 @@ class ContentSource(object):
for filter_item in filters:
sense, pkg_list = filter_item
if sense == '+':
- # include
- exactmatch, matched, _unmatched = yum.packages.parsePackages(
- excluded, pkg_list)
- allmatched = yum.misc.unique(exactmatch + matched)
- selected = yum.misc.unique(selected + allmatched)
- for pkg in allmatched:
- if pkg in excluded:
- excluded.remove(pkg)
+ if not exclude_only:
+ # include
+ exactmatch, matched, _unmatched = yum.packages.parsePackages(
+ excluded, pkg_list)
+ allmatched = yum.misc.unique(exactmatch + matched)
+ selected = yum.misc.unique(selected + allmatched)
+ for pkg in allmatched:
+ if pkg in excluded:
+ excluded.remove(pkg)
elif sense == '-':
# exclude
exactmatch, matched, _unmatched = yum.packages.parsePackages(
commit 79d6a7bec9b099c5a2b3d99f641cb26b2d32483e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 5 17:04:26 2014 +0100
Automatic commit of package [susestudio-java-client] minor release [0.1.4-2].
diff --git a/rel-eng/packages/susestudio-java-client b/rel-eng/packages/susestudio-java-client
index 007138d..2412f45 100644
--- a/rel-eng/packages/susestudio-java-client
+++ b/rel-eng/packages/susestudio-java-client
@@ -1 +1 @@
-0.1.4-1 spec-tree/susestudio-java-client/
+0.1.4-2 spec-tree/susestudio-java-client/
diff --git a/spec-tree/susestudio-java-client/susestudio-java-client.spec b/spec-tree/susestudio-java-client/susestudio-java-client.spec
index 0be3fef..c5a743c 100644
--- a/spec-tree/susestudio-java-client/susestudio-java-client.spec
+++ b/spec-tree/susestudio-java-client/susestudio-java-client.spec
@@ -17,7 +17,7 @@
Name: susestudio-java-client
Summary: Java client library for SUSE Studio
Version: 0.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
License: MIT
Group: Development/Libraries/Java
Url: https://github.com/susestudio/susestudio-lib-java
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
%{_javadir}/*.jar
%changelog
+* Wed Feb 05 2014 Michael Mraka <michael.mraka(a)redhat.com> 0.1.4-2
+- source file is named differently
+
* Wed Feb 05 2014 Michael Mraka <michael.mraka(a)redhat.com> 0.1.4-1
- Update susestudio-java-client spec file for building version 0.1.4
commit 7668b5b4edb8b2ebecfc05becfdd28aa846b0a67
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 5 16:58:54 2014 +0100
source file is named differently
diff --git a/spec-tree/susestudio-java-client/susestudio-java-client.spec b/spec-tree/susestudio-java-client/susestudio-java-client.spec
index b243f57..0be3fef 100644
--- a/spec-tree/susestudio-java-client/susestudio-java-client.spec
+++ b/spec-tree/susestudio-java-client/susestudio-java-client.spec
@@ -21,7 +21,7 @@ Release: 1%{?dist}
License: MIT
Group: Development/Libraries/Java
Url: https://github.com/susestudio/susestudio-lib-java
-Source0: %{name}-%{version}.tar.bz2
+Source0: https://github.com/susestudio/susestudio-lib-java/archive/v%{version}.tar...
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ant
BuildRequires: java-devel
@@ -38,7 +38,7 @@ Provides: java(com.suse.studio:susestudio-java-client) == %{version}
A Java client library for accessing SUSE Studio via its REST API.
%prep
-%setup
+%setup -n susestudio-lib-java-%{version}
rm lib/*.jar
build-jar-repository -p lib/ %third_party_jars
commit 3064d6aa81c9762a94ce92a5c20c7866baad44ae
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 5 16:49:00 2014 +0100
Automatic commit of package [susestudio-java-client] minor release [0.1.4-1].
diff --git a/rel-eng/packages/susestudio-java-client b/rel-eng/packages/susestudio-java-client
index d12ab2c..007138d 100644
--- a/rel-eng/packages/susestudio-java-client
+++ b/rel-eng/packages/susestudio-java-client
@@ -1 +1 @@
-0.1.2-2 spec-tree/susestudio-java-client/
+0.1.4-1 spec-tree/susestudio-java-client/
diff --git a/spec-tree/susestudio-java-client/susestudio-java-client.spec b/spec-tree/susestudio-java-client/susestudio-java-client.spec
index 99ca9de..b243f57 100644
--- a/spec-tree/susestudio-java-client/susestudio-java-client.spec
+++ b/spec-tree/susestudio-java-client/susestudio-java-client.spec
@@ -17,7 +17,7 @@
Name: susestudio-java-client
Summary: Java client library for SUSE Studio
Version: 0.1.4
-Release: 2%{?dist}
+Release: 1%{?dist}
License: MIT
Group: Development/Libraries/Java
Url: https://github.com/susestudio/susestudio-lib-java
@@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT
%{_javadir}/*.jar
%changelog
+* Wed Feb 05 2014 Michael Mraka <michael.mraka(a)redhat.com> 0.1.4-1
+- Update susestudio-java-client spec file for building version 0.1.4
+
* Tue Jan 07 2014 Tomas Lestach <tlestach(a)redhat.com> 0.1.2-2
- jpackage-utils were replaced with javapackages-tools in fc20
commit 363e9318ee3b282b960c09785db9eaa3763a2b9c
Author: Johannes Renner <jrenner(a)suse.de>
Date: Wed Feb 5 11:56:53 2014 +0100
Patch code to build against susestudio-java-client version 0.1.4
diff --git a/java/code/src/com/redhat/rhn/domain/image/Image.java b/java/code/src/com/redhat/rhn/domain/image/Image.java
index a3ad87c..47997d9 100644
--- a/java/code/src/com/redhat/rhn/domain/image/Image.java
+++ b/java/code/src/com/redhat/rhn/domain/image/Image.java
@@ -26,7 +26,7 @@ public class Image extends BaseDto implements Comparable<Image> {
private String name;
private String version;
private String arch;
- private String imageSize;
+ private int imageSize;
private String imageType;
private String downloadUrl;
private String editUrl;
@@ -100,7 +100,7 @@ public class Image extends BaseDto implements Comparable<Image> {
* Get the image size.
* @return image size
*/
- public String getImageSize() {
+ public int getImageSize() {
return this.imageSize;
}
@@ -108,7 +108,7 @@ public class Image extends BaseDto implements Comparable<Image> {
* Set the image size.
* @param imageSizeIn image size
*/
- public void setImageSize(String imageSizeIn) {
+ public void setImageSize(int imageSizeIn) {
this.imageSize = imageSizeIn;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/renderers/ImagesRenderer.java b/java/code/src/com/redhat/rhn/frontend/action/renderers/ImagesRenderer.java
index dea77e7..1a42d18 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/renderers/ImagesRenderer.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/renderers/ImagesRenderer.java
@@ -15,7 +15,6 @@
package com.redhat.rhn.frontend.action.renderers;
-import java.io.IOException;
import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -34,6 +33,7 @@ import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.listview.PageControl;
import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
import com.suse.studio.client.SUSEStudio;
+import com.suse.studio.client.exception.SUSEStudioException;
import com.suse.studio.client.model.Appliance;
import com.suse.studio.client.model.Build;
@@ -83,7 +83,7 @@ public class ImagesRenderer extends BaseFragmentRenderer {
throw re;
}
}
- catch (IOException e) {
+ catch (SUSEStudioException e) {
logger.error(e.getMessage());
request.setAttribute(ATTRIB_ERROR_MSG, "images.message.error.connection");
}
@@ -95,7 +95,7 @@ public class ImagesRenderer extends BaseFragmentRenderer {
* @return list of {@link Image} objects
*/
private List<Image> getImages(User user, HttpServletRequest request)
- throws IOException {
+ throws SUSEStudioException {
List<Appliance> appliances = new ArrayList<Appliance>();
// Lookup credentials and url
commit d15418e8144efa607888c0447f0677b987875ba6
Author: Johannes Renner <jrenner(a)suse.de>
Date: Wed Feb 5 11:55:17 2014 +0100
Update susestudio-java-client spec file for building version 0.1.4
diff --git a/spec-tree/susestudio-java-client/susestudio-java-client.spec b/spec-tree/susestudio-java-client/susestudio-java-client.spec
index 1965cb0..99ca9de 100644
--- a/spec-tree/susestudio-java-client/susestudio-java-client.spec
+++ b/spec-tree/susestudio-java-client/susestudio-java-client.spec
@@ -1,7 +1,7 @@
#
# spec file for package susestudio-java-client
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuremberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuremberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,14 +12,11 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
%define third_party_jars simple-xml
Name: susestudio-java-client
Summary: Java client library for SUSE Studio
-Version: 0.1.2
+Version: 0.1.4
Release: 2%{?dist}
License: MIT
Group: Development/Libraries/Java
@@ -46,7 +43,7 @@ rm lib/*.jar
build-jar-repository -p lib/ %third_party_jars
%build
-ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
+ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 dist-jar
%install
install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
commit 2dfb10ab40d2dfaa258aaf328322cba5934a9702
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Feb 5 16:22:47 2014 +0100
render <thead> and <tr> in UnpagedListDisplayTag
refactoring in 8a903238b768a45569e5c04cecc0ab3ddbfe0907 broke the stuff and html validators were complaining about missing tags for thead and tr - fixing it
diff --git a/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java b/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java
index 6572d0a..c159284 100644
--- a/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java
+++ b/java/code/src/com/redhat/rhn/frontend/taglibs/UnpagedListDisplayTag.java
@@ -291,6 +291,8 @@ public class UnpagedListDisplayTag extends ListDisplayTagBase {
out.println(">");
+ out.println("<thead>");
+ out.println("<tr>");
if (getIterator() != null && getIterator().hasNext()) {
// Push a new BodyContent writer onto the stack so that
commit b2ef58fc55383da6515694359f43879f2c1fdcea
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Feb 5 15:14:31 2014 +0100
use unstyled links
diff --git a/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp b/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp
index b72d1f0..b399c55 100644
--- a/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp
+++ b/java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp
@@ -49,9 +49,9 @@
</label>
<div class="col-lg-6">
<c:forEach items="${pack.channels}" var="channel">
- <a class="btn btn-info" href="/rhn/channels/ChannelDetail.do?cid=${channel.id}">
+ <a href="/rhn/channels/ChannelDetail.do?cid=${channel.id}">
${channel.name}
- </a>
+ </a><br/>
</c:forEach>
</div>
</div>
@@ -308,7 +308,7 @@
</label>
<div class="col-lg-6">
<c:forEach items="${erratum}" var="tmpErrata">
- <a class="btn btn-info" href="/rhn/errata/details/Details.do?eid=${tmpErrata.id}"><c:out value="${tmpErrata.advisory}" /></a>
+ <a href="/rhn/errata/details/Details.do?eid=${tmpErrata.id}"><c:out value="${tmpErrata.advisory}" /></a></br>
</c:forEach>
<c:if test="${erratumEmpty == true}">
<bean:message key="package.jsp.errataunavailable" />
commit 53e664e7dde69f1587fa614aa547cb4fd2b8548e
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Wed Feb 5 16:30:46 2014 +0100
Reuse code
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp
index b715fae..fcbcf97 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata.jsp
@@ -26,69 +26,7 @@
<rl:listset name="errataListSet" legend="errata">
<rhn:csrf />
<rhn:submitted />
- <rl:list name="errataList" styleclass="list"
- emptykey="erratalist.jsp.norelevanterrata" alphabarcolumn="advisorySynopsis">
- <rl:decorator name="ElaborationDecorator"/>
- <rl:decorator name="PageSizeDecorator"/>
- <rl:decorator name="SelectableDecorator"/>
-
- <rl:selectablecolumn value="${current.id}" selected="${current.selected}"
- disabled="${not current.selectable}" styleclass="first-column"/>
-
- <rl:column headerkey="erratalist.jsp.type" styleclass="text-align: center;" bound="false">
- <c:if test="${current.securityAdvisory}">
- <rhn:icon type="errata-security" />
- </c:if>
- <c:if test="${current.bugFix}">
- <rhn:icon type="errata-bugfix" />
- </c:if>
- <c:if test="${current.productEnhancement}">
- <rhn:icon type="errata-enhance" />
- </c:if>
- </rl:column>
-
- <rl:column headerkey="erratalist.jsp.advisory" bound="false" sortattr="advisoryName" sortable="true">
- <a href="/rhn/errata/details/Details.do?eid=${current.id}">${current.advisoryName}</a>
- </rl:column>
-
- <rl:column headerkey="erratalist.jsp.synopsis" bound="false" sortattr="advisorySynopsis"
- sortable="true" filterattr="advisorySynopsis">
- ${current.advisorySynopsis}
- </rl:column>
-
- <rl:column headerkey="errata.jsp.status" bound="false" sortattr="currentStatusAndActionId[0]" sortable="true">
- <c:if test="${not empty current.status}">
- <c:if test="${current.currentStatusAndActionId[0] == 'Queued'}">
- <a href="/rhn/schedule/ActionDetails.do?aid=${current.currentStatusAndActionId[1]}">
- <bean:message key="affectedsystems.jsp.pending"/>
- </a>
- </c:if>
- <c:if test="${current.currentStatusAndActionId[0] == 'Failed'}">
- <a href="/network/systems/details/history/event.pxt?sid=${param.sid}&hid=${current.currentStatusAndActionId[1]}">
- <bean:message key="actions.jsp.failed"/>
- </a>
- </c:if>
- <c:if test="${current.currentStatusAndActionId[0] == 'Picked Up'}">
- <a href="/network/systems/details/history/event.pxt?sid=${param.sid}&hid=${current.currentStatusAndActionId[1]}">
- <bean:message key="actions.jsp.pickedup"/>
- </a>
- </c:if>
- </c:if>
- <c:if test="${empty current.status}">
- <bean:message key="affectedsystems.jsp.none"/>
- </c:if>
- </rl:column>
-
- <rl:column headerkey="errata.jsp.affected" bound="false" sortattr="affectedSystemCount" sortable="true">
- <a href="/rhn/systems/ssm/ErrataSystemsAffected.do?eid=${current.id}">${current.affectedSystemCount}</a>
- </rl:column>
-
- <rl:column headerkey="erratalist.jsp.updated" bound="false" sortattr="updateDateObj"
- sortable="true" defaultsort="desc" styleclass="last-column">
- ${current.updateDate}
- </rl:column>
-
- </rl:list>
+<%@ include file="/WEB-INF/pages/ssm/systems/errata-list-fragment.jspf" %>
<div class="text-right">
<hr />
commit c03e3eef649e2925c0717771cbf5ab2c778dcc44
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 5 16:41:08 2014 +0100
Automatic commit of package [spacewalk-java] release [2.1.145-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 5553af4..b5b8d19 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: 2.1.144
+Version: 2.1.145
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -801,6 +801,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Feb 05 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.145-1
+- page layout fixes
+- Generalized code so it can be used both with and without selectable column
+- Generification of Listable
+
* Tue Feb 04 2014 Stephen Herr <sherr(a)redhat.com> 2.1.144-1
- 1061425 - Improve package search performance
- 1061425 - query performance improvement for package search
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index fd3a36a..893333a 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.144-1 java/
+2.1.145-1 java/
commit b04e871eefdf54c4c2cefaa0f53ce1dee045852e
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 5 16:24:36 2014 +0100
fixed entitlement orgs page layout
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp
index ab5ffad..fb7e45f 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/entitlementorgs.jsp
@@ -61,12 +61,12 @@
sortable="false"
headerkey="entitlementorgs.proposed_total">
<div class="row">
- <div class="col-lg-1">
+ <div class="col-lg-6">
<div class="input-group">
- <span class="input-group-btn">
- <html:text property="newCount_${current.orgid}" size="5" value="${current.total}"
+ <html:text property="newCount_${current.orgid}" size="5" value="${current.total}"
styleClass="form-control"
onkeydown="return blockEnter(event)" />
+ <span class="input-group-btn">
<html:submit styleClass="btn btn-info" onclick="this.form.orgClicked.value = '${current.orgid}'">
<bean:message key="entitlementorgs.update"/>
</html:submit>
@@ -99,7 +99,7 @@
<bean:message key="entitlementorgs.total_allocated"/>:
</label>
<div class="col-lg-6">
- <div class="well well-sm">
+ <div class="text">
${maxEnt}
</div>
<span class="help-block">
@@ -112,7 +112,7 @@
<bean:message key="entitlementorgs.total_inuse"/>:
</label>
<div class="col-lg-6">
- <div class="well well-sm">
+ <div class="text">
${curEnt}
</div>
</div>
@@ -122,7 +122,7 @@
<bean:message key="entitlementorgs.total_orguse"/>:
</label>
<div class="col-lg-6">
- <div class="well well-sm">
+ <div class="text">
<bean:message key="entitlementorgs.total_orgusedata"
arg0="${alloc}" arg1="${orgsnum}" arg2="${ratio}"/>
</div>
commit c08684eeba33bf67f4b394481e99c227c28d21a0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 5 15:33:12 2014 +0100
fixed org configuration page alignment
diff --git a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
index ade2c98..d8a1ce4 100644
--- a/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/multiorg/configuration.jsp
@@ -60,20 +60,25 @@ function modifyUploadCheckbox(checkbox) {
<rhn:submitted/>
<input type="hidden" name="oid" value="${param.oid}"/>
<div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <label>
+ <label class="col-lg-3 control-label">
+ <bean:message key="org-config.staging-content.jsp"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="checkbox">
<input type="checkbox" name="staging_content_enabled"
value="enabled" id="staging_content_enabled"
<c:if test = "${org.orgConfig.stagingContentEnabled}">
checked="checked"
</c:if>/>
- <bean:message key="org-config.staging-content.jsp"/>
- </label>
+ </div>
</div>
</div>
<div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <label>
+ <label class="col-lg-3 control-label">
+ <bean:message key="org-config.crash-reporting.jsp"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="checkbox">
<input type="checkbox"
name="crash_reporting_enabled"
value="enabled"
@@ -82,13 +87,15 @@ function modifyUploadCheckbox(checkbox) {
<c:if test = "${org.orgConfig.crashReportingEnabled}">
checked="checked"
</c:if>/>
- <bean:message key="org-config.crash-reporting.jsp"/>
- </label>
+ </div>
</div>
</div>
<div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <label>
+ <label class="col-lg-3 control-label">
+ <bean:message key="org-config.crashfile-upload.jsp"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="checkbox">
<input type="checkbox"
name="crashfile_upload_enabled"
value="enabled"
@@ -99,8 +106,7 @@ function modifyUploadCheckbox(checkbox) {
<c:if test = "${org.orgConfig.crashfileUploadEnabled}">
checked="checked"
</c:if>/>
- <bean:message key="org-config.crashfile-upload.jsp"/>
- </label>
+ </div>
</div>
</div>
<div class="form-group">
@@ -116,8 +122,11 @@ function modifyUploadCheckbox(checkbox) {
</div>
</div>
<div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <label>
+ <label class="col-lg-3 control-label">
+ <bean:message key="org-config.scapfile-upload.jsp"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="checkbox">
<input type="checkbox"
name="scapfile_upload_enabled"
value="enabled"
@@ -125,8 +134,7 @@ function modifyUploadCheckbox(checkbox) {
<c:if test = "${org.orgConfig.scapfileUploadEnabled}">
checked="checked"
</c:if>/>
- <bean:message key="org-config.scapfile-upload.jsp"/>
- </label>
+ </div>
</div>
</div>
<div class="form-group">
@@ -142,8 +150,11 @@ function modifyUploadCheckbox(checkbox) {
</div>
</div>
<div class="form-group">
- <div class="col-lg-offset-3 col-lg-6">
- <label>
+ <label class="col-lg-3 control-label">
+ <bean:message key="org-config.scap-retention"/>
+ </label>
+ <div class="col-lg-6">
+ <div class="checkbox">
<input type="checkbox"
name="scap_retention_set"
value="on"
@@ -152,8 +163,7 @@ function modifyUploadCheckbox(checkbox) {
<c:if test = "${org.orgConfig.scapRetentionPeriodDays != null}">
checked="checked"
</c:if>/>
- <bean:message key="org-config.scap-retention"/>
- </label>
+ </div>
</div>
</div>
<div class="form-group">
commit a77a50d4f88d7576619eccf15199615bf2c5e295
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Feb 5 15:22:24 2014 +0100
fixed suite / detail probe page alignment
diff --git a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp
index 0366746..4457f45 100644
--- a/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp
+++ b/java/code/webapp/WEB-INF/pages/admin/monitoring/config/probe-edit.jsp
@@ -39,14 +39,14 @@
<label class="col-lg-3 control-label">
<bean:message key="probeedit.jsp.probecommand" />
</label>
- <div class="col-lg-6">${probe.command.description}</div>
+ <div class="col-lg-6 text">${probe.command.description}</div>
</div>
<c:if test='${not empty probe.command.systemRequirements}'>
<div class="form-group">
<label class="col-lg-3 control-label">
<bean:message key="probeedit.jsp.commandrequirements" />
</label>
- <div class="col-lg-6">
+ <div class="col-lg-6 text">
<bean:message key="${probe.command.systemRequirements}"/>
</div>
</div>
@@ -56,7 +56,7 @@
<label class="col-lg-3 control-label">
<bean:message key="probeedit.jsp.versionsupport" />
</label>
- <div class="col-lg-6">${probe.command.versionSupport}</div>
+ <div class="col-lg-6 text">${probe.command.versionSupport}</div>
</div>
</c:if>
<div class="form-group">
@@ -76,9 +76,11 @@
<bean:message key="probeedit.jsp.notification" />
</label>
<div class="col-lg-6">
+ <div class="checkbox">
<html:checkbox onclick="refreshNotifFields()"
property="notification"
styleId="notification"/>
+ </div>
</div>
</div>
<div class="form-group">
commit 9fde26e397ae2131c20f73b9884fe9bc4f11d3fd
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Wed Feb 5 16:22:09 2014 +0100
Generalized code so it can be used both with and without selectable column
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/errata-list-fragment.jspf b/java/code/webapp/WEB-INF/pages/ssm/systems/errata-list-fragment.jspf
index 460b1b0..0217b07 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/errata-list-fragment.jspf
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/errata-list-fragment.jspf
@@ -6,60 +6,66 @@
<rl:list name="errataList" styleclass="list"
emptykey="erratalist.jsp.norelevanterrata" alphabarcolumn="advisorySynopsis">
- <rl:decorator name="ElaborationDecorator"/>
- <rl:decorator name="PageSizeDecorator"/>
+ <rl:decorator name="ElaborationDecorator" />
+ <rl:decorator name="PageSizeDecorator" />
- <rl:column headerkey="erratalist.jsp.type" styleclass="text-align: center;" bound="false">
- <c:if test="${current.securityAdvisory}">
- <rhn:icon type="errata-security" />
- </c:if>
- <c:if test="${current.bugFix}">
- <rhn:icon type="errata-bugfix" />
- </c:if>
- <c:if test="${current.productEnhancement}">
- <rhn:icon type="errata-enhance" />
- </c:if>
- </rl:column>
+ <c:if test="${empty notSelectable}">
+ <rl:decorator name="SelectableDecorator" />
+ <rl:selectablecolumn value="${current.id}" selected="${current.selected}"
+ disabled="${not current.selectable}" styleclass="first-column" />
+ </c:if>
- <rl:column headerkey="erratalist.jsp.advisory" bound="false" sortattr="advisoryName" sortable="true">
- <a href="/rhn/errata/details/Details.do?eid=${current.id}">${current.advisoryName}</a>
- </rl:column>
+ <rl:column headerkey="erratalist.jsp.type" styleclass="text-align: center;" bound="false">
+ <c:if test="${current.securityAdvisory}">
+ <rhn:icon type="errata-security" />
+ </c:if>
+ <c:if test="${current.bugFix}">
+ <rhn:icon type="errata-bugfix" />
+ </c:if>
+ <c:if test="${current.productEnhancement}">
+ <rhn:icon type="errata-enhance" />
+ </c:if>
+ </rl:column>
- <rl:column headerkey="erratalist.jsp.synopsis" bound="false" sortattr="advisorySynopsis"
- sortable="true" filterattr="advisorySynopsis">
- ${current.advisorySynopsis}
- </rl:column>
+ <rl:column headerkey="erratalist.jsp.advisory" bound="false" sortattr="advisoryName" sortable="true">
+ <a href="/rhn/errata/details/Details.do?eid=${current.id}">${current.advisoryName}</a>
+ </rl:column>
- <rl:column headerkey="errata.jsp.status" bound="false" sortattr="currentStatusAndActionId[0]" sortable="true">
- <c:if test="${not empty current.status}">
- <c:if test="${current.currentStatusAndActionId[0] == 'Queued'}">
- <a href="/rhn/schedule/ActionDetails.do?aid=${current.currentStatusAndActionId[1]}">
- <bean:message key="affectedsystems.jsp.pending"/>
- </a>
- </c:if>
- <c:if test="${current.currentStatusAndActionId[0] == 'Failed'}">
- <a href="/network/systems/details/history/event.pxt?sid=${param.sid}&hid=${current.currentStatusAndActionId[1]}">
- <bean:message key="actions.jsp.failed"/>
- </a>
- </c:if>
- <c:if test="${current.currentStatusAndActionId[0] == 'Picked Up'}">
- <a href="/network/systems/details/history/event.pxt?sid=${param.sid}&hid=${current.currentStatusAndActionId[1]}">
- <bean:message key="actions.jsp.pickedup"/>
- </a>
- </c:if>
- </c:if>
- <c:if test="${empty current.status}">
- <bean:message key="affectedsystems.jsp.none"/>
- </c:if>
- </rl:column>
+ <rl:column headerkey="erratalist.jsp.synopsis" bound="false" sortattr="advisorySynopsis"
+ sortable="true" filterattr="advisorySynopsis">
+ ${current.advisorySynopsis}
+ </rl:column>
- <rl:column headerkey="errata.jsp.affected" bound="false" sortattr="affectedSystemCount" sortable="true">
- <a href="/rhn/systems/ssm/ErrataSystemsAffected.do?eid=${current.id}">${current.affectedSystemCount}</a>
- </rl:column>
+ <rl:column headerkey="errata.jsp.status" bound="false" sortattr="currentStatusAndActionId[0]" sortable="true">
+ <c:if test="${not empty current.status}">
+ <c:if test="${current.currentStatusAndActionId[0] == 'Queued'}">
+ <a href="/rhn/schedule/ActionDetails.do?aid=${current.currentStatusAndActionId[1]}">
+ <bean:message key="affectedsystems.jsp.pending" />
+ </a>
+ </c:if>
+ <c:if test="${current.currentStatusAndActionId[0] == 'Failed'}">
+ <a href="/network/systems/details/history/event.pxt?sid=${param.sid}&hid=${current.currentStatusAndActionId[1]}">
+ <bean:message key="actions.jsp.failed" />
+ </a>
+ </c:if>
+ <c:if test="${current.currentStatusAndActionId[0] == 'Picked Up'}">
+ <a href="/network/systems/details/history/event.pxt?sid=${param.sid}&hid=${current.currentStatusAndActionId[1]}">
+ <bean:message key="actions.jsp.pickedup" />
+ </a>
+ </c:if>
+ </c:if>
+ <c:if test="${empty current.status}">
+ <bean:message key="affectedsystems.jsp.none" />
+ </c:if>
+ </rl:column>
- <rl:column headerkey="erratalist.jsp.updated" bound="false" sortattr="updateDateObj"
- sortable="true" defaultsort="desc" styleclass="last-column">
- ${current.updateDate}
- </rl:column>
+ <rl:column headerkey="errata.jsp.affected" bound="false" sortattr="affectedSystemCount" sortable="true">
+ <a href="/rhn/systems/ssm/ErrataSystemsAffected.do?eid=${current.id}">${current.affectedSystemCount}</a>
+ </rl:column>
+
+ <rl:column headerkey="erratalist.jsp.updated" bound="false" sortattr="updateDateObj"
+ sortable="true" defaultsort="desc" styleclass="last-column">
+ ${current.updateDate}
+ </rl:column>
</rl:list>
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp
index 5793e66..9fc24f7 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/ssm-errata-confirm.jsp
@@ -14,6 +14,8 @@
<rl:listset name="errataSet" legend="errata">
<rhn:csrf />
<rhn:submitted />
+
+<c:set var="notSelectable" value="True" />
<%@ include file="/WEB-INF/pages/ssm/systems/errata-list-fragment.jspf" %>
<table class="details" align="center">
10 years, 3 months
Changes to 'master-action-chaining'
by Silvio Moioli
New branch 'master-action-chaining' available with the following commits:
commit de753d979f8c0bceb1e77fe4f9176a802f5a7cbf
Author: Michael Calmer <mc(a)suse.de>
Date: Tue Jan 21 09:33:08 2014 +0100
make reboot_in_progress a public function
commit 4954b1ffaf9190232cc10272b257ffc3c6b0df3a
Author: Michael Calmer <mc(a)suse.de>
Date: Wed Feb 5 14:35:41 2014 +0100
add reboot action cleanup task
commit 098a32a47a9a3574d5a4f5341a00638e7dcc4847
Author: Michael Calmer <mc(a)suse.de>
Date: Wed Feb 5 14:31:56 2014 +0100
Implement task to invalidate reboot actions
If a client do not checkin 6 hours after the reboot was picked up
set the action to failed and all dependent actions too.
commit 8c7792a69b32ab4b697e2b71bfbbb0eb9090fc2a
Author: Michael Calmer <mc(a)suse.de>
Date: Fri Dec 20 16:33:52 2013 +0100
do not notify osad of a server which reboot is in progress
commit a9cc5b3c79ec7cb81d642d5ae98bcb8402a96138
Author: Michael Calmer <mc(a)suse.de>
Date: Fri Dec 20 16:27:54 2013 +0100
set reboot action status to sucess after the reboot
reboot action let the status stay on picked up
after the real reboot the update_status call set this action to success
commit c4e15765b1e01092c1d2979e9b58e157e5ab08e3
Author: Bo Maryniuk <bo(a)suse.de>
Date: Wed Feb 5 18:43:08 2014 +0100
Squashme: Fix according to the massive refactoring to ActionChainManager
commit fffc7b3d0e595b0ee48409946c40f9ab92391e37
Author: Bo Maryniuk <bo(a)suse.de>
Date: Wed Feb 5 18:17:19 2014 +0100
Added System reboot, added more API by ID
commit 2ae9cf5dea4a8b99e17d8bc413b89d57253b9460
Author: Bo Maryniuk <bo(a)suse.de>
Date: Tue Feb 4 19:25:28 2014 +0100
Added package install by ID
commit 7bf6157772982da663884100abbb1cf5e06e58a2
Author: Bo Maryniuk <bo(a)suse.de>
Date: Tue Feb 4 19:24:51 2014 +0100
Added package install by ID
commit de812371001f69d9201f38563f7e72ea65df369d
Author: Bo Maryniuk <bo(a)suse.de>
Date: Mon Feb 3 17:34:49 2014 +0100
Squachme: API is now accepts real server attributes - IP and name
commit 5ad8b1d76a5e51e4e02f28b89b6a6a318151e436
Author: Bo Maryniuk <bo(a)suse.de>
Date: Mon Feb 3 17:33:42 2014 +0100
Changed example to the new API interface
commit d9ab81b10836146291395ab70933aeafc93ecc16
Author: Bo Maryniuk <bo(a)suse.de>
Date: Fri Jan 31 19:27:18 2014 +0100
XML-RPC API: Action Chain initial implementation
commit cc2b28d31c5e94e124b435684112aa94af5cfbc5
Author: Bo Maryniuk <bo(a)suse.de>
Date: Thu Jan 30 20:48:17 2014 +0100
Added Action Chain listing and Action details API
commit 67586c6695eeae35b726f2e85d4bdbed1826c0d7
Author: Bo Maryniuk <bo(a)suse.de>
Date: Thu Jan 30 20:47:41 2014 +0100
Added an example of Action Chain API use
commit 96727e3907e009d42ba7c47ff8296bfcf963d967
Author: Bo Maryniuk <bo(a)suse.de>
Date: Thu Jan 30 19:36:40 2014 +0100
Squashme: Added single system update/install/remove/verify pkg by name
commit 6cb738001b6c4db3f606ba225bdb7222a83774ba
Author: Bo Maryniuk <bo(a)suse.de>
Date: Wed Jan 29 20:10:57 2014 +0100
Squashme: Added basic API. ToDO: finish data transformations.
commit 87099d8dfb3315ab0ea661f815810240d6033c68
Author: Bo Maryniuk <bo(a)suse.de>
Date: Fri Jan 24 19:40:47 2014 +0100
Squashme: ActionChain API
commit a27046ceb69d049cd1272248f492c541cad5edab
Author: Bo Maryniuk <bo(a)suse.de>
Date: Thu Jan 23 20:22:32 2014 +0100
TBD: Added ActionChainHandler
commit 7b987b4d3a83144ba2506f9154aca6fe4c120ba9
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Feb 6 15:45:00 2014 +0100
SSM package actions: allow queuing to Action Chains
commit 3696d7fedc3a3eb9b7b8222e9daefdba74b78581
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Feb 3 12:07:15 2014 +0100
Remove functionality to add remote command before a package action in SSM, it is superseded by Action Chains
commit 2c32456083178927a70080c6f28237d18a0efcbb
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 31 15:08:13 2014 +0100
Action Chain Edit page tests
commit 0fc964bcd29ac98d1d03f88072404d675fa05455
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 31 15:08:02 2014 +0100
Action Chain Edit page added
commit c5662d90d7a083a9b2e08d5623e9ff30a48a72cc
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 22 16:44:48 2014 +0100
Action Chain List page added
commit e029df8bf1dd7028b407d4f55e7c83bced35c8e2
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 20 18:21:11 2014 +0100
Reboot: use proper user messages
commit 952ef482353db74e952a214cba751028b2f149df
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 20 18:18:15 2014 +0100
Reboot: allow queuing to Action Chains
commit 24c7cd99899d7f8cb189f1e7ea20f61d67aacab8
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 20 18:00:37 2014 +0100
Deploy Configuration: use proper user message
commit 848075243c811a98168f218abee7f742b4484202
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 20 17:42:37 2014 +0100
Deploy Configuration: allow queuing to Action Chains
Also refactors ActionManager to extract some methods.
commit f273693842cf5e59f82908a7464aa72ccd96cc58
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 17 14:36:34 2014 +0100
Remote Command: use proper user message
commit 95ff50144c622ae294f2d740a2cd3b670d58641c
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 17 14:32:05 2014 +0100
Remote Command: allow queuing to Action Chains
Also refactors ActionManager to extract a method.
commit abddb7502092729903b8a7c63934d1ed2e5b4304
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 17 12:53:37 2014 +0100
Errata actions: use proper user message
commit ceb8ffd69865ec7f22fb3e29504451a89b5994f0
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Fri Jan 17 12:27:50 2014 +0100
Errata actions: allow queuing to Action Chains
commit 1f7d3b219b4e34b19b38a972481cf133fd6f44d6
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Jan 16 12:17:04 2014 +0100
Remove functionality to add remote command before a package action, it is superseded by Action Chains
commit 6cf2b2e2a464882b435ca02ed9177c0bfa93241e
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Jan 16 13:44:54 2014 +0100
Single system package actions: use proper user message
commit 3e346ca0870be8994ad1ec41f441373b7576dd28
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Thu Jan 16 09:23:45 2014 +0100
Single system package actions: allow queuing to Action Chains
- refactoring (method extractions) in ActionManager
- addition of ActionChainManager
- edits to struts Actions to handle action chain parameters
commit 2c5c849fbb218ec5296e5bff5a28fd572913a1d3
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 15 15:26:50 2014 +0100
Controller helper tests added
commit aba0bab17d4c2a781014168c8145a10cf090601c
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 15 15:26:38 2014 +0100
Controller helper class added
commit 4bc711d816623591af0b30952b14ddca8ccb3490
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Jan 14 16:17:48 2014 +0100
ORM class tests added
commit fb067b80dc2490e0aa3179fbad60df56c73b512b
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Jan 14 16:17:23 2014 +0100
ORM classes for new tables added
commit bb74cd1f586bd6154bd8e9b7fd551e4a4a278217
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 13 12:23:52 2014 +0100
New tables and upgrade scripts added
commit 85e396a6b65e307241788c6438a4028457a55c2f
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 22 13:37:27 2014 +0100
Front-end code for action chain creation/selection added
commit 2d587367774035a22da600717f1f00a32e959220
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 22 14:48:17 2014 +0100
Javascript library jQuery UI added
commit e688b219a403347f8b08edff2264c818793b29e2
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 22 13:37:55 2014 +0100
Javascript library select2 added
commit 6d710a71ddb7c2c32fa63dfb6cd7217e9189854f
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 27 10:54:01 2014 +0100
ActionFormatter: utility methods tests
commit 145c1d7efe52cbda41bd088fa47b2aa4c785b136
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Jan 27 09:10:19 2014 +0100
ActionFormatter: add utility methods
commit a6ac1c39311a301b17d9b3672849a4795b372a23
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Wed Jan 8 18:34:43 2014 +0100
Refactoring: use a fragment for scheduling options on supported operations
10 years, 3 months
2 commits - java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4 ++--
java/code/webapp/WEB-INF/pages/systems/overview.jsp | 4 ++--
17 files changed, 34 insertions(+), 34 deletions(-)
New commits:
commit 3ab093bbe626be3052e80c2fe5763bbbb4444736
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Feb 6 11:06:13 2014 +0100
remove html formatting in other languages
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
index 5ec40f0..ae13b28 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
@@ -4854,11 +4854,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>সিস্টেমের আইকন</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> সিস্টেম দল প্রদর্শন </div> </a></target>
+ <target>সিস্টেম দল প্রদর্শন </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
index 8f1351c..cccd641 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
@@ -5402,11 +5402,11 @@ für diese Berechtigung, mit Ausnahme des Verbrauchs der Standardorganisation.</
<target>System-Icon</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> Systemgruppen ansehen </div> </a></target>
+ <target>Systemgruppen ansehen </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index 52c2a6a..9e31510 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -5401,11 +5401,11 @@ para este derecho, excluyendo el consumo de la organización predeterminada.</ta
<target>Icono de Sistema</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> Ver grupos de sistemas </div> </a></target>
+ <target>Ver grupos de sistemas </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
index 631e71b..c86a7b5 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
@@ -5402,11 +5402,11 @@ pour ce droit d'accès, moins la consommation par défaut de l'organisation.</ta
<target>Icône Système</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> Afficher les groupes de systèmes </div> </a></target>
+ <target>Afficher les groupes de systèmes </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
index 7fc60a9..d9c2cc6 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
@@ -4854,11 +4854,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>સિસ્ટમ ચિહ્ન</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> સિસ્ટમ જૂથો જુઓ </div> </a></target>
+ <target>સિસ્ટમ જૂથો જુઓ </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
index aa7b874..4943faa 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
@@ -4854,11 +4854,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>सिस्टम प्रतीक चिह्न</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> सिस्टम समूह देखें </div> </a></target>
+ <target>सिस्टम समूह देखें </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
index d527162..0dd09b7 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
@@ -5401,11 +5401,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>Icona sistema</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> Visualizza Gruppi di sistemi </div> </a></target>
+ <target>Visualizza Gruppi di sistemi </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
index 1e3e9f0..f0494f4 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
@@ -5403,11 +5403,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>システムアイコン</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> システムグループの表示 </div> </a></target>
+ <target>システムグループの表示 </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
index ee1eaef..231fcaf 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
@@ -5400,11 +5400,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>시스템 아이콘</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> 시스템 그룹 보기 </div> </a></target>
+ <target>시스템 그룹 보기 </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
index 60dd4e6..7434a89 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
@@ -4854,11 +4854,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>ਸਿਸਟਮ ਆਈਕਾਨ</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> ਸਿਸਟਮ ਗਰੁੱਪ ਵੇਖਾਓ </div> </a></target>
+ <target>ਸਿਸਟਮ ਗਰੁੱਪ ਵੇਖਾਓ </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
index 8737d43..68afda6 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
@@ -5399,11 +5399,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>Ícone Sistema</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> Ver Grupos de Sistemas </div> </a></target>
+ <target>Ver Grupos de Sistemas </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
index 1dedf1d..041f087 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
@@ -5398,11 +5398,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>Значок системы</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> Группы систем </div> </a></target>
+ <target>Группы систем </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
index 55fa52d..3bcc175 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
@@ -4854,11 +4854,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>கணினி சின்னம்</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> கணினி குழுக்களை பார்வையிடுதல் </div> </a></target>
+ <target>கணினி குழுக்களை பார்வையிடுதல் </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
index b930b6d..3ba18ca 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
@@ -5401,11 +5401,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>系统图标</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> 查看系统组群 </div> </a></target>
+ <target>查看系统组群 </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
index af0be3a..209b3ff 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
@@ -5398,11 +5398,11 @@ value for this entitlement, excluding the default organization's consumption.</s
<target>系統圖示</target>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups </source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
- <target><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> 檢視系統群組 </div> </a></target>
+ <target>檢視系統群組 </target>
</trans-unit>
<trans-unit id="overview.jsp.groups">
<source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
commit 767df70a7db09c7d38f3c01122711e4c585ba1ec
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Feb 6 10:46:49 2014 +0100
remove html formatting from StringResources
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 3f5208c..1a453b2 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
@@ -4739,13 +4739,13 @@ value for this entitlement, excluding the default organization's consumption.</s
</context-group>
</trans-unit>
<trans-unit id="overview.jsp.systems">
- <source><a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <i class="spacewalk-icon-system-groups"> </i> View System Groups </div> </a></source>
+ <source>View System Groups</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
</trans-unit>
<trans-unit id="overview.jsp.groups">
- <source>System Groups (<a href="/rhn/systems/Overview.do?showgroups=false">View Systems</a>)</source>
+ <source>View Systems</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/systems/Overview</context>
</context-group>
diff --git a/java/code/webapp/WEB-INF/pages/systems/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/overview.jsp
index 16ea7bf..2004f64 100644
--- a/java/code/webapp/WEB-INF/pages/systems/overview.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/overview.jsp
@@ -20,12 +20,12 @@
<rhn:csrf />
<rhn:submitted />
<c:if test="${not groups}">
- <bean:message key="overview.jsp.systems"/>
+ <a href="/rhn/systems/Overview.do?showgroups=true"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <rhn:icon type="header-system-groups" /> <bean:message key="overview.jsp.systems"/> </div> </a>
<%@ include file="/WEB-INF/pages/common/fragments/systems/system_listdisplay.jspf" %>
</c:if>
<c:if test="${groups}">
- <h2><bean:message key="overview.jsp.groups"/></h2>
+ <a href="/rhn/systems/Overview.do?showgroups=false"> <div class="btn btn-default spacewalk-btn-margin-vertical"> <rhn:icon type="header-system" /> <bean:message key="overview.jsp.groups"/> </div> </a>
<%@ include file="/WEB-INF/pages/common/fragments/systems/group_listdisplay.jspf" %>
</c:if>
</rl:listset>
10 years, 3 months
java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
New commits:
commit 3e9d084838a1bc23646384040c353aac5fdd3afb
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Thu Feb 6 10:30:10 2014 +0100
fix checkstyle
f72f426327a1006e215ab5e7cb39b7b3b24da410 caused the trouble
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index 8e27f61..ba76c0a 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -704,14 +704,16 @@ public class SystemHandler extends BaseHandler {
CPU cpu = server.getCpu();
if (cpu == null) {
m.put("cpu_info", new HashMap<String, String>());
- } else {
+ }
+ else {
m.put("cpu_info", cpu);
}
Dmi dmi = server.getDmi();
if (dmi == null) {
m.put("dmi_info", new HashMap<String, String>());
- } else {
+ }
+ else {
m.put("dmi_info", dmi);
}
10 years, 3 months
backend/satellite_tools
by Michael Mraka
backend/satellite_tools/spacewalk-remove-channel | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 13dd9aa39c6cbcd874733a97d93c5423238e30be
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Wed Feb 5 15:48:56 2014 +0100
870990 - sw-rm-ch -l when satellite-sync runs.
diff --git a/backend/satellite_tools/spacewalk-remove-channel b/backend/satellite_tools/spacewalk-remove-channel
index 3ca931d..5b5380f 100755
--- a/backend/satellite_tools/spacewalk-remove-channel
+++ b/backend/satellite_tools/spacewalk-remove-channel
@@ -65,16 +65,6 @@ def main():
sys.stderr.write('ERROR: must be root to execute\n')
sys.exit(8)
- for command in ['spacewalk-remove-channel', 'satellite-sync',
- 'spacewalk-repo-sync']:
- try:
- LOCK.append(rhnLockfile.Lockfile(
- os.path.join(LOCK_DIR, "%s.pid" % command)))
- except rhnLockfile.LockfileLockedException:
- print("ERROR: An instance of %s is running, exiting." % command)
- sys.exit(-1)
-
-
global options_table
parser = OptionParser(option_list=options_table)
@@ -89,6 +79,16 @@ def main():
sys.stderr.write("Nothing to do\n")
sys.exit(0)
+ if not options.list:
+ for command in ['spacewalk-remove-channel', 'satellite-sync',
+ 'spacewalk-repo-sync']:
+ try:
+ LOCK.append(rhnLockfile.Lockfile(
+ os.path.join(LOCK_DIR, "%s.pid" % command)))
+ except rhnLockfile.LockfileLockedException:
+ print("ERROR: An instance of %s is running, exiting." % command)
+ sys.exit(-1)
+
initCFG('server')
initLOG("stdout", options.verbose or 0)
10 years, 3 months
Changes to 'refs/tags/spacewalk-setup-2.1.14-1'
by Michael Mraka
Tag 'spacewalk-setup-2.1.14-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2014-02-06 08:42 +0000
Tagging package [spacewalk-setup] version [2.1.14-1] in directory [spacewalk/setup/].
Changes since spacewalk-branding-2.1.26-1:
Michael Mraka (2):
removed embedded oracle code
Automatic commit of package [spacewalk-setup] release [2.1.14-1].
---
rel-eng/packages/spacewalk-setup | 2
spacewalk/setup/lib/Spacewalk/Setup.pm | 90 ---------------------
spacewalk/setup/share/oracle/install-db.sh | 96 -----------------------
spacewalk/setup/share/oracle/remove-db.sh | 54 ------------
spacewalk/setup/share/oracle/upgrade-db.sh | 121 -----------------------------
spacewalk/setup/spacewalk-setup.spec | 11 --
6 files changed, 5 insertions(+), 369 deletions(-)
---
10 years, 3 months
2 commits - rel-eng/packages spacewalk/setup
by Michael Mraka
rel-eng/packages/spacewalk-setup | 2
spacewalk/setup/lib/Spacewalk/Setup.pm | 90 ---------------------
spacewalk/setup/share/oracle/install-db.sh | 96 -----------------------
spacewalk/setup/share/oracle/remove-db.sh | 54 ------------
spacewalk/setup/share/oracle/upgrade-db.sh | 121 -----------------------------
spacewalk/setup/spacewalk-setup.spec | 11 --
6 files changed, 5 insertions(+), 369 deletions(-)
New commits:
commit 4c4d0f5705374876e3d5180dcabda9aa19332adf
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Feb 6 09:42:41 2014 +0100
Automatic commit of package [spacewalk-setup] release [2.1.14-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 20b5986..34ef8b6 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-2.1.13-1 spacewalk/setup/
+2.1.14-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 6bcb109..10db632 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,7 +1,7 @@
%{!?fedora: %global sbinpath /sbin}%{?fedora: %global sbinpath %{_sbindir}}
Name: spacewalk-setup
-Version: 2.1.13
+Version: 2.1.14
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -107,6 +107,9 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Thu Feb 06 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.14-1
+- removed embedded oracle code
+
* Wed Jan 29 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.13-1
- fixed typo in library path
- tomcat on RHEL5 and RHEL6 needs more parameters
commit 9be2a49e7aa531fc3ec0a7baca30ad7d6c8b0c17
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Feb 6 09:39:07 2014 +0100
removed embedded oracle code
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index 32d3e74..5d3a475 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -1283,7 +1283,6 @@ sub oracle_setup_db {
oracle_check_for_users_and_groups($opts);
print loc("* Setting up database.\n");
- oracle_setup_embedded_db($opts, $answers);
oracle_setup_db_connection($opts, $answers);
oracle_test_db_settings($opts, $answers);
write_rhn_conf($answers, 'db-backend', 'db-name', 'db-user', 'db-password');
@@ -1302,95 +1301,6 @@ sub oracle_check_for_users_and_groups {
}
}
-sub oracle_setup_embedded_db {
- my $opts = shift;
- my $answers = shift;
-
- if (not is_embedded_db($opts)) {
- return 0;
- } else {
- $answers->{'db-user'} = 'rhnsat' if not defined $answers->{'db-user'};
- $answers->{'db-password'} = 'rhnsat' if not defined $answers->{'db-password'};
- $answers->{'db-name'} = 'rhnsat.world';
- $answers->{'db-host'} = 'localhost';
- $answers->{'db-port'} = 1521;
- }
-
-
- if ($opts->{'upgrade'}) {
- printf loc(<<EOQ, DB_UPGRADE_LOG_FILE);
-** Database: Upgrading the database server to latest Oracle 10g:
-** Database: This is a long process that is logged in:
-** Database: %s
-EOQ
- print_progress(-init_message => "*** Progress: #",
- -log_file_name => DB_UPGRADE_LOG_FILE,
- -log_file_size => DB_UPGRADE_LOG_SIZE,
- -err_message => "Could not upgrade database.\n",
- -err_code => 15,
- -system_opts => ['/sbin/runuser', 'oracle', '-c',
- SHARED_DIR . '/oracle/upgrade-db.sh' .
- " --user $answers->{'db-user'}"]);
-
- system_or_exit(['service', 'oracle', 'restart'], 41,
- 'Could not restart oracle service');
-
- return 0;
- }
-
- if ($opts->{"skip-db-install"} || $opts->{"upgrade"}) {
- print loc("** Database: Embedded database installation SKIPPED.\n");
-
- return 0;
- }
-
- if (-d "/rhnsat/data") {
- my $shared_dir = SHARED_DIR;
- print loc(<<EOQ);
-The embedded database appears to be already installed. Either rerun
-this script with the --skip-db-install option, or use the
-'$shared_dir/oracle/remove-db.sh' script to remove the embedded database and try
-again.
-EOQ
-
- exit 13;
- }
-
- if (not $opts->{"skip-db-diskspace-check"}) {
- system_or_exit(['python', SHARED_DIR .
- '/embedded_diskspace_check.py'], 14,
- 'There is not enough space available for the embedded database.');
- }
- else {
- print loc("** Database: Embedded database diskspace check SKIPPED!\n");
- }
-
- printf loc(<<EOQ, DB_INSTALL_LOG_FILE);
-** Database: Installing the database:
-** Database: This is a long process that is logged in:
-** Database: %s
-EOQ
-
- if (have_selinux()) {
- local *X; open X, '>', DB_INSTALL_LOG_FILE and close X;
- system('/sbin/restorecon', DB_INSTALL_LOG_FILE);
- }
- print_progress(-init_message => "*** Progress: #",
- -log_file_name => DB_INSTALL_LOG_FILE,
- -log_file_size => DB_INSTALL_LOG_SIZE,
- -err_message => "Could not install database.\n",
- -err_code => 15,
- -system_opts => [ SHARED_DIR . "/oracle/install-db.sh",
- "--user", $answers->{'db-user'}, "--password", $answers->{'db-password'}]);
-
- print loc("** Database: Installation complete.\n");
-
- sleep(5); # We need to sleep because sometimes the database doesn't
- # come back up fast enough.
-
- return 1;
-}
-
sub oracle_setup_db_connection {
my $opts = shift;
my $answers = shift;
diff --git a/spacewalk/setup/share/oracle/install-db.sh b/spacewalk/setup/share/oracle/install-db.sh
deleted file mode 100644
index 4a83eb8..0000000
--- a/spacewalk/setup/share/oracle/install-db.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-#
-# Installs/creates the RHN embedded database at mountpoint /rhnsat
-#
-#
-#
-# Copyright (c) 2008--2012 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.
-
-
-set -x
-
-# exit if anything fails
-set -e
-
-DB_NAME="rhnsat"
-DB_USER="rhnsat"
-DB_PASSWORD="rhnsat"
-
-if [ ${#} -gt 0 ]; then
- while [ -n "$1" ] ; do
- case $1 in
- -d | --db | --database )
- shift
- DB_NAME=$1
- ;;
- -u | --user* )
- shift
- DB_USER=$1
- ;;
- -p | --password )
- shift
- DB_PASSWORD=$1
- ;;
- * )
- exit -1
- ;;
- esac
- shift
- done
-fi
-
-# set oracle environment to embedded server
-ORAENV_ASK=NO
-ORACLE_SID=embedded
-export ORAENV_ASK ORACLE_SID
-. oraenv
-
-mkdir -p /rhnsat/data /rhnsat/admin
-chown -RL oracle:dba /rhnsat
-if selinuxenabled && semodule -l | grep '^oracle-rhnsat\b' ; then
- restorecon -rv /rhnsat
- RUNRESTORECON=--run-restorecon
-fi
-
-ORACLE_ADMIN_DIR=/opt/apps/oracle/admin/10.2.0
-export ORACLE_ADMIN_DIR
-
-/sbin/runuser - oracle -c "$ORACLE_ADMIN_DIR/create-db.sh --db $DB_NAME --user $DB_USER --password $DB_PASSWORD --datadir /rhnsat/data/rhnsat --admindir /rhnsat/admin/rhnsat --template $ORACLE_ADMIN_DIR/embedded-createdb.tmpl $RUNRESTORECON"
-
-LISTFILE=$ORACLE_HOME/network/admin/listener.ora
-
-cat > $LISTFILE <<EOF
-LISTENER=
- (DESCRIPTION=
- (ADDRESS_LIST=
- (ADDRESS = (PROTOCOL = TCP)(HOST = 127.0.0.1)(PORT = 1521))
- ))
-SID_LIST_LISTENER=
- (SID_LIST=
- (SID_DESC=
- (GLOBAL_DBNAME=$DB_NAME.world)
- (ORACLE_HOME=$ORACLE_HOME)
- (SID_NAME=$DB_NAME))
- )
-EOF
-
-chown oracle:dba $LISTFILE
-
-# add the service
-chkconfig --add oracle
-
-service oracle restart
-
-set +x
-
diff --git a/spacewalk/setup/share/oracle/remove-db.sh b/spacewalk/setup/share/oracle/remove-db.sh
deleted file mode 100644
index 1053d70..0000000
--- a/spacewalk/setup/share/oracle/remove-db.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/sh
-#
-# simply stop the oracle instance, nuke all the data associated with it,
-# and then remove the daemon
-#
-# WARNING: mere mortals should not use this script!
-#
-# usage: /bin/bash remove-db.sh
-#
-#
-#
-# 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.
-
-
-set -x
-
-# shut down the instance; stop the listener
-/sbin/service oracle stop
-
-# wipeout the data directories
-rm -rfv /rhnsat
-find ~oracle/config/ -type f | grep -i rhnsat | xargs rm -rfv
-
-# remove the service
-/sbin/chkconfig --del oracle
-
-# let's get violent! Kill all oracle processes!
-/sbin/runuser - oracle -c 'kill -9 -1'
-sleep 1
-
-# removing any remaining Semaphore Arrays (see ipcs -s)
-ipcs -s | perl -l -a -n -e 'print $F[1] if $F[2] =~ /oracle/ and $F[1] =~ /^[0-9]/ ' | xargs -n 1 -r ipcrm -s
-
-# removing any remaining Shared Memory Segments (see ipcs -m)
-ipcs -m | perl -l -a -n -e 'print $F[1] if $F[2] =~ /oracle/ and $F[1] =~ /^[0-9]/' | xargs -n 1 -r ipcrm -m
-
-set +x
-
-echo
-echo "WARNING: you may want to double check that shared memory and semaphore"
-echo " resources are cleared out for oracle via the ipcs and ipcrm"
-echo " commands"
-
diff --git a/spacewalk/setup/share/oracle/upgrade-db.sh b/spacewalk/setup/share/oracle/upgrade-db.sh
deleted file mode 100644
index 50f4202..0000000
--- a/spacewalk/setup/share/oracle/upgrade-db.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/sh
-# Upgrades RHN embedded database at mountpoint /rhnsat
-#
-# Copyright (c) 2008--2012 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.
-
-set -x
-
-# exit if anything fails
-set -e
-set -o pipefail
-
-DB_NAME="rhnsat"
-DB_USER="rhnsat"
-
-if [ ${#} -gt 0 ]; then
- while [ -n "$1" ] ; do
- case $1 in
- -d | --db | --database )
- shift
- DB_NAME=$1
- ;;
- -u | --user* )
- shift
- DB_USER=$1
- ;;
- * )
- exit -1
- ;;
- esac
- shift
- done
-fi
-
-if [ -r "$(dbhome embedded)/dbs/spfilerhnsat.ora" ]; then
- MAJOR_DB_UPGRADE=0
-else
- MAJOR_DB_UPGRADE=1
-fi
-
-# set oracle environment to embedded server
-ORAENV_ASK=NO
-ORACLE_SID=embedded
-ORACLE_BASE=/opt/apps/oracle
-. oraenv
-
-ORACLE_9I_HOME=$(echo $ORACLE_HOME | sed 's|10\.2\.0/db_1|9.2.0|')
-ORACLE_ADMIN_DIR=$ORACLE_BASE/admin/10.2.0
-ORACLE_ADMIN_9I_DIR=$ORACLE_BASE/admin/9.2.0
-ORACLE_CONFIG_DIR=$ORACLE_BASE/config/10.2.0
-ORACLE_CONFIG_9I_DIR=$ORACLE_BASE/config/9.2.0
-
-# change env to rhnsat instance
-export ORACLE_SID=$DB_NAME
-
-# If the record for satellite database exists, substitute it with new value.
-# Otherwise create a new record.
-if grep -q "^$ORACLE_SID:.*$" /etc/oratab; then
- # We cannot do in-place edit, since we're running under oracle user and
- # do not have write access to /etc
- oratab=$(sed "s;^$ORACLE_SID:.*$;$ORACLE_SID:$ORACLE_HOME:Y;" /etc/oratab)
- echo "$oratab" > /etc/oratab
-else
- echo "$ORACLE_SID:$ORACLE_HOME:Y" >> /etc/oratab
-fi
-
-. oraenv
-
-# modify listener
-LISTENER_ORA=network/admin/listener.ora
-[ -f $ORACLE_HOME/$LISTENER_ORA ] || \
-sed "s|\(ORACLE_HOME=.*\)|(ORACLE_HOME=$ORACLE_HOME)|" \
- $ORACLE_9I_HOME/$LISTENER_ORA >$ORACLE_HOME/$LISTENER_ORA
-
-# for 9i -> 10g upgrades, modify db init files
-if [ $MAJOR_DB_UPGRADE -gt 0 ]; then
- cp -a $ORACLE_CONFIG_9I_DIR/* $ORACLE_CONFIG_DIR/
- UPGRADE_PFILE=$ORACLE_CONFIG_DIR/upgrade-init$ORACLE_SID.ora
- cat $ORACLE_ADMIN_DIR/init-params.ora >$UPGRADE_PFILE
- grep --text -E -f - $ORACLE_CONFIG_9I_DIR/spfile$ORACLE_SID.ora \
- >>$UPGRADE_PFILE <<EOPATTERNS
-audit_file_dest
-background_dump_dest
-control_files
-core_dump_dest
-db_domain
-db_name
-instance_name
-user_dump_dest
-EOPATTERNS
- echo "compatible=10.2.0.4.0" >>$UPGRADE_PFILE
- $ORACLE_ADMIN_DIR/oracle-compute-sga.sh >>$UPGRADE_PFILE
-fi
-
-# upgrade the database
-if [ $MAJOR_DB_UPGRADE -gt 0 ]; then
- UPGRADE_TMPL=$ORACLE_ADMIN_DIR/embedded-upgradedb.tmpl
-else
- UPGRADE_TMPL=$ORACLE_ADMIN_DIR/embedded-upgradedb-10g.tmpl
-fi
-
-# sqlplus ... | cat ... is here to fool selinux, since oracle_sqlplus_t
-m4 -I$ORACLE_ADMIN_DIR \
- --define RHNORA_DBNAME=$ORACLE_SID \
- --define RHNORA_DATA_PATH=/rhnsat/data/rhnsat \
- --define RHNORA_DB_USER=$DB_USER \
- $UPGRADE_TMPL \
- | $ORACLE_HOME/bin/sqlplus /nolog \
- | cat -
-
-set +x
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index de3c12a..6bcb109 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -76,12 +76,6 @@ install -m 0644 share/defaults.d/defaults.conf %{buildroot}/%{_datadir}/spacewal
install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/cobbler
install -m 0644 share/cobbler/* %{buildroot}/%{_datadir}/spacewalk/setup/cobbler/
-# Oracle specific stuff, possible candidate for sub-package down the road:
-install -d -m 755 %{buildroot}/%{_datadir}/spacewalk/setup/oracle/
-install -m 0755 share/oracle/install-db.sh %{buildroot}/%{_datadir}/spacewalk/setup/oracle
-install -m 0755 share/oracle/remove-db.sh %{buildroot}/%{_datadir}/spacewalk/setup/oracle
-install -m 0755 share/oracle/upgrade-db.sh %{buildroot}/%{_datadir}/spacewalk/setup/oracle
-
# create a directory for misc. Spacewalk things
install -d -m 755 %{buildroot}/%{_var}/spacewalk
10 years, 3 months
Changes to 'refs/tags/spacewalk-branding-2.1.26-1'
by Michael Mraka
Tag 'spacewalk-branding-2.1.26-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2014-02-06 07:50 +0000
Tagging package [spacewalk-branding] version [2.1.26-1] in directory [branding/].
Changes since spacewalk-java-2.1.146-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-branding] release [2.1.26-1].
---
branding/spacewalk-branding.spec | 7 ++++++-
rel-eng/packages/spacewalk-branding | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
---
10 years, 3 months
branding/spacewalk-branding.spec rel-eng/packages
by Michael Mraka
branding/spacewalk-branding.spec | 7 ++++++-
rel-eng/packages/spacewalk-branding | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 06951de91ac6b28c3d86e6da5acc417c2ed4ccc6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Feb 6 08:50:31 2014 +0100
Automatic commit of package [spacewalk-branding] release [2.1.26-1].
diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec
index c3f8ed6..3afea03 100644
--- a/branding/spacewalk-branding.spec
+++ b/branding/spacewalk-branding.spec
@@ -9,7 +9,7 @@
%endif
Name: spacewalk-branding
-Version: 2.1.25
+Version: 2.1.26
Release: 1%{?dist}
Summary: Spacewalk branding data
@@ -87,6 +87,11 @@ rm -rf %{buildroot}
%doc LICENSE
%changelog
+* Thu Feb 06 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.26-1
+- fixed create probe page aligning
+- required field marker used to be red
+- password meter needs pwstrength-bootstrap
+
* Tue Feb 04 2014 Michael Mraka <michael.mraka(a)redhat.com> 2.1.25-1
- help links are already hidden via spacewalk-help-link class
- move toolbar items right for all header levels
diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding
index 2b73635..389225b 100644
--- a/rel-eng/packages/spacewalk-branding
+++ b/rel-eng/packages/spacewalk-branding
@@ -1 +1 @@
-2.1.25-1 branding/
+2.1.26-1 branding/
10 years, 3 months