From jboss-cvs-commits at lists.jboss.org Tue Apr 1 22:10:46 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 1 Apr 2014 22:10:46 -0400 Subject: [jboss-cvs] JBossAS SVN: r114792 - branches/JBPAPP_5/main/src/bin. Message-ID: <201404020210.s322AkIO024788@svn01.web.mwc.hst.phx2.redhat.com> Author: soul2zimate Date: 2014-04-01 22:10:45 -0400 (Tue, 01 Apr 2014) New Revision: 114792 Modified: branches/JBPAPP_5/main/src/bin/run.bat branches/JBPAPP_5/main/src/bin/run.sh Log: JBPAPP-11070, update version number for JBOSS_NATIVE_DIR in run.sh and run.bat Modified: branches/JBPAPP_5/main/src/bin/run.bat =================================================================== --- branches/JBPAPP_5/main/src/bin/run.bat 2014-03-28 03:19:42 UTC (rev 114791) +++ branches/JBPAPP_5/main/src/bin/run.bat 2014-04-02 02:10:45 UTC (rev 114792) @@ -157,8 +157,8 @@ set "CHECK_NATIVE_HOME=%JBOSS_HOME%\..\native\bin" ) else if exist "%JBOSS_HOME%\bin\native\bin" ( set "CHECK_NATIVE_HOME=%JBOSS_HOME%\bin\native\bin" -) else if exist "%JBOSS_HOME%\..\..\jboss-ep-5.2\native\bin" ( - set "CHECK_NATIVE_HOME=%JBOSS_HOME%\..\..\jboss-ep-5.2\native\bin" +) else if exist "%JBOSS_HOME%\..\..\jboss-ep-5.3\native\bin" ( + set "CHECK_NATIVE_HOME=%JBOSS_HOME%\..\..\jboss-ep-5.3\native\bin" ) if "x%CHECK_NATIVE_HOME%" == "x" goto WITHOUT_JBOSS_NATIVE Modified: branches/JBPAPP_5/main/src/bin/run.sh =================================================================== --- branches/JBPAPP_5/main/src/bin/run.sh 2014-03-28 03:19:42 UTC (rev 114791) +++ branches/JBPAPP_5/main/src/bin/run.sh 2014-04-02 02:10:45 UTC (rev 114792) @@ -249,8 +249,8 @@ JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/../native" && pwd` elif [ -d "$JBOSS_HOME/native/lib64" ]; then JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/native" && pwd` -elif [ -d "$JBOSS_HOME/../../jboss-ep-5.2/native" ]; then - JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/../../jboss-ep-5.2/native" && pwd` +elif [ -d "$JBOSS_HOME/../../jboss-ep-5.3/native" ]; then + JBOSS_NATIVE_DIR=`cd "$JBOSS_HOME/../../jboss-ep-5.3/native" && pwd` fi if [ -d "$JBOSS_NATIVE_DIR" ]; then if $cygwin; then From jboss-cvs-commits at lists.jboss.org Thu Apr 3 08:21:38 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 3 Apr 2014 08:21:38 -0400 Subject: [jboss-cvs] JBossAS SVN: r114793 - branches/JBPAPP_5/testsuite/src/main/org/jboss/test/servicebindingmanager. Message-ID: <201404031221.s33CLccv030838@svn01.web.mwc.hst.phx2.redhat.com> Author: ehugonnet Date: 2014-04-03 08:21:38 -0400 (Thu, 03 Apr 2014) New Revision: 114793 Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/servicebindingmanager/JBPAPP4281UnitTestCase.java Log: Fixing JBPAPP-10998 using File.separatorChar instead of / in path to file. Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/servicebindingmanager/JBPAPP4281UnitTestCase.java =================================================================== --- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/servicebindingmanager/JBPAPP4281UnitTestCase.java 2014-04-02 02:10:45 UTC (rev 114792) +++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/servicebindingmanager/JBPAPP4281UnitTestCase.java 2014-04-03 12:21:38 UTC (rev 114793) @@ -70,7 +70,9 @@ try { // read the bindings-jboss-beans.xml and parse out the xslt - String defaultServerProfileBindingsXml = extractXSLTFromXml( System.getProperty("jboss.dist") + "/server/all/conf/bindingservice.beans/META-INF/bindings-jboss-beans.xml" ); + String defaultServerProfileBindingsXml = extractXSLTFromXml( System.getProperty("jboss.dist") + File.separatorChar + + "server" + File.separatorChar + "all" + File.separatorChar + "conf" + File.separatorChar + "bindingservice.beans" + + File.separatorChar + "META-INF" + File.separatorChar + "bindings-jboss-beans.xml" ); // the server.xml we will transform URL serverXMLURL = Thread.currentThread().getContextClassLoader().getResource("servicebindingmanager/jbpapp4281/server.xml"); From jboss-cvs-commits at lists.jboss.org Thu Apr 3 08:50:08 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 3 Apr 2014 08:50:08 -0400 Subject: [jboss-cvs] JBossAS SVN: r114794 - branches/JBPAPP_5/testsuite/src/main/org/jboss/test/servicebindingmanager. Message-ID: <201404031250.s33Co8o2001346@svn01.web.mwc.hst.phx2.redhat.com> Author: ehugonnet Date: 2014-04-03 08:50:07 -0400 (Thu, 03 Apr 2014) New Revision: 114794 Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/servicebindingmanager/JBPAPP4281UnitTestCase.java Log: Using File.toURI to be cross-plateform Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/servicebindingmanager/JBPAPP4281UnitTestCase.java =================================================================== --- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/servicebindingmanager/JBPAPP4281UnitTestCase.java 2014-04-03 12:21:38 UTC (rev 114793) +++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/servicebindingmanager/JBPAPP4281UnitTestCase.java 2014-04-03 12:50:07 UTC (rev 114794) @@ -109,7 +109,7 @@ { DocumentBuilder db = dbf.newDocumentBuilder(); - Document dom = db.parse(new URI(path).toASCIIString()); + Document dom = db.parse(new File(path).toURI().toASCIIString()); Element root = dom.getDocumentElement(); NodeList beans = root.getElementsByTagName("bean"); From jboss-cvs-commits at lists.jboss.org Fri Apr 4 04:30:34 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Fri, 4 Apr 2014 04:30:34 -0400 Subject: [jboss-cvs] JBossAS SVN: r114795 - branches/JBPAPP_5/main/src/main/org/jboss/system. Message-ID: <201404040830.s348UYJx026121@svn01.web.mwc.hst.phx2.redhat.com> Author: ehugonnet Date: 2014-04-04 04:30:34 -0400 (Fri, 04 Apr 2014) New Revision: 114795 Modified: branches/JBPAPP_5/main/src/main/org/jboss/system/JBossRMIClassLoader.java Log: [JBPAPP-10904] Using doPriviledged to access the ClassLoader this fixing the "access denied". Modified: branches/JBPAPP_5/main/src/main/org/jboss/system/JBossRMIClassLoader.java =================================================================== --- branches/JBPAPP_5/main/src/main/org/jboss/system/JBossRMIClassLoader.java 2014-04-03 12:50:07 UTC (rev 114794) +++ branches/JBPAPP_5/main/src/main/org/jboss/system/JBossRMIClassLoader.java 2014-04-04 08:30:34 UTC (rev 114795) @@ -25,6 +25,10 @@ import java.rmi.server.RMIClassLoader; import java.rmi.server.RMIClassLoaderSpi; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.util.logging.Level; +import java.util.logging.Logger; /** * An implementation of RMIClassLoaderSpi to workaround the @@ -94,10 +98,28 @@ /* * Just delegate */ - public ClassLoader getClassLoader(String codebase) + public ClassLoader getClassLoader(final String codebase) throws MalformedURLException { - return delegate.getClassLoader(codebase); + if (System.getSecurityManager() == null) + { + return delegate.getClassLoader(codebase); + } + return AccessController.doPrivileged(new PrivilegedAction() + { + @Override + public ClassLoader run() + { + try + { + return delegate.getClassLoader(codebase); + } + catch (MalformedURLException ex) + { + throw new RuntimeException(ex); + } + } + }); } /* From jboss-cvs-commits at lists.jboss.org Fri Apr 4 04:45:37 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Fri, 4 Apr 2014 04:45:37 -0400 Subject: [jboss-cvs] JBossAS SVN: r114796 - branches/JBPAPP_5/main/src/main/org/jboss/system. Message-ID: <201404040845.s348jb82027783@svn01.web.mwc.hst.phx2.redhat.com> Author: ehugonnet Date: 2014-04-04 04:45:36 -0400 (Fri, 04 Apr 2014) New Revision: 114796 Modified: branches/JBPAPP_5/main/src/main/org/jboss/system/JBossRMIClassLoader.java Log: [JBPAPP-10904] Using doPriviledged to access the ClassLoader this fixing the "access denied". reverting previous commit as the doPriviledged block was wrongly placed. Modified: branches/JBPAPP_5/main/src/main/org/jboss/system/JBossRMIClassLoader.java =================================================================== --- branches/JBPAPP_5/main/src/main/org/jboss/system/JBossRMIClassLoader.java 2014-04-04 08:30:34 UTC (rev 114795) +++ branches/JBPAPP_5/main/src/main/org/jboss/system/JBossRMIClassLoader.java 2014-04-04 08:45:36 UTC (rev 114796) @@ -83,7 +83,7 @@ public Class loadProxyClass(String codebase, String[] interfaces, ClassLoader ignored) throws MalformedURLException, ClassNotFoundException { - return delegate.loadProxyClass(codebase, interfaces, Thread.currentThread().getContextClassLoader()); + return delegate.loadProxyClass(codebase, interfaces, getTTCLClassLoader()); } /* @@ -92,37 +92,36 @@ public Class loadClass(String codebase, String name, ClassLoader ignored) throws MalformedURLException, ClassNotFoundException { - return delegate.loadClass(codebase, name, Thread.currentThread().getContextClassLoader()); + return delegate.loadClass(codebase, name, getTTCLClassLoader()); } - /* - * Just delegate - */ - public ClassLoader getClassLoader(final String codebase) - throws MalformedURLException + private ClassLoader getTTCLClassLoader() { - if (System.getSecurityManager() == null) + if (System.getSecurityManager() == null) { - return delegate.getClassLoader(codebase); + return Thread.currentThread().getContextClassLoader(); } return AccessController.doPrivileged(new PrivilegedAction() { @Override public ClassLoader run() { - try - { - return delegate.getClassLoader(codebase); - } - catch (MalformedURLException ex) - { - throw new RuntimeException(ex); - } + return Thread.currentThread().getContextClassLoader(); } }); } /* + * Just delegate + */ + public ClassLoader getClassLoader(final String codebase) + throws MalformedURLException + { + + return delegate.getClassLoader(codebase); + } + + /* * Try to delegate an default to the java.rmi.server.codebase on any * failure. */ From jboss-cvs-commits at lists.jboss.org Fri Apr 4 13:18:48 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Fri, 4 Apr 2014 13:18:48 -0400 Subject: [jboss-cvs] Picketbox SVN: r533 - branches/eap62/picketbox-infinispan/src/main/java/org/jboss/security/authentication. Message-ID: <201404041718.s34HImca008448@svn01.web.mwc.hst.phx2.redhat.com> Author: dehort Date: 2014-04-04 13:18:48 -0400 (Fri, 04 Apr 2014) New Revision: 533 Modified: branches/eap62/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java Log: [bz-1069886] Fixed an issue where SecureIdentityLoginModule (and ConfiguredIdentityLoginModule) results are not cached by the JAAS cache Modified: branches/eap62/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java =================================================================== --- branches/eap62/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java 2014-03-18 21:06:46 UTC (rev 532) +++ branches/eap62/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java 2014-04-04 17:18:48 UTC (rev 533) @@ -133,7 +133,7 @@ public boolean isValid(Principal principal, Object credential, Subject activeSubject) { // first check cache - DomainInfo cachedEntry = getCacheInfo(principal); + DomainInfo cachedEntry = getCacheInfo(principal != null ? principal : new org.jboss.security.SimplePrincipal("null")); PicketBoxLogger.LOGGER.traceBeginIsValid(principal, cachedEntry != null ? cachedEntry.toString() : null); boolean isValid = false; @@ -423,7 +423,7 @@ private Subject updateCache(LoginContext loginContext, Subject subject, Principal principal, Object credential) { // If we don't have a cache there is nothing to update - if (domainCache == null || principal == null) + if (domainCache == null) return subject; DomainInfo info = new DomainInfo(); @@ -470,7 +470,7 @@ // If the user already exists another login is active. Currently // only one is allowed so remove the old and insert the new - domainCache.put(principal, info); + domainCache.put(principal != null ? principal : new org.jboss.security.SimplePrincipal("null"), info); PicketBoxLogger.LOGGER.traceInsertedCacheInfo(info.toString()); return info.subject; } @@ -507,4 +507,4 @@ } } } -} \ No newline at end of file +} From jboss-cvs-commits at lists.jboss.org Wed Apr 9 04:21:53 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 9 Apr 2014 04:21:53 -0400 Subject: [jboss-cvs] JBossAS SVN: r114797 - in branches/JBPAPP_5/testsuite: src/resources/jbossts/resources and 1 other directories. Message-ID: <201404090821.s398Lrqe021720@svn01.web.mwc.hst.phx2.redhat.com> Author: ochaloup Date: 2014-04-09 04:21:52 -0400 (Wed, 09 Apr 2014) New Revision: 114797 Added: branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql55-xa-ds.xml branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/oracle12c-xa-ds.xml Modified: branches/JBPAPP_5/testsuite/imports/config/tests-crash-recovery.xml branches/JBPAPP_5/testsuite/imports/config/tests-jts-propagation.xml branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql50-xa-ds.xml branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql51-xa-ds.xml branches/JBPAPP_5/testsuite/src/resources/jbossts/scripts/as-tests.xml Log: Adding oracle12c as supported database under crash recovery tests Modified: branches/JBPAPP_5/testsuite/imports/config/tests-crash-recovery.xml =================================================================== --- branches/JBPAPP_5/testsuite/imports/config/tests-crash-recovery.xml 2014-04-04 08:45:36 UTC (rev 114796) +++ branches/JBPAPP_5/testsuite/imports/config/tests-crash-recovery.xml 2014-04-09 08:21:52 UTC (rev 114797) @@ -14,7 +14,7 @@ - + - + Property changes on: branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql50-xa-ds.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Modified: branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql51-xa-ds.xml =================================================================== --- branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql51-xa-ds.xml 2014-04-04 08:45:36 UTC (rev 114796) +++ branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql51-xa-ds.xml 2014-04-09 08:21:52 UTC (rev 114797) @@ -9,7 +9,7 @@ CrashRecoveryDS com.mysql.jdbc.jdbc2.optional.MysqlXADataSource - db01.mw.lab.eng.bos.redhat.com + vmg02.mw.lab.eng.bos.redhat.com 3306 crashrec @CREDENTIALS@ Property changes on: branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql51-xa-ds.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql55-xa-ds.xml =================================================================== --- branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql55-xa-ds.xml (rev 0) +++ branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql55-xa-ds.xml 2014-04-09 08:21:52 UTC (rev 114797) @@ -0,0 +1,29 @@ + + + + + + + + CrashRecoveryDS + com.mysql.jdbc.jdbc2.optional.MysqlXADataSource + db01.mw.lab.eng.bos.redhat.com + 3306 + crashrec + @CREDENTIALS@ + com.mysql.jdbc.integration.jboss.ExtendedMysqlExceptionSorter + + com.mysql.jdbc.integration.jboss.MysqlValidConnectionChecker + TRANSACTION_SERIALIZABLE + + + + mySQL + + + + Property changes on: branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/mysql55-xa-ds.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/oracle12c-xa-ds.xml =================================================================== --- branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/oracle12c-xa-ds.xml (rev 0) +++ branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/oracle12c-xa-ds.xml 2014-04-09 08:21:52 UTC (rev 114797) @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + CrashRecoveryDS + false + oracle.jdbc.xa.client.OracleXADataSource + jdbc:oracle:thin:@dev151.mw.lab.eng.bos.redhat.com:1521:qaora12 + @CREDENTIALS@ + + org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker + + org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter + + + + + + Oracle9i + + + + Property changes on: branches/JBPAPP_5/testsuite/src/resources/jbossts/resources/oracle12c-xa-ds.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Modified: branches/JBPAPP_5/testsuite/src/resources/jbossts/scripts/as-tests.xml =================================================================== --- branches/JBPAPP_5/testsuite/src/resources/jbossts/scripts/as-tests.xml 2014-04-04 08:45:36 UTC (rev 114796) +++ branches/JBPAPP_5/testsuite/src/resources/jbossts/scripts/as-tests.xml 2014-04-09 08:21:52 UTC (rev 114797) @@ -96,6 +96,21 @@ + + + + + + + + + + + + + + + @@ -105,6 +120,9 @@ + + + @@ -117,18 +135,6 @@ - - - - - - - - - - - - @@ -144,17 +150,19 @@ + + + + + + - - - - @@ -232,19 +240,21 @@ + + + + + + - - - - @@ -327,6 +337,14 @@ + + + + + + + + @@ -395,7 +413,7 @@ - + @@ -403,12 +421,20 @@ - + + + + + + + + + @@ -459,7 +485,7 @@ + - + + + + + + + + + + + + + + + + @@ -703,6 +744,21 @@ + + + + + + + + + + + + + + + @@ -720,18 +776,30 @@ + + + + + + - + - - + ]]> + + + ]]> - - - + + + + ]]> + + + ]]> + - - + - - + + + - - + - + @@ -809,9 +877,9 @@ + - - + @@ -836,7 +904,14 @@ - + + + + + + + + @@ -845,6 +920,7 @@ depends="get.driver.oracle_10, get.driver.oracle_11, get.driver.oracle_11_rac, + get.driver.oracle_12c, get.driver.mssql_2005, get.driver.mssql_2008, get.driver.mssql_2008_r2, @@ -857,8 +933,7 @@ get.driver.psql_8.4, get.driver.psql_8.3, get.driver.psql_8.2, - get.driver.mysql_5.1, - get.driver.mysql_5.0, + get.driver.mysql_5, get.driver.db2_9.7, get.driver.sybase_15" /> @@ -870,6 +945,10 @@ + + + @@ -890,42 +969,38 @@ + + + + + + - - - - - - - - - - - - + + - - - From jboss-cvs-commits at lists.jboss.org Wed Apr 9 07:05:53 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 9 Apr 2014 07:05:53 -0400 Subject: [jboss-cvs] JBossAS SVN: r114798 - projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/auth/spi. Message-ID: <201404091105.s39B5r8V025549@svn01.web.mwc.hst.phx2.redhat.com> Author: ehugonnet Date: 2014-04-09 07:05:53 -0400 (Wed, 09 Apr 2014) New Revision: 114798 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java Log: JBPAPP-10452: fixing issue when setting role's DN to rolesCtxDN Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java 2014-04-09 08:21:52 UTC (rev 114797) +++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java 2014-04-09 11:05:53 UTC (rev 114798) @@ -745,8 +745,12 @@ int len = searchResult.length(); String appendRolesCtxDN = "" + ("".equals(rolesCtxDN) ? "" : "," + rolesCtxDN); - if (searchResult.endsWith("\"")) + if(len == 0) { + result = rolesCtxDN; + } + else if (searchResult.endsWith("\"")) + { result = searchResult.substring(0, len - 1) + appendRolesCtxDN + "\""; } else From jboss-cvs-commits at lists.jboss.org Thu Apr 10 06:38:13 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 10 Apr 2014 06:38:13 -0400 Subject: [jboss-cvs] JBossAS SVN: r114799 - branches/JBPAPP_5/component-matrix. Message-ID: <201404101038.s3AAcDJ6028757@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-04-10 06:38:12 -0400 (Thu, 10 Apr 2014) New Revision: 114799 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: JBPAPP-10993 Upgrade xalan from 2.7.1-patch-07 to 2.7.1-patch-08 Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-04-09 11:05:53 UTC (rev 114798) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-04-10 10:38:12 UTC (rev 114799) @@ -30,7 +30,7 @@ - 2.7.1-patch-07 + 2.7.1-patch-08 2.3.2-jboss-5 2.3.2-jboss-5 2.3.2-jboss-5 From jboss-cvs-commits at lists.jboss.org Thu Apr 10 09:11:36 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 10 Apr 2014 09:11:36 -0400 Subject: [jboss-cvs] JBossAS SVN: r114800 - branches/JBPAPP_5/testsuite/src/resources/test-configs/tomcat-ssl/deploy/jbossweb.sar. Message-ID: <201404101311.s3ADBaXI031506@svn01.web.mwc.hst.phx2.redhat.com> Author: istudens at redhat.com Date: 2014-04-10 09:11:36 -0400 (Thu, 10 Apr 2014) New Revision: 114800 Modified: branches/JBPAPP_5/testsuite/src/resources/test-configs/tomcat-ssl/deploy/jbossweb.sar/server.xml Log: JBPAPP-11031 adding AprLifecycleListener to tomcat-ssl configuration Modified: branches/JBPAPP_5/testsuite/src/resources/test-configs/tomcat-ssl/deploy/jbossweb.sar/server.xml =================================================================== --- branches/JBPAPP_5/testsuite/src/resources/test-configs/tomcat-ssl/deploy/jbossweb.sar/server.xml 2014-04-10 10:38:12 UTC (rev 114799) +++ branches/JBPAPP_5/testsuite/src/resources/test-configs/tomcat-ssl/deploy/jbossweb.sar/server.xml 2014-04-10 13:11:36 UTC (rev 114800) @@ -5,6 +5,13 @@ start to allow web apps to be deployed before starting the connectors. --> + + + + + + From jboss-cvs-commits at lists.jboss.org Thu Apr 10 16:53:24 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 10 Apr 2014 16:53:24 -0400 Subject: [jboss-cvs] JBossAS SVN: r114801 - in branches/JBPAPP_5: testsuite/src/main/org/jboss/test/security/ldapext and 1 other directories. Message-ID: <201404102053.s3AKrOSh027352@svn01.web.mwc.hst.phx2.redhat.com> Author: dpospisil Date: 2014-04-10 16:53:24 -0400 (Thu, 10 Apr 2014) New Revision: 114801 Modified: branches/JBPAPP_5/component-matrix/pom.xml branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/ldapext/LDAPServerControl.java branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/DSAnnotationProcessor.java branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/KDCServerAnnotationProcessor.java branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/KerberosServerControl.java branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/ManagedCreateLdapServer.java branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/NoReplayKdcServer.java Log: JBPAPP-11111 Update ApacheDS to 2.0.0-M15 Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-04-10 13:11:36 UTC (rev 114800) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-04-10 20:53:24 UTC (rev 114801) @@ -108,7 +108,7 @@ 2.1 1.2.3 1.1 - 2.0.0-M7 + 2.0.0-M15 4.2.1 1.5.6 1.2 Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/ldapext/LDAPServerControl.java =================================================================== --- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/ldapext/LDAPServerControl.java 2014-04-10 13:11:36 UTC (rev 114800) +++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/ldapext/LDAPServerControl.java 2014-04-10 20:53:24 UTC (rev 114801) @@ -32,16 +32,16 @@ import org.apache.directory.server.core.kerberos.KeyDerivationInterceptor; import org.apache.directory.server.factory.ServerAnnotationProcessor; import org.apache.directory.server.ldap.LdapServer; -import org.apache.directory.shared.ldap.model.entry.DefaultEntry; -import org.apache.directory.shared.ldap.model.ldif.LdifEntry; -import org.apache.directory.shared.ldap.model.ldif.LdifReader; -import org.apache.directory.shared.ldap.model.schema.SchemaManager; import org.jboss.logging.Logger; import java.io.*; import java.net.*; import java.util.HashMap; import java.util.Map; +import org.apache.directory.api.ldap.model.entry.DefaultEntry; +import org.apache.directory.api.ldap.model.ldif.LdifEntry; +import org.apache.directory.api.ldap.model.ldif.LdifReader; +import org.apache.directory.api.ldap.model.schema.SchemaManager; /** * Small application which starts/stops ApacheDS and LDAP and imports LDIFs provided as program Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/DSAnnotationProcessor.java =================================================================== --- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/DSAnnotationProcessor.java 2014-04-10 13:11:36 UTC (rev 114800) +++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/DSAnnotationProcessor.java 2014-04-10 20:53:24 UTC (rev 114801) @@ -23,7 +23,12 @@ import java.util.HashSet; import java.util.List; import java.util.Set; - +import org.apache.directory.api.ldap.model.entry.DefaultEntry; +import org.apache.directory.api.ldap.model.exception.LdapException; +import org.apache.directory.api.ldap.model.ldif.LdifEntry; +import org.apache.directory.api.ldap.model.ldif.LdifReader; +import org.apache.directory.api.ldap.model.name.Dn; +import org.apache.directory.api.ldap.model.schema.SchemaManager; import org.apache.directory.server.core.annotations.AnnotationUtils; import org.apache.directory.server.core.annotations.ContextEntry; import org.apache.directory.server.core.annotations.CreateAuthenticator; @@ -41,12 +46,6 @@ import org.apache.directory.server.core.partition.impl.btree.AbstractBTreePartition; import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex; import org.apache.directory.server.i18n.I18n; -import org.apache.directory.shared.ldap.model.entry.DefaultEntry; -import org.apache.directory.shared.ldap.model.exception.LdapException; -import org.apache.directory.shared.ldap.model.ldif.LdifEntry; -import org.apache.directory.shared.ldap.model.ldif.LdifReader; -import org.apache.directory.shared.ldap.model.name.Dn; -import org.apache.directory.shared.ldap.model.schema.SchemaManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -158,9 +157,9 @@ partition.setId(createPartition.name()); partition.setSuffixDn(new Dn(service.getSchemaManager(), createPartition.suffix())); - if (partition instanceof AbstractBTreePartition) + if (partition instanceof AbstractBTreePartition) { - AbstractBTreePartition btreePartition = (AbstractBTreePartition) partition; + AbstractBTreePartition btreePartition = (AbstractBTreePartition) partition; btreePartition.setCacheSize(createPartition.cacheSize()); btreePartition.setPartitionPath(new File(service.getInstanceLayout().getPartitionsDirectory(), createPartition.name()).toURI()); @@ -173,9 +172,9 @@ // The annotation does not specify a specific index // type. // We use the generic index implementation. - JdbmIndex index = new JdbmIndex(); - index.setAttributeId(createIndex.attribute()); + JdbmIndex index = new JdbmIndex(createIndex.attribute(), true); + btreePartition.addIndexedAttributes(index); } } Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/KDCServerAnnotationProcessor.java =================================================================== --- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/KDCServerAnnotationProcessor.java 2014-04-10 13:11:36 UTC (rev 114800) +++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/KDCServerAnnotationProcessor.java 2014-04-10 20:53:24 UTC (rev 114801) @@ -25,6 +25,7 @@ import org.apache.directory.server.core.annotations.AnnotationUtils; import org.apache.directory.server.core.api.DirectoryService; import org.apache.directory.server.i18n.I18n; +import org.apache.directory.server.kerberos.KerberosConfig; import org.apache.directory.server.kerberos.kdc.KdcServer; import org.apache.directory.server.protocol.shared.transport.TcpTransport; import org.apache.directory.server.protocol.shared.transport.Transport; @@ -79,14 +80,16 @@ { return null; } - KdcServer kdcServer = new NoReplayKdcServer(); - kdcServer.setServiceName(createKdcServer.name()); - kdcServer.setKdcPrincipal(createKdcServer.kdcPrincipal()); - kdcServer.setPrimaryRealm(createKdcServer.primaryRealm()); - kdcServer.setMaximumTicketLifetime(createKdcServer.maxTicketLifetime()); - kdcServer.setMaximumRenewableLifetime(createKdcServer.maxRenewableLifetime()); - kdcServer.setSearchBaseDn(createKdcServer.searchBaseDn()); - kdcServer.setPaEncTimestampRequired(false); + + KerberosConfig kdcConfig = new KerberosConfig(); + kdcConfig.setServicePrincipal(createKdcServer.kdcPrincipal()); + kdcConfig.setPrimaryRealm(createKdcServer.primaryRealm()); + kdcConfig.setMaximumTicketLifetime(createKdcServer.maxTicketLifetime()); + kdcConfig.setMaximumRenewableLifetime(createKdcServer.maxRenewableLifetime()); + kdcConfig.setPaEncTimestampRequired(false); + kdcConfig.setSearchBaseDn(createKdcServer.searchBaseDn()); + + KdcServer kdcServer = new NoReplayKdcServer(kdcConfig); CreateTransport[] transportBuilders = createKdcServer.transports(); Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/KerberosServerControl.java =================================================================== --- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/KerberosServerControl.java 2014-04-10 13:11:36 UTC (rev 114800) +++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/KerberosServerControl.java 2014-04-10 20:53:24 UTC (rev 114801) @@ -37,6 +37,10 @@ import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.text.StrSubstitutor; +import org.apache.directory.api.ldap.model.entry.DefaultEntry; +import org.apache.directory.api.ldap.model.ldif.LdifEntry; +import org.apache.directory.api.ldap.model.ldif.LdifReader; +import org.apache.directory.api.ldap.model.schema.SchemaManager; import org.apache.directory.server.annotations.CreateTransport; import org.apache.directory.server.core.annotations.ContextEntry; import org.apache.directory.server.core.annotations.CreateDS; @@ -45,10 +49,6 @@ import org.apache.directory.server.core.api.DirectoryService; import org.apache.directory.server.core.kerberos.KeyDerivationInterceptor; import org.apache.directory.server.kerberos.kdc.KdcServer; -import org.apache.directory.shared.ldap.model.entry.DefaultEntry; -import org.apache.directory.shared.ldap.model.ldif.LdifEntry; -import org.apache.directory.shared.ldap.model.ldif.LdifReader; -import org.apache.directory.shared.ldap.model.schema.SchemaManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/ManagedCreateLdapServer.java =================================================================== --- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/ManagedCreateLdapServer.java 2014-04-10 13:11:36 UTC (rev 114800) +++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/ManagedCreateLdapServer.java 2014-04-10 20:53:24 UTC (rev 114801) @@ -74,6 +74,8 @@ /** The service principal, used by GSSAPI. */ private String saslPrincipal; + private String[] saslRealms; + // Constructors ---------------------------------------------------------- /** @@ -98,6 +100,7 @@ ntlmProvider = createLdapServer.ntlmProvider(); saslHost = createLdapServer.saslHost(); saslPrincipal = createLdapServer.saslPrincipal(); + saslRealms = createLdapServer.saslRealms(); } // Public methods -------------------------------------------------------- @@ -362,4 +365,8 @@ this.saslPrincipal = saslPrincipal; } + public String[] saslRealms() { + return saslRealms; + } + } Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/NoReplayKdcServer.java =================================================================== --- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/NoReplayKdcServer.java 2014-04-10 13:11:36 UTC (rev 114800) +++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/NoReplayKdcServer.java 2014-04-10 20:53:24 UTC (rev 114801) @@ -24,8 +24,9 @@ import java.io.IOException; import java.lang.reflect.Field; +import org.apache.directory.api.ldap.model.exception.LdapInvalidDnException; +import org.apache.directory.server.kerberos.KerberosConfig; import org.apache.directory.server.kerberos.kdc.KdcServer; -import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,6 +40,9 @@ private static Logger LOGGER = LoggerFactory.getLogger(NoReplayKdcServer.class); + NoReplayKdcServer(KerberosConfig kdcConfig) { + super(kdcConfig); + } /** * @throws IOException if we cannot bind to the sockets From jboss-cvs-commits at lists.jboss.org Fri Apr 11 09:19:11 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Fri, 11 Apr 2014 09:19:11 -0400 Subject: [jboss-cvs] JBossAS SVN: r114802 - branches/JBPAPP_5/main/src/bin. Message-ID: <201404111319.s3BDJBtl012879@svn01.web.mwc.hst.phx2.redhat.com> Author: dpospisil Date: 2014-04-11 09:19:10 -0400 (Fri, 11 Apr 2014) New Revision: 114802 Modified: branches/JBPAPP_5/main/src/bin/run.bat Log: JBPAPP-11034 - run.[bat|sh] scripts fails to start server on IBM jdk (all platforms) and solaris 10 Modified: branches/JBPAPP_5/main/src/bin/run.bat =================================================================== --- branches/JBPAPP_5/main/src/bin/run.bat 2014-04-10 20:53:24 UTC (rev 114801) +++ branches/JBPAPP_5/main/src/bin/run.bat 2014-04-11 13:19:10 UTC (rev 114802) @@ -133,12 +133,15 @@ move /y "%JBOSS_LOG_DIR%\gc.log.2" "%JBOSS_LOG_DIR%\backupgc.log.2" > nul 2>&1 move /y "%JBOSS_LOG_DIR%\gc.log.3" "%JBOSS_LOG_DIR%\backupgc.log.3" > nul 2>&1 move /y "%JBOSS_LOG_DIR%\gc.log.4" "%JBOSS_LOG_DIR%\backupgc.log.4" > nul 2>&1 - "%JAVA%" -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M "-Xloggc:%JBOSS_LOG_DIR%\gc.log" -XX:-TraceClassUnloading -version > nul 2>&1 - if not errorlevel == 1 ( + set XLOGGC="%JBOSS_LOG_DIR%\gc.log" + "%JAVA%" -Xloggc:%XLOGGC% -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M -XX:-TraceClassUnloading -version > nul 2>&1 + if not errorlevel == 1 ( if not exist "%JBOSS_LOG_DIR%" > nul 2>&1 ( mkdir "%JBOSS_LOG_DIR%" > nul 2>&1 ) - set "JAVA_OPTS=-verbose:gc "-Xloggc:%JBOSS_LOG_DIR%\gc.log" -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M -XX:-TraceClassUnloading %JAVA_OPTS%" + set "JAVA_OPTS=-verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M -XX:-TraceClassUnloading %JAVA_OPTS%" + ) else ( + set XLOGGC= ) ) @@ -218,11 +221,17 @@ echo. :RESTART +if x%XLOGGC% == x ( "%JAVA%" %JAVA_OPTS% ^ -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" ^ -classpath "%JBOSS_CLASSPATH%" ^ org.jboss.Main %ARGS% - +) else ( +"%JAVA%" -Xloggc:%XLOGGC% %JAVA_OPTS% ^ + -Djava.endorsed.dirs="%JBOSS_ENDORSED_DIRS%" ^ + -classpath "%JBOSS_CLASSPATH%" ^ + org.jboss.Main %ARGS% +) if ERRORLEVEL 10 goto RESTART :END From jboss-cvs-commits at lists.jboss.org Mon Apr 14 09:54:00 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 14 Apr 2014 09:54:00 -0400 Subject: [jboss-cvs] JBossAS SVN: r114803 - branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation. Message-ID: <201404141354.s3EDs0XR021866@svn01.web.mwc.hst.phx2.redhat.com> Author: pjelinek Date: 2014-04-14 09:53:59 -0400 (Mon, 14 Apr 2014) New Revision: 114803 Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/GSSTestServer.java branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/KerberosServerControl.java branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/NegotiationSetup.java Log: JBPAPP-11001 workaround - on behalf of hmlnarik at redhat.com Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/GSSTestServer.java =================================================================== --- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/GSSTestServer.java 2014-04-11 13:19:10 UTC (rev 114802) +++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/GSSTestServer.java 2014-04-14 13:53:59 UTC (rev 114803) @@ -112,7 +112,7 @@ final Socket socket = new Socket(); try { - socket.connect(new InetSocketAddress(InetAddress.getLocalHost(), PORT), SOCKET_TIMEOUT); + socket.connect(new InetSocketAddress(InetAddress.getByName(null), PORT), SOCKET_TIMEOUT); DataOutputStream dos = new DataOutputStream(socket.getOutputStream()); dos.writeInt(CMD_STOP); dos.flush(); Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/KerberosServerControl.java =================================================================== --- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/KerberosServerControl.java 2014-04-11 13:19:10 UTC (rev 114802) +++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/KerberosServerControl.java 2014-04-14 13:53:59 UTC (rev 114803) @@ -131,7 +131,7 @@ if (args.length == 1 && STOP_CMD.equals(args[0])) { System.out.println("Sending STOP command to Kerberos controll process."); - SocketAddress sockaddr = new InetSocketAddress(InetAddress.getLocalHost(), SERVER_PORT); + SocketAddress sockaddr = new InetSocketAddress(InetAddress.getByName(null), SERVER_PORT); // Create an unbound socket Socket sock = new Socket(); sock.connect(sockaddr, SOCKET_TIMEOUT); Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/NegotiationSetup.java =================================================================== --- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/NegotiationSetup.java 2014-04-11 13:19:10 UTC (rev 114802) +++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/negotiation/NegotiationSetup.java 2014-04-14 13:53:59 UTC (rev 114803) @@ -21,7 +21,10 @@ */ package org.jboss.test.security.negotiation; +import java.io.ByteArrayOutputStream; +import java.io.DataOutputStream; import java.io.File; +import java.io.FileOutputStream; import java.io.FileWriter; import java.io.IOException; import java.util.ArrayList; @@ -74,6 +77,12 @@ private final String serverPrincipalName; + /** + * Byte array constant for keytab file format 5.2. + */ + public static final byte[] VERSION_52 = new byte[] + { ( byte ) 0x05, ( byte ) 0x02 }; + // Constructors ---------------------------------------------------------- /** @@ -180,28 +189,73 @@ * @param password * @param keytabFile * @throws IOException - * @throws DocumentException */ - private static final void createKeytabFile(String principalName, String password, File keytabFile) - throws IOException, DocumentException - { - final KerberosTime timeStamp = new KerberosTime(); - final long principalType = 1L; //KRB5_NT_PRINCIPAL + public static void createKeytabFile(final String principalName, final String passPhrase, final File keytabFile) throws IOException { + LOGGER.info("Principal name: " + principalName); - final Keytab keytab = Keytab.getInstance(); - final List entries = new ArrayList(); - for (Map.Entry keyEntry : KerberosKeyFactory.getKerberosKeys(principalName, - password).entrySet()) - { - final EncryptionKey key = keyEntry.getValue(); - final byte keyVersion = (byte) key.getKeyVersion(); - entries.add(new KeytabEntry(principalName, principalType, timeStamp, keyVersion, key)); - } - keytab.setEntries(entries); - keytab.write(keytabFile); - } + DataOutputStream dos = null; + try { + dos = new DataOutputStream(new FileOutputStream(keytabFile)); + dos.write(VERSION_52); + createKeyTabEntries(dos, principalName, passPhrase, 1 /* KRB5_NT_PRINCIPAL */); + } finally { + IOUtils.closeQuietly(dos); + } + } /** + * Produces a keytab file for given principal-password-type triplet. + * + * @param dos File to write keytab to + * @param principalName + * @param passPhrase + * @param principalType + * @throws IOException + */ + private static void createKeyTabEntries(final DataOutputStream dos, final String principalName, final String passPhrase, int principalType) throws IOException { + for (Map.Entry keyEntry : KerberosKeyFactory.getKerberosKeys(principalName, + passPhrase).entrySet()) { + final KerberosTime timeStamp = new KerberosTime(); + final EncryptionKey key = keyEntry.getValue(); + final byte keyVersion = (byte) key.getKeyVersion(); + // entries.add(new KeytabEntry(principalName, principalType, timeStamp, keyVersion, key)); + + final ByteArrayOutputStream baos = new ByteArrayOutputStream(); + DataOutputStream entryDos = new DataOutputStream(baos); + // handle principal name + String[] spnSplit = principalName.split("@"); + String nameComponent = spnSplit[0]; + String realm = spnSplit[1]; + + String[] nameComponents = nameComponent.split("/"); + try { + // increment for v1 + entryDos.writeShort((short) nameComponents.length); + entryDos.writeUTF(realm); + // write components + for (String component : nameComponents) { + entryDos.writeUTF(component); + } + + entryDos.writeInt(principalType); + entryDos.writeInt((int) (timeStamp.getTime() / 1000)); + entryDos.write(keyVersion); + + entryDos.writeShort((short) key.getKeyType().getValue()); + + byte[] data = key.getKeyValue(); + entryDos.writeShort((short) data.length); + entryDos.write(data); + } finally { + IOUtils.closeQuietly(entryDos); + } + final byte[] entryBytes = baos.toByteArray(); + dos.writeInt(entryBytes.length); + dos.write(entryBytes); + } + } + + /** * Registers SPNEGO authenticator in war-deployers-jboss-beans.xml. * * @throws DocumentException From jboss-cvs-commits at lists.jboss.org Tue Apr 15 08:00:57 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 15 Apr 2014 08:00:57 -0400 Subject: [jboss-cvs] JBossAS SVN: r114804 - branches/JBPAPP_5/testsuite/src/main/org/jboss/test/scripts/test. Message-ID: <201404151200.s3FC0vGt016967@svn01.web.mwc.hst.phx2.redhat.com> Author: pjelinek Date: 2014-04-15 08:00:56 -0400 (Tue, 15 Apr 2014) New Revision: 114804 Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/scripts/test/RunTestCase.java Log: JBPAPP-11126 on behalf of pkremens at redhat.com Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/scripts/test/RunTestCase.java =================================================================== --- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/scripts/test/RunTestCase.java 2014-04-14 13:53:59 UTC (rev 114803) +++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/scripts/test/RunTestCase.java 2014-04-15 12:00:56 UTC (rev 114804) @@ -27,9 +27,9 @@ import java.io.FileReader; import javax.management.ObjectName ; import javax.management.MalformedObjectNameException ; +import java.util.Map; +import java.util.Arrays; - - /** * Unit tests of run.sh and run.bat. * @@ -228,7 +228,7 @@ // TODO Solaris machines tend to fail if ANY environment variables are given this way. Why? // set the environment - String[] envp = new String[] { "LAUNCH_JBOSS_IN_BACKGROUND=true", "JBOSS_PIDFILE=" + pidFile.getAbsolutePath() }; + String[] envp = updateEnvs("LAUNCH_JBOSS_IN_BACKGROUND=true", "JBOSS_PIDFILE=" + pidFile.getAbsolutePath()); System.out.println("created pidFile: " + pidFile.getAbsolutePath()); // set the working directory @@ -284,6 +284,23 @@ Thread.sleep(2000); assertFalse("pidfile should be deleted", pidFile.exists()); } + + /** + * Update existing environment properties. + * + * @param extraEnv Extra environment properties. + * @return String array of updated environment properties. + */ + private String[] updateEnvs(String... extraEnv) { + Map envMap = System.getenv(); + int index = extraEnv.length; + String[] envs = Arrays.copyOf(extraEnv, index + envMap.size()); + for (Map.Entry entry : envMap.entrySet()) { + envs[index++] = entry.getKey() + "=" + entry.getValue(); + } + return envs; + } + private void writeLogsToTestCase() { From jboss-cvs-commits at lists.jboss.org Tue Apr 15 08:13:10 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 15 Apr 2014 08:13:10 -0400 Subject: [jboss-cvs] JBossAS SVN: r114805 - branches/JBPAPP_5/component-matrix. Message-ID: <201404151213.s3FCDAxb017953@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-04-15 08:13:10 -0400 (Tue, 15 Apr 2014) New Revision: 114805 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: JBPAPP-11073 Upgrade HornetQ to 2.2.28.Final Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-04-15 12:00:56 UTC (rev 114804) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-04-15 12:13:10 UTC (rev 114805) @@ -46,7 +46,7 @@ 3.1.2.SP18 1.0.1.GA 1.4.8.SP10 - 2.2.27.Final + 2.2.28.Final 2.1.16.GA 2.6.22.Final 3.8.2 From jboss-cvs-commits at lists.jboss.org Thu Apr 17 01:44:46 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 17 Apr 2014 01:44:46 -0400 Subject: [jboss-cvs] JBossAS SVN: r114806 - branches/JBPAPP_5/component-matrix. Message-ID: <201404170544.s3H5ik2n021575@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-04-17 01:44:45 -0400 (Thu, 17 Apr 2014) New Revision: 114806 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: JBPAPP-11016 Upgrade jbossts to 4.6.1.GA_CP15 Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-04-15 12:13:10 UTC (rev 114805) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-04-17 05:44:45 UTC (rev 114806) @@ -39,7 +39,7 @@ 2.1 1.0-MR1 2.0.1 - 4.6.1.GA_CP13 + 4.6.1.GA_CP15 1.1.0.SP11 3.1.2.SP14 1.1.2.SP8 From jboss-cvs-commits at lists.jboss.org Thu Apr 17 07:50:38 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 17 Apr 2014 07:50:38 -0400 Subject: [jboss-cvs] Picketbox SVN: r534 - in branches/eap62: assembly and 18 other directories. Message-ID: <201404171150.s3HBocJk001591@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek at redhat.com Date: 2014-04-17 07:50:37 -0400 (Thu, 17 Apr 2014) New Revision: 534 Modified: branches/eap62/assembly/pom.xml branches/eap62/parent/pom.xml branches/eap62/picketbox-infinispan/pom.xml branches/eap62/picketbox/pom.xml branches/eap62/pom.xml branches/eap62/security-jboss-sx/acl/pom.xml branches/eap62/security-jboss-sx/assembly/pom.xml branches/eap62/security-jboss-sx/identity/pom.xml branches/eap62/security-jboss-sx/jbosssx-client/pom.xml branches/eap62/security-jboss-sx/jbosssx/pom.xml branches/eap62/security-jboss-sx/parent/pom.xml branches/eap62/security-jboss-sx/pom.xml branches/eap62/security-spi/acl/pom.xml branches/eap62/security-spi/assembly/pom.xml branches/eap62/security-spi/authorization/pom.xml branches/eap62/security-spi/common/pom.xml branches/eap62/security-spi/identity/pom.xml branches/eap62/security-spi/parent/pom.xml branches/eap62/security-spi/pom.xml branches/eap62/security-spi/spi/pom.xml Log: setting new version to POMs 4.0.19.SP6 Modified: branches/eap62/assembly/pom.xml =================================================================== --- branches/eap62/assembly/pom.xml 2014-04-04 17:18:48 UTC (rev 533) +++ branches/eap62/assembly/pom.xml 2014-04-17 11:50:37 UTC (rev 534) @@ -2,7 +2,7 @@ org.picketbox picketbox-parent - 4.0.19.SP6-SNAPSHOT + 4.0.19.SP6 ../parent 4.0.0 Modified: branches/eap62/parent/pom.xml =================================================================== --- branches/eap62/parent/pom.xml 2014-04-04 17:18:48 UTC (rev 533) +++ branches/eap62/parent/pom.xml 2014-04-17 11:50:37 UTC (rev 534) @@ -8,7 +8,7 @@ org.picketbox picketbox-parent pom - 4.0.19.SP6-SNAPSHOT + 4.0.19.SP6 PicketBox- Parent http://jboss.org/picketbox PicketBox is a security framework for authentication, authorization, audit and mapping @@ -23,8 +23,8 @@ http://www.jboss.org - scm:svn:http://anonsvn.jboss.org/repos/picketbox/tags/4.0.19.SP6-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/tags/4.0.19.SP6-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/tags/4.0.19.SP6 + scm:svn:https://svn.jboss.org/repos/picketbox/tags/4.0.19.SP6 Modified: branches/eap62/picketbox/pom.xml =================================================================== --- branches/eap62/picketbox/pom.xml 2014-04-04 17:18:48 UTC (rev 533) +++ branches/eap62/picketbox/pom.xml 2014-04-17 11:50:37 UTC (rev 534) @@ -8,7 +8,7 @@ 4.0.0 org.picketbox picketbox-bare - 4.0.19.SP6-SNAPSHOT + 4.0.19.SP6 jar Picketbox http://jboss.org/picketbox Modified: branches/eap62/picketbox-infinispan/pom.xml =================================================================== --- branches/eap62/picketbox-infinispan/pom.xml 2014-04-04 17:18:48 UTC (rev 533) +++ branches/eap62/picketbox-infinispan/pom.xml 2014-04-17 11:50:37 UTC (rev 534) @@ -8,7 +8,7 @@ 4.0.0 org.picketbox picketbox-infinispan - 4.0.19.SP6-SNAPSHOT + 4.0.19.SP6 jar Picketbox Infinispan http://jboss.org/picketbox Modified: branches/eap62/pom.xml =================================================================== --- branches/eap62/pom.xml 2014-04-04 17:18:48 UTC (rev 533) +++ branches/eap62/pom.xml 2014-04-17 11:50:37 UTC (rev 534) @@ -2,7 +2,7 @@ org.picketbox picketbox-parent - 4.0.19.SP6-SNAPSHOT + 4.0.19.SP6 parent Modified: branches/eap62/security-jboss-sx/acl/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/acl/pom.xml 2014-04-04 17:18:48 UTC (rev 533) +++ branches/eap62/security-jboss-sx/acl/pom.xml 2014-04-17 11:50:37 UTC (rev 534) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP6-SNAPSHOT + 4.0.19.SP6 ../parent 4.0.0 Modified: branches/eap62/security-jboss-sx/assembly/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/assembly/pom.xml 2014-04-04 17:18:48 UTC (rev 533) +++ branches/eap62/security-jboss-sx/assembly/pom.xml 2014-04-17 11:50:37 UTC (rev 534) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP6-SNAPSHOT + 4.0.19.SP6 ../parent 4.0.0 Modified: branches/eap62/security-jboss-sx/identity/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/identity/pom.xml 2014-04-04 17:18:48 UTC (rev 533) +++ branches/eap62/security-jboss-sx/identity/pom.xml 2014-04-17 11:50:37 UTC (rev 534) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP6-SNAPSHOT + 4.0.19.SP6 ../parent 4.0.0 Modified: branches/eap62/security-jboss-sx/jbosssx/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/jbosssx/pom.xml 2014-04-04 17:18:48 UTC (rev 533) +++ branches/eap62/security-jboss-sx/jbosssx/pom.xml 2014-04-17 11:50:37 UTC (rev 534) @@ -3,7 +3,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP6-SNAPSHOT + 4.0.19.SP6 ../parent 4.0.0 Modified: branches/eap62/security-jboss-sx/jbosssx-client/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/jbosssx-client/pom.xml 2014-04-04 17:18:48 UTC (rev 533) +++ branches/eap62/security-jboss-sx/jbosssx-client/pom.xml 2014-04-17 11:50:37 UTC (rev 534) @@ -7,7 +7,7 @@ 4.0.0 org.picketbox jbosssx-client - 4.0.19.SP6-SNAPSHOT + 4.0.19.SP6 jar PicketBox Client http://www.jboss.org/picketbox Modified: branches/eap62/security-jboss-sx/parent/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/parent/pom.xml 2014-04-04 17:18:48 UTC (rev 533) +++ branches/eap62/security-jboss-sx/parent/pom.xml 2014-04-17 11:50:37 UTC (rev 534) @@ -8,7 +8,7 @@ org.picketbox jbosssx-parent pom - 4.0.19.SP6-SNAPSHOT + 4.0.19.SP6 JBossSX - Parent http://jboss.org/picketbox PicketBox is a security project for Java Applications. @@ -23,8 +23,8 @@ http://www.jboss.org - scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.19.SP6-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.19.SP6-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.19.SP6 + scm:svn:https://svn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.19.SP6 @@ -148,6 +148,6 @@ GA - 4.0.19.SP6-SNAPSHOT + 4.0.19.SP6 Modified: branches/eap62/security-jboss-sx/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/pom.xml 2014-04-04 17:18:48 UTC (rev 533) +++ branches/eap62/security-jboss-sx/pom.xml 2014-04-17 11:50:37 UTC (rev 534) @@ -7,7 +7,7 @@ 4.0.0 org.picketbox jbosssx-pom - 4.0.19.SP6-SNAPSHOT + 4.0.19.SP6 pom PicketBox Implementation - Parent http://jboss.org/picketbox Modified: branches/eap62/security-spi/acl/pom.xml =================================================================== --- branches/eap62/security-spi/acl/pom.xml 2014-04-04 17:18:48 UTC (rev 533) +++ branches/eap62/security-spi/acl/pom.xml 2014-04-17 11:50:37 UTC (rev 534) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP6-SNAPSHOT + 4.0.19.SP6 ../parent 4.0.0 @@ -22,9 +22,9 @@ http://www.jboss.org - scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6-SNAPSHOT - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP6-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP6 Modified: branches/eap62/security-spi/assembly/pom.xml =================================================================== --- branches/eap62/security-spi/assembly/pom.xml 2014-04-04 17:18:48 UTC (rev 533) +++ branches/eap62/security-spi/assembly/pom.xml 2014-04-17 11:50:37 UTC (rev 534) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP6-SNAPSHOT + 4.0.19.SP6 ../parent 4.0.0 Modified: branches/eap62/security-spi/authorization/pom.xml =================================================================== --- branches/eap62/security-spi/authorization/pom.xml 2014-04-04 17:18:48 UTC (rev 533) +++ branches/eap62/security-spi/authorization/pom.xml 2014-04-17 11:50:37 UTC (rev 534) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP6-SNAPSHOT + 4.0.19.SP6 ../parent 4.0.0 @@ -22,9 +22,9 @@ http://www.jboss.org - scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6-SNAPSHOT - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP6-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP6 Modified: branches/eap62/security-spi/common/pom.xml =================================================================== --- branches/eap62/security-spi/common/pom.xml 2014-04-04 17:18:48 UTC (rev 533) +++ branches/eap62/security-spi/common/pom.xml 2014-04-17 11:50:37 UTC (rev 534) @@ -5,7 +5,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP6-SNAPSHOT + 4.0.19.SP6 ../parent 4.0.0 @@ -25,9 +25,9 @@ http://www.jboss.org - scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6-SNAPSHOT - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP6-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP6 Modified: branches/eap62/security-spi/identity/pom.xml =================================================================== --- branches/eap62/security-spi/identity/pom.xml 2014-04-04 17:18:48 UTC (rev 533) +++ branches/eap62/security-spi/identity/pom.xml 2014-04-17 11:50:37 UTC (rev 534) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP6-SNAPSHOT + 4.0.19.SP6 ../parent 4.0.0 @@ -22,9 +22,9 @@ http://www.jboss.org - scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6-SNAPSHOT - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP6-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP6 Modified: branches/eap62/security-spi/parent/pom.xml =================================================================== --- branches/eap62/security-spi/parent/pom.xml 2014-04-04 17:18:48 UTC (rev 533) +++ branches/eap62/security-spi/parent/pom.xml 2014-04-17 11:50:37 UTC (rev 534) @@ -8,7 +8,7 @@ org.picketbox picketbox-spi-parent pom - 4.0.19.SP6-SNAPSHOT + 4.0.19.SP6 PicketBox SPI - Parent http://jboss.org/picketbox PicketBox is a security project for Java Applications. @@ -23,8 +23,8 @@ http://www.jboss.org - scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 Modified: branches/eap62/security-spi/pom.xml =================================================================== --- branches/eap62/security-spi/pom.xml 2014-04-04 17:18:48 UTC (rev 533) +++ branches/eap62/security-spi/pom.xml 2014-04-17 11:50:37 UTC (rev 534) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP6-SNAPSHOT + 4.0.19.SP6 parent 4.0.0 Modified: branches/eap62/security-spi/spi/pom.xml =================================================================== --- branches/eap62/security-spi/spi/pom.xml 2014-04-04 17:18:48 UTC (rev 533) +++ branches/eap62/security-spi/spi/pom.xml 2014-04-17 11:50:37 UTC (rev 534) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP6-SNAPSHOT + 4.0.19.SP6 ../parent 4.0.0 @@ -22,9 +22,9 @@ http://www.jboss.org - scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6-SNAPSHOT - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP6-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP6 From jboss-cvs-commits at lists.jboss.org Thu Apr 17 07:52:12 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 17 Apr 2014 07:52:12 -0400 Subject: [jboss-cvs] Picketbox SVN: r535 - tags. Message-ID: <201404171152.s3HBqC4d001686@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek at redhat.com Date: 2014-04-17 07:52:11 -0400 (Thu, 17 Apr 2014) New Revision: 535 Added: tags/4.0.19.SP6/ Log: tagging release 4.0.19.SP6 From jboss-cvs-commits at lists.jboss.org Thu Apr 17 08:17:38 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 17 Apr 2014 08:17:38 -0400 Subject: [jboss-cvs] Picketbox SVN: r536 - in branches/eap62: assembly and 18 other directories. Message-ID: <201404171217.s3HCHcbQ010602@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek at redhat.com Date: 2014-04-17 08:17:37 -0400 (Thu, 17 Apr 2014) New Revision: 536 Modified: branches/eap62/assembly/pom.xml branches/eap62/parent/pom.xml branches/eap62/picketbox-infinispan/pom.xml branches/eap62/picketbox/pom.xml branches/eap62/pom.xml branches/eap62/security-jboss-sx/acl/pom.xml branches/eap62/security-jboss-sx/assembly/pom.xml branches/eap62/security-jboss-sx/identity/pom.xml branches/eap62/security-jboss-sx/jbosssx-client/pom.xml branches/eap62/security-jboss-sx/jbosssx/pom.xml branches/eap62/security-jboss-sx/parent/pom.xml branches/eap62/security-jboss-sx/pom.xml branches/eap62/security-spi/acl/pom.xml branches/eap62/security-spi/assembly/pom.xml branches/eap62/security-spi/authorization/pom.xml branches/eap62/security-spi/common/pom.xml branches/eap62/security-spi/identity/pom.xml branches/eap62/security-spi/parent/pom.xml branches/eap62/security-spi/pom.xml branches/eap62/security-spi/spi/pom.xml Log: setting next version for development Modified: branches/eap62/assembly/pom.xml =================================================================== --- branches/eap62/assembly/pom.xml 2014-04-17 11:52:11 UTC (rev 535) +++ branches/eap62/assembly/pom.xml 2014-04-17 12:17:37 UTC (rev 536) @@ -2,7 +2,7 @@ org.picketbox picketbox-parent - 4.0.19.SP6 + 4.0.19.SP7-SNAPSHOT ../parent 4.0.0 Modified: branches/eap62/parent/pom.xml =================================================================== --- branches/eap62/parent/pom.xml 2014-04-17 11:52:11 UTC (rev 535) +++ branches/eap62/parent/pom.xml 2014-04-17 12:17:37 UTC (rev 536) @@ -8,7 +8,7 @@ org.picketbox picketbox-parent pom - 4.0.19.SP6 + 4.0.19.SP7-SNAPSHOT PicketBox- Parent http://jboss.org/picketbox PicketBox is a security framework for authentication, authorization, audit and mapping @@ -23,8 +23,8 @@ http://www.jboss.org - scm:svn:http://anonsvn.jboss.org/repos/picketbox/tags/4.0.19.SP6 - scm:svn:https://svn.jboss.org/repos/picketbox/tags/4.0.19.SP6 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/tags/4.0.19.SP7-SNAPSHOT + scm:svn:https://svn.jboss.org/repos/picketbox/tags/4.0.19.SP7-SNAPSHOT Modified: branches/eap62/picketbox/pom.xml =================================================================== --- branches/eap62/picketbox/pom.xml 2014-04-17 11:52:11 UTC (rev 535) +++ branches/eap62/picketbox/pom.xml 2014-04-17 12:17:37 UTC (rev 536) @@ -8,7 +8,7 @@ 4.0.0 org.picketbox picketbox-bare - 4.0.19.SP6 + 4.0.19.SP7-SNAPSHOT jar Picketbox http://jboss.org/picketbox Modified: branches/eap62/picketbox-infinispan/pom.xml =================================================================== --- branches/eap62/picketbox-infinispan/pom.xml 2014-04-17 11:52:11 UTC (rev 535) +++ branches/eap62/picketbox-infinispan/pom.xml 2014-04-17 12:17:37 UTC (rev 536) @@ -8,7 +8,7 @@ 4.0.0 org.picketbox picketbox-infinispan - 4.0.19.SP6 + 4.0.19.SP7-SNAPSHOT jar Picketbox Infinispan http://jboss.org/picketbox Modified: branches/eap62/pom.xml =================================================================== --- branches/eap62/pom.xml 2014-04-17 11:52:11 UTC (rev 535) +++ branches/eap62/pom.xml 2014-04-17 12:17:37 UTC (rev 536) @@ -2,7 +2,7 @@ org.picketbox picketbox-parent - 4.0.19.SP6 + 4.0.19.SP7-SNAPSHOT parent Modified: branches/eap62/security-jboss-sx/acl/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/acl/pom.xml 2014-04-17 11:52:11 UTC (rev 535) +++ branches/eap62/security-jboss-sx/acl/pom.xml 2014-04-17 12:17:37 UTC (rev 536) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP6 + 4.0.19.SP7-SNAPSHOT ../parent 4.0.0 Modified: branches/eap62/security-jboss-sx/assembly/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/assembly/pom.xml 2014-04-17 11:52:11 UTC (rev 535) +++ branches/eap62/security-jboss-sx/assembly/pom.xml 2014-04-17 12:17:37 UTC (rev 536) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP6 + 4.0.19.SP7-SNAPSHOT ../parent 4.0.0 Modified: branches/eap62/security-jboss-sx/identity/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/identity/pom.xml 2014-04-17 11:52:11 UTC (rev 535) +++ branches/eap62/security-jboss-sx/identity/pom.xml 2014-04-17 12:17:37 UTC (rev 536) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP6 + 4.0.19.SP7-SNAPSHOT ../parent 4.0.0 Modified: branches/eap62/security-jboss-sx/jbosssx/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/jbosssx/pom.xml 2014-04-17 11:52:11 UTC (rev 535) +++ branches/eap62/security-jboss-sx/jbosssx/pom.xml 2014-04-17 12:17:37 UTC (rev 536) @@ -3,7 +3,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP6 + 4.0.19.SP7-SNAPSHOT ../parent 4.0.0 Modified: branches/eap62/security-jboss-sx/jbosssx-client/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/jbosssx-client/pom.xml 2014-04-17 11:52:11 UTC (rev 535) +++ branches/eap62/security-jboss-sx/jbosssx-client/pom.xml 2014-04-17 12:17:37 UTC (rev 536) @@ -7,7 +7,7 @@ 4.0.0 org.picketbox jbosssx-client - 4.0.19.SP6 + 4.0.19.SP7-SNAPSHOT jar PicketBox Client http://www.jboss.org/picketbox Modified: branches/eap62/security-jboss-sx/parent/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/parent/pom.xml 2014-04-17 11:52:11 UTC (rev 535) +++ branches/eap62/security-jboss-sx/parent/pom.xml 2014-04-17 12:17:37 UTC (rev 536) @@ -8,7 +8,7 @@ org.picketbox jbosssx-parent pom - 4.0.19.SP6 + 4.0.19.SP7-SNAPSHOT JBossSX - Parent http://jboss.org/picketbox PicketBox is a security project for Java Applications. @@ -23,8 +23,8 @@ http://www.jboss.org - scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.19.SP6 - scm:svn:https://svn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.19.SP6 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.19.SP7-SNAPSHOT + scm:svn:https://svn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.19.SP7-SNAPSHOT @@ -148,6 +148,6 @@ GA - 4.0.19.SP6 + 4.0.19.SP7-SNAPSHOT Modified: branches/eap62/security-jboss-sx/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/pom.xml 2014-04-17 11:52:11 UTC (rev 535) +++ branches/eap62/security-jboss-sx/pom.xml 2014-04-17 12:17:37 UTC (rev 536) @@ -7,7 +7,7 @@ 4.0.0 org.picketbox jbosssx-pom - 4.0.19.SP6 + 4.0.19.SP7-SNAPSHOT pom PicketBox Implementation - Parent http://jboss.org/picketbox Modified: branches/eap62/security-spi/acl/pom.xml =================================================================== --- branches/eap62/security-spi/acl/pom.xml 2014-04-17 11:52:11 UTC (rev 535) +++ branches/eap62/security-spi/acl/pom.xml 2014-04-17 12:17:37 UTC (rev 536) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP6 + 4.0.19.SP7-SNAPSHOT ../parent 4.0.0 @@ -22,9 +22,9 @@ http://www.jboss.org - scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP6 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP7-SNAPSHOT + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP7-SNAPSHOT + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP7-SNAPSHOT Modified: branches/eap62/security-spi/assembly/pom.xml =================================================================== --- branches/eap62/security-spi/assembly/pom.xml 2014-04-17 11:52:11 UTC (rev 535) +++ branches/eap62/security-spi/assembly/pom.xml 2014-04-17 12:17:37 UTC (rev 536) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP6 + 4.0.19.SP7-SNAPSHOT ../parent 4.0.0 Modified: branches/eap62/security-spi/authorization/pom.xml =================================================================== --- branches/eap62/security-spi/authorization/pom.xml 2014-04-17 11:52:11 UTC (rev 535) +++ branches/eap62/security-spi/authorization/pom.xml 2014-04-17 12:17:37 UTC (rev 536) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP6 + 4.0.19.SP7-SNAPSHOT ../parent 4.0.0 @@ -22,9 +22,9 @@ http://www.jboss.org - scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP6 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP7-SNAPSHOT + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP7-SNAPSHOT + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP7-SNAPSHOT Modified: branches/eap62/security-spi/common/pom.xml =================================================================== --- branches/eap62/security-spi/common/pom.xml 2014-04-17 11:52:11 UTC (rev 535) +++ branches/eap62/security-spi/common/pom.xml 2014-04-17 12:17:37 UTC (rev 536) @@ -5,7 +5,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP6 + 4.0.19.SP7-SNAPSHOT ../parent 4.0.0 @@ -25,9 +25,9 @@ http://www.jboss.org - scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP6 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP7-SNAPSHOT + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP7-SNAPSHOT + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP7-SNAPSHOT Modified: branches/eap62/security-spi/identity/pom.xml =================================================================== --- branches/eap62/security-spi/identity/pom.xml 2014-04-17 11:52:11 UTC (rev 535) +++ branches/eap62/security-spi/identity/pom.xml 2014-04-17 12:17:37 UTC (rev 536) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP6 + 4.0.19.SP7-SNAPSHOT ../parent 4.0.0 @@ -22,9 +22,9 @@ http://www.jboss.org - scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP6 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP7-SNAPSHOT + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP7-SNAPSHOT + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP7-SNAPSHOT Modified: branches/eap62/security-spi/parent/pom.xml =================================================================== --- branches/eap62/security-spi/parent/pom.xml 2014-04-17 11:52:11 UTC (rev 535) +++ branches/eap62/security-spi/parent/pom.xml 2014-04-17 12:17:37 UTC (rev 536) @@ -8,7 +8,7 @@ org.picketbox picketbox-spi-parent pom - 4.0.19.SP6 + 4.0.19.SP7-SNAPSHOT PicketBox SPI - Parent http://jboss.org/picketbox PicketBox is a security project for Java Applications. @@ -23,8 +23,8 @@ http://www.jboss.org - scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP7-SNAPSHOT + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP7-SNAPSHOT Modified: branches/eap62/security-spi/pom.xml =================================================================== --- branches/eap62/security-spi/pom.xml 2014-04-17 11:52:11 UTC (rev 535) +++ branches/eap62/security-spi/pom.xml 2014-04-17 12:17:37 UTC (rev 536) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP6 + 4.0.19.SP7-SNAPSHOT parent 4.0.0 Modified: branches/eap62/security-spi/spi/pom.xml =================================================================== --- branches/eap62/security-spi/spi/pom.xml 2014-04-17 11:52:11 UTC (rev 535) +++ branches/eap62/security-spi/spi/pom.xml 2014-04-17 12:17:37 UTC (rev 536) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP6 + 4.0.19.SP7-SNAPSHOT ../parent 4.0.0 @@ -22,9 +22,9 @@ http://www.jboss.org - scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP6 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP6 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP7-SNAPSHOT + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP7-SNAPSHOT + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP7-SNAPSHOT From jboss-cvs-commits at lists.jboss.org Thu Apr 17 16:13:28 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 17 Apr 2014 16:13:28 -0400 Subject: [jboss-cvs] Picketbox SVN: r537 - branches. Message-ID: <201404172013.s3HKDSSm014018@svn01.web.mwc.hst.phx2.redhat.com> Author: dehort Date: 2014-04-17 16:13:27 -0400 (Thu, 17 Apr 2014) New Revision: 537 Added: branches/4.0.17.SP2-bz-1089068/ Log: [bz-1089068] Creating a branch for a one-off patch From jboss-cvs-commits at lists.jboss.org Thu Apr 17 16:41:42 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 17 Apr 2014 16:41:42 -0400 Subject: [jboss-cvs] Picketbox SVN: r538 - branches/4.0.17.SP2-bz-1089068/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi. Message-ID: <201404172041.s3HKfgXX017385@svn01.web.mwc.hst.phx2.redhat.com> Author: dehort Date: 2014-04-17 16:41:42 -0400 (Thu, 17 Apr 2014) New Revision: 538 Modified: branches/4.0.17.SP2-bz-1089068/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java Log: [bz-1089068] Fixed an issue where the LdapExtLoginModule fetches too many attributes in roleSearch Modified: branches/4.0.17.SP2-bz-1089068/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java =================================================================== --- branches/4.0.17.SP2-bz-1089068/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java 2014-04-17 20:13:27 UTC (rev 537) +++ branches/4.0.17.SP2-bz-1089068/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java 2014-04-17 20:41:42 UTC (rev 538) @@ -468,6 +468,7 @@ SearchControls constraints = new SearchControls(); constraints.setSearchScope(searchScope); constraints.setTimeLimit(searchTimeLimit); + constraints.setReturningAttributes(new String[0]); rolesSearch(ctx, constraints, username, userDN, recursion, 0); } catch(Exception e) From jboss-cvs-commits at lists.jboss.org Sun Apr 20 23:52:30 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Sun, 20 Apr 2014 23:52:30 -0400 Subject: [jboss-cvs] JBoss Messaging SVN: r8626 - branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms. Message-ID: <201404210352.s3L3qU5D020956@svn01.web.mwc.hst.phx2.redhat.com> Author: gaohoward Date: 2014-04-20 23:52:29 -0400 (Sun, 20 Apr 2014) New Revision: 8626 Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/DLQTest.java Log: JBMESSAGING-1951 DLQTest is unstable because of inappropriate cleanup Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/DLQTest.java =================================================================== --- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/DLQTest.java 2014-03-14 07:36:21 UTC (rev 8625) +++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/DLQTest.java 2014-04-21 03:52:29 UTC (rev 8626) @@ -54,7 +54,38 @@ } // Public -------------------------------------------------------- + @Override + protected void tearDown() throws Exception + { + ObjectName serverPeerObjectName = ServerManagement.getServerPeerObjectName(); + ServerManagement.setAttribute(serverPeerObjectName, + "DefaultDLQ", + "jboss.messaging.destination:service=Queue,name=DLQ"); + String testQueue1ObjectName = "jboss.messaging.destination:service=Queue,name=Queue1"; + ServerManagement.setAttribute(new ObjectName(testQueue1ObjectName), + "MaxDeliveryAttempts", + "-1"); + String testQueue2ObjectName = "jboss.messaging.destination:service=Queue,name=Queue2"; + ServerManagement.setAttribute(new ObjectName(testQueue2ObjectName), + "MaxDeliveryAttempts", + "-1"); + String testQueue3ObjectName = "jboss.messaging.destination:service=Queue,name=Queue3"; + ServerManagement.setAttribute(new ObjectName(testQueue3ObjectName), + "MaxDeliveryAttempts", + "-1"); + String testQueue4ObjectName = "jboss.messaging.destination:service=Queue,name=Queue4"; + ServerManagement.setAttribute(new ObjectName(testQueue4ObjectName), + "MaxDeliveryAttempts", + "-1"); + String testTopic1ObjectName = "jboss.messaging.destination:service=Topic,name=Topic1"; + ServerManagement.setAttribute(new ObjectName(testTopic1ObjectName), + "MaxDeliveryAttempts", + "-1"); + + super.tearDown(); + } + public void testDLQAlreadyDeployed() throws Exception { if (ServerManagement.isRemote()) @@ -370,7 +401,7 @@ { for (int j = 0; j < NUM_MESSAGES; j++) { - TextMessage tm = (TextMessage)cons.receive(1000); + TextMessage tm = (TextMessage)cons.receive(5000); assertNotNull(tm); @@ -741,7 +772,7 @@ { for (int j = 0; j < NUM_MESSAGES; j++) { - TextMessage tm = (TextMessage)cons.receive(1000); + TextMessage tm = (TextMessage)cons.receive(5000); assertNotNull(tm); @@ -841,7 +872,7 @@ { for (int j = 0; j < NUM_MESSAGES; j++) { - TextMessage tm = (TextMessage)cons.receive(1000); + TextMessage tm = (TextMessage)cons.receive(5000); assertNotNull(tm); From jboss-cvs-commits at lists.jboss.org Tue Apr 22 21:59:16 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 22 Apr 2014 21:59:16 -0400 Subject: [jboss-cvs] JBoss Messaging SVN: r8627 - in branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms: bridge and 1 other directories. Message-ID: <201404230159.s3N1xGNS021600@svn01.web.mwc.hst.phx2.redhat.com> Author: gaohoward Date: 2014-04-22 21:59:15 -0400 (Tue, 22 Apr 2014) New Revision: 8627 Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/ConnectionConsumerTest.java branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/DisableLoadBalancingAndFailoverTest.java Log: JBPAPP-11144 Intermittent failures in JBM test suite Increasing timeout to allow tests pass on slow machines. Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/ConnectionConsumerTest.java =================================================================== --- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/ConnectionConsumerTest.java 2014-04-21 03:52:29 UTC (rev 8626) +++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/ConnectionConsumerTest.java 2014-04-23 01:59:15 UTC (rev 8627) @@ -208,7 +208,9 @@ TextMessage m1 = sessProd.createTextMessage("a"); prod.send(m1); - + + //waiting for the message before close. + Thread.sleep(3000); cc.close(); pool.shutdown(); Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java =================================================================== --- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java 2014-04-21 03:52:29 UTC (rev 8626) +++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/bridge/BridgeTestBase.java 2014-04-23 01:59:15 UTC (rev 8627) @@ -323,7 +323,7 @@ for (int i = 0; i < numMessages; i++) { - TextMessage tm = (TextMessage)cons.receive(30000); + TextMessage tm = (TextMessage)cons.receive(100000); assertNotNull(tm); Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/DisableLoadBalancingAndFailoverTest.java =================================================================== --- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/DisableLoadBalancingAndFailoverTest.java 2014-04-21 03:52:29 UTC (rev 8626) +++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/clustering/DisableLoadBalancingAndFailoverTest.java 2014-04-23 01:59:15 UTC (rev 8627) @@ -14,7 +14,6 @@ import javax.jms.MessageProducer; import javax.jms.Session; import javax.jms.TextMessage; -import javax.management.ObjectName; import org.jboss.jms.client.FailoverEvent; import org.jboss.jms.client.JBossConnection; @@ -240,7 +239,7 @@ long end = System.currentTimeMillis(); //Make sure it doesn't take too long - assertTrue((end - start) <= 500); + assertTrue((end - start) <= 10000); } } finally @@ -296,7 +295,7 @@ prod.send(tm); - TextMessage rm = (TextMessage)cons.receive(1000); + TextMessage rm = (TextMessage)cons.receive(5000); assertNotNull(rm); @@ -362,7 +361,7 @@ prod.send(tm); - TextMessage rm = (TextMessage)cons.receive(2000); + TextMessage rm = (TextMessage)cons.receive(5000); assertNotNull(rm); From jboss-cvs-commits at lists.jboss.org Wed Apr 23 19:58:48 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 23 Apr 2014 19:58:48 -0400 Subject: [jboss-cvs] JBossAS SVN: r114807 - branches/JBPAPP_5/component-matrix. Message-ID: <201404232358.s3NNwm55007995@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-04-23 19:58:48 -0400 (Wed, 23 Apr 2014) New Revision: 114807 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: JBPAPP-10992 Upgrade to jboss-negotiation 2.1.6.Final Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-04-17 05:44:45 UTC (rev 114806) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-04-23 23:58:48 UTC (rev 114807) @@ -88,7 +88,7 @@ 2.5.4.SP5 2.0.8.Final 2.0.8.Final - 2.1.4.GA + 2.1.6.Final 1.0.6.FINAL 1.0.2.GA_CP03 1.0.0.GA From jboss-cvs-commits at lists.jboss.org Fri Apr 25 23:50:23 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Fri, 25 Apr 2014 23:50:23 -0400 Subject: [jboss-cvs] JBoss Messaging SVN: r8628 - in branches/Branch_1_4: docs and 1 other directory. Message-ID: <201404260350.s3Q3oNtM015097@svn01.web.mwc.hst.phx2.redhat.com> Author: gaohoward Date: 2014-04-25 23:50:23 -0400 (Fri, 25 Apr 2014) New Revision: 8628 Modified: branches/Branch_1_4/build-messaging.xml branches/Branch_1_4/docs/README.html Log: Updating version and readme Modified: branches/Branch_1_4/build-messaging.xml =================================================================== --- branches/Branch_1_4/build-messaging.xml 2014-04-23 01:59:15 UTC (rev 8627) +++ branches/Branch_1_4/build-messaging.xml 2014-04-26 03:50:23 UTC (rev 8628) @@ -52,10 +52,10 @@ - - - - + + + + Modified: branches/Branch_1_4/docs/README.html =================================================================== --- branches/Branch_1_4/docs/README.html 2014-04-23 01:59:15 UTC (rev 8627) +++ branches/Branch_1_4/docs/README.html 2014-04-26 03:50:23 UTC (rev 8628) @@ -3,19 +3,19 @@ - Release Notes - JBoss Messaging - Version 1.4.8.SP10 + Release Notes - JBoss Messaging - Version 1.4.8.SP11 -

Release Notes - JBoss Messaging - Version 1.4.8.SP10

+

Release Notes - JBoss Messaging - Version 1.4.8.SP11


-

14 Feburary 2014

+

25 April 2014

-

JBoss Messaging Version 1.4.8.SP10 is a release made and tested exclusively for the EAP 5 only and it should be part of the JBoss 5 download bundle.

+

JBoss Messaging Version 1.4.8.SP11 is a release made and tested exclusively for the EAP 5 only and it should be part of the JBoss 5 download bundle.

-For full description of the contents please see the JBoss Messaging project JIRA.

+For full description of the contents please see the JBoss Messaging project JIRA.

Enjoy!

From jboss-cvs-commits at lists.jboss.org Mon Apr 28 07:58:41 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 28 Apr 2014 07:58:41 -0400 Subject: [jboss-cvs] JBoss Messaging SVN: r8629 - branches/Branch_1_4/docs. Message-ID: <201404281158.s3SBwfBT016792@svn01.web.mwc.hst.phx2.redhat.com> Author: gaohoward Date: 2014-04-28 07:58:41 -0400 (Mon, 28 Apr 2014) New Revision: 8629 Modified: branches/Branch_1_4/docs/README.html Log: update release note link Modified: branches/Branch_1_4/docs/README.html =================================================================== --- branches/Branch_1_4/docs/README.html 2014-04-26 03:50:23 UTC (rev 8628) +++ branches/Branch_1_4/docs/README.html 2014-04-28 11:58:41 UTC (rev 8629) @@ -15,7 +15,7 @@

JBoss Messaging Version 1.4.8.SP11 is a release made and tested exclusively for the EAP 5 only and it should be part of the JBoss 5 download bundle.

-For full description of the contents please see the JBoss Messaging project JIRA.

+For full description of the contents please see the JBoss Messaging project JIRA.

Enjoy!

From jboss-cvs-commits at lists.jboss.org Mon Apr 28 08:42:14 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 28 Apr 2014 08:42:14 -0400 Subject: [jboss-cvs] JBoss Messaging SVN: r8630 - tags. Message-ID: <201404281242.s3SCgEfN027578@svn01.web.mwc.hst.phx2.redhat.com> Author: gaohoward Date: 2014-04-28 08:42:14 -0400 (Mon, 28 Apr 2014) New Revision: 8630 Added: tags/JBossMessaging_1_4_8_SP11/ Log: tagging 1.4.8.SP11 From jboss-cvs-commits at lists.jboss.org Tue Apr 29 07:02:05 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 29 Apr 2014 07:02:05 -0400 Subject: [jboss-cvs] JBossAS SVN: r114808 - branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/test. Message-ID: <201404291102.s3TB25TF019365@svn01.web.mwc.hst.phx2.redhat.com> Author: baranowb Date: 2014-04-29 07:02:04 -0400 (Tue, 29 Apr 2014) New Revision: 114808 Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/test/NegotiationTestCase.java Log: JBPAPP-10748 Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/test/NegotiationTestCase.java =================================================================== --- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/test/NegotiationTestCase.java 2014-04-23 23:58:48 UTC (rev 114807) +++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/test/NegotiationTestCase.java 2014-04-29 11:02:04 UTC (rev 114808) @@ -23,15 +23,19 @@ import java.io.File; import java.security.Principal; +import java.security.PrivilegedExceptionAction; import java.util.Properties; import javax.naming.Context; import javax.naming.InitialContext; +import javax.security.auth.Subject; import javax.security.auth.login.Configuration; +import javax.security.auth.login.LoginContext; import javax.servlet.http.HttpServletResponse; import org.apache.commons.lang.SystemUtils; import org.jboss.logging.Logger; +import org.jboss.security.auth.callback.UsernamePasswordHandler; import org.jboss.test.JBossTestCase; import org.jboss.test.security.ejb3.SimpleSession; import org.jboss.test.security.negotiation.GSSTestServer; @@ -40,6 +44,7 @@ import org.jboss.test.security.negotiation.NegotiationUtils; import org.jboss.test.security.negotiation.PropagateIdentityServlet; + /** * A JBoss Negotiation tests. Two processes must be started before this TC runs - KDC Server ({@link KerberosServerControl}) and * sample server for testing identity propagation ({@link GSSTestServer}). @@ -150,51 +155,63 @@ assertEquals("Unexpected response body", "OK", responseBody); } - /** - * Tests EJB authentication using SPNEGO. - * - * @throws Exception - */ + public void testEjbAccess() throws Exception { - if (SystemUtils.JAVA_VENDOR.startsWith("IBM")) - { - return; - // fail("Providing client credentials is not supported by SPNEGOSocket."); - } + try{ LOGGER.info("Testing EJB3 access."); final String jarName = JAR_NAME + ".jar"; undeploy(jarName); deploy(jarName); - final Properties env = new Properties(); - env.put(Context.PROVIDER_URL, NAMING_PROVIDER_URL); - env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory"); - env.put(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces"); - - //hnelson - regular user - Configuration.setConfiguration(new Krb5LoginConfiguration("hnelson", - new File(JBOSS_SERVER_HOME, "hnelson.keytab"), false)); - InitialContext ctx = new InitialContext(env); - SimpleSession session = (SimpleSession) ctx.lookup("SimpleStatelessSessionBean/remote"); - Principal principal = session.invokeRegularMethod(); + // Use our custom configuration to avoid reliance on external config + Configuration.setConfiguration(new Krb5LoginConfiguration("hnelson at JBOSS.ORG", null, false)); + LoginContext lc = new LoginContext(getClass().getName(), new UsernamePasswordHandler("hnelson", "secret")); + lc.login(); + Principal principal = Subject.doAs(lc.getSubject(), new InvokeProtectedEjb(false)); assertEquals("User's principal name doesn't match.", "hnelson at JBOSS.ORG", principal.getName()); - ctx.close(); + lc.logout(); - //TODO call invokeAdministrativeMethod() - should fail (but for now it hangs-up and test fails on timeout) + //TODO try to call invokeAdministrativeMethod() - should fail (but for now it hangs-up and test fails on timeout) - //jduke - administrator - Configuration.setConfiguration(new Krb5LoginConfiguration("jduke", new File(JBOSS_SERVER_HOME, "jduke.keytab"), - false)); - ctx = new InitialContext(env); - session = (SimpleSession) ctx.lookup("SimpleStatelessSessionBean/remote"); - principal = session.invokeAdministrativeMethod(); + Configuration.setConfiguration(new Krb5LoginConfiguration("jduke at JBOSS.ORG", null, false)); + lc = new LoginContext(getClass().getName(), new UsernamePasswordHandler("jduke", "theduke")); + lc.login(); + principal = Subject.doAs(lc.getSubject(), new InvokeProtectedEjb(true)); assertEquals("User's principal name doesn't match.", "jduke at JBOSS.ORG", principal.getName()); - ctx.close(); - + lc.logout(); + } catch(Exception e){ + e.printStackTrace(); + } } + + private static class InvokeProtectedEjb implements PrivilegedExceptionAction + { + boolean administrative; + + public InvokeProtectedEjb(boolean administrative) + { + this.administrative = administrative; + } + + public Principal run() throws Exception + { + final Properties env = new Properties(); + env.put(Context.PROVIDER_URL, NAMING_PROVIDER_URL); + env.put(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory"); + env.put(Context.URL_PKG_PREFIXES, "org.jboss.naming:org.jnp.interfaces"); + + InitialContext ctx = new InitialContext(env); + SimpleSession session = (SimpleSession) ctx.lookup("SimpleStatelessSessionBean/remote"); + + Principal principal = administrative ? session.invokeAdministrativeMethod() : session.invokeRegularMethod(); + ctx.close(); + return principal; + } + }; + // Private methods ------------------------------------------------------- /**