From jboss-cvs-commits at lists.jboss.org Wed Mar 5 10:41:01 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 5 Mar 2014 10:41:01 -0500 Subject: [jboss-cvs] JBossAS SVN: r114751 - branches/JBPAPP_5/testsuite/src/main/org/jboss/test/jca/test. Message-ID: <201403051541.s25Ff1NQ029293@svn01.web.mwc.hst.phx2.redhat.com> Author: pjelinek Date: 2014-03-05 10:41:01 -0500 (Wed, 05 Mar 2014) New Revision: 114751 Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/jca/test/HAConnectionFactoryUnitTestCase.java Log: [JBPAPP-11021] Test temporary failed to avoid whole testsuite be stuck. You can run the test with -Djbosstest.runTestFailoverLocalMCF=true Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/jca/test/HAConnectionFactoryUnitTestCase.java =================================================================== --- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/jca/test/HAConnectionFactoryUnitTestCase.java 2014-02-27 16:08:18 UTC (rev 114750) +++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/jca/test/HAConnectionFactoryUnitTestCase.java 2014-03-05 15:41:01 UTC (rev 114751) @@ -27,6 +27,7 @@ import java.util.Arrays; +import junit.framework.Assert; import junit.framework.Test; @@ -47,13 +48,17 @@ super(name); } + private static final Boolean runTestFailoverLocalMCF = Boolean.valueOf(System.getProperty("jbosstest.runTestFailoverLocalMCF")); + public static Test suite() throws Exception { Test t; t = getDeploySetup(HAConnectionFactoryUnitTestCase.class, "jcatest.jar"); //t = getDeploySetup(t, "jboss-ha-local-jdbc.rar"); - //t = getDeploySetup(t, "jboss-ha-xa-jdbc.rar"); - //t = getDeploySetup(t, "test-ha-ds.xml"); + //t = getDeploySetup(t, "jboss-ha-xa-jdbc.rar"); + if(runTestFailoverLocalMCF) { + t = getDeploySetup(t, "test-ha-ds.xml"); + } t = getDeploySetup(t, "test-ha-xa-ds.xml"); t = getDeploySetup(t, "jbosstestadapter.rar"); t = getDeploySetup(t, "jca-support.sar"); @@ -66,13 +71,18 @@ //t = getDeploySetup(t, new File(connectorLib + "jboss-ha-xa-jdbc.rar").toURL().toString()); return t; } -/* + public void testFailoverLocalMCF() throws Exception { - HAConnectionSessionHome home = (HAConnectionSessionHome)getInitialContext().lookup("HAConnectionSession"); - home.create().testHaLocalConnection(); + if(runTestFailoverLocalMCF) { + HAConnectionSessionHome home = (HAConnectionSessionHome)getInitialContext().lookup("HAConnectionSession"); + home.create().testHaLocalConnection(); + }else { + Assert.fail("Test temporary failed to avoid whole testsuite be stuck. You can run the test with -Djbosstest.runTestFailoverLocalMCF=true See https://issues.jboss.org/browse/JBPAPP-11021"); + } + } -*/ + public void testFailoverXaMCF() throws Exception { HAConnectionSessionHome home = (HAConnectionSessionHome)getInitialContext().lookup("HAConnectionSession"); From jboss-cvs-commits at lists.jboss.org Thu Mar 6 06:10:48 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 6 Mar 2014 06:10:48 -0500 Subject: [jboss-cvs] JBossAS SVN: r114752 - branches/JBPAPP_5/component-matrix. Message-ID: <201403061110.s26BAmxa022371@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-03-06 06:10:47 -0500 (Thu, 06 Mar 2014) New Revision: 114752 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: Revert jbossts version because JBPAPP-10433 won't fix Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-03-05 15:41:01 UTC (rev 114751) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-03-06 11:10:47 UTC (rev 114752) @@ -39,7 +39,7 @@ 2.1 1.0-MR1 2.0.1 - 4.6.1.GA_CP13-patch-01 + 4.6.1.GA_CP13 1.1.0.SP11 3.1.2.SP14 1.1.2.SP8 From jboss-cvs-commits at lists.jboss.org Thu Mar 6 16:28:40 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 6 Mar 2014 16:28:40 -0500 Subject: [jboss-cvs] Picketbox SVN: r518 - branches. Message-ID: <201403062128.s26LSeuR022278@svn01.web.mwc.hst.phx2.redhat.com> Author: dehort Date: 2014-03-06 16:28:39 -0500 (Thu, 06 Mar 2014) New Revision: 518 Added: branches/4.0.17.Final-bz-1073646/ Log: Creating a branch for a one-off patch [bz-1073646] From jboss-cvs-commits at lists.jboss.org Thu Mar 6 16:31:06 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 6 Mar 2014 16:31:06 -0500 Subject: [jboss-cvs] Picketbox SVN: r519 - branches/4.0.17.Final-bz-1073646/picketbox-infinispan/src/main/java/org/jboss/security/authentication. Message-ID: <201403062131.s26LV6bG023017@svn01.web.mwc.hst.phx2.redhat.com> Author: dehort Date: 2014-03-06 16:31:06 -0500 (Thu, 06 Mar 2014) New Revision: 519 Modified: branches/4.0.17.Final-bz-1073646/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java Log: Fixed an issue where the SecureIdentityLoginModule results were not cached by the JAAS cache [bz-1073646] Modified: branches/4.0.17.Final-bz-1073646/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java =================================================================== --- branches/4.0.17.Final-bz-1073646/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java 2014-03-06 21:28:39 UTC (rev 518) +++ branches/4.0.17.Final-bz-1073646/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java 2014-03-06 21:31:06 UTC (rev 519) @@ -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 Thu Mar 6 17:43:39 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 6 Mar 2014 17:43:39 -0500 Subject: [jboss-cvs] Picketbox SVN: r520 - trunk/picketbox-infinispan/src/main/java/org/jboss/security/authentication. Message-ID: <201403062243.s26Mhd0H004399@svn01.web.mwc.hst.phx2.redhat.com> Author: dehort Date: 2014-03-06 17:43:38 -0500 (Thu, 06 Mar 2014) New Revision: 520 Modified: trunk/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java Log: Fixed an issue where the SecureIdentityLoginModule results were not cached by the JAAS cache [SECURITY-803] Modified: trunk/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java =================================================================== --- trunk/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java 2014-03-06 21:31:06 UTC (rev 519) +++ trunk/picketbox-infinispan/src/main/java/org/jboss/security/authentication/JBossCachedAuthenticationManager.java 2014-03-06 22:43:38 UTC (rev 520) @@ -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 Fri Mar 7 05:21:06 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Fri, 7 Mar 2014 05:21:06 -0500 Subject: [jboss-cvs] JBossAS SVN: r114753 - branches/JBPAPP_5/ejb3/src/main/org/jboss/ejb3/iiop. Message-ID: <201403071021.s27AL6k5025765@svn01.web.mwc.hst.phx2.redhat.com> Author: dpospisil Date: 2014-03-07 05:21:06 -0500 (Fri, 07 Mar 2014) New Revision: 114753 Modified: branches/JBPAPP_5/ejb3/src/main/org/jboss/ejb3/iiop/BeanCorbaServant.java Log: [JBPAPP-11036] IIOP - Client principal is retained in subsequent invocations even if the client is not associated with the principal anymore Modified: branches/JBPAPP_5/ejb3/src/main/org/jboss/ejb3/iiop/BeanCorbaServant.java =================================================================== --- branches/JBPAPP_5/ejb3/src/main/org/jboss/ejb3/iiop/BeanCorbaServant.java 2014-03-06 11:10:47 UTC (rev 114752) +++ branches/JBPAPP_5/ejb3/src/main/org/jboss/ejb3/iiop/BeanCorbaServant.java 2014-03-07 10:21:06 UTC (rev 114753) @@ -201,6 +201,8 @@ log.debug("username = " + name); Principal principal = new SimplePrincipal(name); SecurityAssociation.setPrincipal(principal); + } else { + SecurityAssociation.setPrincipal(null); } if(credentials != null && credentials.length > 0) From jboss-cvs-commits at lists.jboss.org Mon Mar 10 00:50:08 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 10 Mar 2014 00:50:08 -0400 Subject: [jboss-cvs] JBossAS SVN: r114754 - branches/JBPAPP_5/testsuite/src/main/org/jboss/test/jca/test. Message-ID: <201403100450.s2A4o8Fn029387@svn01.web.mwc.hst.phx2.redhat.com> Author: pjelinek Date: 2014-03-10 00:50:07 -0400 (Mon, 10 Mar 2014) New Revision: 114754 Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/jca/test/HAConnectionFactoryUnitTestCase.java Log: [JBPAPP-11021] Revert the logic to fail the test when -Djbosstest.ignoreTestFailoverLocalMCF=true argument is passed. Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/jca/test/HAConnectionFactoryUnitTestCase.java =================================================================== --- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/jca/test/HAConnectionFactoryUnitTestCase.java 2014-03-07 10:21:06 UTC (rev 114753) +++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/jca/test/HAConnectionFactoryUnitTestCase.java 2014-03-10 04:50:07 UTC (rev 114754) @@ -48,7 +48,7 @@ super(name); } - private static final Boolean runTestFailoverLocalMCF = Boolean.valueOf(System.getProperty("jbosstest.runTestFailoverLocalMCF")); + private static final Boolean ignoreTestFailoverLocalMCF = Boolean.valueOf(System.getProperty("jbosstest.ignoreTestFailoverLocalMCF")); public static Test suite() throws Exception { @@ -56,7 +56,7 @@ t = getDeploySetup(HAConnectionFactoryUnitTestCase.class, "jcatest.jar"); //t = getDeploySetup(t, "jboss-ha-local-jdbc.rar"); //t = getDeploySetup(t, "jboss-ha-xa-jdbc.rar"); - if(runTestFailoverLocalMCF) { + if(!ignoreTestFailoverLocalMCF) { t = getDeploySetup(t, "test-ha-ds.xml"); } t = getDeploySetup(t, "test-ha-xa-ds.xml"); @@ -74,11 +74,11 @@ public void testFailoverLocalMCF() throws Exception { - if(runTestFailoverLocalMCF) { + if(!ignoreTestFailoverLocalMCF) { HAConnectionSessionHome home = (HAConnectionSessionHome)getInitialContext().lookup("HAConnectionSession"); home.create().testHaLocalConnection(); }else { - Assert.fail("Test temporary failed to avoid whole testsuite be stuck. You can run the test with -Djbosstest.runTestFailoverLocalMCF=true See https://issues.jboss.org/browse/JBPAPP-11021"); + Assert.fail("Test temporary failed to avoid whole testsuite be stuck. You can run the test without -Djbosstest.ignoreTestFailoverLocalMCF=true See https://issues.jboss.org/browse/JBPAPP-11021"); } } From jboss-cvs-commits at lists.jboss.org Tue Mar 11 10:57:43 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 11 Mar 2014 10:57:43 -0400 Subject: [jboss-cvs] JBossAS SVN: r114755 - branches/JBPAPP_5/main/src/bin. Message-ID: <201403111457.s2BEvhiR011619@svn01.web.mwc.hst.phx2.redhat.com> Author: dpospisil Date: 2014-03-11 10:57:43 -0400 (Tue, 11 Mar 2014) New Revision: 114755 Modified: branches/JBPAPP_5/main/src/bin/run.bat branches/JBPAPP_5/main/src/bin/run.sh 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-03-10 04:50:07 UTC (rev 114754) +++ branches/JBPAPP_5/main/src/bin/run.bat 2014-03-11 14:57:43 UTC (rev 114755) @@ -127,13 +127,17 @@ rem Add rotating GC logs, if supported, and not already defined echo "%JAVA_OPTS%" | findstr /I "\-verbose:gc" > nul if errorlevel == 1 ( - "%JAVA%" -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M -version > nul 2>&1 + rem Back up any prior logs + move /y "%JBOSS_LOG_DIR%\gc.log.0" "%JBOSS_LOG_DIR%\backupgc.log.0" > nul 2>&1 + move /y "%JBOSS_LOG_DIR%\gc.log.1" "%JBOSS_LOG_DIR%\backupgc.log.1" > nul 2>&1 + 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%" -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M -Xloggc:%JBOSS_LOG_DIR%\gc.log -version > nul 2>&1 if not errorlevel == 1 ( if not exist "%JBOSS_LOG_DIR%" > nul 2>&1 ( mkdir "%JBOSS_LOG_DIR%" > nul 2>&1 ) - rem Back up any prior logs - rename "%JBOSS_LOG_DIR%\gc.log.*" "backupgc.log.?" > 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 %JAVA_OPTS%" ) ) Modified: branches/JBPAPP_5/main/src/bin/run.sh =================================================================== --- branches/JBPAPP_5/main/src/bin/run.sh 2014-03-10 04:50:07 UTC (rev 114754) +++ branches/JBPAPP_5/main/src/bin/run.sh 2014-03-11 14:57:43 UTC (rev 114755) @@ -40,6 +40,7 @@ JBOSS_LOG_DIR=`echo $SWITCH|sed 's/\-Djboss.server.log.dir=//'` fi + echo "$SWITCH" | grep "^--run-conf=" > /dev/null if [ $? -eq 0 ]; then RUN_CONF=`echo $SWITCH|sed 's/--run-conf=//'` @@ -278,6 +279,14 @@ fi fi +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + JBOSS_CLASSPATH=`cygpath --path --windows "$JBOSS_CLASSPATH"` + JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` +fi + # Enable rotating GC logs if the JVM supports it and GC logs are not already enabled NO_GC_LOG_ROTATE=`echo $JAVA_OPTS | $GREP "\-verbose:gc"` if [ "x$NO_GC_LOG_ROTATE" = "x" ]; then @@ -324,11 +333,13 @@ fi # backup prior logs - for file in $JBOSS_LOG_DIR/gc.log.* - do - mv "$file" "$JBOSS_LOG_DIR/backupgc.log${file#*/gc.log}" >/dev/null 2>&1 - done - "$JAVA" -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M -version >/dev/null 2>&1 && mkdir -p $JBOSS_LOG_DIR && JAVA_OPTS="-verbose:gc -Xloggc:$JBOSS_LOG_DIR/gc.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M $JAVA_OPTS" + mv "$JBOSS_LOG_DIR/gc.log.0" "$JBOSS_LOG_DIR/backupgc.log.0" >/dev/null 2>&1 + mv "$JBOSS_LOG_DIR/gc.log.1" "$JBOSS_LOG_DIR/backupgc.log.1" >/dev/null 2>&1 + mv "$JBOSS_LOG_DIR/gc.log.2" "$JBOSS_LOG_DIR/backupgc.log.2" >/dev/null 2>&1 + mv "$JBOSS_LOG_DIR/gc.log.3" "$JBOSS_LOG_DIR/backupgc.log.3" >/dev/null 2>&1 + mv "$JBOSS_LOG_DIR/gc.log.4" "$JBOSS_LOG_DIR/backupgc.log.4" >/dev/null 2>&1 + + "$JAVA" -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M -Xloggc:$JBOSS_LOG_DIR/gc.log -version >/dev/null 2>&1 && mkdir -p $JBOSS_LOG_DIR && JAVA_OPTS="-verbose:gc -Xloggc:$JBOSS_LOG_DIR/gc.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M $JAVA_OPTS" fi # Setup JBoss specific properties @@ -337,14 +348,6 @@ # Setup the java endorsed dirs JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed" -# For Cygwin, switch paths to Windows format before running java -if $cygwin; then - JBOSS_HOME=`cygpath --path --windows "$JBOSS_HOME"` - JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` - JBOSS_CLASSPATH=`cygpath --path --windows "$JBOSS_CLASSPATH"` - JBOSS_ENDORSED_DIRS=`cygpath --path --windows "$JBOSS_ENDORSED_DIRS"` -fi - # Display our environment echo "=========================================================================" echo "" From jboss-cvs-commits at lists.jboss.org Tue Mar 11 11:22:04 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 11 Mar 2014 11:22:04 -0400 Subject: [jboss-cvs] JBossAS SVN: r114756 - branches/JBPAPP_5/main/src/bin. Message-ID: <201403111522.s2BFM4gK020617@svn01.web.mwc.hst.phx2.redhat.com> Author: dpospisil Date: 2014-03-11 11:22:03 -0400 (Tue, 11 Mar 2014) New Revision: 114756 Modified: branches/JBPAPP_5/main/src/bin/run.bat branches/JBPAPP_5/main/src/bin/run.sh Log: [JBPAPP-11034] Fix for rotating log path containing whitespaces. Modified: branches/JBPAPP_5/main/src/bin/run.bat =================================================================== --- branches/JBPAPP_5/main/src/bin/run.bat 2014-03-11 14:57:43 UTC (rev 114755) +++ branches/JBPAPP_5/main/src/bin/run.bat 2014-03-11 15:22:03 UTC (rev 114756) @@ -133,12 +133,12 @@ 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%" -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M -Xloggc:%JBOSS_LOG_DIR%\gc.log -version > nul 2>&1 + "%JAVA%" -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M "-Xloggc:%JBOSS_LOG_DIR%\gc.log" -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 %JAVA_OPTS%" + set "JAVA_OPTS=-verbose:gc "-Xloggc:%JBOSS_LOG_DIR%\gc.log" -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M %JAVA_OPTS%" ) ) Modified: branches/JBPAPP_5/main/src/bin/run.sh =================================================================== --- branches/JBPAPP_5/main/src/bin/run.sh 2014-03-11 14:57:43 UTC (rev 114755) +++ branches/JBPAPP_5/main/src/bin/run.sh 2014-03-11 15:22:03 UTC (rev 114756) @@ -339,7 +339,7 @@ mv "$JBOSS_LOG_DIR/gc.log.3" "$JBOSS_LOG_DIR/backupgc.log.3" >/dev/null 2>&1 mv "$JBOSS_LOG_DIR/gc.log.4" "$JBOSS_LOG_DIR/backupgc.log.4" >/dev/null 2>&1 - "$JAVA" -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M -Xloggc:$JBOSS_LOG_DIR/gc.log -version >/dev/null 2>&1 && mkdir -p $JBOSS_LOG_DIR && JAVA_OPTS="-verbose:gc -Xloggc:$JBOSS_LOG_DIR/gc.log -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M $JAVA_OPTS" + "$JAVA" -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M "-Xloggc:$JBOSS_LOG_DIR/gc.log" -version >/dev/null 2>&1 && mkdir -p $JBOSS_LOG_DIR && JAVA_OPTS="-verbose:gc \"-Xloggc:$JBOSS_LOG_DIR/gc.log\" -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M $JAVA_OPTS" fi # Setup JBoss specific properties From jboss-cvs-commits at lists.jboss.org Tue Mar 11 22:32:38 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 11 Mar 2014 22:32:38 -0400 Subject: [jboss-cvs] JBoss Messaging SVN: r8620 - admin. Message-ID: <201403120232.s2C2WcPp032479@svn01.web.mwc.hst.phx2.redhat.com> Author: gaohoward Date: 2014-03-11 22:32:37 -0400 (Tue, 11 Mar 2014) New Revision: 8620 Modified: admin/authz_svn.conf Log: adding Aaron Ogburn Modified: admin/authz_svn.conf =================================================================== --- admin/authz_svn.conf 2014-02-20 18:29:13 UTC (rev 8619) +++ admin/authz_svn.conf 2014-03-12 02:32:37 UTC (rev 8620) @@ -26,5 +26,5 @@ system-admins=eric.brown at jboss.com, tom.benninger at jboss.com, brad.mcduffie at jboss.com, jocelyn.fragniere at jboss.com, blake.bowers at jboss.com, newtonm, bob.mcwhirter, jnunn, dsullens project-admins=gaohoward, clebert.suconic ## full committer list -project-developers=ovidiu.feodorov at jboss.com, rsigal, timfox, ron_sigal, clebert.suconic at jboss.com, juha at jboss.org, sam.griffith at jboss.com, sergeypk, apwalker, cbrock, tkirby, miclark, ataylor, jhowell at redhat.com, anil.saldhana at jboss.com, jmesnil, justi9, scott.stark at jboss.org, bershath27, jcoleman at redhat.com, trustin, david.boeren, mputz, mageshbk at jboss.com, jeff.yuchang, jim.ma, jervisliu, chwuinred, irooskov at redhat.com, noriko, khashida at redhat.com, tnagamot at redhat.com, xhuang at jboss.com, agarcia at jboss.com, jdimanos at jboss.com, mospina at redhat.com, nwallace, gaohoward, jbertram, jesper.pedersen, mospina, noriko, laubai, pthurmond, pthurmond at jboss.com, benlc, rebecca_newton, jaredmorgs, raggz, dgrove_redhat.com, dehort, tcowhey +project-developers=ovidiu.feodorov at jboss.com, rsigal, timfox, ron_sigal, clebert.suconic at jboss.com, juha at jboss.org, sam.griffith at jboss.com, sergeypk, apwalker, cbrock, tkirby, miclark, ataylor, jhowell at redhat.com, anil.saldhana at jboss.com, jmesnil, justi9, scott.stark at jboss.org, bershath27, jcoleman at redhat.com, trustin, david.boeren, mputz, mageshbk at jboss.com, jeff.yuchang, jim.ma, jervisliu, chwuinred, irooskov at redhat.com, noriko, khashida at redhat.com, tnagamot at redhat.com, xhuang at jboss.com, agarcia at jboss.com, jdimanos at jboss.com, mospina at redhat.com, nwallace, gaohoward, jbertram, jesper.pedersen, mospina, noriko, laubai, pthurmond, pthurmond at jboss.com, benlc, rebecca_newton, jaredmorgs, raggz, dgrove_redhat.com, dehort, tcowhey, aogburn From jboss-cvs-commits at lists.jboss.org Wed Mar 12 06:06:53 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 12 Mar 2014 06:06:53 -0400 Subject: [jboss-cvs] JBossAS SVN: r114757 - projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/authorization/modules/ejb. Message-ID: <201403121006.s2CA6r6K002595@svn01.web.mwc.hst.phx2.redhat.com> Author: soul2zimate Date: 2014-03-12 06:06:53 -0400 (Wed, 12 Mar 2014) New Revision: 114757 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/authorization/modules/ejb/EJBJACCPolicyModuleDelegate.java Log: [SECURITY-804], backport for Branch_2_0 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/authorization/modules/ejb/EJBJACCPolicyModuleDelegate.java =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/authorization/modules/ejb/EJBJACCPolicyModuleDelegate.java 2014-03-11 15:22:03 UTC (rev 114756) +++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/authorization/modules/ejb/EJBJACCPolicyModuleDelegate.java 2014-03-12 10:06:53 UTC (rev 114757) @@ -28,12 +28,15 @@ import java.security.Principal; import java.security.ProtectionDomain; import java.util.Map; +import java.util.Set; import javax.security.auth.Subject; import javax.security.jacc.EJBMethodPermission; import javax.security.jacc.EJBRoleRefPermission; import org.jboss.logging.Logger; +import org.jboss.security.RunAs; +import org.jboss.security.RunAsIdentity; import org.jboss.security.authorization.AuthorizationContext; import org.jboss.security.authorization.PolicyRegistration; import org.jboss.security.authorization.Resource; @@ -62,6 +65,7 @@ private CodeSource ejbCS = null; private String roleName = null; private Boolean roleRefCheck = Boolean.FALSE; + private RunAsIdentity callerRunAs; public EJBJACCPolicyModuleDelegate() { @@ -90,6 +94,9 @@ this.ejbMethod = ejbResource.getEjbMethod(); this.ejbName = ejbResource.getEjbName(); this.methodInterface = ejbResource.getEjbMethodInterface(); + RunAs runAs = ejbResource.getCallerRunAsIdentity(); + if(runAs instanceof RunAsIdentity) + this.callerRunAs = RunAsIdentity.class.cast(runAs); //isCallerInRole checks this.roleName = (String)map.get(ResourceKeys.ROLENAME); @@ -138,8 +145,17 @@ private boolean checkWithPolicy(Permission ejbPerm, Subject subject, Role role) { - Principal[] principals = this.getPrincipals(subject, role); - ProtectionDomain pd = new ProtectionDomain (ejbCS, null, null, principals); - return Policy.getPolicy().implies(pd, ejbPerm); + // caller is using the caller identity + if (this.callerRunAs == null) { + Principal[] principals = this.getPrincipals(subject, role); + ProtectionDomain pd = new ProtectionDomain(ejbCS, null, null,principals); + return Policy.getPolicy().implies(pd, ejbPerm); + } + // caller is using a run-as identity + else { + Set principals = this.callerRunAs.getRunAsRoles(); + ProtectionDomain pd = new ProtectionDomain(ejbCS, null, null, principals.toArray(new Principal[principals.size()])); + return Policy.getPolicy().implies(pd, ejbPerm); + } } } \ No newline at end of file From jboss-cvs-commits at lists.jboss.org Wed Mar 12 14:18:56 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 12 Mar 2014 14:18:56 -0400 Subject: [jboss-cvs] JBoss Messaging SVN: r8621 - in branches/Branch_1_4: integration/AS5/src/main/org/jboss/jms/server/endpoint and 6 other directories. Message-ID: <201403121818.s2CIIujF008592@svn01.web.mwc.hst.phx2.redhat.com> Author: aogburn Date: 2014-03-12 14:18:55 -0400 (Wed, 12 Mar 2014) New Revision: 8621 Modified: branches/Branch_1_4/.classpath branches/Branch_1_4/integration/AS5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java branches/Branch_1_4/integration/EAP4/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java branches/Branch_1_4/integration/EAP5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java branches/Branch_1_4/src/main/org/jboss/jms/client/container/JmsClientAspectXMLLoader.java branches/Branch_1_4/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java branches/Branch_1_4/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java Log: [JBMESSAGING-1941] remove old AspectManager synchronization to avoid deadlock Modified: branches/Branch_1_4/.classpath =================================================================== --- branches/Branch_1_4/.classpath 2014-03-12 02:32:37 UTC (rev 8620) +++ branches/Branch_1_4/.classpath 2014-03-12 18:18:55 UTC (rev 8621) @@ -1,65 +1,125 @@ - - - - - - - + + + - - + - + + - - - - + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + - - + + + - - - + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + Modified: branches/Branch_1_4/integration/AS5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java =================================================================== --- branches/Branch_1_4/integration/AS5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2014-03-12 02:32:37 UTC (rev 8620) +++ branches/Branch_1_4/integration/AS5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2014-03-12 18:18:55 UTC (rev 8621) @@ -29,7 +29,6 @@ import javax.jms.JMSException; -import org.jboss.aop.AspectManager; import org.jboss.jms.client.delegate.ClientConnectionDelegate; import org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate; import org.jboss.jms.delegate.ConnectionFactoryEndpoint; @@ -276,25 +275,13 @@ String connectionID = endpoint.getConnectionID(); - ConnectionAdvised connAdvised; + ConnectionAdvised connAdvised = new ConnectionAdvised(endpoint); - // Need to synchronized to prevent a deadlock - // See http://jira.jboss.com/jira/browse/JBMESSAGING-797 - synchronized (AspectManager.instance()) - { - connAdvised = new ConnectionAdvised(endpoint); - } - Dispatcher.instance.registerTarget(connectionID, connAdvised); log.trace("created and registered " + endpoint); - // Need to synchronized to prevent a deadlock - // See http://jira.jboss.com/jira/browse/JBMESSAGING-797 - synchronized (AspectManager.instance()) - { - return new ClientConnectionDelegate(connectionID, serverPeer.getServerPeerID()); - } + return new ClientConnectionDelegate(connectionID, serverPeer.getServerPeerID()); } public byte[] getClientAOPStack() throws JMSException Modified: branches/Branch_1_4/integration/EAP4/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java =================================================================== --- branches/Branch_1_4/integration/EAP4/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2014-03-12 02:32:37 UTC (rev 8620) +++ branches/Branch_1_4/integration/EAP4/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2014-03-12 18:18:55 UTC (rev 8621) @@ -30,7 +30,6 @@ import javax.jms.JMSException; -import org.jboss.aop.AspectManager; import org.jboss.jms.client.delegate.ClientConnectionDelegate; import org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate; import org.jboss.jms.delegate.ConnectionFactoryEndpoint; @@ -279,25 +278,13 @@ String connectionID = endpoint.getConnectionID(); - ConnectionAdvised connAdvised; + ConnectionAdvised connAdvised = new ConnectionAdvised(endpoint); - // Need to synchronized to prevent a deadlock - // See http://jira.jboss.com/jira/browse/JBMESSAGING-797 - synchronized (AspectManager.instance()) - { - connAdvised = new ConnectionAdvised(endpoint); - } - Dispatcher.instance.registerTarget(connectionID, connAdvised); log.trace("created and registered " + endpoint); - // Need to synchronized to prevent a deadlock - // See http://jira.jboss.com/jira/browse/JBMESSAGING-797 - synchronized (AspectManager.instance()) - { - return new ClientConnectionDelegate(connectionID, serverPeer.getServerPeerID()); - } + return new ClientConnectionDelegate(connectionID, serverPeer.getServerPeerID()); } public byte[] getClientAOPStack() throws JMSException Modified: branches/Branch_1_4/integration/EAP5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java =================================================================== --- branches/Branch_1_4/integration/EAP5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2014-03-12 02:32:37 UTC (rev 8620) +++ branches/Branch_1_4/integration/EAP5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2014-03-12 18:18:55 UTC (rev 8621) @@ -29,7 +29,6 @@ import javax.jms.JMSException; -import org.jboss.aop.AspectManager; import org.jboss.jms.client.delegate.ClientConnectionDelegate; import org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate; import org.jboss.jms.delegate.ConnectionFactoryEndpoint; @@ -276,25 +275,13 @@ String connectionID = endpoint.getConnectionID(); - ConnectionAdvised connAdvised; + ConnectionAdvised connAdvised = new ConnectionAdvised(endpoint); - // Need to synchronized to prevent a deadlock - // See http://jira.jboss.com/jira/browse/JBMESSAGING-797 - synchronized (AspectManager.instance()) - { - connAdvised = new ConnectionAdvised(endpoint); - } - Dispatcher.instance.registerTarget(connectionID, connAdvised); log.trace("created and registered " + endpoint); - // Need to synchronized to prevent a deadlock - // See http://jira.jboss.com/jira/browse/JBMESSAGING-797 - synchronized (AspectManager.instance()) - { - return new ClientConnectionDelegate(connectionID, serverPeer.getServerPeerID()); - } + return new ClientConnectionDelegate(connectionID, serverPeer.getServerPeerID()); } public byte[] getClientAOPStack() throws JMSException Modified: branches/Branch_1_4/src/main/org/jboss/jms/client/container/JmsClientAspectXMLLoader.java =================================================================== --- branches/Branch_1_4/src/main/org/jboss/jms/client/container/JmsClientAspectXMLLoader.java 2014-03-12 02:32:37 UTC (rev 8620) +++ branches/Branch_1_4/src/main/org/jboss/jms/client/container/JmsClientAspectXMLLoader.java 2014-03-12 18:18:55 UTC (rev 8621) @@ -61,43 +61,38 @@ */ public void deployXML(byte[] config) throws Exception { + + InputStream is = null; + + try + { + is = new ByteArrayInputStream(config); - //We need to synchronized to prevent a deadlock - //See http://jira.jboss.com/jira/browse/JBMESSAGING-797 - synchronized (AspectManager.instance()) - { - InputStream is = null; + DocumentBuilderFactory docBuilderFactory = null; + + docBuilderFactory = DocumentBuilderFactory.newInstance(); - try - { - is = new ByteArrayInputStream(config); - - DocumentBuilderFactory docBuilderFactory = null; + docBuilderFactory.setValidating(false); - docBuilderFactory = DocumentBuilderFactory.newInstance(); + InputSource source = new InputSource(is); - docBuilderFactory.setValidating(false); + URL url = AspectXmlLoader.class.getResource("/jboss-aop_1_0.dtd"); - InputSource source = new InputSource(is); + source.setSystemId(url.toString()); - URL url = AspectXmlLoader.class.getResource("/jboss-aop_1_0.dtd"); + DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder(); - source.setSystemId(url.toString()); + docBuilder.setEntityResolver(new Resolver()); - DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder(); + Document doc = docBuilder.parse(source); - docBuilder.setEntityResolver(new Resolver()); - - Document doc = docBuilder.parse(source); - - this.deployXML(doc, null, this.getClass().getClassLoader()); - } - finally + this.deployXML(doc, null, this.getClass().getClassLoader()); + } + finally + { + if (is != null) { - if (is != null) - { - is.close(); - } + is.close(); } } } Modified: branches/Branch_1_4/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java =================================================================== --- branches/Branch_1_4/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java 2014-03-12 02:32:37 UTC (rev 8620) +++ branches/Branch_1_4/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java 2014-03-12 18:18:55 UTC (rev 8621) @@ -35,7 +35,6 @@ import javax.naming.InitialContext; import javax.naming.NamingException; -import org.jboss.aop.AspectManager; import org.jboss.jms.client.JBossConnectionFactory; import org.jboss.jms.client.delegate.ClientClusteredConnectionFactoryDelegate; import org.jboss.jms.client.delegate.ClientConnectionFactoryDelegate; @@ -236,15 +235,8 @@ // Now bind it in JNDI rebindConnectionFactory(initialContext, jndiBindings, delegate); - ConnectionFactoryAdvised advised; + ConnectionFactoryAdvised advised = new ConnectionFactoryAdvised(endpoint); - // Need to synchronized to prevent a deadlock - // See http://jira.jboss.com/jira/browse/JBMESSAGING-797 - synchronized (AspectManager.instance()) - { - advised = new ConnectionFactoryAdvised(endpoint); - } - // Registering with the dispatcher should always be the last thing otherwise a client could // use a partially initialised object Dispatcher.instance.registerTarget(id, advised); Modified: branches/Branch_1_4/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java =================================================================== --- branches/Branch_1_4/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java 2014-03-12 02:32:37 UTC (rev 8620) +++ branches/Branch_1_4/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java 2014-03-12 18:18:55 UTC (rev 8621) @@ -29,7 +29,6 @@ import java.util.Map; import java.util.Set; -import org.jboss.aop.AspectManager; import org.jboss.jms.delegate.ConnectionEndpoint; import org.jboss.jms.server.ConnectionManager; import org.jboss.jms.server.endpoint.ServerConnectionEndpoint; @@ -372,12 +371,7 @@ // TODO: What we really need to do is to wrap the End point in registerConnection, when we // get the connection. But, I'm hesitant, because there are are many of instanceof checks that would // fail if I wrapped it during registerConneciton. - // Need to synchronized to prevent a deadlock - // See http://jira.jboss.com/jira/browse/JBMESSAGING-797 - synchronized (AspectManager.instance()) - { - sce = new ConnectionAdvised(sce); - } + sce = new ConnectionAdvised(sce); try { sce.closing(-1); @@ -470,12 +464,7 @@ // wrap the Endpoint in the ConnectionAdvised so that we get a proper call back for the close // TODO: What we really need to do is to wrap the Endpoint in registerConnection, when we // get the connection. Then anyone - // Need to synchronized to prevent a deadlock - // See http://jira.jboss.com/jira/browse/JBMESSAGING-797 - synchronized (AspectManager.instance()) - { - conn = new ConnectionAdvised(conn); - } + conn = new ConnectionAdvised(conn); try { conn.closing(-1); Modified: branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java =================================================================== --- branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java 2014-03-12 02:32:37 UTC (rev 8620) +++ branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java 2014-03-12 18:18:55 UTC (rev 8621) @@ -36,7 +36,6 @@ import javax.jms.JMSException; import javax.jms.Session; -import org.jboss.aop.AspectManager; import org.jboss.jms.client.delegate.ClientSessionDelegate; import org.jboss.jms.client.remoting.CallbackManager; import org.jboss.jms.delegate.ConnectionEndpoint; @@ -265,15 +264,8 @@ sessions.put(sessionID, ep); } - SessionAdvised advised; + SessionAdvised advised = new SessionAdvised(ep); - // Need to synchronized to prevent a deadlock - // See http://jira.jboss.com/jira/browse/JBMESSAGING-797 - synchronized (AspectManager.instance()) - { - advised = new SessionAdvised(ep); - } - SessionAdvised sessionAdvised = advised; serverPeer.addSession(sessionID, ep); Modified: branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java =================================================================== --- branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java 2014-03-12 02:32:37 UTC (rev 8620) +++ branches/Branch_1_4/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java 2014-03-12 18:18:55 UTC (rev 8621) @@ -39,7 +39,6 @@ import javax.jms.InvalidDestinationException; import javax.jms.JMSException; -import org.jboss.aop.AspectManager; import org.jboss.jms.client.delegate.ClientBrowserDelegate; import org.jboss.jms.client.delegate.ClientConsumerDelegate; import org.jboss.jms.delegate.Ack; @@ -2031,15 +2030,8 @@ binding.queue.getName(), this, selectorString, false, dest, null, null, 0, 1, true, false, prefetchSize); - ConsumerAdvised advised; + ConsumerAdvised advised = new ConsumerAdvised(ep); - // Need to synchronized to prevent a deadlock - // See http://jira.jboss.com/jira/browse/JBMESSAGING-797 - synchronized (AspectManager.instance()) - { - advised = new ConsumerAdvised(ep); - } - Dispatcher.instance.registerTarget(consumerID, advised); ClientConsumerDelegate stub = @@ -2351,15 +2343,8 @@ rep.put(queue.getName(), DUR_SUB_STATE_CONSUMERS); } - ConsumerAdvised advised; + ConsumerAdvised advised = new ConsumerAdvised(ep); - // Need to synchronized to prevent a deadlock - // See http://jira.jboss.com/jira/browse/JBMESSAGING-797 - synchronized (AspectManager.instance()) - { - advised = new ConsumerAdvised(ep); - } - Dispatcher.instance.registerTarget(consumerID, advised); ClientConsumerDelegate stub = @@ -2415,15 +2400,8 @@ browsers.put(browserID, ep); } - BrowserAdvised advised; + BrowserAdvised advised = new BrowserAdvised(ep); - // Need to synchronized to prevent a deadlock - // See http://jira.jboss.com/jira/browse/JBMESSAGING-797 - synchronized (AspectManager.instance()) - { - advised = new BrowserAdvised(ep); - } - Dispatcher.instance.registerTarget(browserID, advised); ClientBrowserDelegate stub = new ClientBrowserDelegate(browserID); From jboss-cvs-commits at lists.jboss.org Wed Mar 12 21:49:46 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 12 Mar 2014 21:49:46 -0400 Subject: [jboss-cvs] JBossAS SVN: r114758 - branches/JBPAPP_5/main/src/bin. Message-ID: <201403130149.s2D1nkmp004254@svn01.web.mwc.hst.phx2.redhat.com> Author: aogburn Date: 2014-03-12 21:49:46 -0400 (Wed, 12 Mar 2014) New Revision: 114758 Modified: branches/JBPAPP_5/main/src/bin/run.bat branches/JBPAPP_5/main/src/bin/run.sh Log: [JBPAPP-11024] prevent class unloading messages on stdout Modified: branches/JBPAPP_5/main/src/bin/run.bat =================================================================== --- branches/JBPAPP_5/main/src/bin/run.bat 2014-03-12 10:06:53 UTC (rev 114757) +++ branches/JBPAPP_5/main/src/bin/run.bat 2014-03-13 01:49:46 UTC (rev 114758) @@ -133,12 +133,12 @@ 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%" -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M "-Xloggc:%JBOSS_LOG_DIR%\gc.log" -version > 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 ( 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 %JAVA_OPTS%" + 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%" ) ) Modified: branches/JBPAPP_5/main/src/bin/run.sh =================================================================== --- branches/JBPAPP_5/main/src/bin/run.sh 2014-03-12 10:06:53 UTC (rev 114757) +++ branches/JBPAPP_5/main/src/bin/run.sh 2014-03-13 01:49:46 UTC (rev 114758) @@ -339,7 +339,7 @@ mv "$JBOSS_LOG_DIR/gc.log.3" "$JBOSS_LOG_DIR/backupgc.log.3" >/dev/null 2>&1 mv "$JBOSS_LOG_DIR/gc.log.4" "$JBOSS_LOG_DIR/backupgc.log.4" >/dev/null 2>&1 - "$JAVA" -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M "-Xloggc:$JBOSS_LOG_DIR/gc.log" -version >/dev/null 2>&1 && mkdir -p $JBOSS_LOG_DIR && JAVA_OPTS="-verbose:gc \"-Xloggc:$JBOSS_LOG_DIR/gc.log\" -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M $JAVA_OPTS" + "$JAVA" -verbose:gc -XX:+PrintGCDetails -XX:+PrintGCDateStamps -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=5 -XX:GCLogFileSize=3M "-Xloggc:$JBOSS_LOG_DIR/gc.log" -XX:-TraceClassUnloading -version >/dev/null 2>&1 && mkdir -p $JBOSS_LOG_DIR && 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" fi # Setup JBoss specific properties From jboss-cvs-commits at lists.jboss.org Wed Mar 12 21:57:59 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 12 Mar 2014 21:57:59 -0400 Subject: [jboss-cvs] JBoss Messaging SVN: r8622 - in branches/Branch_1_4: docs and 1 other directory. Message-ID: <201403130157.s2D1vxgH005821@svn01.web.mwc.hst.phx2.redhat.com> Author: gaohoward Date: 2014-03-12 21:57:59 -0400 (Wed, 12 Mar 2014) New Revision: 8622 Modified: branches/Branch_1_4/build-messaging-EAP5.xml branches/Branch_1_4/build-messaging.xml branches/Branch_1_4/build-thirdparty-EAP5.xml branches/Branch_1_4/docs/README.html Log: update version Modified: branches/Branch_1_4/build-messaging-EAP5.xml =================================================================== --- branches/Branch_1_4/build-messaging-EAP5.xml 2014-03-12 18:18:55 UTC (rev 8621) +++ branches/Branch_1_4/build-messaging-EAP5.xml 2014-03-13 01:57:59 UTC (rev 8622) @@ -10,6 +10,8 @@ + + - + /HASessionState/Default Modified: branches/JBPAPP_5/cluster/src/etc/hapartition-jboss-beans.xml =================================================================== --- branches/JBPAPP_5/cluster/src/etc/hapartition-jboss-beans.xml 2014-03-13 09:33:58 UTC (rev 114759) +++ branches/JBPAPP_5/cluster/src/etc/hapartition-jboss-beans.xml 2014-03-13 10:20:42 UTC (rev 114760) @@ -24,7 +24,6 @@ class="org.jboss.ha.framework.server.ClusterPartition"> jboss:service=Naming - HASessionStateService @org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=HAPartition,partition=${jboss.partition.name:DefaultPartition}", exposedInterface=org.jboss.ha.framework.server.ClusterPartitionMBean.class, registerDirectly=true) From jboss-cvs-commits at lists.jboss.org Thu Mar 13 23:08:38 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 13 Mar 2014 23:08:38 -0400 Subject: [jboss-cvs] JBoss Messaging SVN: r8624 - branches/Branch_1_4/docs. Message-ID: <201403140308.s2E38cjx008582@svn01.web.mwc.hst.phx2.redhat.com> Author: gaohoward Date: 2014-03-13 23:08:37 -0400 (Thu, 13 Mar 2014) New Revision: 8624 Modified: branches/Branch_1_4/docs/README.html Log: update release notes Modified: branches/Branch_1_4/docs/README.html =================================================================== --- branches/Branch_1_4/docs/README.html 2014-03-13 02:34:48 UTC (rev 8623) +++ branches/Branch_1_4/docs/README.html 2014-03-14 03:08:37 UTC (rev 8624) @@ -11,11 +11,11 @@
-

13 Feburary 2014

+

14 Feburary 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.

-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 Fri Mar 14 03:36:21 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Fri, 14 Mar 2014 03:36:21 -0400 Subject: [jboss-cvs] JBoss Messaging SVN: r8625 - tags. Message-ID: <201403140736.s2E7aLNg030654@svn01.web.mwc.hst.phx2.redhat.com> Author: gaohoward Date: 2014-03-14 03:36:21 -0400 (Fri, 14 Mar 2014) New Revision: 8625 Added: tags/JBossMessaging_1_4_8_SP10/ Log: Tagging 1.4.8.SP10 From jboss-cvs-commits at lists.jboss.org Fri Mar 14 08:43:18 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Fri, 14 Mar 2014 08:43:18 -0400 Subject: [jboss-cvs] JBossAS SVN: r114761 - branches/JBPAPP_5/component-matrix. Message-ID: <201403141243.s2EChI5P031330@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-03-14 08:43:17 -0400 (Fri, 14 Mar 2014) New Revision: 114761 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: Upgrade jboss-messaging to 1.4.8.SP10 (JBPAPP-11028) Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-03-13 10:20:42 UTC (rev 114760) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-03-14 12:43:17 UTC (rev 114761) @@ -45,7 +45,7 @@ 1.1.2.SP8 3.1.2.SP18 1.0.1.GA - 1.4.8.SP9_patch_01 + 1.4.8.SP10 2.2.27.Final 2.1.15.GA 2.6.22.Final From jboss-cvs-commits at lists.jboss.org Fri Mar 14 10:25:32 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Fri, 14 Mar 2014 10:25:32 -0400 Subject: [jboss-cvs] Picketbox SVN: r521 - in trunk: security-spi/spi/src/main/java/org/jboss/security/vault and 1 other directory. Message-ID: <201403141425.s2EEPWF3022672@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek at redhat.com Date: 2014-03-14 10:25:32 -0400 (Fri, 14 Mar 2014) New Revision: 521 Modified: trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/vault/SecurityVaultUnitTestCase.java trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityActions.java trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVaultFactory.java Log: [SECURITY-805] Overload SecurityVaultFactory.get() to be able to specify the classloader Modified: trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/vault/SecurityVaultUnitTestCase.java =================================================================== --- trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/vault/SecurityVaultUnitTestCase.java 2014-03-06 22:43:38 UTC (rev 520) +++ trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/vault/SecurityVaultUnitTestCase.java 2014-03-14 14:25:32 UTC (rev 521) @@ -36,10 +36,12 @@ import javax.crypto.SecretKeyFactory; import javax.crypto.spec.PBEKeySpec; import javax.crypto.spec.PBEParameterSpec; + import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; +import java.lang.reflect.Field; import java.nio.channels.FileChannel; import java.security.AccessController; import java.security.PrivilegedAction; @@ -69,6 +71,31 @@ assertTrue(vault instanceof PicketBoxSecurityVault); assertFalse(vault.isInitialized()); } + + @Test + public void testClassLoaderVault() throws Exception + { + //Back up the existing vault and reset it + Field field = SecurityVaultFactory.class.getDeclaredField("vault"); + field.setAccessible(true); + Object existingVault = field.get(null); + try + { + field.set(null, null); + ClassLoader cl = SecurityVaultFactory.class.getClassLoader(); + SecurityVault vault = SecurityVaultFactory.get(cl, TestVault.class.getName()); + assertNotNull(vault); + assertTrue(vault instanceof TestVault); + assertFalse(vault.isInitialized()); + } + finally + { + if (existingVault != null) + { + field.set(null, existingVault); + } + } + } @Test public void testHandshake() throws Exception Modified: trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityActions.java =================================================================== --- trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityActions.java 2014-03-06 22:43:38 UTC (rev 520) +++ trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityActions.java 2014-03-14 14:25:32 UTC (rev 521) @@ -2,7 +2,7 @@ * JBoss, Home of Professional Open Source. * Copyright 2008, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * distribution for a full listing of individual contributors. * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as @@ -44,7 +44,7 @@ loadedClass = cl.loadClass(fqn); } catch (ClassNotFoundException e) - { + { } if(loadedClass == null) { @@ -53,12 +53,41 @@ loadedClass = Thread.currentThread().getContextClassLoader().loadClass(fqn); } catch (ClassNotFoundException e) - { - } + { + } } return loadedClass; } }); - + } + + static Class loadClass(final ClassLoader classLoader, final String fqn) + { + return AccessController.doPrivileged(new PrivilegedAction>() + { + public Class run() + { + Class loadedClass = null; + try + { + loadedClass = classLoader.loadClass(fqn); + } + catch (ClassNotFoundException e) + { + } + if(loadedClass == null) + { + try + { + loadedClass = Thread.currentThread().getContextClassLoader().loadClass(fqn); + } + catch (ClassNotFoundException e) + { + } + } + return loadedClass; + } + }); + } } \ No newline at end of file Modified: trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVaultFactory.java =================================================================== --- trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVaultFactory.java 2014-03-06 22:43:38 UTC (rev 520) +++ trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVaultFactory.java 2014-03-14 14:25:32 UTC (rev 521) @@ -2,7 +2,7 @@ * JBoss, Home of Professional Open Source. * Copyright 2008, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * distribution for a full listing of individual contributors. * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as @@ -32,7 +32,7 @@ { private static String defaultVault = "org.picketbox.plugins.vault.PicketBoxSecurityVault"; private static SecurityVault vault= null; - + /** * Get an instance of {@link SecurityVault} * Remember to initialize the vault by checking {@link SecurityVault#isInitialized()} @@ -43,7 +43,7 @@ { return get(defaultVault); } - + /** * Get an instance of {@link SecurityVault} * Remember to initialize the vault by checking {@link SecurityVault#isInitialized()} @@ -59,7 +59,7 @@ } if(fqn == null) return get(); - + if(vault == null) { Class vaultClass = SecurityActions.loadClass(SecurityVaultFactory.class,fqn); @@ -76,4 +76,38 @@ } return vault; } + + /** + * Get an instance of {@link SecurityVault} + * Remember to initialize the vault by checking {@link SecurityVault#isInitialized()} + * @param classLoader the class loader to use loading the vault + * @param fqn fully qualified name of the vault implementation + * @return an instance of {@link SecurityVault} + * @throws SecurityVaultException + */ + public static SecurityVault get(ClassLoader classLoader, String fqn) throws SecurityVaultException + { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityVaultFactory.class.getName() + ".get")); + } + if(fqn == null) + return get(); + + if(vault == null) + { + Class vaultClass = SecurityActions.loadClass(classLoader,fqn); + if(vaultClass == null) + throw new SecurityVaultException(PicketBoxMessages.MESSAGES.unableToLoadVaultMessage()); + try + { + vault = (SecurityVault) vaultClass.newInstance(); + } + catch (Exception e) + { + throw new SecurityVaultException(PicketBoxMessages.MESSAGES.unableToCreateVaultMessage(), e); + } + } + return vault; + } } \ No newline at end of file From jboss-cvs-commits at lists.jboss.org Fri Mar 14 10:26:19 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Fri, 14 Mar 2014 10:26:19 -0400 Subject: [jboss-cvs] Picketbox SVN: r522 - trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/vault. Message-ID: <201403141426.s2EEQJBP022692@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek at redhat.com Date: 2014-03-14 10:26:19 -0400 (Fri, 14 Mar 2014) New Revision: 522 Added: trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/vault/TestVault.java Log: [SECURITY-805] Overload SecurityVaultFactory.get() to be able to specify the classloader Added: trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/vault/TestVault.java =================================================================== --- trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/vault/TestVault.java (rev 0) +++ trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/vault/TestVault.java 2014-03-14 14:26:19 UTC (rev 522) @@ -0,0 +1,29 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.security.vault; + +import org.picketbox.plugins.vault.PicketBoxSecurityVault; + +public class TestVault extends PicketBoxSecurityVault +{ +} \ No newline at end of file From jboss-cvs-commits at lists.jboss.org Fri Mar 14 11:48:53 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Fri, 14 Mar 2014 11:48:53 -0400 Subject: [jboss-cvs] Picketbox SVN: r523 - trunk/security-spi/spi/src/main/java/org/jboss/security/vault. Message-ID: <201403141548.s2EFmr8i005597@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek at redhat.com Date: 2014-03-14 11:48:52 -0400 (Fri, 14 Mar 2014) New Revision: 523 Modified: trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityActions.java trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVaultFactory.java Log: [SECURITY-805] additional tweaks by Kabir Modified: trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityActions.java =================================================================== --- trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityActions.java 2014-03-14 14:26:19 UTC (rev 522) +++ trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityActions.java 2014-03-14 15:48:52 UTC (rev 523) @@ -68,26 +68,15 @@ { public Class run() { - Class loadedClass = null; try { - loadedClass = classLoader.loadClass(fqn); + return classLoader.loadClass(fqn); } catch (ClassNotFoundException e) { } - if(loadedClass == null) - { - try - { - loadedClass = Thread.currentThread().getContextClassLoader().loadClass(fqn); - } - catch (ClassNotFoundException e) - { - } - } - return loadedClass; + return null; } }); } -} \ No newline at end of file +} Modified: trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVaultFactory.java =================================================================== --- trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVaultFactory.java 2014-03-14 14:26:19 UTC (rev 522) +++ trunk/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVaultFactory.java 2014-03-14 15:48:52 UTC (rev 523) @@ -87,13 +87,16 @@ */ public static SecurityVault get(ClassLoader classLoader, String fqn) throws SecurityVaultException { + if (classLoader == null){ + throw PicketBoxMessages.MESSAGES.invalidNullArgument("classLoader"); + } + if (fqn == null){ + throw PicketBoxMessages.MESSAGES.invalidNullArgument("fqn"); + } SecurityManager sm = System.getSecurityManager(); if (sm != null) { sm.checkPermission(new RuntimePermission(SecurityVaultFactory.class.getName() + ".get")); } - if(fqn == null) - return get(); - if(vault == null) { Class vaultClass = SecurityActions.loadClass(classLoader,fqn); From jboss-cvs-commits at lists.jboss.org Tue Mar 18 09:39:03 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 18 Mar 2014 09:39:03 -0400 Subject: [jboss-cvs] Picketbox SVN: r524 - tags. Message-ID: <201403181339.s2IDd3PU004028@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek at redhat.com Date: 2014-03-18 09:39:03 -0400 (Tue, 18 Mar 2014) New Revision: 524 Added: tags/4.0.19.SP3/ Log: tagging 4.0.19.SP3 release From jboss-cvs-commits at lists.jboss.org Tue Mar 18 15:21:31 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 18 Mar 2014 15:21:31 -0400 Subject: [jboss-cvs] Picketbox SVN: r525 - branches/eap62/parent. Message-ID: <201403181921.s2IJLVxS009941@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek at redhat.com Date: 2014-03-18 15:21:30 -0400 (Tue, 18 Mar 2014) New Revision: 525 Modified: branches/eap62/parent/pom.xml Log: setting compiler target and source to 1.6 Modified: branches/eap62/parent/pom.xml =================================================================== --- branches/eap62/parent/pom.xml 2014-03-18 13:39:03 UTC (rev 524) +++ branches/eap62/parent/pom.xml 2014-03-18 19:21:30 UTC (rev 525) @@ -26,7 +26,19 @@ scm:svn:http://anonsvn.jboss.org/repos/picketbox/tags/4.0.19.SP5-SNAPSHOT scm:svn:https://svn.jboss.org/repos/picketbox/tags/4.0.19.SP5-SNAPSHOT - + + + + + UTF-8 + + + + 1.6 + 1.6 + + From jboss-cvs-commits at lists.jboss.org Tue Mar 18 15:45:25 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 18 Mar 2014 15:45:25 -0400 Subject: [jboss-cvs] Picketbox SVN: r526 - in branches/eap62: security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/vault and 1 other directories. Message-ID: <201403181945.s2IJjPfN012087@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek at redhat.com Date: 2014-03-18 15:45:24 -0400 (Tue, 18 Mar 2014) New Revision: 526 Added: branches/eap62/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/vault/TestVault.java Modified: branches/eap62/ branches/eap62/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityActions.java branches/eap62/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVaultFactory.java Log: [SECURITY-805] Overload SecurityVaultFactory.get() to be able to specify the classloader --merged from trunk by kkhan Property changes on: branches/eap62 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/4.0.16.Final_BZ_901138:413 /branches/embargo/4.0.14.Final-JBPAPP6-1704:377 /branches/embargo/4.0.16.Final-vault:408-449 /branches/embargo/BZ1050058-JSM-checks:497 /tags/4.0.16.Final:393-407 /trunk:458,462-464 + /branches/4.0.16.Final_BZ_901138:413 /branches/embargo/4.0.14.Final-JBPAPP6-1704:377 /branches/embargo/4.0.16.Final-vault:408-449 /branches/embargo/BZ1050058-JSM-checks:497 /tags/4.0.16.Final:393-407 /trunk:458,462-464,522-523 Copied: branches/eap62/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/vault/TestVault.java (from rev 523, trunk/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/vault/TestVault.java) =================================================================== --- branches/eap62/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/vault/TestVault.java (rev 0) +++ branches/eap62/security-jboss-sx/jbosssx/src/test/java/org/jboss/test/security/vault/TestVault.java 2014-03-18 19:45:24 UTC (rev 526) @@ -0,0 +1,29 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2011, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.test.security.vault; + +import org.picketbox.plugins.vault.PicketBoxSecurityVault; + +public class TestVault extends PicketBoxSecurityVault +{ +} \ No newline at end of file Modified: branches/eap62/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityActions.java =================================================================== --- branches/eap62/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityActions.java 2014-03-18 19:21:30 UTC (rev 525) +++ branches/eap62/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityActions.java 2014-03-18 19:45:24 UTC (rev 526) @@ -2,7 +2,7 @@ * JBoss, Home of Professional Open Source. * Copyright 2008, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * distribution for a full listing of individual contributors. * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as @@ -44,7 +44,7 @@ loadedClass = cl.loadClass(fqn); } catch (ClassNotFoundException e) - { + { } if(loadedClass == null) { @@ -53,12 +53,30 @@ loadedClass = Thread.currentThread().getContextClassLoader().loadClass(fqn); } catch (ClassNotFoundException e) - { - } + { + } } return loadedClass; } }); - + } -} \ No newline at end of file + + static Class loadClass(final ClassLoader classLoader, final String fqn) + { + return AccessController.doPrivileged(new PrivilegedAction>() + { + public Class run() + { + try + { + return classLoader.loadClass(fqn); + } + catch (ClassNotFoundException e) + { + } + return null; + } + }); + } +} Modified: branches/eap62/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVaultFactory.java =================================================================== --- branches/eap62/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVaultFactory.java 2014-03-18 19:21:30 UTC (rev 525) +++ branches/eap62/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVaultFactory.java 2014-03-18 19:45:24 UTC (rev 526) @@ -2,7 +2,7 @@ * JBoss, Home of Professional Open Source. * Copyright 2008, Red Hat Middleware LLC, and individual contributors * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. + * distribution for a full listing of individual contributors. * * This is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as @@ -32,7 +32,7 @@ { private static String defaultVault = "org.picketbox.plugins.vault.PicketBoxSecurityVault"; private static SecurityVault vault= null; - + /** * Get an instance of {@link SecurityVault} * Remember to initialize the vault by checking {@link SecurityVault#isInitialized()} @@ -43,7 +43,7 @@ { return get(defaultVault); } - + /** * Get an instance of {@link SecurityVault} * Remember to initialize the vault by checking {@link SecurityVault#isInitialized()} @@ -59,7 +59,7 @@ } if(fqn == null) return get(); - + if(vault == null) { Class vaultClass = SecurityActions.loadClass(SecurityVaultFactory.class,fqn); @@ -76,4 +76,41 @@ } return vault; } + + /** + * Get an instance of {@link SecurityVault} + * Remember to initialize the vault by checking {@link SecurityVault#isInitialized()} + * @param classLoader the class loader to use loading the vault + * @param fqn fully qualified name of the vault implementation + * @return an instance of {@link SecurityVault} + * @throws SecurityVaultException + */ + public static SecurityVault get(ClassLoader classLoader, String fqn) throws SecurityVaultException + { + if (classLoader == null){ + throw PicketBoxMessages.MESSAGES.invalidNullArgument("classLoader"); + } + if (fqn == null){ + throw PicketBoxMessages.MESSAGES.invalidNullArgument("fqn"); + } + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityVaultFactory.class.getName() + ".get")); + } + if(vault == null) + { + Class vaultClass = SecurityActions.loadClass(classLoader,fqn); + if(vaultClass == null) + throw new SecurityVaultException(PicketBoxMessages.MESSAGES.unableToLoadVaultMessage()); + try + { + vault = (SecurityVault) vaultClass.newInstance(); + } + catch (Exception e) + { + throw new SecurityVaultException(PicketBoxMessages.MESSAGES.unableToCreateVaultMessage(), e); + } + } + return vault; + } } \ No newline at end of file From jboss-cvs-commits at lists.jboss.org Tue Mar 18 15:46:59 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 18 Mar 2014 15:46:59 -0400 Subject: [jboss-cvs] Picketbox SVN: r527 - in branches/eap62: assembly and 18 other directories. Message-ID: <201403181946.s2IJkxDf012186@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek at redhat.com Date: 2014-03-18 15:46:58 -0400 (Tue, 18 Mar 2014) New Revision: 527 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: release preparation 4.0.19.SP5 Modified: branches/eap62/assembly/pom.xml =================================================================== --- branches/eap62/assembly/pom.xml 2014-03-18 19:45:24 UTC (rev 526) +++ branches/eap62/assembly/pom.xml 2014-03-18 19:46:58 UTC (rev 527) @@ -2,7 +2,7 @@ org.picketbox picketbox-parent - 4.0.19.SP5-SNAPSHOT + 4.0.19.SP5 ../parent 4.0.0 Modified: branches/eap62/parent/pom.xml =================================================================== --- branches/eap62/parent/pom.xml 2014-03-18 19:45:24 UTC (rev 526) +++ branches/eap62/parent/pom.xml 2014-03-18 19:46:58 UTC (rev 527) @@ -8,7 +8,7 @@ org.picketbox picketbox-parent pom - 4.0.19.SP5-SNAPSHOT + 4.0.19.SP5 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.SP5-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/tags/4.0.19.SP5-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/tags/4.0.19.SP5 + scm:svn:https://svn.jboss.org/repos/picketbox/tags/4.0.19.SP5 Modified: branches/eap62/picketbox/pom.xml =================================================================== --- branches/eap62/picketbox/pom.xml 2014-03-18 19:45:24 UTC (rev 526) +++ branches/eap62/picketbox/pom.xml 2014-03-18 19:46:58 UTC (rev 527) @@ -8,7 +8,7 @@ 4.0.0 org.picketbox picketbox-bare - 4.0.19.SP5-SNAPSHOT + 4.0.19.SP5 jar Picketbox http://jboss.org/picketbox Modified: branches/eap62/picketbox-infinispan/pom.xml =================================================================== --- branches/eap62/picketbox-infinispan/pom.xml 2014-03-18 19:45:24 UTC (rev 526) +++ branches/eap62/picketbox-infinispan/pom.xml 2014-03-18 19:46:58 UTC (rev 527) @@ -8,7 +8,7 @@ 4.0.0 org.picketbox picketbox-infinispan - 4.0.19.SP5-SNAPSHOT + 4.0.19.SP5 jar Picketbox Infinispan http://jboss.org/picketbox Modified: branches/eap62/pom.xml =================================================================== --- branches/eap62/pom.xml 2014-03-18 19:45:24 UTC (rev 526) +++ branches/eap62/pom.xml 2014-03-18 19:46:58 UTC (rev 527) @@ -2,7 +2,7 @@ org.picketbox picketbox-parent - 4.0.19.SP5-SNAPSHOT + 4.0.19.SP5 parent Modified: branches/eap62/security-jboss-sx/acl/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/acl/pom.xml 2014-03-18 19:45:24 UTC (rev 526) +++ branches/eap62/security-jboss-sx/acl/pom.xml 2014-03-18 19:46:58 UTC (rev 527) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP5-SNAPSHOT + 4.0.19.SP5 ../parent 4.0.0 Modified: branches/eap62/security-jboss-sx/assembly/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/assembly/pom.xml 2014-03-18 19:45:24 UTC (rev 526) +++ branches/eap62/security-jboss-sx/assembly/pom.xml 2014-03-18 19:46:58 UTC (rev 527) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP5-SNAPSHOT + 4.0.19.SP5 ../parent 4.0.0 Modified: branches/eap62/security-jboss-sx/identity/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/identity/pom.xml 2014-03-18 19:45:24 UTC (rev 526) +++ branches/eap62/security-jboss-sx/identity/pom.xml 2014-03-18 19:46:58 UTC (rev 527) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP5-SNAPSHOT + 4.0.19.SP5 ../parent 4.0.0 Modified: branches/eap62/security-jboss-sx/jbosssx/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/jbosssx/pom.xml 2014-03-18 19:45:24 UTC (rev 526) +++ branches/eap62/security-jboss-sx/jbosssx/pom.xml 2014-03-18 19:46:58 UTC (rev 527) @@ -3,7 +3,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP5-SNAPSHOT + 4.0.19.SP5 ../parent 4.0.0 Modified: branches/eap62/security-jboss-sx/jbosssx-client/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/jbosssx-client/pom.xml 2014-03-18 19:45:24 UTC (rev 526) +++ branches/eap62/security-jboss-sx/jbosssx-client/pom.xml 2014-03-18 19:46:58 UTC (rev 527) @@ -7,7 +7,7 @@ 4.0.0 org.picketbox jbosssx-client - 4.0.19.SP5-SNAPSHOT + 4.0.19.SP5 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-03-18 19:45:24 UTC (rev 526) +++ branches/eap62/security-jboss-sx/parent/pom.xml 2014-03-18 19:46:58 UTC (rev 527) @@ -8,7 +8,7 @@ org.picketbox jbosssx-parent pom - 4.0.19.SP5-SNAPSHOT + 4.0.19.SP5 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.SP5-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.19.SP5-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.19.SP5 + scm:svn:https://svn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.19.SP5 @@ -148,6 +148,6 @@ GA - 4.0.19.SP5-SNAPSHOT + 4.0.19.SP5 Modified: branches/eap62/security-jboss-sx/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/pom.xml 2014-03-18 19:45:24 UTC (rev 526) +++ branches/eap62/security-jboss-sx/pom.xml 2014-03-18 19:46:58 UTC (rev 527) @@ -7,7 +7,7 @@ 4.0.0 org.picketbox jbosssx-pom - 4.0.19.SP5-SNAPSHOT + 4.0.19.SP5 pom PicketBox Implementation - Parent http://jboss.org/picketbox Modified: branches/eap62/security-spi/acl/pom.xml =================================================================== --- branches/eap62/security-spi/acl/pom.xml 2014-03-18 19:45:24 UTC (rev 526) +++ branches/eap62/security-spi/acl/pom.xml 2014-03-18 19:46:58 UTC (rev 527) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP5-SNAPSHOT + 4.0.19.SP5 ../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.SP5-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5-SNAPSHOT - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP5-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP5 Modified: branches/eap62/security-spi/assembly/pom.xml =================================================================== --- branches/eap62/security-spi/assembly/pom.xml 2014-03-18 19:45:24 UTC (rev 526) +++ branches/eap62/security-spi/assembly/pom.xml 2014-03-18 19:46:58 UTC (rev 527) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP5-SNAPSHOT + 4.0.19.SP5 ../parent 4.0.0 Modified: branches/eap62/security-spi/authorization/pom.xml =================================================================== --- branches/eap62/security-spi/authorization/pom.xml 2014-03-18 19:45:24 UTC (rev 526) +++ branches/eap62/security-spi/authorization/pom.xml 2014-03-18 19:46:58 UTC (rev 527) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP5-SNAPSHOT + 4.0.19.SP5 ../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.SP5-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5-SNAPSHOT - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP5-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP5 Modified: branches/eap62/security-spi/common/pom.xml =================================================================== --- branches/eap62/security-spi/common/pom.xml 2014-03-18 19:45:24 UTC (rev 526) +++ branches/eap62/security-spi/common/pom.xml 2014-03-18 19:46:58 UTC (rev 527) @@ -5,7 +5,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP5-SNAPSHOT + 4.0.19.SP5 ../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.SP5-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5-SNAPSHOT - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP5-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP5 Modified: branches/eap62/security-spi/identity/pom.xml =================================================================== --- branches/eap62/security-spi/identity/pom.xml 2014-03-18 19:45:24 UTC (rev 526) +++ branches/eap62/security-spi/identity/pom.xml 2014-03-18 19:46:58 UTC (rev 527) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP5-SNAPSHOT + 4.0.19.SP5 ../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.SP5-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5-SNAPSHOT - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP5-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP5 Modified: branches/eap62/security-spi/parent/pom.xml =================================================================== --- branches/eap62/security-spi/parent/pom.xml 2014-03-18 19:45:24 UTC (rev 526) +++ branches/eap62/security-spi/parent/pom.xml 2014-03-18 19:46:58 UTC (rev 527) @@ -8,7 +8,7 @@ org.picketbox picketbox-spi-parent pom - 4.0.19.SP5-SNAPSHOT + 4.0.19.SP5 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.SP5-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5 Modified: branches/eap62/security-spi/pom.xml =================================================================== --- branches/eap62/security-spi/pom.xml 2014-03-18 19:45:24 UTC (rev 526) +++ branches/eap62/security-spi/pom.xml 2014-03-18 19:46:58 UTC (rev 527) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP5-SNAPSHOT + 4.0.19.SP5 parent 4.0.0 Modified: branches/eap62/security-spi/spi/pom.xml =================================================================== --- branches/eap62/security-spi/spi/pom.xml 2014-03-18 19:45:24 UTC (rev 526) +++ branches/eap62/security-spi/spi/pom.xml 2014-03-18 19:46:58 UTC (rev 527) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP5-SNAPSHOT + 4.0.19.SP5 ../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.SP5-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5-SNAPSHOT - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP5-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP5 From jboss-cvs-commits at lists.jboss.org Tue Mar 18 16:22:23 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 18 Mar 2014 16:22:23 -0400 Subject: [jboss-cvs] Picketbox SVN: r528 - tags. Message-ID: <201403182022.s2IKMN1o022761@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek at redhat.com Date: 2014-03-18 16:22:23 -0400 (Tue, 18 Mar 2014) New Revision: 528 Added: tags/4.0.19.SP5/ Log: tagging 4.0.19.SP5 From jboss-cvs-commits at lists.jboss.org Tue Mar 18 16:24:23 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 18 Mar 2014 16:24:23 -0400 Subject: [jboss-cvs] Picketbox SVN: r529 - in branches/eap62: assembly and 18 other directories. Message-ID: <201403182024.s2IKONut022795@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek at redhat.com Date: 2014-03-18 16:24:23 -0400 (Tue, 18 Mar 2014) New Revision: 529 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 release version to 4.0.19.SP6-SNAPSHOT Modified: branches/eap62/assembly/pom.xml =================================================================== --- branches/eap62/assembly/pom.xml 2014-03-18 20:22:23 UTC (rev 528) +++ branches/eap62/assembly/pom.xml 2014-03-18 20:24:23 UTC (rev 529) @@ -2,7 +2,7 @@ org.picketbox picketbox-parent - 4.0.19.SP5 + 4.0.19.SP6-SNAPSHOT ../parent 4.0.0 Modified: branches/eap62/parent/pom.xml =================================================================== --- branches/eap62/parent/pom.xml 2014-03-18 20:22:23 UTC (rev 528) +++ branches/eap62/parent/pom.xml 2014-03-18 20:24:23 UTC (rev 529) @@ -8,7 +8,7 @@ org.picketbox picketbox-parent pom - 4.0.19.SP5 + 4.0.19.SP6-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.SP5 - scm:svn:https://svn.jboss.org/repos/picketbox/tags/4.0.19.SP5 + 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 Modified: branches/eap62/picketbox/pom.xml =================================================================== --- branches/eap62/picketbox/pom.xml 2014-03-18 20:22:23 UTC (rev 528) +++ branches/eap62/picketbox/pom.xml 2014-03-18 20:24:23 UTC (rev 529) @@ -8,7 +8,7 @@ 4.0.0 org.picketbox picketbox-bare - 4.0.19.SP5 + 4.0.19.SP6-SNAPSHOT jar Picketbox http://jboss.org/picketbox Modified: branches/eap62/picketbox-infinispan/pom.xml =================================================================== --- branches/eap62/picketbox-infinispan/pom.xml 2014-03-18 20:22:23 UTC (rev 528) +++ branches/eap62/picketbox-infinispan/pom.xml 2014-03-18 20:24:23 UTC (rev 529) @@ -8,7 +8,7 @@ 4.0.0 org.picketbox picketbox-infinispan - 4.0.19.SP5 + 4.0.19.SP6-SNAPSHOT jar Picketbox Infinispan http://jboss.org/picketbox Modified: branches/eap62/pom.xml =================================================================== --- branches/eap62/pom.xml 2014-03-18 20:22:23 UTC (rev 528) +++ branches/eap62/pom.xml 2014-03-18 20:24:23 UTC (rev 529) @@ -2,7 +2,7 @@ org.picketbox picketbox-parent - 4.0.19.SP5 + 4.0.19.SP6-SNAPSHOT parent Modified: branches/eap62/security-jboss-sx/acl/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/acl/pom.xml 2014-03-18 20:22:23 UTC (rev 528) +++ branches/eap62/security-jboss-sx/acl/pom.xml 2014-03-18 20:24:23 UTC (rev 529) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP5 + 4.0.19.SP6-SNAPSHOT ../parent 4.0.0 Modified: branches/eap62/security-jboss-sx/assembly/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/assembly/pom.xml 2014-03-18 20:22:23 UTC (rev 528) +++ branches/eap62/security-jboss-sx/assembly/pom.xml 2014-03-18 20:24:23 UTC (rev 529) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP5 + 4.0.19.SP6-SNAPSHOT ../parent 4.0.0 Modified: branches/eap62/security-jboss-sx/identity/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/identity/pom.xml 2014-03-18 20:22:23 UTC (rev 528) +++ branches/eap62/security-jboss-sx/identity/pom.xml 2014-03-18 20:24:23 UTC (rev 529) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP5 + 4.0.19.SP6-SNAPSHOT ../parent 4.0.0 Modified: branches/eap62/security-jboss-sx/jbosssx/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/jbosssx/pom.xml 2014-03-18 20:22:23 UTC (rev 528) +++ branches/eap62/security-jboss-sx/jbosssx/pom.xml 2014-03-18 20:24:23 UTC (rev 529) @@ -3,7 +3,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP5 + 4.0.19.SP6-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-03-18 20:22:23 UTC (rev 528) +++ branches/eap62/security-jboss-sx/jbosssx-client/pom.xml 2014-03-18 20:24:23 UTC (rev 529) @@ -7,7 +7,7 @@ 4.0.0 org.picketbox jbosssx-client - 4.0.19.SP5 + 4.0.19.SP6-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-03-18 20:22:23 UTC (rev 528) +++ branches/eap62/security-jboss-sx/parent/pom.xml 2014-03-18 20:24:23 UTC (rev 529) @@ -8,7 +8,7 @@ org.picketbox jbosssx-parent pom - 4.0.19.SP5 + 4.0.19.SP6-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.SP5 - scm:svn:https://svn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.19.SP5 + 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 @@ -148,6 +148,6 @@ GA - 4.0.19.SP5 + 4.0.19.SP6-SNAPSHOT Modified: branches/eap62/security-jboss-sx/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/pom.xml 2014-03-18 20:22:23 UTC (rev 528) +++ branches/eap62/security-jboss-sx/pom.xml 2014-03-18 20:24:23 UTC (rev 529) @@ -7,7 +7,7 @@ 4.0.0 org.picketbox jbosssx-pom - 4.0.19.SP5 + 4.0.19.SP6-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-03-18 20:22:23 UTC (rev 528) +++ branches/eap62/security-spi/acl/pom.xml 2014-03-18 20:24:23 UTC (rev 529) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP5 + 4.0.19.SP6-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.SP5 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP5 + 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 Modified: branches/eap62/security-spi/assembly/pom.xml =================================================================== --- branches/eap62/security-spi/assembly/pom.xml 2014-03-18 20:22:23 UTC (rev 528) +++ branches/eap62/security-spi/assembly/pom.xml 2014-03-18 20:24:23 UTC (rev 529) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP5 + 4.0.19.SP6-SNAPSHOT ../parent 4.0.0 Modified: branches/eap62/security-spi/authorization/pom.xml =================================================================== --- branches/eap62/security-spi/authorization/pom.xml 2014-03-18 20:22:23 UTC (rev 528) +++ branches/eap62/security-spi/authorization/pom.xml 2014-03-18 20:24:23 UTC (rev 529) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP5 + 4.0.19.SP6-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.SP5 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP5 + 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 Modified: branches/eap62/security-spi/common/pom.xml =================================================================== --- branches/eap62/security-spi/common/pom.xml 2014-03-18 20:22:23 UTC (rev 528) +++ branches/eap62/security-spi/common/pom.xml 2014-03-18 20:24:23 UTC (rev 529) @@ -5,7 +5,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP5 + 4.0.19.SP6-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.SP5 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP5 + 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 Modified: branches/eap62/security-spi/identity/pom.xml =================================================================== --- branches/eap62/security-spi/identity/pom.xml 2014-03-18 20:22:23 UTC (rev 528) +++ branches/eap62/security-spi/identity/pom.xml 2014-03-18 20:24:23 UTC (rev 529) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP5 + 4.0.19.SP6-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.SP5 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP5 + 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 Modified: branches/eap62/security-spi/parent/pom.xml =================================================================== --- branches/eap62/security-spi/parent/pom.xml 2014-03-18 20:22:23 UTC (rev 528) +++ branches/eap62/security-spi/parent/pom.xml 2014-03-18 20:24:23 UTC (rev 529) @@ -8,7 +8,7 @@ org.picketbox picketbox-spi-parent pom - 4.0.19.SP5 + 4.0.19.SP6-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.SP5 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5 + 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 Modified: branches/eap62/security-spi/pom.xml =================================================================== --- branches/eap62/security-spi/pom.xml 2014-03-18 20:22:23 UTC (rev 528) +++ branches/eap62/security-spi/pom.xml 2014-03-18 20:24:23 UTC (rev 529) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP5 + 4.0.19.SP6-SNAPSHOT parent 4.0.0 Modified: branches/eap62/security-spi/spi/pom.xml =================================================================== --- branches/eap62/security-spi/spi/pom.xml 2014-03-18 20:22:23 UTC (rev 528) +++ branches/eap62/security-spi/spi/pom.xml 2014-03-18 20:24:23 UTC (rev 529) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP5 + 4.0.19.SP6-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.SP5 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP5 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP5 + 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 From jboss-cvs-commits at lists.jboss.org Tue Mar 18 16:52:08 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 18 Mar 2014 16:52:08 -0400 Subject: [jboss-cvs] Picketbox SVN: r530 - in trunk: assembly and 18 other directories. Message-ID: <201403182052.s2IKq8Ob025821@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek at redhat.com Date: 2014-03-18 16:52:08 -0400 (Tue, 18 Mar 2014) New Revision: 530 Modified: trunk/assembly/pom.xml trunk/parent/pom.xml trunk/picketbox-infinispan/pom.xml trunk/picketbox/pom.xml trunk/pom.xml trunk/security-jboss-sx/acl/pom.xml trunk/security-jboss-sx/assembly/pom.xml trunk/security-jboss-sx/identity/pom.xml trunk/security-jboss-sx/jbosssx-client/pom.xml trunk/security-jboss-sx/jbosssx/pom.xml trunk/security-jboss-sx/parent/pom.xml trunk/security-jboss-sx/pom.xml trunk/security-spi/acl/pom.xml trunk/security-spi/assembly/pom.xml trunk/security-spi/authorization/pom.xml trunk/security-spi/common/pom.xml trunk/security-spi/identity/pom.xml trunk/security-spi/parent/pom.xml trunk/security-spi/pom.xml trunk/security-spi/spi/pom.xml Log: changing release version to 4.0.21.Beta2 Modified: trunk/assembly/pom.xml =================================================================== --- trunk/assembly/pom.xml 2014-03-18 20:24:23 UTC (rev 529) +++ trunk/assembly/pom.xml 2014-03-18 20:52:08 UTC (rev 530) @@ -2,7 +2,7 @@ org.picketbox picketbox-parent - 4.0.21.Beta2-SNAPSHOT + 4.0.21.Beta2 ../parent 4.0.0 Modified: trunk/parent/pom.xml =================================================================== --- trunk/parent/pom.xml 2014-03-18 20:24:23 UTC (rev 529) +++ trunk/parent/pom.xml 2014-03-18 20:52:08 UTC (rev 530) @@ -8,7 +8,7 @@ org.picketbox picketbox-parent pom - 4.0.21.Beta2-SNAPSHOT + 4.0.21.Beta2 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.21.Beta2-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/tags/4.0.21.Beta2-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/tags/4.0.21.Beta2 + scm:svn:https://svn.jboss.org/repos/picketbox/tags/4.0.21.Beta2 Modified: trunk/picketbox/pom.xml =================================================================== --- trunk/picketbox/pom.xml 2014-03-18 20:24:23 UTC (rev 529) +++ trunk/picketbox/pom.xml 2014-03-18 20:52:08 UTC (rev 530) @@ -8,7 +8,7 @@ 4.0.0 org.picketbox picketbox-bare - 4.0.21.Beta2-SNAPSHOT + 4.0.21.Beta2 jar Picketbox http://jboss.org/picketbox Modified: trunk/picketbox-infinispan/pom.xml =================================================================== --- trunk/picketbox-infinispan/pom.xml 2014-03-18 20:24:23 UTC (rev 529) +++ trunk/picketbox-infinispan/pom.xml 2014-03-18 20:52:08 UTC (rev 530) @@ -8,7 +8,7 @@ 4.0.0 org.picketbox picketbox-infinispan - 4.0.21.Beta2-SNAPSHOT + 4.0.21.Beta2 jar Picketbox Infinispan http://jboss.org/picketbox Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-18 20:24:23 UTC (rev 529) +++ trunk/pom.xml 2014-03-18 20:52:08 UTC (rev 530) @@ -2,7 +2,7 @@ org.picketbox picketbox-parent - 4.0.21.Beta2-SNAPSHOT + 4.0.21.Beta2 parent Modified: trunk/security-jboss-sx/acl/pom.xml =================================================================== --- trunk/security-jboss-sx/acl/pom.xml 2014-03-18 20:24:23 UTC (rev 529) +++ trunk/security-jboss-sx/acl/pom.xml 2014-03-18 20:52:08 UTC (rev 530) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.21.Beta2-SNAPSHOT + 4.0.21.Beta2 ../parent 4.0.0 Modified: trunk/security-jboss-sx/assembly/pom.xml =================================================================== --- trunk/security-jboss-sx/assembly/pom.xml 2014-03-18 20:24:23 UTC (rev 529) +++ trunk/security-jboss-sx/assembly/pom.xml 2014-03-18 20:52:08 UTC (rev 530) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.21.Beta2-SNAPSHOT + 4.0.21.Beta2 ../parent 4.0.0 Modified: trunk/security-jboss-sx/identity/pom.xml =================================================================== --- trunk/security-jboss-sx/identity/pom.xml 2014-03-18 20:24:23 UTC (rev 529) +++ trunk/security-jboss-sx/identity/pom.xml 2014-03-18 20:52:08 UTC (rev 530) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.21.Beta2-SNAPSHOT + 4.0.21.Beta2 ../parent 4.0.0 Modified: trunk/security-jboss-sx/jbosssx/pom.xml =================================================================== --- trunk/security-jboss-sx/jbosssx/pom.xml 2014-03-18 20:24:23 UTC (rev 529) +++ trunk/security-jboss-sx/jbosssx/pom.xml 2014-03-18 20:52:08 UTC (rev 530) @@ -3,7 +3,7 @@ org.picketbox jbosssx-parent - 4.0.21.Beta2-SNAPSHOT + 4.0.21.Beta2 ../parent 4.0.0 Modified: trunk/security-jboss-sx/jbosssx-client/pom.xml =================================================================== --- trunk/security-jboss-sx/jbosssx-client/pom.xml 2014-03-18 20:24:23 UTC (rev 529) +++ trunk/security-jboss-sx/jbosssx-client/pom.xml 2014-03-18 20:52:08 UTC (rev 530) @@ -7,7 +7,7 @@ 4.0.0 org.picketbox jbosssx-client - 4.0.21.Beta2-SNAPSHOT + 4.0.21.Beta2 jar PicketBox Client http://www.jboss.org/picketbox Modified: trunk/security-jboss-sx/parent/pom.xml =================================================================== --- trunk/security-jboss-sx/parent/pom.xml 2014-03-18 20:24:23 UTC (rev 529) +++ trunk/security-jboss-sx/parent/pom.xml 2014-03-18 20:52:08 UTC (rev 530) @@ -8,7 +8,7 @@ org.picketbox jbosssx-parent pom - 4.0.21.Beta2-SNAPSHOT + 4.0.21.Beta2 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.21.Beta2-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.21.Beta2-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.21.Beta2 + scm:svn:https://svn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.21.Beta2 @@ -148,6 +148,6 @@ GA - 4.0.21.Beta2-SNAPSHOT + 4.0.21.Beta2 Modified: trunk/security-jboss-sx/pom.xml =================================================================== --- trunk/security-jboss-sx/pom.xml 2014-03-18 20:24:23 UTC (rev 529) +++ trunk/security-jboss-sx/pom.xml 2014-03-18 20:52:08 UTC (rev 530) @@ -7,7 +7,7 @@ 4.0.0 org.picketbox jbosssx-pom - 4.0.21.Beta2-SNAPSHOT + 4.0.21.Beta2 pom PicketBox Implementation - Parent http://jboss.org/picketbox Modified: trunk/security-spi/acl/pom.xml =================================================================== --- trunk/security-spi/acl/pom.xml 2014-03-18 20:24:23 UTC (rev 529) +++ trunk/security-spi/acl/pom.xml 2014-03-18 20:52:08 UTC (rev 530) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta2-SNAPSHOT + 4.0.21.Beta2 ../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.21.Beta2-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2-SNAPSHOT - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta2-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta2 Modified: trunk/security-spi/assembly/pom.xml =================================================================== --- trunk/security-spi/assembly/pom.xml 2014-03-18 20:24:23 UTC (rev 529) +++ trunk/security-spi/assembly/pom.xml 2014-03-18 20:52:08 UTC (rev 530) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta2-SNAPSHOT + 4.0.21.Beta2 ../parent 4.0.0 Modified: trunk/security-spi/authorization/pom.xml =================================================================== --- trunk/security-spi/authorization/pom.xml 2014-03-18 20:24:23 UTC (rev 529) +++ trunk/security-spi/authorization/pom.xml 2014-03-18 20:52:08 UTC (rev 530) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta2-SNAPSHOT + 4.0.21.Beta2 ../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.21.Beta2-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2-SNAPSHOT - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta2-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta2 Modified: trunk/security-spi/common/pom.xml =================================================================== --- trunk/security-spi/common/pom.xml 2014-03-18 20:24:23 UTC (rev 529) +++ trunk/security-spi/common/pom.xml 2014-03-18 20:52:08 UTC (rev 530) @@ -5,7 +5,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta2-SNAPSHOT + 4.0.21.Beta2 ../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.21.Beta2-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2-SNAPSHOT - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta2-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta2 Modified: trunk/security-spi/identity/pom.xml =================================================================== --- trunk/security-spi/identity/pom.xml 2014-03-18 20:24:23 UTC (rev 529) +++ trunk/security-spi/identity/pom.xml 2014-03-18 20:52:08 UTC (rev 530) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta2-SNAPSHOT + 4.0.21.Beta2 ../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.21.Beta2-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2-SNAPSHOT - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta2-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta2 Modified: trunk/security-spi/parent/pom.xml =================================================================== --- trunk/security-spi/parent/pom.xml 2014-03-18 20:24:23 UTC (rev 529) +++ trunk/security-spi/parent/pom.xml 2014-03-18 20:52:08 UTC (rev 530) @@ -8,7 +8,7 @@ org.picketbox picketbox-spi-parent pom - 4.0.21.Beta2-SNAPSHOT + 4.0.21.Beta2 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.21.Beta2-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2 Modified: trunk/security-spi/pom.xml =================================================================== --- trunk/security-spi/pom.xml 2014-03-18 20:24:23 UTC (rev 529) +++ trunk/security-spi/pom.xml 2014-03-18 20:52:08 UTC (rev 530) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta2-SNAPSHOT + 4.0.21.Beta2 parent 4.0.0 Modified: trunk/security-spi/spi/pom.xml =================================================================== --- trunk/security-spi/spi/pom.xml 2014-03-18 20:24:23 UTC (rev 529) +++ trunk/security-spi/spi/pom.xml 2014-03-18 20:52:08 UTC (rev 530) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta2-SNAPSHOT + 4.0.21.Beta2 ../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.21.Beta2-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2-SNAPSHOT - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta2-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta2 From jboss-cvs-commits at lists.jboss.org Tue Mar 18 17:05:44 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 18 Mar 2014 17:05:44 -0400 Subject: [jboss-cvs] Picketbox SVN: r531 - tags. Message-ID: <201403182105.s2IL5iAW000642@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek at redhat.com Date: 2014-03-18 17:05:44 -0400 (Tue, 18 Mar 2014) New Revision: 531 Added: tags/4.0.21.Beta2/ Log: tagging 4.0.21.Beta2 From jboss-cvs-commits at lists.jboss.org Tue Mar 18 17:06:46 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 18 Mar 2014 17:06:46 -0400 Subject: [jboss-cvs] Picketbox SVN: r532 - in trunk: assembly and 18 other directories. Message-ID: <201403182106.s2IL6k5J000664@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek at redhat.com Date: 2014-03-18 17:06:46 -0400 (Tue, 18 Mar 2014) New Revision: 532 Modified: trunk/assembly/pom.xml trunk/parent/pom.xml trunk/picketbox-infinispan/pom.xml trunk/picketbox/pom.xml trunk/pom.xml trunk/security-jboss-sx/acl/pom.xml trunk/security-jboss-sx/assembly/pom.xml trunk/security-jboss-sx/identity/pom.xml trunk/security-jboss-sx/jbosssx-client/pom.xml trunk/security-jboss-sx/jbosssx/pom.xml trunk/security-jboss-sx/parent/pom.xml trunk/security-jboss-sx/pom.xml trunk/security-spi/acl/pom.xml trunk/security-spi/assembly/pom.xml trunk/security-spi/authorization/pom.xml trunk/security-spi/common/pom.xml trunk/security-spi/identity/pom.xml trunk/security-spi/parent/pom.xml trunk/security-spi/pom.xml trunk/security-spi/spi/pom.xml Log: setting next development version 4.0.21.Beta3-SNAPSHOT Modified: trunk/assembly/pom.xml =================================================================== --- trunk/assembly/pom.xml 2014-03-18 21:05:44 UTC (rev 531) +++ trunk/assembly/pom.xml 2014-03-18 21:06:46 UTC (rev 532) @@ -2,7 +2,7 @@ org.picketbox picketbox-parent - 4.0.21.Beta2 + 4.0.21.Beta3-SNAPSHOT ../parent 4.0.0 Modified: trunk/parent/pom.xml =================================================================== --- trunk/parent/pom.xml 2014-03-18 21:05:44 UTC (rev 531) +++ trunk/parent/pom.xml 2014-03-18 21:06:46 UTC (rev 532) @@ -8,7 +8,7 @@ org.picketbox picketbox-parent pom - 4.0.21.Beta2 + 4.0.21.Beta3-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.21.Beta2 - scm:svn:https://svn.jboss.org/repos/picketbox/tags/4.0.21.Beta2 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/tags/4.0.21.Beta3-SNAPSHOT + scm:svn:https://svn.jboss.org/repos/picketbox/tags/4.0.21.Beta3-SNAPSHOT Modified: trunk/picketbox/pom.xml =================================================================== --- trunk/picketbox/pom.xml 2014-03-18 21:05:44 UTC (rev 531) +++ trunk/picketbox/pom.xml 2014-03-18 21:06:46 UTC (rev 532) @@ -8,7 +8,7 @@ 4.0.0 org.picketbox picketbox-bare - 4.0.21.Beta2 + 4.0.21.Beta3-SNAPSHOT jar Picketbox http://jboss.org/picketbox Modified: trunk/picketbox-infinispan/pom.xml =================================================================== --- trunk/picketbox-infinispan/pom.xml 2014-03-18 21:05:44 UTC (rev 531) +++ trunk/picketbox-infinispan/pom.xml 2014-03-18 21:06:46 UTC (rev 532) @@ -8,7 +8,7 @@ 4.0.0 org.picketbox picketbox-infinispan - 4.0.21.Beta2 + 4.0.21.Beta3-SNAPSHOT jar Picketbox Infinispan http://jboss.org/picketbox Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-18 21:05:44 UTC (rev 531) +++ trunk/pom.xml 2014-03-18 21:06:46 UTC (rev 532) @@ -2,7 +2,7 @@ org.picketbox picketbox-parent - 4.0.21.Beta2 + 4.0.21.Beta3-SNAPSHOT parent Modified: trunk/security-jboss-sx/acl/pom.xml =================================================================== --- trunk/security-jboss-sx/acl/pom.xml 2014-03-18 21:05:44 UTC (rev 531) +++ trunk/security-jboss-sx/acl/pom.xml 2014-03-18 21:06:46 UTC (rev 532) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.21.Beta2 + 4.0.21.Beta3-SNAPSHOT ../parent 4.0.0 Modified: trunk/security-jboss-sx/assembly/pom.xml =================================================================== --- trunk/security-jboss-sx/assembly/pom.xml 2014-03-18 21:05:44 UTC (rev 531) +++ trunk/security-jboss-sx/assembly/pom.xml 2014-03-18 21:06:46 UTC (rev 532) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.21.Beta2 + 4.0.21.Beta3-SNAPSHOT ../parent 4.0.0 Modified: trunk/security-jboss-sx/identity/pom.xml =================================================================== --- trunk/security-jboss-sx/identity/pom.xml 2014-03-18 21:05:44 UTC (rev 531) +++ trunk/security-jboss-sx/identity/pom.xml 2014-03-18 21:06:46 UTC (rev 532) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.21.Beta2 + 4.0.21.Beta3-SNAPSHOT ../parent 4.0.0 Modified: trunk/security-jboss-sx/jbosssx/pom.xml =================================================================== --- trunk/security-jboss-sx/jbosssx/pom.xml 2014-03-18 21:05:44 UTC (rev 531) +++ trunk/security-jboss-sx/jbosssx/pom.xml 2014-03-18 21:06:46 UTC (rev 532) @@ -3,7 +3,7 @@ org.picketbox jbosssx-parent - 4.0.21.Beta2 + 4.0.21.Beta3-SNAPSHOT ../parent 4.0.0 Modified: trunk/security-jboss-sx/jbosssx-client/pom.xml =================================================================== --- trunk/security-jboss-sx/jbosssx-client/pom.xml 2014-03-18 21:05:44 UTC (rev 531) +++ trunk/security-jboss-sx/jbosssx-client/pom.xml 2014-03-18 21:06:46 UTC (rev 532) @@ -7,7 +7,7 @@ 4.0.0 org.picketbox jbosssx-client - 4.0.21.Beta2 + 4.0.21.Beta3-SNAPSHOT jar PicketBox Client http://www.jboss.org/picketbox Modified: trunk/security-jboss-sx/parent/pom.xml =================================================================== --- trunk/security-jboss-sx/parent/pom.xml 2014-03-18 21:05:44 UTC (rev 531) +++ trunk/security-jboss-sx/parent/pom.xml 2014-03-18 21:06:46 UTC (rev 532) @@ -8,7 +8,7 @@ org.picketbox jbosssx-parent pom - 4.0.21.Beta2 + 4.0.21.Beta3-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.21.Beta2 - scm:svn:https://svn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.21.Beta2 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.21.Beta3-SNAPSHOT + scm:svn:https://svn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.21.Beta3-SNAPSHOT @@ -148,6 +148,6 @@ GA - 4.0.21.Beta2 + 4.0.21.Beta3-SNAPSHOT Modified: trunk/security-jboss-sx/pom.xml =================================================================== --- trunk/security-jboss-sx/pom.xml 2014-03-18 21:05:44 UTC (rev 531) +++ trunk/security-jboss-sx/pom.xml 2014-03-18 21:06:46 UTC (rev 532) @@ -7,7 +7,7 @@ 4.0.0 org.picketbox jbosssx-pom - 4.0.21.Beta2 + 4.0.21.Beta3-SNAPSHOT pom PicketBox Implementation - Parent http://jboss.org/picketbox Modified: trunk/security-spi/acl/pom.xml =================================================================== --- trunk/security-spi/acl/pom.xml 2014-03-18 21:05:44 UTC (rev 531) +++ trunk/security-spi/acl/pom.xml 2014-03-18 21:06:46 UTC (rev 532) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta2 + 4.0.21.Beta3-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.21.Beta2 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta2 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta3-SNAPSHOT + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta3-SNAPSHOT + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta3-SNAPSHOT Modified: trunk/security-spi/assembly/pom.xml =================================================================== --- trunk/security-spi/assembly/pom.xml 2014-03-18 21:05:44 UTC (rev 531) +++ trunk/security-spi/assembly/pom.xml 2014-03-18 21:06:46 UTC (rev 532) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta2 + 4.0.21.Beta3-SNAPSHOT ../parent 4.0.0 Modified: trunk/security-spi/authorization/pom.xml =================================================================== --- trunk/security-spi/authorization/pom.xml 2014-03-18 21:05:44 UTC (rev 531) +++ trunk/security-spi/authorization/pom.xml 2014-03-18 21:06:46 UTC (rev 532) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta2 + 4.0.21.Beta3-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.21.Beta2 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta2 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta3-SNAPSHOT + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta3-SNAPSHOT + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta3-SNAPSHOT Modified: trunk/security-spi/common/pom.xml =================================================================== --- trunk/security-spi/common/pom.xml 2014-03-18 21:05:44 UTC (rev 531) +++ trunk/security-spi/common/pom.xml 2014-03-18 21:06:46 UTC (rev 532) @@ -5,7 +5,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta2 + 4.0.21.Beta3-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.21.Beta2 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta2 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta3-SNAPSHOT + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta3-SNAPSHOT + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta3-SNAPSHOT Modified: trunk/security-spi/identity/pom.xml =================================================================== --- trunk/security-spi/identity/pom.xml 2014-03-18 21:05:44 UTC (rev 531) +++ trunk/security-spi/identity/pom.xml 2014-03-18 21:06:46 UTC (rev 532) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta2 + 4.0.21.Beta3-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.21.Beta2 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta2 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta3-SNAPSHOT + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta3-SNAPSHOT + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta3-SNAPSHOT Modified: trunk/security-spi/parent/pom.xml =================================================================== --- trunk/security-spi/parent/pom.xml 2014-03-18 21:05:44 UTC (rev 531) +++ trunk/security-spi/parent/pom.xml 2014-03-18 21:06:46 UTC (rev 532) @@ -8,7 +8,7 @@ org.picketbox picketbox-spi-parent pom - 4.0.21.Beta2 + 4.0.21.Beta3-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.21.Beta2 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta3-SNAPSHOT + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta3-SNAPSHOT Modified: trunk/security-spi/pom.xml =================================================================== --- trunk/security-spi/pom.xml 2014-03-18 21:05:44 UTC (rev 531) +++ trunk/security-spi/pom.xml 2014-03-18 21:06:46 UTC (rev 532) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta2 + 4.0.21.Beta3-SNAPSHOT parent 4.0.0 Modified: trunk/security-spi/spi/pom.xml =================================================================== --- trunk/security-spi/spi/pom.xml 2014-03-18 21:05:44 UTC (rev 531) +++ trunk/security-spi/spi/pom.xml 2014-03-18 21:06:46 UTC (rev 532) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta2 + 4.0.21.Beta3-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.21.Beta2 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta2 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta2 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta3-SNAPSHOT + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta3-SNAPSHOT + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta3-SNAPSHOT From jboss-cvs-commits at lists.jboss.org Wed Mar 19 21:55:00 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 19 Mar 2014 21:55:00 -0400 Subject: [jboss-cvs] JBossAS SVN: r114762 - branches/JBPAPP_5/tomcat/src/main/org/jboss/web/tomcat/security. Message-ID: <201403200155.s2K1t0vo003025@svn01.web.mwc.hst.phx2.redhat.com> Author: soul2zimate Date: 2014-03-19 21:54:59 -0400 (Wed, 19 Mar 2014) New Revision: 114762 Modified: branches/JBPAPP_5/tomcat/src/main/org/jboss/web/tomcat/security/JBossGenericPrincipal.java Log: JBPAPP-10737 change JBossGenericPrincipal access level from default to public Modified: branches/JBPAPP_5/tomcat/src/main/org/jboss/web/tomcat/security/JBossGenericPrincipal.java =================================================================== --- branches/JBPAPP_5/tomcat/src/main/org/jboss/web/tomcat/security/JBossGenericPrincipal.java 2014-03-14 12:43:17 UTC (rev 114761) +++ branches/JBPAPP_5/tomcat/src/main/org/jboss/web/tomcat/security/JBossGenericPrincipal.java 2014-03-20 01:54:59 UTC (rev 114762) @@ -37,7 +37,7 @@ * @author Scott.Stark at jboss.org * @version $Revision$ */ -class JBossGenericPrincipal +public class JBossGenericPrincipal extends GenericPrincipal { /** The authenticated user name as a Principal */ From jboss-cvs-commits at lists.jboss.org Fri Mar 21 07:30:39 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Fri, 21 Mar 2014 07:30:39 -0400 Subject: [jboss-cvs] JBossAS SVN: r114763 - in projects/security/security-jboss-sx/branches/Branch_2_0: acl and 7 other directories. Message-ID: <201403211130.s2LBUdu8013653@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-03-21 07:30:38 -0400 (Fri, 21 Mar 2014) New Revision: 114763 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/acl/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/assembly/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/identity/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-bridge-as4/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-client/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/parent/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/pom.xml Log: cleaning up this shit Modified: projects/security/security-jboss-sx/branches/Branch_2_0/acl/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/acl/pom.xml 2014-03-20 01:54:59 UTC (rev 114762) +++ projects/security/security-jboss-sx/branches/Branch_2_0/acl/pom.xml 2014-03-21 11:30:38 UTC (rev 114763) @@ -2,7 +2,7 @@ org.jboss.security jbosssx-parent - 2.0.7.Final + 2.0.8-SNAPSHOT ../parent 4.0.0 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/assembly/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/assembly/pom.xml 2014-03-20 01:54:59 UTC (rev 114762) +++ projects/security/security-jboss-sx/branches/Branch_2_0/assembly/pom.xml 2014-03-21 11:30:38 UTC (rev 114763) @@ -2,7 +2,7 @@ org.jboss.security jbosssx-parent - 2.0.7.Final + 2.0.8-SNAPSHOT ../parent 4.0.0 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/identity/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/identity/pom.xml 2014-03-20 01:54:59 UTC (rev 114762) +++ projects/security/security-jboss-sx/branches/Branch_2_0/identity/pom.xml 2014-03-21 11:30:38 UTC (rev 114763) @@ -2,7 +2,7 @@ org.jboss.security jbosssx-parent - 2.0.7.Final + 2.0.8-SNAPSHOT ../parent 4.0.0 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/pom.xml 2014-03-20 01:54:59 UTC (rev 114762) +++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/pom.xml 2014-03-21 11:30:38 UTC (rev 114763) @@ -2,7 +2,7 @@ org.jboss.security jbosssx-parent - 2.0.7.Final + 2.0.8-SNAPSHOT ../parent 4.0.0 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-bridge-as4/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-bridge-as4/pom.xml 2014-03-20 01:54:59 UTC (rev 114762) +++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-bridge-as4/pom.xml 2014-03-21 11:30:38 UTC (rev 114763) @@ -2,7 +2,7 @@ org.jboss.security jbosssx-parent - 2.0.7.Final + 2.0.8-SNAPSHOT ../parent 4.0.0 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-client/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-client/pom.xml 2014-03-20 01:54:59 UTC (rev 114762) +++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-client/pom.xml 2014-03-21 11:30:38 UTC (rev 114763) @@ -7,7 +7,7 @@ 4.0.0 org.jboss.security jbosssx-client - 2.0.7.Final + 2.0.8-SNAPSHOT jar JBoss Security Client http://www.jboss.org Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/pom.xml 2014-03-20 01:54:59 UTC (rev 114762) +++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/pom.xml 2014-03-21 11:30:38 UTC (rev 114763) @@ -3,7 +3,7 @@ org.jboss.security jbosssx-parent - 2.0.7.Final + 2.0.8-SNAPSHOT ../parent 4.0.0 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/parent/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/parent/pom.xml 2014-03-20 01:54:59 UTC (rev 114762) +++ projects/security/security-jboss-sx/branches/Branch_2_0/parent/pom.xml 2014-03-21 11:30:38 UTC (rev 114763) @@ -8,7 +8,7 @@ org.jboss.security jbosssx-parent pom - 2.0.7.Final + 2.0.8-SNAPSHOT JBossSX - Parent http://labs.jboss.org/portal/jbosssecurity/ JBoss Security is a cross cutting project that handles security for the JEMS projects Modified: projects/security/security-jboss-sx/branches/Branch_2_0/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/pom.xml 2014-03-20 01:54:59 UTC (rev 114762) +++ projects/security/security-jboss-sx/branches/Branch_2_0/pom.xml 2014-03-21 11:30:38 UTC (rev 114763) @@ -7,7 +7,7 @@ 4.0.0 org.jboss.security jbosssx-pom - 2.0.7.Final + 2.0.8-SNAPSHOT pom JBoss Security Implementation for the JBAS - Parent http://labs.jboss.org/portal/jbosssecurity/ From jboss-cvs-commits at lists.jboss.org Fri Mar 21 13:52:45 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Fri, 21 Mar 2014 13:52:45 -0400 Subject: [jboss-cvs] JBossAS SVN: r114764 - in projects/metadata/trunk/src: main/java/org/jboss/metadata/annotation/creator/ejb and 2 other directories. Message-ID: <201403211752.s2LHqjrr027934@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-03-21 13:52:45 -0400 (Fri, 21 Mar 2014) New Revision: 114764 Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/AbstractDeclareRolesProcessor.java projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/DeclareRolesProcessor.java projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/DeclareRolesProcessor.java Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/DeclareRolesProcessor.java projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/AbstractSessionBeanProcessor.java projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/AbstractSessionBeanProcessor.java projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/PostXmlProcessingUnitTestCase.java Log: JBMETA-374: process @DeclareRoles into security-role-ref Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/DeclareRolesProcessor.java =================================================================== --- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/DeclareRolesProcessor.java 2014-03-21 11:30:38 UTC (rev 114763) +++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/DeclareRolesProcessor.java 2014-03-21 17:52:45 UTC (rev 114764) @@ -37,7 +37,9 @@ * * @author Scott.Stark at jboss.org * @version $Revision$ + * @deprecated see JBPAPP-11037 */ + at Deprecated public class DeclareRolesProcessor extends AbstractFinderUser implements Processor> Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/AbstractDeclareRolesProcessor.java =================================================================== --- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/AbstractDeclareRolesProcessor.java (rev 0) +++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/AbstractDeclareRolesProcessor.java 2014-03-21 17:52:45 UTC (rev 114764) @@ -0,0 +1,61 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright (c) 2014, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.metadata.annotation.creator.ejb; + +import org.jboss.metadata.annotation.creator.AbstractFinderUser; +import org.jboss.metadata.annotation.creator.ProcessorUtils; +import org.jboss.metadata.annotation.finder.AnnotationFinder; +import org.jboss.metadata.javaee.spec.SecurityRoleRefMetaData; +import org.jboss.metadata.javaee.spec.SecurityRoleRefsMetaData; + +import javax.annotation.security.DeclareRoles; +import java.lang.annotation.Annotation; +import java.lang.reflect.AnnotatedElement; +import java.util.Collection; + +/** + * EJB 3.0 17.2.5.3 + * + * @author Carlo de Wolf + */ +public abstract class AbstractDeclareRolesProcessor extends AbstractFinderUser +{ + public AbstractDeclareRolesProcessor(final AnnotationFinder finder) + { + super(finder); + } + + protected void process(final SecurityRoleRefsMetaData metaData, final DeclareRoles declareRoles) + { + for (String roleName : declareRoles.value()) + { + SecurityRoleRefMetaData securityRoleRef = new SecurityRoleRefMetaData(); + securityRoleRef.setRoleName(roleName); + metaData.add(securityRoleRef); + } + } + + public Collection> getAnnotationTypes() + { + return ProcessorUtils.createAnnotationSet(DeclareRoles.class); + } +} Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/AbstractSessionBeanProcessor.java =================================================================== --- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/AbstractSessionBeanProcessor.java 2014-03-21 11:30:38 UTC (rev 114763) +++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/AbstractSessionBeanProcessor.java 2014-03-21 17:52:45 UTC (rev 114764) @@ -40,7 +40,7 @@ * session bean meta data. * * @author Carlo de Wolf - * @version $Revision: $ + * @version $Revision$ */ public abstract class AbstractSessionBeanProcessor extends AbstractEnterpriseBeanProcessor implements Creator, SessionBeanMetaData>, Processor> { @@ -49,6 +49,7 @@ { super(finder); // + addTypeProcessor(new DeclareRolesProcessor(finder)); addTypeProcessor(new LocalProcessor(finder)); addTypeProcessor(new LocalHomeProcessor(finder)); addTypeProcessor(new RemoteProcessor(finder)); @@ -93,5 +94,5 @@ return bean; } - + } Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/DeclareRolesProcessor.java =================================================================== --- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/DeclareRolesProcessor.java (rev 0) +++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/DeclareRolesProcessor.java 2014-03-21 17:52:45 UTC (rev 114764) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright (c) 2014, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.metadata.annotation.creator.ejb; + +import org.jboss.metadata.annotation.creator.Processor; +import org.jboss.metadata.annotation.finder.AnnotationFinder; +import org.jboss.metadata.ejb.spec.SessionBeanMetaData; +import org.jboss.metadata.javaee.spec.SecurityRoleRefsMetaData; + +import javax.annotation.security.DeclareRoles; +import java.lang.reflect.AnnotatedElement; + +/** + * @author Carlo de Wolf + */ +public class DeclareRolesProcessor extends AbstractDeclareRolesProcessor + implements Processor> +{ + public DeclareRolesProcessor(final AnnotationFinder finder) + { + super(finder); + } + + public void process(final SessionBeanMetaData metaData, final Class type) + { + DeclareRoles declareRoles = finder.getAnnotation(type, DeclareRoles.class); + if(declareRoles == null) + return; + SecurityRoleRefsMetaData securityRoleRefs = new SecurityRoleRefsMetaData(); + super.process(securityRoleRefs, declareRoles); + metaData.setSecurityRoleRefs(securityRoleRefs); + } +} Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/AbstractSessionBeanProcessor.java =================================================================== --- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/AbstractSessionBeanProcessor.java 2014-03-21 11:30:38 UTC (rev 114763) +++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/AbstractSessionBeanProcessor.java 2014-03-21 17:52:45 UTC (rev 114764) @@ -28,6 +28,7 @@ import org.jboss.metadata.annotation.creator.Creator; import org.jboss.metadata.annotation.creator.Processor; +import org.jboss.metadata.annotation.creator.ejb.AbstractDeclareRolesProcessor; import org.jboss.metadata.annotation.finder.AnnotationFinder; import org.jboss.metadata.ejb.jboss.JBossMetaData; import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData; @@ -51,6 +52,7 @@ { super(finder); + addTypeProcessor(new DeclareRolesProcessor(finder)); addTypeProcessor(new LocalProcessor(finder)); addTypeProcessor(new LocalHomeProcessor(finder)); addTypeProcessor(new RemoteProcessor(finder)); Added: projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/DeclareRolesProcessor.java =================================================================== --- projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/DeclareRolesProcessor.java (rev 0) +++ projects/metadata/trunk/src/main/java/org/jboss/metadata/annotation/creator/ejb/jboss/DeclareRolesProcessor.java 2014-03-21 17:52:45 UTC (rev 114764) @@ -0,0 +1,56 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright (c) 2014, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.metadata.annotation.creator.ejb.jboss; + +import org.jboss.metadata.annotation.creator.AbstractFinderUser; +import org.jboss.metadata.annotation.creator.Processor; +import org.jboss.metadata.annotation.creator.ejb.AbstractDeclareRolesProcessor; +import org.jboss.metadata.annotation.finder.AnnotationFinder; +import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData; +import org.jboss.metadata.javaee.spec.SecurityRoleRefsMetaData; + +import javax.annotation.security.DeclareRoles; +import java.lang.annotation.Annotation; +import java.lang.reflect.AnnotatedElement; +import java.util.Collection; + +/** + * @author Carlo de Wolf + */ +public class DeclareRolesProcessor extends AbstractDeclareRolesProcessor + implements Processor> +{ + protected DeclareRolesProcessor(final AnnotationFinder finder) + { + super(finder); + } + + public void process(final JBossSessionBeanMetaData metaData, final Class type) + { + DeclareRoles declareRoles = finder.getAnnotation(type, DeclareRoles.class); + if(declareRoles == null) + return; + SecurityRoleRefsMetaData securityRoleRefs = new SecurityRoleRefsMetaData(); + super.process(securityRoleRefs, declareRoles); + metaData.setSecurityRoleRefs(securityRoleRefs); + } +} Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/PostXmlProcessingUnitTestCase.java =================================================================== --- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/PostXmlProcessingUnitTestCase.java 2014-03-21 11:30:38 UTC (rev 114763) +++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/annotation/jbmeta99/PostXmlProcessingUnitTestCase.java 2014-03-21 17:52:45 UTC (rev 114764) @@ -74,6 +74,7 @@ import org.jboss.metadata.javaee.spec.ResourceEnvironmentReferencesMetaData; import org.jboss.metadata.javaee.spec.RunAsMetaData; import org.jboss.metadata.javaee.spec.SecurityRoleMetaData; +import org.jboss.metadata.javaee.spec.SecurityRoleRefMetaData; import org.jboss.metadata.javaee.spec.SecurityRolesMetaData; import org.jboss.metadata.javaee.spec.ServiceReferenceMetaData; import org.jboss.metadata.javaee.spec.ServiceReferencesMetaData; @@ -461,6 +462,11 @@ assertEquals("stack", remoteBinding.getInterceptorStack()); assertEquals("factory", remoteBinding.getProxyFactory()); assertEquals("RemoteBinding", remoteBinding.getJndiName()); + + // JBMETA-374 + assertEquals(2, bean.getSecurityRoleRefs().size()); + assertNotNull(bean.getSecurityRoleRefs().get("Role1")); + assertNotNull(bean.getSecurityRoleRefs().get("Role2")); } private void assertMyMDB(IEnterpriseBeanMetaData enterpriseBean) From jboss-cvs-commits at lists.jboss.org Sat Mar 22 23:53:34 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Sat, 22 Mar 2014 23:53:34 -0400 Subject: [jboss-cvs] JBossAS SVN: r114765 - projects/metadata/trunk. Message-ID: <201403230353.s2N3rYkD019924@svn01.web.mwc.hst.phx2.redhat.com> Author: soul2zimate Date: 2014-03-22 23:53:33 -0400 (Sat, 22 Mar 2014) New Revision: 114765 Modified: projects/metadata/trunk/pom.xml Log: [maven-release-plugin] prepare release 1.0.8.GA Modified: projects/metadata/trunk/pom.xml =================================================================== --- projects/metadata/trunk/pom.xml 2014-03-21 17:52:45 UTC (rev 114764) +++ projects/metadata/trunk/pom.xml 2014-03-23 03:53:33 UTC (rev 114765) @@ -8,14 +8,14 @@ org.jboss.metadata jboss-metadata jar - 1.0.8-SNAPSHOT + 1.0.8.GA JBoss Metadata http://www.jboss.org The common JavaEE metadata classes - scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/metadata/trunk/ - scm:svn:https://svn.jboss.org/repos/jbossas/projects/metadata/trunk/ - http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/jboss-parent-5/jboss-metadata + scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/metadata/tags/1.0.8.GA + scm:svn:https://svn.jboss.org/repos/jbossas/projects/metadata/tags/1.0.8.GA + http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.0.8.GA From jboss-cvs-commits at lists.jboss.org Sat Mar 22 23:53:44 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Sat, 22 Mar 2014 23:53:44 -0400 Subject: [jboss-cvs] JBossAS SVN: r114766 - projects/metadata/tags. Message-ID: <201403230353.s2N3ri8d019943@svn01.web.mwc.hst.phx2.redhat.com> Author: soul2zimate Date: 2014-03-22 23:53:44 -0400 (Sat, 22 Mar 2014) New Revision: 114766 Added: projects/metadata/tags/1.0.8.GA/ Log: [maven-scm] copy for tag 1.0.8.GA From jboss-cvs-commits at lists.jboss.org Sat Mar 22 23:53:49 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Sat, 22 Mar 2014 23:53:49 -0400 Subject: [jboss-cvs] JBossAS SVN: r114767 - projects/metadata/trunk. Message-ID: <201403230353.s2N3rn4M019961@svn01.web.mwc.hst.phx2.redhat.com> Author: soul2zimate Date: 2014-03-22 23:53:49 -0400 (Sat, 22 Mar 2014) New Revision: 114767 Modified: projects/metadata/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: projects/metadata/trunk/pom.xml =================================================================== --- projects/metadata/trunk/pom.xml 2014-03-23 03:53:44 UTC (rev 114766) +++ projects/metadata/trunk/pom.xml 2014-03-23 03:53:49 UTC (rev 114767) @@ -8,14 +8,14 @@ org.jboss.metadata jboss-metadata jar - 1.0.8.GA + 1.0.9-SNAPSHOT JBoss Metadata http://www.jboss.org The common JavaEE metadata classes - scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/metadata/tags/1.0.8.GA - scm:svn:https://svn.jboss.org/repos/jbossas/projects/metadata/tags/1.0.8.GA - http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/1.0.8.GA + scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/metadata/trunk/ + scm:svn:https://svn.jboss.org/repos/jbossas/projects/metadata/trunk/ + http://anonsvn.jboss.org/repos/maven/poms/jboss-parent-pom/tags/jboss-parent-5/jboss-metadata From jboss-cvs-commits at lists.jboss.org Mon Mar 24 03:38:53 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 24 Mar 2014 03:38:53 -0400 Subject: [jboss-cvs] JBossAS SVN: r114768 - branches/JBPAPP_5/component-matrix. Message-ID: <201403240738.s2O7crGp018325@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-03-24 03:38:53 -0400 (Mon, 24 Mar 2014) New Revision: 114768 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: JBPAPP-10919 Upgrade jboss-metadata to 1.0.8 Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-03-23 03:53:49 UTC (rev 114767) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-03-24 07:38:53 UTC (rev 114768) @@ -81,7 +81,7 @@ 1.1.2.GA-patch-01 2.1.1.SP2 2.0.3.GA - 1.0.7.GA + 1.0.8.GA 2.0.11.GA 5.0.3.GA_CP02 2.0.4.GA From jboss-cvs-commits at lists.jboss.org Mon Mar 24 08:43:00 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 24 Mar 2014 08:43:00 -0400 Subject: [jboss-cvs] JBossAS SVN: r114769 - in projects/security/security-jboss-sx/branches/Branch_2_0: acl and 7 other directories. Message-ID: <201403241243.s2OCh0UT018175@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek Date: 2014-03-24 08:43:00 -0400 (Mon, 24 Mar 2014) New Revision: 114769 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/acl/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/assembly/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/identity/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-bridge-as4/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-client/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/parent/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/pom.xml Log: releasing jbosssx 2.0.8.Final Modified: projects/security/security-jboss-sx/branches/Branch_2_0/acl/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/acl/pom.xml 2014-03-24 07:38:53 UTC (rev 114768) +++ projects/security/security-jboss-sx/branches/Branch_2_0/acl/pom.xml 2014-03-24 12:43:00 UTC (rev 114769) @@ -2,7 +2,7 @@ org.jboss.security jbosssx-parent - 2.0.8-SNAPSHOT + 2.0.8.Final ../parent 4.0.0 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/assembly/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/assembly/pom.xml 2014-03-24 07:38:53 UTC (rev 114768) +++ projects/security/security-jboss-sx/branches/Branch_2_0/assembly/pom.xml 2014-03-24 12:43:00 UTC (rev 114769) @@ -2,7 +2,7 @@ org.jboss.security jbosssx-parent - 2.0.8-SNAPSHOT + 2.0.8.Final ../parent 4.0.0 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/identity/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/identity/pom.xml 2014-03-24 07:38:53 UTC (rev 114768) +++ projects/security/security-jboss-sx/branches/Branch_2_0/identity/pom.xml 2014-03-24 12:43:00 UTC (rev 114769) @@ -2,7 +2,7 @@ org.jboss.security jbosssx-parent - 2.0.8-SNAPSHOT + 2.0.8.Final ../parent 4.0.0 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/pom.xml 2014-03-24 07:38:53 UTC (rev 114768) +++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/pom.xml 2014-03-24 12:43:00 UTC (rev 114769) @@ -2,7 +2,7 @@ org.jboss.security jbosssx-parent - 2.0.8-SNAPSHOT + 2.0.8.Final ../parent 4.0.0 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-bridge-as4/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-bridge-as4/pom.xml 2014-03-24 07:38:53 UTC (rev 114768) +++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-bridge-as4/pom.xml 2014-03-24 12:43:00 UTC (rev 114769) @@ -2,7 +2,7 @@ org.jboss.security jbosssx-parent - 2.0.8-SNAPSHOT + 2.0.8.Final ../parent 4.0.0 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-client/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-client/pom.xml 2014-03-24 07:38:53 UTC (rev 114768) +++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-client/pom.xml 2014-03-24 12:43:00 UTC (rev 114769) @@ -7,7 +7,7 @@ 4.0.0 org.jboss.security jbosssx-client - 2.0.8-SNAPSHOT + 2.0.8.Final jar JBoss Security Client http://www.jboss.org Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/pom.xml 2014-03-24 07:38:53 UTC (rev 114768) +++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/pom.xml 2014-03-24 12:43:00 UTC (rev 114769) @@ -3,7 +3,7 @@ org.jboss.security jbosssx-parent - 2.0.8-SNAPSHOT + 2.0.8.Final ../parent 4.0.0 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/parent/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/parent/pom.xml 2014-03-24 07:38:53 UTC (rev 114768) +++ projects/security/security-jboss-sx/branches/Branch_2_0/parent/pom.xml 2014-03-24 12:43:00 UTC (rev 114769) @@ -8,7 +8,7 @@ org.jboss.security jbosssx-parent pom - 2.0.8-SNAPSHOT + 2.0.8.Final JBossSX - Parent http://labs.jboss.org/portal/jbosssecurity/ JBoss Security is a cross cutting project that handles security for the JEMS projects Modified: projects/security/security-jboss-sx/branches/Branch_2_0/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/pom.xml 2014-03-24 07:38:53 UTC (rev 114768) +++ projects/security/security-jboss-sx/branches/Branch_2_0/pom.xml 2014-03-24 12:43:00 UTC (rev 114769) @@ -7,7 +7,7 @@ 4.0.0 org.jboss.security jbosssx-pom - 2.0.8-SNAPSHOT + 2.0.8.Final pom JBoss Security Implementation for the JBAS - Parent http://labs.jboss.org/portal/jbosssecurity/ From jboss-cvs-commits at lists.jboss.org Mon Mar 24 08:43:15 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 24 Mar 2014 08:43:15 -0400 Subject: [jboss-cvs] JBossAS SVN: r114770 - in projects/security/security-spi/branches/Branch_2_0: acl and 6 other directories. Message-ID: <201403241243.s2OChFRG018195@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek Date: 2014-03-24 08:43:14 -0400 (Mon, 24 Mar 2014) New Revision: 114770 Modified: projects/security/security-spi/branches/Branch_2_0/acl/pom.xml projects/security/security-spi/branches/Branch_2_0/assembly/pom.xml projects/security/security-spi/branches/Branch_2_0/authorization/pom.xml projects/security/security-spi/branches/Branch_2_0/identity/pom.xml projects/security/security-spi/branches/Branch_2_0/jboss-security-spi-as4/pom.xml projects/security/security-spi/branches/Branch_2_0/parent/pom.xml projects/security/security-spi/branches/Branch_2_0/pom.xml projects/security/security-spi/branches/Branch_2_0/spi/pom.xml Log: releasing jbosssx-spi 2.0.8.Final Modified: projects/security/security-spi/branches/Branch_2_0/acl/pom.xml =================================================================== --- projects/security/security-spi/branches/Branch_2_0/acl/pom.xml 2014-03-24 12:43:00 UTC (rev 114769) +++ projects/security/security-spi/branches/Branch_2_0/acl/pom.xml 2014-03-24 12:43:14 UTC (rev 114770) @@ -2,7 +2,7 @@ org.jboss.security jboss-security-spi-parent - 2.0.7.Final + 2.0.8.Final ../parent 4.0.0 Modified: projects/security/security-spi/branches/Branch_2_0/assembly/pom.xml =================================================================== --- projects/security/security-spi/branches/Branch_2_0/assembly/pom.xml 2014-03-24 12:43:00 UTC (rev 114769) +++ projects/security/security-spi/branches/Branch_2_0/assembly/pom.xml 2014-03-24 12:43:14 UTC (rev 114770) @@ -2,7 +2,7 @@ org.jboss.security jboss-security-spi-parent - 2.0.7.Final + 2.0.8.Final ../parent 4.0.0 Modified: projects/security/security-spi/branches/Branch_2_0/authorization/pom.xml =================================================================== --- projects/security/security-spi/branches/Branch_2_0/authorization/pom.xml 2014-03-24 12:43:00 UTC (rev 114769) +++ projects/security/security-spi/branches/Branch_2_0/authorization/pom.xml 2014-03-24 12:43:14 UTC (rev 114770) @@ -2,7 +2,7 @@ org.jboss.security jboss-security-spi-parent - 2.0.7.Final + 2.0.8.Final ../parent 4.0.0 Modified: projects/security/security-spi/branches/Branch_2_0/identity/pom.xml =================================================================== --- projects/security/security-spi/branches/Branch_2_0/identity/pom.xml 2014-03-24 12:43:00 UTC (rev 114769) +++ projects/security/security-spi/branches/Branch_2_0/identity/pom.xml 2014-03-24 12:43:14 UTC (rev 114770) @@ -2,7 +2,7 @@ org.jboss.security jboss-security-spi-parent - 2.0.7.Final + 2.0.8.Final ../parent 4.0.0 Modified: projects/security/security-spi/branches/Branch_2_0/jboss-security-spi-as4/pom.xml =================================================================== --- projects/security/security-spi/branches/Branch_2_0/jboss-security-spi-as4/pom.xml 2014-03-24 12:43:00 UTC (rev 114769) +++ projects/security/security-spi/branches/Branch_2_0/jboss-security-spi-as4/pom.xml 2014-03-24 12:43:14 UTC (rev 114770) @@ -2,7 +2,7 @@ org.jboss.security jboss-security-spi-parent - 2.0.7.Final + 2.0.8.Final ../parent 4.0.0 Modified: projects/security/security-spi/branches/Branch_2_0/parent/pom.xml =================================================================== --- projects/security/security-spi/branches/Branch_2_0/parent/pom.xml 2014-03-24 12:43:00 UTC (rev 114769) +++ projects/security/security-spi/branches/Branch_2_0/parent/pom.xml 2014-03-24 12:43:14 UTC (rev 114770) @@ -8,7 +8,7 @@ org.jboss.security jboss-security-spi-parent pom - 2.0.7.Final + 2.0.8.Final JBoss Security SPI - Parent http://labs.jboss.org/portal/jbosssecurity/ JBoss Security is a cross cutting project that handles security for the JEMS projects Modified: projects/security/security-spi/branches/Branch_2_0/pom.xml =================================================================== --- projects/security/security-spi/branches/Branch_2_0/pom.xml 2014-03-24 12:43:00 UTC (rev 114769) +++ projects/security/security-spi/branches/Branch_2_0/pom.xml 2014-03-24 12:43:14 UTC (rev 114770) @@ -2,7 +2,7 @@ org.jboss.security jboss-security-spi-parent - 2.0.7.Final + 2.0.8.Final parent 4.0.0 Modified: projects/security/security-spi/branches/Branch_2_0/spi/pom.xml =================================================================== --- projects/security/security-spi/branches/Branch_2_0/spi/pom.xml 2014-03-24 12:43:00 UTC (rev 114769) +++ projects/security/security-spi/branches/Branch_2_0/spi/pom.xml 2014-03-24 12:43:14 UTC (rev 114770) @@ -2,7 +2,7 @@ org.jboss.security jboss-security-spi-parent - 2.0.7.Final + 2.0.8.Final ../parent 4.0.0 From jboss-cvs-commits at lists.jboss.org Mon Mar 24 09:13:23 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 24 Mar 2014 09:13:23 -0400 Subject: [jboss-cvs] JBossAS SVN: r114771 - projects/security/security-jboss-sx/tags. Message-ID: <201403241313.s2ODDNcY027604@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek Date: 2014-03-24 09:13:23 -0400 (Mon, 24 Mar 2014) New Revision: 114771 Added: projects/security/security-jboss-sx/tags/2.0.8.Final/ Log: tagging 2.0.8.Final From jboss-cvs-commits at lists.jboss.org Mon Mar 24 09:14:40 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 24 Mar 2014 09:14:40 -0400 Subject: [jboss-cvs] JBossAS SVN: r114772 - projects/security/security-spi/tags. Message-ID: <201403241314.s2ODEeOC027628@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek Date: 2014-03-24 09:14:39 -0400 (Mon, 24 Mar 2014) New Revision: 114772 Added: projects/security/security-spi/tags/2.0.8.Final/ Log: tagging 2.0.8.Final From jboss-cvs-commits at lists.jboss.org Mon Mar 24 09:56:12 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 24 Mar 2014 09:56:12 -0400 Subject: [jboss-cvs] JBossAS SVN: r114773 - in projects/security/security-jboss-sx/branches/Branch_2_0: acl and 7 other directories. Message-ID: <201403241356.s2ODuCkm032333@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek Date: 2014-03-24 09:56:12 -0400 (Mon, 24 Mar 2014) New Revision: 114773 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/acl/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/assembly/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/identity/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-bridge-as4/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-client/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/parent/pom.xml projects/security/security-jboss-sx/branches/Branch_2_0/pom.xml Log: setting next development version 2.0.9-SNAPSHOT Modified: projects/security/security-jboss-sx/branches/Branch_2_0/acl/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/acl/pom.xml 2014-03-24 13:14:39 UTC (rev 114772) +++ projects/security/security-jboss-sx/branches/Branch_2_0/acl/pom.xml 2014-03-24 13:56:12 UTC (rev 114773) @@ -2,7 +2,7 @@ org.jboss.security jbosssx-parent - 2.0.8.Final + 2.0.9-SNAPSHOT ../parent 4.0.0 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/assembly/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/assembly/pom.xml 2014-03-24 13:14:39 UTC (rev 114772) +++ projects/security/security-jboss-sx/branches/Branch_2_0/assembly/pom.xml 2014-03-24 13:56:12 UTC (rev 114773) @@ -2,7 +2,7 @@ org.jboss.security jbosssx-parent - 2.0.8.Final + 2.0.9-SNAPSHOT ../parent 4.0.0 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/identity/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/identity/pom.xml 2014-03-24 13:14:39 UTC (rev 114772) +++ projects/security/security-jboss-sx/branches/Branch_2_0/identity/pom.xml 2014-03-24 13:56:12 UTC (rev 114773) @@ -2,7 +2,7 @@ org.jboss.security jbosssx-parent - 2.0.8.Final + 2.0.9-SNAPSHOT ../parent 4.0.0 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/pom.xml 2014-03-24 13:14:39 UTC (rev 114772) +++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/pom.xml 2014-03-24 13:56:12 UTC (rev 114773) @@ -2,7 +2,7 @@ org.jboss.security jbosssx-parent - 2.0.8.Final + 2.0.9-SNAPSHOT ../parent 4.0.0 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-bridge-as4/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-bridge-as4/pom.xml 2014-03-24 13:14:39 UTC (rev 114772) +++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-bridge-as4/pom.xml 2014-03-24 13:56:12 UTC (rev 114773) @@ -2,7 +2,7 @@ org.jboss.security jbosssx-parent - 2.0.8.Final + 2.0.9-SNAPSHOT ../parent 4.0.0 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-client/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-client/pom.xml 2014-03-24 13:14:39 UTC (rev 114772) +++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-client/pom.xml 2014-03-24 13:56:12 UTC (rev 114773) @@ -7,7 +7,7 @@ 4.0.0 org.jboss.security jbosssx-client - 2.0.8.Final + 2.0.9-SNAPSHOT jar JBoss Security Client http://www.jboss.org Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/pom.xml 2014-03-24 13:14:39 UTC (rev 114772) +++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/pom.xml 2014-03-24 13:56:12 UTC (rev 114773) @@ -3,7 +3,7 @@ org.jboss.security jbosssx-parent - 2.0.8.Final + 2.0.9-SNAPSHOT ../parent 4.0.0 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/parent/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/parent/pom.xml 2014-03-24 13:14:39 UTC (rev 114772) +++ projects/security/security-jboss-sx/branches/Branch_2_0/parent/pom.xml 2014-03-24 13:56:12 UTC (rev 114773) @@ -8,7 +8,7 @@ org.jboss.security jbosssx-parent pom - 2.0.8.Final + 2.0.9-SNAPSHOT JBossSX - Parent http://labs.jboss.org/portal/jbosssecurity/ JBoss Security is a cross cutting project that handles security for the JEMS projects Modified: projects/security/security-jboss-sx/branches/Branch_2_0/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/pom.xml 2014-03-24 13:14:39 UTC (rev 114772) +++ projects/security/security-jboss-sx/branches/Branch_2_0/pom.xml 2014-03-24 13:56:12 UTC (rev 114773) @@ -7,7 +7,7 @@ 4.0.0 org.jboss.security jbosssx-pom - 2.0.8.Final + 2.0.9-SNAPSHOT pom JBoss Security Implementation for the JBAS - Parent http://labs.jboss.org/portal/jbosssecurity/ From jboss-cvs-commits at lists.jboss.org Mon Mar 24 09:56:25 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 24 Mar 2014 09:56:25 -0400 Subject: [jboss-cvs] JBossAS SVN: r114774 - in projects/security/security-spi/branches/Branch_2_0: acl and 6 other directories. Message-ID: <201403241356.s2ODuPYj032357@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek Date: 2014-03-24 09:56:24 -0400 (Mon, 24 Mar 2014) New Revision: 114774 Modified: projects/security/security-spi/branches/Branch_2_0/acl/pom.xml projects/security/security-spi/branches/Branch_2_0/assembly/pom.xml projects/security/security-spi/branches/Branch_2_0/authorization/pom.xml projects/security/security-spi/branches/Branch_2_0/identity/pom.xml projects/security/security-spi/branches/Branch_2_0/jboss-security-spi-as4/pom.xml projects/security/security-spi/branches/Branch_2_0/parent/pom.xml projects/security/security-spi/branches/Branch_2_0/pom.xml projects/security/security-spi/branches/Branch_2_0/spi/pom.xml Log: setting next development version 2.0.9-SNAPSHOT Modified: projects/security/security-spi/branches/Branch_2_0/acl/pom.xml =================================================================== --- projects/security/security-spi/branches/Branch_2_0/acl/pom.xml 2014-03-24 13:56:12 UTC (rev 114773) +++ projects/security/security-spi/branches/Branch_2_0/acl/pom.xml 2014-03-24 13:56:24 UTC (rev 114774) @@ -2,7 +2,7 @@ org.jboss.security jboss-security-spi-parent - 2.0.8.Final + 2.0.9-SNAPSHOT ../parent 4.0.0 Modified: projects/security/security-spi/branches/Branch_2_0/assembly/pom.xml =================================================================== --- projects/security/security-spi/branches/Branch_2_0/assembly/pom.xml 2014-03-24 13:56:12 UTC (rev 114773) +++ projects/security/security-spi/branches/Branch_2_0/assembly/pom.xml 2014-03-24 13:56:24 UTC (rev 114774) @@ -2,7 +2,7 @@ org.jboss.security jboss-security-spi-parent - 2.0.8.Final + 2.0.9-SNAPSHOT ../parent 4.0.0 Modified: projects/security/security-spi/branches/Branch_2_0/authorization/pom.xml =================================================================== --- projects/security/security-spi/branches/Branch_2_0/authorization/pom.xml 2014-03-24 13:56:12 UTC (rev 114773) +++ projects/security/security-spi/branches/Branch_2_0/authorization/pom.xml 2014-03-24 13:56:24 UTC (rev 114774) @@ -2,7 +2,7 @@ org.jboss.security jboss-security-spi-parent - 2.0.8.Final + 2.0.9-SNAPSHOT ../parent 4.0.0 Modified: projects/security/security-spi/branches/Branch_2_0/identity/pom.xml =================================================================== --- projects/security/security-spi/branches/Branch_2_0/identity/pom.xml 2014-03-24 13:56:12 UTC (rev 114773) +++ projects/security/security-spi/branches/Branch_2_0/identity/pom.xml 2014-03-24 13:56:24 UTC (rev 114774) @@ -2,7 +2,7 @@ org.jboss.security jboss-security-spi-parent - 2.0.8.Final + 2.0.9-SNAPSHOT ../parent 4.0.0 Modified: projects/security/security-spi/branches/Branch_2_0/jboss-security-spi-as4/pom.xml =================================================================== --- projects/security/security-spi/branches/Branch_2_0/jboss-security-spi-as4/pom.xml 2014-03-24 13:56:12 UTC (rev 114773) +++ projects/security/security-spi/branches/Branch_2_0/jboss-security-spi-as4/pom.xml 2014-03-24 13:56:24 UTC (rev 114774) @@ -2,7 +2,7 @@ org.jboss.security jboss-security-spi-parent - 2.0.8.Final + 2.0.9-SNAPSHOT ../parent 4.0.0 Modified: projects/security/security-spi/branches/Branch_2_0/parent/pom.xml =================================================================== --- projects/security/security-spi/branches/Branch_2_0/parent/pom.xml 2014-03-24 13:56:12 UTC (rev 114773) +++ projects/security/security-spi/branches/Branch_2_0/parent/pom.xml 2014-03-24 13:56:24 UTC (rev 114774) @@ -8,7 +8,7 @@ org.jboss.security jboss-security-spi-parent pom - 2.0.8.Final + 2.0.9-SNAPSHOT JBoss Security SPI - Parent http://labs.jboss.org/portal/jbosssecurity/ JBoss Security is a cross cutting project that handles security for the JEMS projects Modified: projects/security/security-spi/branches/Branch_2_0/pom.xml =================================================================== --- projects/security/security-spi/branches/Branch_2_0/pom.xml 2014-03-24 13:56:12 UTC (rev 114773) +++ projects/security/security-spi/branches/Branch_2_0/pom.xml 2014-03-24 13:56:24 UTC (rev 114774) @@ -2,7 +2,7 @@ org.jboss.security jboss-security-spi-parent - 2.0.8.Final + 2.0.9-SNAPSHOT parent 4.0.0 Modified: projects/security/security-spi/branches/Branch_2_0/spi/pom.xml =================================================================== --- projects/security/security-spi/branches/Branch_2_0/spi/pom.xml 2014-03-24 13:56:12 UTC (rev 114773) +++ projects/security/security-spi/branches/Branch_2_0/spi/pom.xml 2014-03-24 13:56:24 UTC (rev 114774) @@ -2,7 +2,7 @@ org.jboss.security jboss-security-spi-parent - 2.0.8.Final + 2.0.9-SNAPSHOT ../parent 4.0.0 From jboss-cvs-commits at lists.jboss.org Mon Mar 24 10:30:55 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 24 Mar 2014 10:30:55 -0400 Subject: [jboss-cvs] JBossAS SVN: r114775 - in branches/JBPAPP_5/testsuite: src/main/org/jboss/test/security and 4 other directories. Message-ID: <201403241430.s2OEUt2K009487@svn01.web.mwc.hst.phx2.redhat.com> Author: zroubali Date: 2014-03-24 10:30:55 -0400 (Mon, 24 Mar 2014) New Revision: 114775 Added: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/ldapext/ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/ldapext/FakePasswordProvider.java branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/ldapext/LDAPServerControl.java branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/test/LdapExtLoginModuleTestCase.java branches/JBPAPP_5/testsuite/src/resources/security/ldapext/ branches/JBPAPP_5/testsuite/src/resources/security/ldapext/test.ldif Modified: branches/JBPAPP_5/testsuite/build.xml Log: JBQA-8610 - Test cache of passwords from external source for LdapExt login module Modified: branches/JBPAPP_5/testsuite/build.xml =================================================================== --- branches/JBPAPP_5/testsuite/build.xml 2014-03-24 13:56:24 UTC (rev 114774) +++ branches/JBPAPP_5/testsuite/build.xml 2014-03-24 14:30:55 UTC (rev 114775) @@ -685,6 +685,8 @@ --> + + @@ -1740,6 +1742,7 @@ + @@ -5441,8 +5444,8 @@ - - @@ -5508,10 +5511,10 @@ - + - @@ -5632,4 +5635,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Waiting for server to shutdown... + + + + + + + + + + + + + + + + + + Added: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/ldapext/FakePasswordProvider.java =================================================================== --- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/ldapext/FakePasswordProvider.java (rev 0) +++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/ldapext/FakePasswordProvider.java 2014-03-24 14:30:55 UTC (rev 114775) @@ -0,0 +1,100 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.security.ldapext; + +import java.io.*; + +/** + * @author zroubali at redhat.com + */ +public class FakePasswordProvider { + + private static String counterName = "counter.tmp"; + private static File counterFile = new File(System.getProperty("java.io.tmpdir"), counterName); + //private static File counterFile = new File("/home/zroubali/counter.tmp"); + private static String PASSWORD = "secret"; + + public static void main(String[] args) { + + String output = PASSWORD; + + if (args != null && args.length == 1) { + output = args[0]; + } + + reportAccess(); + + System.out.println(output); + System.out.flush(); + } + + + private static void reportAccess() { + + int accessCounter = -1; + + try{ + FileReader reader = new FileReader(counterFile); + accessCounter = reader.read(); + reader.close(); + + accessCounter++; + + FileWriter writer = new FileWriter(counterFile); + writer.write(accessCounter); + writer.close(); + + }catch(IOException ex){ + throw new RuntimeException("Problem with IO on a temporary access counter file.", ex); + } + } + + public static void resetAccessCounter(){ + + try{ + FileWriter writer = new FileWriter(counterFile); + writer.write(0); + writer.flush(); + writer.close(); + + }catch(IOException ex){ + throw new RuntimeException("Problem with IO on a temporary access counter file.", ex); + } + } + + public static int getAccessCounter(){ + + int callsCounter = -1 ; + + try{ + FileReader reader = new FileReader(counterFile); + callsCounter = reader.read(); + reader.close(); + + }catch(IOException ex){ + throw new RuntimeException("Problem with IO on a temporary access counter file.", ex); + } + return callsCounter; + } + + +} Added: 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 (rev 0) +++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/ldapext/LDAPServerControl.java 2014-03-24 14:30:55 UTC (rev 114775) @@ -0,0 +1,217 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.security.ldapext; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.text.StrSubstitutor; +import org.apache.directory.server.annotations.CreateLdapServer; +import org.apache.directory.server.annotations.CreateTransport; +import org.apache.directory.server.core.annotations.*; +import org.apache.directory.server.core.api.DirectoryService; +import org.apache.directory.server.core.factory.DSAnnotationProcessor; +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; + +/** + * Small application which starts/stops ApacheDS and LDAP and imports LDIFs provided as program + * arguments. + *

+ * Use system property ldapControl.port to change port on which is running this control process. The default is + * 10953. + * + * @author zroubali at redhat.com + */ +//@formatter:off +public class LDAPServerControl { + + private static Logger LOGGER = Logger.getLogger(LDAPServerControl.class); + + private static final int SOCKET_TIMEOUT = 2000; // 2 seconds + public static final String STOP_CMD = "stop"; + public static final int SERVER_PORT = Integer.getInteger("ldapControl.port", 10953); + + static final String SECURITY_CREDENTIALS = "secret"; + static final String SECURITY_PRINCIPAL = "uid=admin,ou=system"; + + static final String KEYSTORE_FILENAME = "ldaps.jks"; + static final int LDAP_PORT = 10389; + static final int LDAPS_PORT = 10636; + + private final String hostname; + + private DirectoryService directoryService; + private LdapServer ldapServer; + + + public LDAPServerControl() { + hostname = System.getProperty("ldap.bind.address", "localhost"); + } + + + public static void main(String[] args) { + try { + if (args.length == 1 && STOP_CMD.equals(args[0])) { + System.out.println("Sending STOP command to LDAP server control process."); + SocketAddress sockaddr = new InetSocketAddress(InetAddress.getLocalHost(), SERVER_PORT); + // Create an unbound socket + Socket sock = new Socket(); + sock.connect(sockaddr, SOCKET_TIMEOUT); + BufferedWriter wr = new BufferedWriter(new OutputStreamWriter(sock.getOutputStream())); + wr.write(STOP_CMD); + wr.close(); + sock.close(); + } else { + System.out.println("Starting LDAP server control process."); + LDAPServerControl ldapServerControl = new LDAPServerControl(); + ldapServerControl.createLdap(args); + ldapServerControl.waitForStop(); + ldapServerControl.stopLdap(); + } + + } catch (Exception e) { + e.printStackTrace(); + System.exit(1); + } + } + + + //@formatter:off + @CreateDS( + name = "JBossDS", + partitions = + { + @CreatePartition( + name = "jboss", + suffix = "dc=jboss,dc=org", + contextEntry = @ContextEntry( + entryLdif = + "dn: dc=jboss,dc=org\n" + + "dc: jboss\n" + + "objectClass: top\n" + + "objectClass: domain\n\n" ), + indexes = + { + @CreateIndex( attribute = "objectClass" ), + @CreateIndex( attribute = "dc" ), + @CreateIndex( attribute = "ou" ) + }) + }, + additionalInterceptors = { KeyDerivationInterceptor.class }) + @CreateLdapServer ( + transports = + { + @CreateTransport( protocol = "LDAP", port = LDAP_PORT), + @CreateTransport( protocol = "LDAPS", port = LDAPS_PORT) + }, + certificatePassword="secret") + //@formatter:on + public void createLdap(final String[] args) throws Exception, IOException, ClassNotFoundException, FileNotFoundException { + + directoryService = DSAnnotationProcessor.getDirectoryService(); + + if (args != null && args.length > 0) + { + final Map map = new HashMap(); + for (String ldifFile : args) + { + + final String ldifContent = StrSubstitutor.replace(FileUtils.readFileToString(new File(ldifFile), "UTF-8"), + map); + LOGGER.debug(ldifContent); + final SchemaManager schemaManager = directoryService.getSchemaManager(); + try + { + for (LdifEntry ldifEntry : new LdifReader(IOUtils.toInputStream(ldifContent))) + { + directoryService.getAdminSession().add(new DefaultEntry(schemaManager, ldifEntry.getEntry())); + } + } + catch (Exception e) + { + e.printStackTrace(); + throw e; + } + } + } + + final CreateLdapServer createLdapServer = (CreateLdapServer) AnnotationUtils.getInstance(CreateLdapServer.class); + ldapServer = ServerAnnotationProcessor.instantiateLdapServer(createLdapServer, directoryService); + ldapServer.start(); + + } + + /** + * Stops LDAP server and shuts down the directory service. + * + * @throws Exception + */ + public void stopLdap() throws Exception { + + ldapServer.stop(); + directoryService.shutdown(); + FileUtils.deleteDirectory(directoryService.getInstanceLayout().getInstanceDirectory()); + } + + + /** + * Creates a server socket and only waits for the stop command from a client. + * + * @throws Exception + */ + protected void waitForStop() throws Exception + { + final ServerSocket srv = new ServerSocket(SERVER_PORT); + boolean isStop = false; + do + { + // Wait for connection from client. + Socket socket = srv.accept(); + System.out.println("Incomming connection."); + socket.setSoTimeout(SOCKET_TIMEOUT); + BufferedReader rd = new BufferedReader(new InputStreamReader(socket.getInputStream())); + try + { + isStop = STOP_CMD.equals(rd.readLine()); + } + finally + { + rd.close(); + } + System.out.println("Stop command: " + isStop); + socket.close(); + } + while (!isStop); + } + +} Added: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/test/LdapExtLoginModuleTestCase.java =================================================================== --- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/test/LdapExtLoginModuleTestCase.java (rev 0) +++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/security/test/LdapExtLoginModuleTestCase.java 2014-03-24 14:30:55 UTC (rev 114775) @@ -0,0 +1,286 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, Red Hat, Inc., and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.security.test; + +import junit.framework.Test; +import junit.framework.TestSuite; +import org.jboss.logging.Logger; +import org.jboss.security.SimplePrincipal; +import org.jboss.security.auth.callback.UsernamePasswordHandler; +import org.jboss.test.JBossTestCase; +import org.jboss.test.security.ldapext.FakePasswordProvider; + +import javax.security.auth.Subject; +import javax.security.auth.login.AppConfigurationEntry; +import javax.security.auth.login.Configuration; +import javax.security.auth.login.FailedLoginException; +import javax.security.auth.login.LoginContext; +import java.io.File; +import java.lang.reflect.Method; +import java.security.acl.Group; +import java.util.HashMap; +import java.util.Set; +import java.util.StringTokenizer; + +import static org.jboss.test.HttpInvokerHelper.withHttpHAInvoker; + +/** + * @author zroubali at redhat.com + */ +public class LdapExtLoginModuleTestCase extends JBossTestCase { + + private static Logger log = Logger.getLogger(LdapExtLoginModuleTestCase.class); + + private static final Long TIMEOUT = new Long(5000); + + private static final long WAIT_TIMEOUT = TIMEOUT * 4; + + + protected void setUp() throws Exception { + + Configuration.setConfiguration(new TestConfig()); + super.setUp(); + log = getLog(); + } + + public static Test suite() throws Exception { + return getDeploySetup(LdapExtLoginModuleTestCase.class, withHttpHAInvoker()); + } + + + static class TestConfig extends Configuration { + public void refresh() { + } + + public AppConfigurationEntry[] getAppConfigurationEntry(String name) { + AppConfigurationEntry[] entry = null; + try { + Class[] parameterTypes = {}; + Method m = getClass().getDeclaredMethod(name, parameterTypes); + Object[] args = {}; + entry = (AppConfigurationEntry[]) m.invoke(this, args); + } catch (Exception e) { + } + return entry; + } + + + AppConfigurationEntry[] testCorrectCredentials() { + AppConfigurationEntry[] entry = {generateLoginModuleConfiguration(null)}; + return entry; + } + + AppConfigurationEntry[] testWrongCredentials() { + AppConfigurationEntry[] entry = {generateLoginModuleConfiguration(null)}; + return entry; + } + + AppConfigurationEntry[] testCommandEXT() { + AppConfigurationEntry[] entry = {generateLoginModuleConfiguration(generateCommand("EXT"))}; + return entry; + } + + AppConfigurationEntry[] testCommandEXTC() { + AppConfigurationEntry[] entry = {generateLoginModuleConfiguration(generateCommand("EXTC"))}; + return entry; + } + + AppConfigurationEntry[] testCommandEXTCWithExpiration() { + AppConfigurationEntry[] entry = {generateLoginModuleConfiguration(generateCommand("EXTC:"+TIMEOUT.toString(), "fake 1"))}; + return entry; + } + + + private AppConfigurationEntry generateLoginModuleConfiguration(String bindCredentialValue) { + + if (bindCredentialValue == null) { + bindCredentialValue = "secret"; + } + + String name = "org.jboss.security.auth.spi.LdapExtLoginModule"; + HashMap options = new HashMap(); + options.put("java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory"); + options.put("java.naming.provider.url", "ldap://localhost:10389/"); + options.put("java.naming.security.authentication", "simple"); + options.put("throwValidateError", "true"); + + options.put("bindDN", "uid=admin,ou=system"); + options.put("bindCredential", bindCredentialValue); + options.put("baseCtxDN", "ou=People,dc=jboss,dc=org"); + options.put("baseFilter", "(uid={0})"); + + options.put("rolesCtxDN", "ou=Roles,dc=jboss,dc=org"); + options.put("roleFilter", "(|(objectClass=referral)(member={1}))"); + options.put("roleAttributeID", "cn"); + + return new AppConfigurationEntry(name, + AppConfigurationEntry.LoginModuleControlFlag.REQUIRED, options); + } + + } + + + public LdapExtLoginModuleTestCase(String testName) { + super(testName); + } + + public void testCorrectCredentials() throws Exception { + + Subject subject = doLogin("testCorrectCredentials", "jduke", "theduke"); + + Set groups = subject.getPrincipals(Group.class); + Set principals = subject.getPrincipals(); + assertTrue("Principals contains Roles", groups.contains(new SimplePrincipal("Roles"))); + Group roles = (Group) groups.iterator().next(); + assertTrue("Echo is a role", roles.isMember(new SimplePrincipal("Echo"))); + assertTrue("TheDuke is a role", roles.isMember(new SimplePrincipal("TheDuke"))); + + } + + + public void testWrongCredentials() throws Exception { + + try { + doLogin("testWrongCredentials", "jduke", "wrong"); + + // we should'n get here -> fail + fail("User jduke should not be authorized with wrong password."); + } catch (FailedLoginException exp) { + // user wasn't authorized -> OK + } + } + + public void testCommandEXT() throws Exception { + + FakePasswordProvider.resetAccessCounter(); + + // Access #1 + doLogin("testCommandEXT"); + assertEquals("Access #1 should not be cached.", 1, FakePasswordProvider.getAccessCounter()); + + // Access #2 + doLogin("testCommandEXT"); + assertEquals("Access #2 should not be cached.", 2, FakePasswordProvider.getAccessCounter()); + + // Access #3 + doLogin("testCommandEXT"); + assertEquals("Access #3 should not be cached.", 3, FakePasswordProvider.getAccessCounter()); + + + FakePasswordProvider.resetAccessCounter(); + } + + public void testCommandEXTC() throws Exception { + + FakePasswordProvider.resetAccessCounter(); + + // Access #1 + doLogin("testCommandEXTC"); + assertEquals("Access #1 should not be cached.", 1, FakePasswordProvider.getAccessCounter()); + + // Access #2 + doLogin("testCommandEXTC"); + assertEquals("Access #2 should be cached.", 1, FakePasswordProvider.getAccessCounter()); + + // Access #3 + doLogin("testCommandEXTC"); + assertEquals("Access #3 should be cached.", 1, FakePasswordProvider.getAccessCounter()); + + FakePasswordProvider.resetAccessCounter(); + } + + + public void testCommandEXTCWithExpiration() throws Exception { + + FakePasswordProvider.resetAccessCounter(); + + // Access #1 + doLogin("testCommandEXTCWithExpiration", "jbean", "thebean"); + assertEquals("Access #1 should not be cached.", 1, FakePasswordProvider.getAccessCounter()); + + // Access #2 + doLogin("testCommandEXTCWithExpiration", "jbean", "thebean"); + assertEquals("Access #2 should be cached.", 1, FakePasswordProvider.getAccessCounter()); + + // wait for timeout expiration + Thread.sleep(WAIT_TIMEOUT); + + // Access #3 + doLogin("testCommandEXTCWithExpiration", "jbean", "thebean"); + assertEquals("Access #3 should not be cached.", 2, FakePasswordProvider.getAccessCounter()); + + + FakePasswordProvider.resetAccessCounter(); + } + + + public Subject doLogin(String loginContextName) throws Exception{ + + return doLogin(loginContextName, "jduke", "theduke"); + } + + + public Subject doLogin(String loginContextName, String user, String password) throws Exception{ + + UsernamePasswordHandler handler = new UsernamePasswordHandler(user, password.toCharArray()); + LoginContext lc = new LoginContext(loginContextName, handler); + + lc.login(); + Subject subject = lc.getSubject(); + System.out.println("Subject: " + subject); + lc.logout(); + + return subject; + } + + public static String generateCommand(String option){ + return generateCommand(option, ""); + } + + public static String generateCommand(String option, String param){ + + // First check for java.exe or java as the binary + File java = new File(System.getProperty("java.home"), "/bin/java"); + File javaExe = new File(System.getProperty("java.home"), "/bin/java.exe"); + String jre; + if (java.exists()) + jre = java.getAbsolutePath(); + else + jre = javaExe.getAbsolutePath(); + // Build the command to run this jre + String cmd = jre + " -cp " + + FakePasswordProvider.class.getProtectionDomain().getCodeSource().getLocation().getPath() + + " org.jboss.test.security.ldapext.FakePasswordProvider " + param; + + + String out = "{" + option + "}" + cmd; + System.out.println(out); + return out; + } + + public static void main(java.lang.String[] args) { + + TestSuite suite = new TestSuite(LdapExtLoginModuleTestCase.class); + junit.textui.TestRunner.run(suite); + } + +} Added: branches/JBPAPP_5/testsuite/src/resources/security/ldapext/test.ldif =================================================================== --- branches/JBPAPP_5/testsuite/src/resources/security/ldapext/test.ldif (rev 0) +++ branches/JBPAPP_5/testsuite/src/resources/security/ldapext/test.ldif 2014-03-24 14:30:55 UTC (rev 114775) @@ -0,0 +1,56 @@ +# Example1: "jduke" - "TheDuke", "Echo", "Admin" +#baseCtxDN= ou=People,dc=jboss,dc=org +#baseFilter= (uid={0}) +#rolesCtxDN= ou=Roles,dc=jboss,dc=org +#roleFilter= (|(objectClass=referral)(member={1})) +#roleAttributeID= cn +#java.naming.referral= follow + +dn: ou=People,dc=jboss,dc=org +objectclass: top +objectclass: organizationalUnit +ou: People + +dn: uid=jduke,ou=People,dc=jboss,dc=org +objectclass: top +objectclass: uidObject +objectclass: person +uid: jduke +cn: Java Duke +sn: Duke +userPassword: theduke + +dn: uid=jbean,ou=People,dc=jboss,dc=org +objectclass: top +objectclass: uidObject +objectclass: person +uid: jbean +cn: Java Bean +sn: Bean +userPassword: thebean + +dn: ou=Roles,dc=jboss,dc=org +objectclass: top +objectclass: organizationalUnit +ou: Roles + +dn: cn=Echo,ou=Roles,dc=jboss,dc=org +objectClass: groupOfNames +objectClass: top +cn: Echo +description: the JBossAdmin group +member: uid=jduke,ou=People,dc=jboss,dc=org + +dn: cn=TheDuke,ou=Roles,dc=jboss,dc=org +objectClass: groupOfNames +objectClass: top +cn: TheDuke +description: TheDuke role context +member: uid=jduke,ou=People,dc=jboss,dc=org + +dn: cn=JBean,ou=Roles,dc=jboss,dc=org +objectClass: groupOfNames +objectClass: top +cn: JBean +description: TheDuke role context +member: uid=jbean,ou=People,dc=jboss,dc=org From jboss-cvs-commits at lists.jboss.org Mon Mar 24 17:41:57 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 24 Mar 2014 17:41:57 -0400 Subject: [jboss-cvs] JBossAS SVN: r114776 - in projects/ejb3/trunk/security: src/main/java/org/jboss/ejb3/security/helpers and 1 other directory. Message-ID: <201403242141.s2OLfvjt003227@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-03-24 17:41:56 -0400 (Mon, 24 Mar 2014) New Revision: 114776 Modified: projects/ejb3/trunk/security/pom.xml projects/ejb3/trunk/security/src/main/java/org/jboss/ejb3/security/helpers/EJBContextHelper.java Log: JBPAPP-11037: ignore security role references that have no role link set Modified: projects/ejb3/trunk/security/pom.xml =================================================================== --- projects/ejb3/trunk/security/pom.xml 2014-03-24 14:30:55 UTC (rev 114775) +++ projects/ejb3/trunk/security/pom.xml 2014-03-24 21:41:56 UTC (rev 114776) @@ -4,7 +4,7 @@ org.jboss.ejb3 jboss-ejb3-build - 1.0.0 + 1.0.13 ../build/pom.xml @@ -22,6 +22,15 @@ + + + + maven-enforcer-plugin + 1.2 + + + + Modified: projects/ejb3/trunk/security/src/main/java/org/jboss/ejb3/security/helpers/EJBContextHelper.java =================================================================== --- projects/ejb3/trunk/security/src/main/java/org/jboss/ejb3/security/helpers/EJBContextHelper.java 2014-03-24 14:30:55 UTC (rev 114775) +++ projects/ejb3/trunk/security/src/main/java/org/jboss/ejb3/security/helpers/EJBContextHelper.java 2014-03-24 21:41:56 UTC (rev 114776) @@ -151,6 +151,8 @@ Set srset = new HashSet(); for(SecurityRoleRefMetaData srmd: roleRefs) { + if (srmd.getRoleLink() == null) + continue; srset.add(new SecurityRoleRef(srmd.getRoleName(),srmd.getRoleLink(),null)); } Principal principal = getCallerPrincipal(sc, rm, domain); From jboss-cvs-commits at lists.jboss.org Tue Mar 25 03:03:08 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 25 Mar 2014 03:03:08 -0400 Subject: [jboss-cvs] JBossAS SVN: r114777 - branches/JBPAPP_5/component-matrix. Message-ID: <201403250703.s2P738JH028994@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-03-25 03:03:08 -0400 (Tue, 25 Mar 2014) New Revision: 114777 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: JBPAPP-10897 Upgrade JBoss Security to 2.0.8 Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-03-24 21:41:56 UTC (rev 114776) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-03-25 07:03:08 UTC (rev 114777) @@ -86,8 +86,8 @@ 5.0.3.GA_CP02 2.0.4.GA 2.5.4.SP5 - 2.0.7.Final - 2.0.7.Final + 2.0.8.Final + 2.0.8.Final 2.1.4.GA 1.0.6.FINAL 1.0.2.GA_CP03 From jboss-cvs-commits at lists.jboss.org Tue Mar 25 04:54:14 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 25 Mar 2014 04:54:14 -0400 Subject: [jboss-cvs] JBossAS SVN: r114778 - projects/ejb3/trunk/security. Message-ID: <201403250854.s2P8sE79015785@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-03-25 04:54:13 -0400 (Tue, 25 Mar 2014) New Revision: 114778 Modified: projects/ejb3/trunk/security/pom.xml Log: [maven-release-plugin] prepare release jboss-ejb3-security-1.0.3 Modified: projects/ejb3/trunk/security/pom.xml =================================================================== --- projects/ejb3/trunk/security/pom.xml 2014-03-25 07:03:08 UTC (rev 114777) +++ projects/ejb3/trunk/security/pom.xml 2014-03-25 08:54:13 UTC (rev 114778) @@ -14,7 +14,7 @@ org.jboss.ejb3 jboss-ejb3-security - 1.0.3-SNAPSHOT + 1.0.3 jar JBoss EJB 3.0 Security http://labs.jboss.com/jbossejb3/ @@ -166,4 +166,10 @@ + + + scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/ejb3/tags/jboss-ejb3-security-1.0.3 + scm:svn:https://svn.jboss.org/repos/jbossas/projects/ejb3/tags/jboss-ejb3-security-1.0.3 + http://anonsvn.jboss.org/repos/jbossas/projects/ejb3/tags/jboss-ejb3-security-1.0.3 + From jboss-cvs-commits at lists.jboss.org Tue Mar 25 04:54:21 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 25 Mar 2014 04:54:21 -0400 Subject: [jboss-cvs] JBossAS SVN: r114779 - in projects/ejb3/tags: jboss-ejb3-security-1.0.3 and 1 other directory. Message-ID: <201403250854.s2P8sLpv015804@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-03-25 04:54:20 -0400 (Tue, 25 Mar 2014) New Revision: 114779 Added: projects/ejb3/tags/jboss-ejb3-security-1.0.3/ projects/ejb3/tags/jboss-ejb3-security-1.0.3/pom.xml Removed: projects/ejb3/tags/jboss-ejb3-security-1.0.3/pom.xml Log: [maven-release-plugin] copy for tag jboss-ejb3-security-1.0.3 Deleted: projects/ejb3/tags/jboss-ejb3-security-1.0.3/pom.xml =================================================================== --- projects/ejb3/trunk/security/pom.xml 2014-03-25 07:03:08 UTC (rev 114777) +++ projects/ejb3/tags/jboss-ejb3-security-1.0.3/pom.xml 2014-03-25 08:54:20 UTC (rev 114779) @@ -1,169 +0,0 @@ - - - - - org.jboss.ejb3 - jboss-ejb3-build - 1.0.13 - ../build/pom.xml - - - - 4.0.0 - - - org.jboss.ejb3 - jboss-ejb3-security - 1.0.3-SNAPSHOT - jar - JBoss EJB 3.0 Security - http://labs.jboss.com/jbossejb3/ - The JBoss EJB 3.0 Security classes - - - - - - - maven-enforcer-plugin - 1.2 - - - - - - - - - maven-assembly-plugin - 2.2-beta-1 - - - make-assembly - package - - attached - - - - - - - jboss-ejb3-security-client.xml - - - - - - - - - - - - org.jboss.aspects - jboss-aspects-common - 1.0.0.Beta1 - test - - - - org.jboss.aspects - jboss-current-invocation-aspects - 1.0.0.CR1 - - - - org.jboss.ejb3 - jboss-ejb3-interceptors - 1.0.0 - - - - - org.jboss.security - jboss-security-spi - 2.0.2.SP1 - - - - - org.jboss.security - jbosssx - 2.0.2.SP1 - - - - - org.jboss.javaee - jboss-jacc-api - - - - org.jboss.ejb3 - jboss-ejb3-ext-api - 1.0.0 - - - - org.jboss.ejb3 - jboss-ejb3-ext-api-impl - 1.0.0 - - - - - org.jboss.aop - jboss-aop - - - jboss - jboss-common-logging-spi - - - jboss - jboss-logging-spi - - - - - - - org.jboss.ejb3 - jboss-ejb3-metadata - 1.0.0 - - - - - org.jboss - jboss-common-core - - - - - org.jboss.logging - jboss-logging-spi - - - - - org.jboss.metadata - jboss-metadata - - - - org.jboss.naming - jnpserver - test - - - - - junit - junit - test - - - - Copied: projects/ejb3/tags/jboss-ejb3-security-1.0.3/pom.xml (from rev 114778, projects/ejb3/trunk/security/pom.xml) =================================================================== --- projects/ejb3/tags/jboss-ejb3-security-1.0.3/pom.xml (rev 0) +++ projects/ejb3/tags/jboss-ejb3-security-1.0.3/pom.xml 2014-03-25 08:54:20 UTC (rev 114779) @@ -0,0 +1,175 @@ + + + + + org.jboss.ejb3 + jboss-ejb3-build + 1.0.13 + ../build/pom.xml + + + + 4.0.0 + + + org.jboss.ejb3 + jboss-ejb3-security + 1.0.3 + jar + JBoss EJB 3.0 Security + http://labs.jboss.com/jbossejb3/ + The JBoss EJB 3.0 Security classes + + + + + + + maven-enforcer-plugin + 1.2 + + + + + + + + + maven-assembly-plugin + 2.2-beta-1 + + + make-assembly + package + + attached + + + + + + + jboss-ejb3-security-client.xml + + + + + + + + + + + + org.jboss.aspects + jboss-aspects-common + 1.0.0.Beta1 + test + + + + org.jboss.aspects + jboss-current-invocation-aspects + 1.0.0.CR1 + + + + org.jboss.ejb3 + jboss-ejb3-interceptors + 1.0.0 + + + + + org.jboss.security + jboss-security-spi + 2.0.2.SP1 + + + + + org.jboss.security + jbosssx + 2.0.2.SP1 + + + + + org.jboss.javaee + jboss-jacc-api + + + + org.jboss.ejb3 + jboss-ejb3-ext-api + 1.0.0 + + + + org.jboss.ejb3 + jboss-ejb3-ext-api-impl + 1.0.0 + + + + + org.jboss.aop + jboss-aop + + + jboss + jboss-common-logging-spi + + + jboss + jboss-logging-spi + + + + + + + org.jboss.ejb3 + jboss-ejb3-metadata + 1.0.0 + + + + + org.jboss + jboss-common-core + + + + + org.jboss.logging + jboss-logging-spi + + + + + org.jboss.metadata + jboss-metadata + + + + org.jboss.naming + jnpserver + test + + + + + junit + junit + test + + + + + + scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/ejb3/tags/jboss-ejb3-security-1.0.3 + scm:svn:https://svn.jboss.org/repos/jbossas/projects/ejb3/tags/jboss-ejb3-security-1.0.3 + http://anonsvn.jboss.org/repos/jbossas/projects/ejb3/tags/jboss-ejb3-security-1.0.3 + + From jboss-cvs-commits at lists.jboss.org Tue Mar 25 04:54:24 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 25 Mar 2014 04:54:24 -0400 Subject: [jboss-cvs] JBossAS SVN: r114780 - projects/ejb3/trunk/security. Message-ID: <201403250854.s2P8sOhe015822@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-03-25 04:54:24 -0400 (Tue, 25 Mar 2014) New Revision: 114780 Modified: projects/ejb3/trunk/security/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: projects/ejb3/trunk/security/pom.xml =================================================================== --- projects/ejb3/trunk/security/pom.xml 2014-03-25 08:54:20 UTC (rev 114779) +++ projects/ejb3/trunk/security/pom.xml 2014-03-25 08:54:24 UTC (rev 114780) @@ -14,7 +14,7 @@ org.jboss.ejb3 jboss-ejb3-security - 1.0.3 + 1.0.4-SNAPSHOT jar JBoss EJB 3.0 Security http://labs.jboss.com/jbossejb3/ @@ -166,10 +166,4 @@ - - - scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/ejb3/tags/jboss-ejb3-security-1.0.3 - scm:svn:https://svn.jboss.org/repos/jbossas/projects/ejb3/tags/jboss-ejb3-security-1.0.3 - http://anonsvn.jboss.org/repos/jbossas/projects/ejb3/tags/jboss-ejb3-security-1.0.3 - From jboss-cvs-commits at lists.jboss.org Tue Mar 25 05:28:32 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 25 Mar 2014 05:28:32 -0400 Subject: [jboss-cvs] JBossAS SVN: r114781 - branches/JBPAPP_5/component-matrix. Message-ID: <201403250928.s2P9SWSd025598@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-03-25 05:28:32 -0400 (Tue, 25 Mar 2014) New Revision: 114781 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: JBPAPP-11063: upgrade to jboss-ejb3-bom-eap5 1.0.6 Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-03-25 08:54:24 UTC (rev 114780) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-03-25 09:28:32 UTC (rev 114781) @@ -72,7 +72,7 @@ 2.2.21.GA 1.0.1.Final 2.0.10.GA - 1.0.5 + 1.0.6 5.1.0.SP1 2.0.1.GA 1.3.4.SP6 From jboss-cvs-commits at lists.jboss.org Tue Mar 25 05:29:52 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 25 Mar 2014 05:29:52 -0400 Subject: [jboss-cvs] JBossAS SVN: r114782 - branches/JBPAPP_5/server/src/main/org/jboss/ejb. Message-ID: <201403250929.s2P9Tqec025623@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-03-25 05:29:52 -0400 (Tue, 25 Mar 2014) New Revision: 114782 Modified: branches/JBPAPP_5/server/src/main/org/jboss/ejb/EJBPermissionMapping.java Log: JBPAPP-11037: fix EJB permission mapping as per EJB 3.0 17.3 Modified: branches/JBPAPP_5/server/src/main/org/jboss/ejb/EJBPermissionMapping.java =================================================================== --- branches/JBPAPP_5/server/src/main/org/jboss/ejb/EJBPermissionMapping.java 2014-03-25 09:28:32 UTC (rev 114781) +++ branches/JBPAPP_5/server/src/main/org/jboss/ejb/EJBPermissionMapping.java 2014-03-25 09:29:52 UTC (rev 114782) @@ -21,14 +21,18 @@ */ package org.jboss.ejb; +import java.lang.reflect.Method; +import java.security.Permissions; import java.util.Iterator; import java.util.Set; +import javax.ejb.EJBContext; import javax.security.jacc.EJBMethodPermission; import javax.security.jacc.EJBRoleRefPermission; import javax.security.jacc.PolicyConfiguration; import javax.security.jacc.PolicyContextException; +import org.jboss.logging.Logger; import org.jboss.metadata.ejb.jboss.JBossEnterpriseBeanMetaData; import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData; import org.jboss.metadata.ejb.spec.ExcludeListMetaData; @@ -49,10 +53,24 @@ */ public class EJBPermissionMapping { + private static final Logger LOGGER = Logger.getLogger(EJBPermissionMapping.class); + private static boolean anyInterfaceImplied(final Permissions specifiedPermissions, final String ejbName, final Method method) + { + for (MethodInterfaceType methodInterfaceType : MethodInterfaceType.values()) + { + EJBMethodPermission p = new EJBMethodPermission(ejbName, methodInterfaceType.name(), method); + if (specifiedPermissions.implies(p)) + return true; + } + return false; + } + public static void createPermissions(JBossEnterpriseBeanMetaData bean, PolicyConfiguration pc) throws PolicyContextException { + final Permissions specifiedPermissions = new Permissions(); + // Process the method-permission MethodMetaData MethodPermissionsMetaData perms = bean.getMethodPermissions(); if (perms != null) @@ -74,6 +92,7 @@ MethodInterfaceType miType = mmd.getMethodIntf(); String iface = miType != null ? miType.name() : null; EJBMethodPermission p = new EJBMethodPermission(mmd.getEjbName(), methodName, iface, params); + specifiedPermissions.add(p); if (perm.getUnchecked() != null) { pc.addToUncheckedPolicy(p); @@ -111,6 +130,7 @@ MethodInterfaceType miType = mmd.getMethodIntf(); String iface = miType != null ? miType.name() : null; EJBMethodPermission p = new EJBMethodPermission(mmd.getEjbName(), methodName, iface, params); + specifiedPermissions.add(p); pc.addToExcludedPolicy(p); } } @@ -121,7 +141,11 @@ for (org.jboss.metadata.javaee.spec.SecurityRoleRefMetaData ref : refs) { EJBRoleRefPermission p = new EJBRoleRefPermission(bean.getEjbName(), ref.getRoleName()); - pc.addToRole(ref.getRoleLink(), p); + // EJB 3.0 17.3.3 if not used, then equal to the role-name + String roleLink = ref.getRoleLink(); + if (roleLink == null) + roleLink = ref.getRoleName(); + pc.addToRole(roleLink, p); } /* Special handling of stateful session bean getEJBObject due how the @@ -137,5 +161,30 @@ pc.addToUncheckedPolicy(p); } } + + // EJB 3.0 17.3.2.3 + try + { + Class beanClass = Class.forName(bean.getEjbClass(), false, Thread.currentThread().getContextClassLoader()); + for (Method method : beanClass.getMethods()) + { + Class declaringClass = method.getDeclaringClass(); + if (declaringClass == Object.class || EJBContext.class.isAssignableFrom(declaringClass)) + continue; + if (anyInterfaceImplied(specifiedPermissions, bean.getEjbName(), method)) + continue; + // now without an interface + EJBMethodPermission p = new EJBMethodPermission(bean.getEjbName(), null, method); + if (specifiedPermissions.implies(p)) + continue; + // if nothing has been said yet about this kind of permission + pc.addToUncheckedPolicy(p); + LOGGER.debugf("No permission specified for %s, adding it to unchecked", p); + } + } + catch (ClassNotFoundException e) + { + throw new RuntimeException(e); + } } } From jboss-cvs-commits at lists.jboss.org Tue Mar 25 17:33:31 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 25 Mar 2014 17:33:31 -0400 Subject: [jboss-cvs] JBossAS SVN: r114783 - branches/JBPAPP_5/testsuite/src/resources/security/jacc/ejbperm. Message-ID: <201403252133.s2PLXVJ8014717@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-03-25 17:33:30 -0400 (Tue, 25 Mar 2014) New Revision: 114783 Modified: branches/JBPAPP_5/testsuite/src/resources/security/jacc/ejbperm/jacc_ejb_jar.xml Log: JBPAPP-11037: must use an existing class as ejb-class Modified: branches/JBPAPP_5/testsuite/src/resources/security/jacc/ejbperm/jacc_ejb_jar.xml =================================================================== --- branches/JBPAPP_5/testsuite/src/resources/security/jacc/ejbperm/jacc_ejb_jar.xml 2014-03-25 09:29:52 UTC (rev 114782) +++ branches/JBPAPP_5/testsuite/src/resources/security/jacc/ejbperm/jacc_ejb_jar.xml 2014-03-25 21:33:30 UTC (rev 114783) @@ -6,7 +6,7 @@ JACCEntity JACCEntityHome JACCEntity - JACCEntityBean + java.lang.Object Container JACCEntityKey false @@ -37,7 +37,7 @@ JACCSession JACCSessionHome JACCSession - JACCSessionBean + java.lang.Object Stateful Container From jboss-cvs-commits at lists.jboss.org Wed Mar 26 07:00:48 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 26 Mar 2014 07:00:48 -0400 Subject: [jboss-cvs] JBossAS SVN: r114784 - branches/JBPAPP_5/component-matrix. Message-ID: <201403261100.s2QB0m3U019790@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-03-26 07:00:48 -0400 (Wed, 26 Mar 2014) New Revision: 114784 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: JBPAPP-11064 Update glassfish-jstl to add JSTL memory leak fix Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-03-25 21:33:30 UTC (rev 114783) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-03-26 11:00:48 UTC (rev 114784) @@ -478,7 +478,7 @@ javax.servlet jstl - 1.2 + 1.2-patch-01 From jboss-cvs-commits at lists.jboss.org Thu Mar 27 05:01:54 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 27 Mar 2014 05:01:54 -0400 Subject: [jboss-cvs] JBossAS SVN: r114785 - branches/JBPAPP_5/component-matrix. Message-ID: <201403270901.s2R91sDp026196@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-03-27 05:01:54 -0400 (Thu, 27 Mar 2014) New Revision: 114785 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: JBPAPP-11067: Upgrade to JBoss Web 2.1.16.GA Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-03-26 11:00:48 UTC (rev 114784) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-03-27 09:01:54 UTC (rev 114785) @@ -47,7 +47,7 @@ 1.0.1.GA 1.4.8.SP10 2.2.27.Final - 2.1.15.GA + 2.1.16.GA 2.6.22.Final 3.8.2 3.4.0.GA_CP06 From jboss-cvs-commits at lists.jboss.org Thu Mar 27 05:29:58 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 27 Mar 2014 05:29:58 -0400 Subject: [jboss-cvs] JBossAS SVN: r114786 - in branches/JBPAPP_5/testsuite/src/resources/security-spi/deploymentlevel-roletorolesmapping: META-INF and 1 other directory. Message-ID: <201403270929.s2R9TwdP028849@svn01.web.mwc.hst.phx2.redhat.com> Author: simkam Date: 2014-03-27 05:29:58 -0400 (Thu, 27 Mar 2014) New Revision: 114786 Modified: branches/JBPAPP_5/testsuite/src/resources/security-spi/deploymentlevel-roletorolesmapping/META-INF/jboss-app.xml branches/JBPAPP_5/testsuite/src/resources/security-spi/deploymentlevel-roletorolesmapping/roletorolesmapping-test-service.xml Log: [JBQA-8614] corrected test for EAP5-17 Modified: branches/JBPAPP_5/testsuite/src/resources/security-spi/deploymentlevel-roletorolesmapping/META-INF/jboss-app.xml =================================================================== --- branches/JBPAPP_5/testsuite/src/resources/security-spi/deploymentlevel-roletorolesmapping/META-INF/jboss-app.xml 2014-03-27 09:01:54 UTC (rev 114785) +++ branches/JBPAPP_5/testsuite/src/resources/security-spi/deploymentlevel-roletorolesmapping/META-INF/jboss-app.xml 2014-03-27 09:29:58 UTC (rev 114786) @@ -8,11 +8,11 @@ j2ee - GoodUser - Role1 + Role1 + GoodUser - AuthorizedUser - Role2 + Role2 + AuthorizedUser Modified: branches/JBPAPP_5/testsuite/src/resources/security-spi/deploymentlevel-roletorolesmapping/roletorolesmapping-test-service.xml =================================================================== --- branches/JBPAPP_5/testsuite/src/resources/security-spi/deploymentlevel-roletorolesmapping/roletorolesmapping-test-service.xml 2014-03-27 09:01:54 UTC (rev 114785) +++ branches/JBPAPP_5/testsuite/src/resources/security-spi/deploymentlevel-roletorolesmapping/roletorolesmapping-test-service.xml 2014-03-27 09:29:58 UTC (rev 114786) @@ -14,9 +14,9 @@ cts-user - - - + + + From jboss-cvs-commits at lists.jboss.org Thu Mar 27 06:32:56 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 27 Mar 2014 06:32:56 -0400 Subject: [jboss-cvs] JBossAS SVN: r114787 - projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/mapping/providers. Message-ID: <201403271032.s2RAWuvF008859@svn01.web.mwc.hst.phx2.redhat.com> Author: soul2zimate Date: 2014-03-27 06:32:56 -0400 (Thu, 27 Mar 2014) New Revision: 114787 Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/mapping/providers/DeploymentRoleToRolesMappingProvider.java Log: SECURITY-811, Don't process role-roles mapping if assignedRoles RoleGroup is null Modified: projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/mapping/providers/DeploymentRoleToRolesMappingProvider.java =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/mapping/providers/DeploymentRoleToRolesMappingProvider.java 2014-03-27 09:29:58 UTC (rev 114786) +++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/src/main/java/org/jboss/security/mapping/providers/DeploymentRoleToRolesMappingProvider.java 2014-03-27 10:32:56 UTC (rev 114787) @@ -93,25 +93,29 @@ RoleGroup newRoles = new SimpleRoleGroup(SecurityConstants.ROLES_IDENTIFIER); RoleGroup assignedRoles = (SimpleRoleGroup)contextMap.get(SecurityConstants.ROLES_IDENTIFIER); - - for (Role r: assignedRoles.getRoles()) { - boolean mappedRoleIncluded = false; - for (String mappedRole: roleToRolesMap.keySet()) { - if (roleToRolesMap.get(mappedRole).contains(r.getRoleName())) { - newRoles.addRole(new SimpleRole(mappedRole)); - mappedRoleIncluded = true; + if(assignedRoles != null){ + for (Role r: assignedRoles.getRoles()) { + + boolean mappedRoleIncluded = false; + for (String mappedRole: roleToRolesMap.keySet()) { + if (roleToRolesMap.get(mappedRole).contains(r.getRoleName())) { + newRoles.addRole(new SimpleRole(mappedRole)); + mappedRoleIncluded = true; + } } - } - if (!mappedRoleIncluded) { - newRoles.addRole(r); + if (!mappedRoleIncluded) { + newRoles.addRole(r); + } + } - } - mappedObject.clearRoles(); - mappedObject.addAll(newRoles.getRoles()); + if(assignedRoles != null){ + mappedObject.clearRoles(); + mappedObject.addAll(newRoles.getRoles()); + } result.setMappedObject(mappedObject); } @@ -127,4 +131,4 @@ return false; } -} \ No newline at end of file +} From jboss-cvs-commits at lists.jboss.org Thu Mar 27 09:26:05 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 27 Mar 2014 09:26:05 -0400 Subject: [jboss-cvs] JBossAS SVN: r114788 - tags. Message-ID: <201403271326.s2RDQ5ol012253@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-03-27 09:26:05 -0400 (Thu, 27 Mar 2014) New Revision: 114788 Added: tags/JBPAPP_5_3_0_ER3/ Log: Tag EAP 5.3.0 ER3 From jboss-cvs-commits at lists.jboss.org Thu Mar 27 10:52:39 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 27 Mar 2014 10:52:39 -0400 Subject: [jboss-cvs] JBossAS SVN: r114789 - in tags/JBPAPP_5_3_0_ER3: adminclient and 32 other directories. Message-ID: <201403271452.s2REqdXS026861@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-03-27 10:52:38 -0400 (Thu, 27 Mar 2014) New Revision: 114789 Modified: tags/JBPAPP_5_3_0_ER3/adminclient/pom.xml tags/JBPAPP_5_3_0_ER3/aspects/pom.xml tags/JBPAPP_5_3_0_ER3/build/build.properties tags/JBPAPP_5_3_0_ER3/build/pom.xml tags/JBPAPP_5_3_0_ER3/client/pom.xml tags/JBPAPP_5_3_0_ER3/cluster/pom.xml tags/JBPAPP_5_3_0_ER3/component-matrix/pom.xml tags/JBPAPP_5_3_0_ER3/connector/pom.xml tags/JBPAPP_5_3_0_ER3/console/pom.xml tags/JBPAPP_5_3_0_ER3/deployment/pom.xml tags/JBPAPP_5_3_0_ER3/ejb3/pom.xml tags/JBPAPP_5_3_0_ER3/embedded/pom.xml tags/JBPAPP_5_3_0_ER3/hibernate-int/pom.xml tags/JBPAPP_5_3_0_ER3/iiop/pom.xml tags/JBPAPP_5_3_0_ER3/j2se/pom.xml tags/JBPAPP_5_3_0_ER3/jbossas/jmx-remoting/pom.xml tags/JBPAPP_5_3_0_ER3/jbossas/pom.xml tags/JBPAPP_5_3_0_ER3/jbossas/remoting/pom.xml tags/JBPAPP_5_3_0_ER3/jmx-remoting/pom.xml tags/JBPAPP_5_3_0_ER3/jmx/pom.xml tags/JBPAPP_5_3_0_ER3/main/pom.xml tags/JBPAPP_5_3_0_ER3/management/pom.xml tags/JBPAPP_5_3_0_ER3/mbeans/pom.xml tags/JBPAPP_5_3_0_ER3/messaging/pom.xml tags/JBPAPP_5_3_0_ER3/pom.xml tags/JBPAPP_5_3_0_ER3/profileservice/pom.xml tags/JBPAPP_5_3_0_ER3/security/pom.xml tags/JBPAPP_5_3_0_ER3/server/pom.xml tags/JBPAPP_5_3_0_ER3/spring-int/pom.xml tags/JBPAPP_5_3_0_ER3/system-jmx/pom.xml tags/JBPAPP_5_3_0_ER3/system/pom.xml tags/JBPAPP_5_3_0_ER3/thirdparty/pom.xml tags/JBPAPP_5_3_0_ER3/tomcat/pom.xml tags/JBPAPP_5_3_0_ER3/varia/pom.xml tags/JBPAPP_5_3_0_ER3/webservices/pom.xml Log: Updated version to EAP 5.3.0.ER3 Modified: tags/JBPAPP_5_3_0_ER3/adminclient/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/adminclient/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/adminclient/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -4,7 +4,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 Modified: tags/JBPAPP_5_3_0_ER3/aspects/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/aspects/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/aspects/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/build/build.properties =================================================================== --- tags/JBPAPP_5_3_0_ER3/build/build.properties 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/build/build.properties 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,6 +3,6 @@ version.major=5 version.minor=3 version.revision=0 -version.tag=Branch +version.tag=ER3 version.name=EAP Modified: tags/JBPAPP_5_3_0_ER3/build/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/build/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/build/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/client/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/client/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/client/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/cluster/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/cluster/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/cluster/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/component-matrix/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/component-matrix/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/component-matrix/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -20,7 +20,7 @@ org.jboss.jbossas jboss-as-component-matrix pom - 5.3.0-SNAPSHOT + 5.3.0.ER3 JBossAS Component Matrix Contract for Consumers of JBossAS Components, defining and Modified: tags/JBPAPP_5_3_0_ER3/connector/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/connector/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/connector/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/console/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/console/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/console/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/deployment/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/deployment/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/deployment/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/ejb3/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/ejb3/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/ejb3/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/embedded/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/embedded/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/embedded/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/hibernate-int/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/hibernate-int/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/hibernate-int/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/iiop/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/iiop/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/iiop/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/j2se/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/j2se/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/j2se/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/jbossas/jmx-remoting/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/jbossas/jmx-remoting/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/jbossas/jmx-remoting/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-jbossas - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/jbossas/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/jbossas/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/jbossas/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/jbossas/remoting/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/jbossas/remoting/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/jbossas/remoting/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-jbossas - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/jmx/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/jmx/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/jmx/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/jmx-remoting/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/jmx-remoting/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/jmx-remoting/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/main/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/main/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/main/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/management/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/management/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/management/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/mbeans/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/mbeans/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/mbeans/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/messaging/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/messaging/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/messaging/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-component-matrix - 5.3.0-SNAPSHOT + 5.3.0.ER3 component-matrix 4.0.0 Modified: tags/JBPAPP_5_3_0_ER3/profileservice/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/profileservice/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/profileservice/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/security/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/security/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/security/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/server/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/server/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/server/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/spring-int/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/spring-int/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/spring-int/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/system/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/system/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/system/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/system-jmx/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/system-jmx/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/system-jmx/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/thirdparty/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/thirdparty/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/thirdparty/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/tomcat/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/tomcat/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/tomcat/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/varia/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/varia/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/varia/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/webservices/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/webservices/pom.xml 2014-03-27 13:26:05 UTC (rev 114788) +++ tags/JBPAPP_5_3_0_ER3/webservices/pom.xml 2014-03-27 14:52:38 UTC (rev 114789) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER3 4.0.0 org.jboss.jbossas From jboss-cvs-commits at lists.jboss.org Thu Mar 27 23:16:22 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 27 Mar 2014 23:16:22 -0400 Subject: [jboss-cvs] JBossAS SVN: r114790 - in tags/JBPAPP_5_3_0_ER3: testsuite and 1 other directories. Message-ID: <201403280316.s2S3GMiZ018506@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-03-27 23:16:22 -0400 (Thu, 27 Mar 2014) New Revision: 114790 Modified: tags/JBPAPP_5_3_0_ER3/build/build.properties tags/JBPAPP_5_3_0_ER3/testsuite/build.xml tags/JBPAPP_5_3_0_ER3/tools/etc/buildmagic/buildmagic.ent tags/JBPAPP_5_3_0_ER3/tools/etc/buildmagic/version-info.xml Log: Remove 'Branch' and set version.tag = Modified: tags/JBPAPP_5_3_0_ER3/build/build.properties =================================================================== --- tags/JBPAPP_5_3_0_ER3/build/build.properties 2014-03-27 14:52:38 UTC (rev 114789) +++ tags/JBPAPP_5_3_0_ER3/build/build.properties 2014-03-28 03:16:22 UTC (rev 114790) @@ -3,6 +3,6 @@ version.major=5 version.minor=3 version.revision=0 -version.tag=ER3 +version.tag= version.name=EAP Modified: tags/JBPAPP_5_3_0_ER3/testsuite/build.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/testsuite/build.xml 2014-03-27 14:52:38 UTC (rev 114789) +++ tags/JBPAPP_5_3_0_ER3/testsuite/build.xml 2014-03-28 03:16:22 UTC (rev 114790) @@ -119,7 +119,7 @@ this is used in the security policy file property references and needs to be valid for the platform. --> - + Modified: tags/JBPAPP_5_3_0_ER3/tools/etc/buildmagic/buildmagic.ent =================================================================== --- tags/JBPAPP_5_3_0_ER3/tools/etc/buildmagic/buildmagic.ent 2014-03-27 14:52:38 UTC (rev 114789) +++ tags/JBPAPP_5_3_0_ER3/tools/etc/buildmagic/buildmagic.ent 2014-03-28 03:16:22 UTC (rev 114790) @@ -105,22 +105,22 @@ - + - + - + - + + value="${version.major}.${version.minor}.${version.revision} (build: SVNTag=${version.cvstag} date=${build.id})"/> Modified: tags/JBPAPP_5_3_0_ER3/tools/etc/buildmagic/version-info.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/tools/etc/buildmagic/version-info.xml 2014-03-27 14:52:38 UTC (rev 114789) +++ tags/JBPAPP_5_3_0_ER3/tools/etc/buildmagic/version-info.xml 2014-03-28 03:16:22 UTC (rev 114790) @@ -16,17 +16,17 @@ - + - + + value="${version.major}.${version.minor}.${version.revision} (build: SVNTag=${version.cvstag} date=${build.id})"/> From jboss-cvs-commits at lists.jboss.org Thu Mar 27 23:19:42 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 27 Mar 2014 23:19:42 -0400 Subject: [jboss-cvs] JBossAS SVN: r114791 - in tags/JBPAPP_5_3_0_ER3: adminclient and 32 other directories. Message-ID: <201403280319.s2S3Jgc1018557@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-03-27 23:19:42 -0400 (Thu, 27 Mar 2014) New Revision: 114791 Modified: tags/JBPAPP_5_3_0_ER3/adminclient/pom.xml tags/JBPAPP_5_3_0_ER3/aspects/pom.xml tags/JBPAPP_5_3_0_ER3/build/pom.xml tags/JBPAPP_5_3_0_ER3/client/pom.xml tags/JBPAPP_5_3_0_ER3/cluster/pom.xml tags/JBPAPP_5_3_0_ER3/component-matrix/pom.xml tags/JBPAPP_5_3_0_ER3/connector/pom.xml tags/JBPAPP_5_3_0_ER3/console/pom.xml tags/JBPAPP_5_3_0_ER3/deployment/pom.xml tags/JBPAPP_5_3_0_ER3/ejb3/pom.xml tags/JBPAPP_5_3_0_ER3/embedded/pom.xml tags/JBPAPP_5_3_0_ER3/hibernate-int/pom.xml tags/JBPAPP_5_3_0_ER3/iiop/pom.xml tags/JBPAPP_5_3_0_ER3/j2se/pom.xml tags/JBPAPP_5_3_0_ER3/jbossas/jmx-remoting/pom.xml tags/JBPAPP_5_3_0_ER3/jbossas/pom.xml tags/JBPAPP_5_3_0_ER3/jbossas/remoting/pom.xml tags/JBPAPP_5_3_0_ER3/jmx-remoting/pom.xml tags/JBPAPP_5_3_0_ER3/jmx/pom.xml tags/JBPAPP_5_3_0_ER3/main/pom.xml tags/JBPAPP_5_3_0_ER3/management/pom.xml tags/JBPAPP_5_3_0_ER3/mbeans/pom.xml tags/JBPAPP_5_3_0_ER3/messaging/pom.xml tags/JBPAPP_5_3_0_ER3/pom.xml tags/JBPAPP_5_3_0_ER3/profileservice/pom.xml tags/JBPAPP_5_3_0_ER3/security/pom.xml tags/JBPAPP_5_3_0_ER3/server/pom.xml tags/JBPAPP_5_3_0_ER3/spring-int/pom.xml tags/JBPAPP_5_3_0_ER3/system-jmx/pom.xml tags/JBPAPP_5_3_0_ER3/system/pom.xml tags/JBPAPP_5_3_0_ER3/thirdparty/pom.xml tags/JBPAPP_5_3_0_ER3/tomcat/pom.xml tags/JBPAPP_5_3_0_ER3/varia/pom.xml tags/JBPAPP_5_3_0_ER3/webservices/pom.xml Log: Remove .ER3 from sub-projects pom.xml Modified: tags/JBPAPP_5_3_0_ER3/adminclient/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/adminclient/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/adminclient/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -4,7 +4,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 Modified: tags/JBPAPP_5_3_0_ER3/aspects/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/aspects/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/aspects/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/build/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/build/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/build/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/client/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/client/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/client/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/cluster/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/cluster/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/cluster/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/component-matrix/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/component-matrix/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/component-matrix/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -20,7 +20,7 @@ org.jboss.jbossas jboss-as-component-matrix pom - 5.3.0.ER3 + 5.3.0 JBossAS Component Matrix Contract for Consumers of JBossAS Components, defining and Modified: tags/JBPAPP_5_3_0_ER3/connector/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/connector/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/connector/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/console/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/console/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/console/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/deployment/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/deployment/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/deployment/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/ejb3/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/ejb3/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/ejb3/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/embedded/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/embedded/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/embedded/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/hibernate-int/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/hibernate-int/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/hibernate-int/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/iiop/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/iiop/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/iiop/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/j2se/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/j2se/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/j2se/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/jbossas/jmx-remoting/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/jbossas/jmx-remoting/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/jbossas/jmx-remoting/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-jbossas - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/jbossas/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/jbossas/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/jbossas/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/jbossas/remoting/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/jbossas/remoting/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/jbossas/remoting/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-jbossas - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/jmx/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/jmx/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/jmx/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/jmx-remoting/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/jmx-remoting/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/jmx-remoting/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/main/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/main/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/main/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/management/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/management/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/management/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/mbeans/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/mbeans/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/mbeans/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/messaging/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/messaging/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/messaging/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-component-matrix - 5.3.0.ER3 + 5.3.0 component-matrix 4.0.0 Modified: tags/JBPAPP_5_3_0_ER3/profileservice/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/profileservice/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/profileservice/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/security/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/security/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/security/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/server/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/server/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/server/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/spring-int/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/spring-int/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/spring-int/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/system/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/system/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/system/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/system-jmx/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/system-jmx/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/system-jmx/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/thirdparty/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/thirdparty/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/thirdparty/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/tomcat/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/tomcat/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/tomcat/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/varia/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/varia/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/varia/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER3/webservices/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER3/webservices/pom.xml 2014-03-28 03:16:22 UTC (rev 114790) +++ tags/JBPAPP_5_3_0_ER3/webservices/pom.xml 2014-03-28 03:19:42 UTC (rev 114791) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER3 + 5.3.0 4.0.0 org.jboss.jbossas