[jboss-as/f19] Fixed wss4j and ass-user.sh issues
Marek Goldmann
goldmann at fedoraproject.org
Thu Sep 5 09:23:08 UTC 2013
commit 0d2e0dff42c6ec48157bf4b96369bf7d91963d19
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date: Thu Sep 5 09:00:06 2013 +0200
Fixed wss4j and ass-user.sh issues
- Fixed broken wss4j symlink, RHBZ#1000371
- add-user.sh script seem to be broken, RHBZ#999781
0001-fedora-Disable-checkstyle.patch | 3 +
...d-standalone-web.xml-example-configuratio.patch | 3 +
...-files-re-arrange-directory-with-init-scr.patch | 3 +
...OME-when-jboss-cli.sh-is-executed-through.patch | 3 +
...OSS_BASE_DIR-is-checked-in-standalone.sh-.patch | 3 +
0006-fedora-Remove-activation-module.patch | 3 +
0007-Use-properties-in-add-user-AS7-module.patch | 3 +
...rt-for-overriding-the-user-and-roles-prop.patch | 3 +
...d-user.sh-mangles-permissions-of-mgmt-use.patch | 3 +
...S7-4286-Fix-JavaCC-grammars-for-version-5.patch | 3 +
...ve-jasper-jdt-requirement-it-was-replaced.patch | 3 +
...emoved-unused-import-in-modcluster-module.patch | 3 +
...ora-Remove-org.osgi.enterprise-dependency.patch | 3 +
...-some-enforcer-exclusions-these-are-alias.patch | 3 +
...ve-jbossweb-native-dependency.-We-ll-have.patch | 3 +
...edora-Disable-checkstyle-in-testsuite-too.patch | 3 +
0017-fedora-Disable-testsuites.patch | 3 +
0018-fedora-Make-AS7-work-with-jython-2.2.1.patch | 3 +
...jtype-dependency-to-hibernate-validator-t.patch | 3 +
...che.openjpa-module.-This-allows-to-use-th.patch | 3 +
0021-fedora-Add-org.hibernate.3-module.patch | 3 +
...org.osgi-org.osgi.compendium-dependency-s.patch | 3 +
...dd-methods-for-creating-a-test-https-conn.patch | 3 +
...d-AS7-4890-upgrade-to-JBossWS-4.1.0.Beta1.patch | 3 +
...ve-javax.jws.api.-This-is-part-of-the-JDK.patch | 3 +
...ing-module-dependencies-in-mime4j-com.sun.patch | 3 +
...ve-still-unavailable-in-Fedora-dependenci.patch | 3 +
...ot-extract-jbossweb-native-it-s-symlinked.patch | 3 +
...w-to-launch-the-domain-mode-using-the-sys.patch | 2 +-
...754-Even-in-silent-mode-the-console-is-re.patch | 110 ++++++++++++++++++++
...061-Relax-the-early-console-check-and-upd.patch | 74 +++++++++++++
jboss-as.spec | 10 ++-
32 files changed, 277 insertions(+), 3 deletions(-)
---
diff --git a/0001-fedora-Disable-checkstyle.patch b/0001-fedora-Disable-checkstyle.patch
index 3515349..02c50f8 100644
--- a/0001-fedora-Disable-checkstyle.patch
+++ b/0001-fedora-Disable-checkstyle.patch
@@ -58,3 +58,6 @@ index 390e45e..036f99e 100644
<!-- Ban bad dependencies -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+--
+1.8.3.1
+
diff --git a/0002-fedora-Added-standalone-web.xml-example-configuratio.patch b/0002-fedora-Added-standalone-web.xml-example-configuratio.patch
index 9b00182..064dbc3 100644
--- a/0002-fedora-Added-standalone-web.xml-example-configuratio.patch
+++ b/0002-fedora-Added-standalone-web.xml-example-configuratio.patch
@@ -256,3 +256,6 @@ index 0000000..73276bc
+ </socket-binding-group>
+
+</server>
+--
+1.8.3.1
+
diff --git a/0003-Add-systemd-files-re-arrange-directory-with-init-scr.patch b/0003-Add-systemd-files-re-arrange-directory-with-init-scr.patch
index fb0b091..95d9043 100644
--- a/0003-Add-systemd-files-re-arrange-directory-with-init-scr.patch
+++ b/0003-Add-systemd-files-re-arrange-directory-with-init-scr.patch
@@ -483,3 +483,6 @@ index 364dd9e..a3c32da 100755
# For Cygwin, switch paths to Windows format before running java
if $cygwin; then
+--
+1.8.3.1
+
diff --git a/0004-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch b/0004-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch
index 73537b3..6408d21 100644
--- a/0004-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch
+++ b/0004-Fix-JBOSS_HOME-when-jboss-cli.sh-is-executed-through.patch
@@ -26,3 +26,6 @@ index a9d1c5d..a1108f5 100755
# OS specific support (must be 'true' or 'false').
cygwin=false;
+--
+1.8.3.1
+
diff --git a/0005-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch b/0005-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch
index 7c9f6ee..5ef69b0 100644
--- a/0005-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch
+++ b/0005-AS7-3800-JBOSS_BASE_DIR-is-checked-in-standalone.sh-.patch
@@ -28,3 +28,6 @@ index a3c32da..80b95c5 100755
"$@" "&"
JBOSS_PID=$!
# Trap common signals and relay them to the jboss process
+--
+1.8.3.1
+
diff --git a/0006-fedora-Remove-activation-module.patch b/0006-fedora-Remove-activation-module.patch
index 43fca6a..d88a130 100644
--- a/0006-fedora-Remove-activation-module.patch
+++ b/0006-fedora-Remove-activation-module.patch
@@ -249,3 +249,6 @@ index 036f99e..686a609 100644
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
<version>${version.javax.enterprise}</version>
+--
+1.8.3.1
+
diff --git a/0007-Use-properties-in-add-user-AS7-module.patch b/0007-Use-properties-in-add-user-AS7-module.patch
index 7ffb44e..aa72353 100644
--- a/0007-Use-properties-in-add-user-AS7-module.patch
+++ b/0007-Use-properties-in-add-user-AS7-module.patch
@@ -2524,3 +2524,6 @@ index 0000000..4c7d094
+
+}
\ No newline at end of file
+--
+1.8.3.1
+
diff --git a/0008-added-support-for-overriding-the-user-and-roles-prop.patch b/0008-added-support-for-overriding-the-user-and-roles-prop.patch
index e7efc48..89632e9 100644
--- a/0008-added-support-for-overriding-the-user-and-roles-prop.patch
+++ b/0008-added-support-for-overriding-the-user-and-roles-prop.patch
@@ -352,3 +352,6 @@ index 0000000..81689d1
+
+
+}
+--
+1.8.3.1
+
diff --git a/0009-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch b/0009-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch
index cf91d17..95a242a 100644
--- a/0009-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch
+++ b/0009-AS7-4536-add-user.sh-mangles-permissions-of-mgmt-use.patch
@@ -94,3 +94,6 @@ index 38737cb..9c4bad9 100644
private void safeClose(final Closeable c) {
try {
c.close();
+--
+1.8.3.1
+
diff --git a/0010-AS7-4286-Fix-JavaCC-grammars-for-version-5.patch b/0010-AS7-4286-Fix-JavaCC-grammars-for-version-5.patch
index f09a119..12d75b4 100644
--- a/0010-AS7-4286-Fix-JavaCC-grammars-for-version-5.patch
+++ b/0010-AS7-4286-Fix-JavaCC-grammars-for-version-5.patch
@@ -139,3 +139,6 @@ index 116f86b..51f996f 100644
+| < UNKNOWN_PATH: "UNKNOWN_PATH" >
+| < COLLECTION_VALUED_PATH: "COLLECTION_VALUED_PATH" >
+}
+--
+1.8.3.1
+
diff --git a/0011-fedora-Remove-jasper-jdt-requirement-it-was-replaced.patch b/0011-fedora-Remove-jasper-jdt-requirement-it-was-replaced.patch
index 8fb248c..746ec92 100644
--- a/0011-fedora-Remove-jasper-jdt-requirement-it-was-replaced.patch
+++ b/0011-fedora-Remove-jasper-jdt-requirement-it-was-replaced.patch
@@ -78,3 +78,6 @@ index d336f0d..ebd0b01 100644
</dependency>
<dependency>
+--
+1.8.3.1
+
diff --git a/0012-Removed-unused-import-in-modcluster-module.patch b/0012-Removed-unused-import-in-modcluster-module.patch
index 1a01a9a..51db33a 100644
--- a/0012-Removed-unused-import-in-modcluster-module.patch
+++ b/0012-Removed-unused-import-in-modcluster-module.patch
@@ -19,3 +19,6 @@ index 71cdff4..b00b073 100644
/**
* The managed subsystem add update.
+--
+1.8.3.1
+
diff --git a/0013-fedora-Remove-org.osgi.enterprise-dependency.patch b/0013-fedora-Remove-org.osgi.enterprise-dependency.patch
index 38bd58b..76fbb29 100644
--- a/0013-fedora-Remove-org.osgi.enterprise-dependency.patch
+++ b/0013-fedora-Remove-org.osgi.enterprise-dependency.patch
@@ -73,3 +73,6 @@ index fbd99b2..a1005c8 100644
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</dependency>
+--
+1.8.3.1
+
diff --git a/0014-fedora-Drop-some-enforcer-exclusions-these-are-alias.patch b/0014-fedora-Drop-some-enforcer-exclusions-these-are-alias.patch
index a5fe1bc..3098b63 100644
--- a/0014-fedora-Drop-some-enforcer-exclusions-these-are-alias.patch
+++ b/0014-fedora-Drop-some-enforcer-exclusions-these-are-alias.patch
@@ -40,3 +40,6 @@ index a7e6ee8..877b810 100644
</excludes>
</bannedDependencies>
</rules>
+--
+1.8.3.1
+
diff --git a/0015-fedora-Remove-jbossweb-native-dependency.-We-ll-have.patch b/0015-fedora-Remove-jbossweb-native-dependency.-We-ll-have.patch
index 433f38d..7e9e4c6 100644
--- a/0015-fedora-Remove-jbossweb-native-dependency.-We-ll-have.patch
+++ b/0015-fedora-Remove-jbossweb-native-dependency.-We-ll-have.patch
@@ -24,3 +24,6 @@ index ca99da8..a3af398 100644
<groupId>org.jboss.invocation</groupId>
<artifactId>jboss-invocation</artifactId>
</dependency>
+--
+1.8.3.1
+
diff --git a/0016-fedora-Disable-checkstyle-in-testsuite-too.patch b/0016-fedora-Disable-checkstyle-in-testsuite-too.patch
index e0ca9b7..b5718c4 100644
--- a/0016-fedora-Disable-checkstyle-in-testsuite-too.patch
+++ b/0016-fedora-Disable-checkstyle-in-testsuite-too.patch
@@ -47,3 +47,6 @@ index d1af58a..4124cb1 100644
<dependencies>
<dependency>
<groupId>org.jboss.as</groupId>
+--
+1.8.3.1
+
diff --git a/0017-fedora-Disable-testsuites.patch b/0017-fedora-Disable-testsuites.patch
index 4471692..e03a553 100644
--- a/0017-fedora-Disable-testsuites.patch
+++ b/0017-fedora-Disable-testsuites.patch
@@ -22,3 +22,6 @@ index 877b810..b131778 100644
</modules>
</profile>
</profiles>
+--
+1.8.3.1
+
diff --git a/0018-fedora-Make-AS7-work-with-jython-2.2.1.patch b/0018-fedora-Make-AS7-work-with-jython-2.2.1.patch
index 94a9655..942a27a 100644
--- a/0018-fedora-Make-AS7-work-with-jython-2.2.1.patch
+++ b/0018-fedora-Make-AS7-work-with-jython-2.2.1.patch
@@ -32,3 +32,6 @@ index d5981da..0059b4e 100644
}
/**
+--
+1.8.3.1
+
diff --git a/0019-fedora-Add-jtype-dependency-to-hibernate-validator-t.patch b/0019-fedora-Add-jtype-dependency-to-hibernate-validator-t.patch
index 556f6b6..db8c57c 100644
--- a/0019-fedora-Add-jtype-dependency-to-hibernate-validator-t.patch
+++ b/0019-fedora-Add-jtype-dependency-to-hibernate-validator-t.patch
@@ -119,3 +119,6 @@ index b131778..c3d3169 100644
<groupId>com.sun.faces</groupId>
<artifactId>jsf-impl</artifactId>
<version>${version.javax.faces.jsf-impl}</version>
+--
+1.8.3.1
+
diff --git a/0020-Add-org.apache.openjpa-module.-This-allows-to-use-th.patch b/0020-Add-org.apache.openjpa-module.-This-allows-to-use-th.patch
index 550714c..166c166 100644
--- a/0020-Add-org.apache.openjpa-module.-This-allows-to-use-th.patch
+++ b/0020-Add-org.apache.openjpa-module.-This-allows-to-use-th.patch
@@ -263,3 +263,6 @@ index c3d3169..538a3e3 100644
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
<version>${version.org.apache.neethi}</version>
+--
+1.8.3.1
+
diff --git a/0021-fedora-Add-org.hibernate.3-module.patch b/0021-fedora-Add-org.hibernate.3-module.patch
index ec3f34d..1e3b1d8 100644
--- a/0021-fedora-Add-org.hibernate.3-module.patch
+++ b/0021-fedora-Add-org.hibernate.3-module.patch
@@ -110,3 +110,6 @@ index 86564ec..45d4aaa 100644
</dependency>
<!-- Internal -->
+--
+1.8.3.1
+
diff --git a/0022-fedora-Add-org.osgi-org.osgi.compendium-dependency-s.patch b/0022-fedora-Add-org.osgi-org.osgi.compendium-dependency-s.patch
index c9d8972..a71d1db 100644
--- a/0022-fedora-Add-org.osgi-org.osgi.compendium-dependency-s.patch
+++ b/0022-fedora-Add-org.osgi-org.osgi.compendium-dependency-s.patch
@@ -56,3 +56,6 @@ index 538a3e3..897243b 100644
<groupId>org.picketbox</groupId>
<artifactId>picketbox</artifactId>
<version>${version.org.picketbox}</version>
+--
+1.8.3.1
+
diff --git a/0023-JBWS-3446-Add-methods-for-creating-a-test-https-conn.patch b/0023-JBWS-3446-Add-methods-for-creating-a-test-https-conn.patch
index 01e87e9..b97e0c2 100644
--- a/0023-JBWS-3446-Add-methods-for-creating-a-test-https-conn.patch
+++ b/0023-JBWS-3446-Add-methods-for-creating-a-test-https-conn.patch
@@ -114,3 +114,6 @@ index 4262fa1..0aac4d6 100644
private static String getSystemProperty(final String name, final String defaultValue) {
PrivilegedAction<String> action = new PrivilegedAction<String>() {
public String run() {
+--
+1.8.3.1
+
diff --git a/0024-Modified-AS7-4890-upgrade-to-JBossWS-4.1.0.Beta1.patch b/0024-Modified-AS7-4890-upgrade-to-JBossWS-4.1.0.Beta1.patch
index 00e35a1..1e33ae4 100644
--- a/0024-Modified-AS7-4890-upgrade-to-JBossWS-4.1.0.Beta1.patch
+++ b/0024-Modified-AS7-4890-upgrade-to-JBossWS-4.1.0.Beta1.patch
@@ -967,3 +967,6 @@ index 897243b..70c105e 100644
<artifactId>jbossws-native-services</artifactId>
<version>${version.org.jboss.ws.jbossws-native}</version>
</dependency>
+--
+1.8.3.1
+
diff --git a/0025-fedora-Remove-javax.jws.api.-This-is-part-of-the-JDK.patch b/0025-fedora-Remove-javax.jws.api.-This-is-part-of-the-JDK.patch
index 45987c6..3c70baa 100644
--- a/0025-fedora-Remove-javax.jws.api.-This-is-part-of-the-JDK.patch
+++ b/0025-fedora-Remove-javax.jws.api.-This-is-part-of-the-JDK.patch
@@ -233,3 +233,6 @@ index 114e769..23cf11d 100644
<!-- this is needed to ensure @Resource annotations on the JaxWS endpoint classes are in the
classloader scope-->
<module name="javax.annotation.api"/>
+--
+1.8.3.1
+
diff --git a/0026-fedora-Missing-module-dependencies-in-mime4j-com.sun.patch b/0026-fedora-Missing-module-dependencies-in-mime4j-com.sun.patch
index 587c28c..5234553 100644
--- a/0026-fedora-Missing-module-dependencies-in-mime4j-com.sun.patch
+++ b/0026-fedora-Missing-module-dependencies-in-mime4j-com.sun.patch
@@ -76,3 +76,6 @@ index 0e04923..65f3893 100644
<!-- Insert resources here -->
</resources>
+--
+1.8.3.1
+
diff --git a/0027-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch b/0027-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch
index 9b8555f..42ddb49 100644
--- a/0027-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch
+++ b/0027-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch
@@ -175,3 +175,6 @@ index 017f42b..83683e3 100644
<dependency>
<groupId>org.scannotation</groupId>
+--
+1.8.3.1
+
diff --git a/0028-fedora-Do-not-extract-jbossweb-native-it-s-symlinked.patch b/0028-fedora-Do-not-extract-jbossweb-native-it-s-symlinked.patch
index 44e8e48..b2ddebf 100644
--- a/0028-fedora-Do-not-extract-jbossweb-native-it-s-symlinked.patch
+++ b/0028-fedora-Do-not-extract-jbossweb-native-it-s-symlinked.patch
@@ -21,3 +21,6 @@ index 425bc63..550ac83 100644
</module-def>
<module-def name="org.jboss.as.webservices">
+--
+1.8.3.1
+
diff --git a/0029-fedora-Allow-to-launch-the-domain-mode-using-the-sys.patch b/0029-fedora-Allow-to-launch-the-domain-mode-using-the-sys.patch
index 803820c..ef6a941 100644
--- a/0029-fedora-Allow-to-launch-the-domain-mode-using-the-sys.patch
+++ b/0029-fedora-Allow-to-launch-the-domain-mode-using-the-sys.patch
@@ -57,5 +57,5 @@ index 0000000..3bc76a3
+fi
+
--
-1.8.1.4
+1.8.3.1
diff --git a/0030-PATCH-AS7-4754-Even-in-silent-mode-the-console-is-re.patch b/0030-PATCH-AS7-4754-Even-in-silent-mode-the-console-is-re.patch
new file mode 100644
index 0000000..f633093
--- /dev/null
+++ b/0030-PATCH-AS7-4754-Even-in-silent-mode-the-console-is-re.patch
@@ -0,0 +1,110 @@
+From 0e626e966347ae6af7abefe853fc02058c65184e Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <marek.goldmann at gmail.com>
+Date: Thu, 5 Sep 2013 08:24:20 +0200
+Subject: [PATCH] [PATCH] [AS7-4754] Even in silent mode the console is
+ required so that error messages can be displayed.
+
+---
+ .../management/security/AddPropertiesUser.java | 18 ++++++++--------
+ .../management/security/state/ErrorState.java | 25 +++++++++++-----------
+ 2 files changed, 21 insertions(+), 22 deletions(-)
+
+diff --git a/domain-management/src/main/java/org/jboss/as/domain/management/security/AddPropertiesUser.java b/domain-management/src/main/java/org/jboss/as/domain/management/security/AddPropertiesUser.java
+index 16bd4bf..05fc0e3 100644
+--- a/domain-management/src/main/java/org/jboss/as/domain/management/security/AddPropertiesUser.java
++++ b/domain-management/src/main/java/org/jboss/as/domain/management/security/AddPropertiesUser.java
+@@ -22,10 +22,7 @@
+
+ package org.jboss.as.domain.management.security;
+
+-import org.jboss.as.domain.management.security.state.PropertyFileFinder;
+-import org.jboss.as.domain.management.security.state.PropertyFilePrompt;
+-import org.jboss.as.domain.management.security.state.State;
+-import org.jboss.as.domain.management.security.state.StateValues;
++import static org.jboss.as.domain.management.DomainManagementMessages.MESSAGES;
+
+ import java.io.Closeable;
+ import java.io.IOException;
+@@ -34,7 +31,10 @@ import java.util.LinkedList;
+ import java.util.List;
+ import java.util.Properties;
+
+-import static org.jboss.as.domain.management.DomainManagementMessages.MESSAGES;
++import org.jboss.as.domain.management.security.state.PropertyFileFinder;
++import org.jboss.as.domain.management.security.state.PropertyFilePrompt;
++import org.jboss.as.domain.management.security.state.State;
++import org.jboss.as.domain.management.security.state.StateValues;
+
+ /**
+ * A command line utility to add new users to the mgmt-users.properties files.
+@@ -69,9 +69,7 @@ public class AddPropertiesUser {
+
+ private static final Properties argsCliProps = new Properties();
+
+-
+- private ConsoleWrapper theConsole;
+-
++ private final ConsoleWrapper theConsole;
+
+ protected State nextState;
+
+@@ -108,7 +106,9 @@ public class AddPropertiesUser {
+ stateValues.setHowInteractive(Interactiveness.NON_INTERACTIVE);
+ }
+
+- if ((theConsole == null) && (stateValues.isSilent() == false)) {
++ // Silent modes still need to be able to output an error on failure.
++ theConsole = new JavaConsole();
++ if (theConsole.getConsole() == null) {
+ throw MESSAGES.noConsoleAvailable();
+ }
+ stateValues.setUserName(user);
+diff --git a/domain-management/src/main/java/org/jboss/as/domain/management/security/state/ErrorState.java b/domain-management/src/main/java/org/jboss/as/domain/management/security/state/ErrorState.java
+index 6f875bc..8fbb930 100644
+--- a/domain-management/src/main/java/org/jboss/as/domain/management/security/state/ErrorState.java
++++ b/domain-management/src/main/java/org/jboss/as/domain/management/security/state/ErrorState.java
+@@ -22,9 +22,10 @@
+
+ package org.jboss.as.domain.management.security.state;
+
+-import org.jboss.as.domain.management.security.ConsoleWrapper;
+-import static org.jboss.as.domain.management.security.AddPropertiesUser.NEW_LINE;
+ import static org.jboss.as.domain.management.DomainManagementMessages.MESSAGES;
++import static org.jboss.as.domain.management.security.AddPropertiesUser.NEW_LINE;
++
++import org.jboss.as.domain.management.security.ConsoleWrapper;
+
+ /**
+ * State to report an error to the user, optionally a nextState can be supplied so the process can continue even though an
+@@ -55,19 +56,17 @@ public class ErrorState implements State {
+ }
+ }
+
+- @Override
+ public State execute() {
+- if ((stateValues == null) || (stateValues != null) && (stateValues.isSilent() == false)) {
+- theConsole.printf(NEW_LINE);
+- theConsole.printf(" * ");
+- theConsole.printf(MESSAGES.errorHeader());
+- theConsole.printf(" * ");
+- theConsole.printf(NEW_LINE);
++ // Errors should be output in all modes.
++ theConsole.printf(NEW_LINE);
++ theConsole.printf(" * ");
++ theConsole.printf(MESSAGES.errorHeader());
++ theConsole.printf(" * ");
++ theConsole.printf(NEW_LINE);
+
+- theConsole.printf(errorMessage);
+- theConsole.printf(NEW_LINE);
+- theConsole.printf(NEW_LINE);
+- }
++ theConsole.printf(errorMessage);
++ theConsole.printf(NEW_LINE);
++ theConsole.printf(NEW_LINE);
+ return nextState;
+ }
+
+--
+1.8.3.1
+
diff --git a/0031-PATCH-AS7-5061-Relax-the-early-console-check-and-upd.patch b/0031-PATCH-AS7-5061-Relax-the-early-console-check-and-upd.patch
new file mode 100644
index 0000000..1e14ac7
--- /dev/null
+++ b/0031-PATCH-AS7-5061-Relax-the-early-console-check-and-upd.patch
@@ -0,0 +1,74 @@
+From 0e4ec355a09fb5755b1516455d3e79625e997a3b Mon Sep 17 00:00:00 2001
+From: Marek Goldmann <marek.goldmann at gmail.com>
+Date: Thu, 5 Sep 2013 08:29:30 +0200
+Subject: [PATCH] [PATCH] [AS7-5061] Relax the early console check and update
+ the ErrorState to use System.err if no console available.
+
+---
+ .../management/security/AddPropertiesUser.java | 3 +--
+ .../management/security/state/ErrorState.java | 28 +++++++++++++---------
+ 2 files changed, 18 insertions(+), 13 deletions(-)
+
+diff --git a/domain-management/src/main/java/org/jboss/as/domain/management/security/AddPropertiesUser.java b/domain-management/src/main/java/org/jboss/as/domain/management/security/AddPropertiesUser.java
+index 05fc0e3..d13b84d 100644
+--- a/domain-management/src/main/java/org/jboss/as/domain/management/security/AddPropertiesUser.java
++++ b/domain-management/src/main/java/org/jboss/as/domain/management/security/AddPropertiesUser.java
+@@ -106,9 +106,8 @@ public class AddPropertiesUser {
+ stateValues.setHowInteractive(Interactiveness.NON_INTERACTIVE);
+ }
+
+- // Silent modes still need to be able to output an error on failure.
+ theConsole = new JavaConsole();
+- if (theConsole.getConsole() == null) {
++ if (theConsole.getConsole() == null && !stateValues.isSilent()) {
+ throw MESSAGES.noConsoleAvailable();
+ }
+ stateValues.setUserName(user);
+diff --git a/domain-management/src/main/java/org/jboss/as/domain/management/security/state/ErrorState.java b/domain-management/src/main/java/org/jboss/as/domain/management/security/state/ErrorState.java
+index 8fbb930..22ac30b 100644
+--- a/domain-management/src/main/java/org/jboss/as/domain/management/security/state/ErrorState.java
++++ b/domain-management/src/main/java/org/jboss/as/domain/management/security/state/ErrorState.java
+@@ -51,23 +51,29 @@ public class ErrorState implements State {
+ this.nextState = nextState;
+ this.stateValues = stateValues;
+ this.theConsole = theConsole;
+- if (theConsole.getConsole() == null) {
+- throw MESSAGES.noConsoleAvailable();
+- }
+ }
+
+ public State execute() {
++ boolean direct = theConsole.getConsole() == null;
+ // Errors should be output in all modes.
+- theConsole.printf(NEW_LINE);
+- theConsole.printf(" * ");
+- theConsole.printf(MESSAGES.errorHeader());
+- theConsole.printf(" * ");
+- theConsole.printf(NEW_LINE);
++ printf(NEW_LINE, direct);
++ printf(" * ", direct);
++ printf(MESSAGES.errorHeader(), direct);
++ printf(" * ", direct);
++ printf(NEW_LINE, direct);
+
+- theConsole.printf(errorMessage);
+- theConsole.printf(NEW_LINE);
+- theConsole.printf(NEW_LINE);
++ printf(errorMessage, direct);
++ printf(NEW_LINE, direct);
++ printf(NEW_LINE, direct);
+ return nextState;
+ }
+
++ private void printf(final String message, final boolean direct) {
++ if (direct) {
++ System.err.print(message);
++ } else {
++ theConsole.printf(message);
++ }
++ }
++
+ }
+--
+1.8.3.1
+
diff --git a/jboss-as.spec b/jboss-as.spec
index 867651a..6b768ab 100644
--- a/jboss-as.spec
+++ b/jboss-as.spec
@@ -19,7 +19,7 @@
Name: jboss-as
Version: 7.1.1
-Release: 20%{?dist}
+Release: 21%{?dist}
Summary: JBoss Application Server
Group: System Environment/Daemons
License: LGPLv2 and ASL 2.0
@@ -63,6 +63,8 @@ Patch25: 0026-fedora-Missing-module-dependencies-in-mime4j-com.sun.patc
Patch26: 0027-fedora-Remove-still-unavailable-in-Fedora-dependenci.patch
Patch27: 0028-fedora-Do-not-extract-jbossweb-native-it-s-symlinked.patch
Patch28: 0029-fedora-Allow-to-launch-the-domain-mode-using-the-sys.patch
+Patch29: 0030-PATCH-AS7-4754-Even-in-silent-mode-the-console-is-re.patch
+Patch30: 0031-PATCH-AS7-5061-Relax-the-early-console-check-and-upd.patch
BuildArch: noarch
@@ -967,7 +969,7 @@ pushd $RPM_BUILD_ROOT%{homedir}
ln -s $(build-classpath weld-core) org/jboss/weld/core/main/weld-core.jar
ln -s $(build-classpath woodstox-core) org/codehaus/woodstox/main/woodstox-core.jar
ln -s $(build-classpath wsdl4j) javax/wsdl4j/api/main/wsdl4j.jar
- ln -s $(build-classpath wss4j) org/apache/ws/security/main/wss4j.jar
+ ln -s $(build-classpath wss4j/wss4j) org/apache/ws/security/main/wss4j.jar
ln -s $(build-classpath xalan-j2) org/apache/xalan/main/xalan-j2.jar
ln -s $(build-classpath xalan-j2-serializer) org/apache/xalan/main/xalan-j2-serializer.jar
ln -s $(build-classpath xerces-j2) org/apache/xerces/main/xerces-j2.jar
@@ -1076,6 +1078,10 @@ rm -rf %{homedir}/modules/org/hornetq/main/lib/linux-${arch}/*
%doc %{homedir}/LICENSE.txt
%changelog
+* Wed Sep 04 2013 Marek Goldmann <mgoldman at redhat.com> - 7.1.1-21
+- Fixed broken wss4j symlink, RHBZ#1000371
+- add-user.sh script seem to be broken, RHBZ#999781
+
* Mon Jun 17 2013 Marek Goldmann <mgoldman at redhat.com> - 7.1.1-20
- Fix dangling symlinks
- ovirt-engine fails to start on Fedora 19 RHBZ#972738
More information about the scm-commits
mailing list