From jboss-cvs-commits at lists.jboss.org Mon Feb 3 03:24:24 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 3 Feb 2014 03:24:24 -0500 Subject: [jboss-cvs] JBossAS SVN: r114682 - branches/JBPAPP_5/cluster/src/main/org/jboss/ha/singleton. Message-ID: <201402030824.s138OOL3018015@svn01.web.mwc.hst.phx2.redhat.com> Author: baranowb Date: 2014-02-03 03:24:23 -0500 (Mon, 03 Feb 2014) New Revision: 114682 Modified: branches/JBPAPP_5/cluster/src/main/org/jboss/ha/singleton/HASingletonElectionPolicyQuorum.java branches/JBPAPP_5/cluster/src/main/org/jboss/ha/singleton/HASingletonElectionPolicySimpleQuorum.java Log: Follow up for JBPAPP-10724 -- r114389 - this commit makes policies behave alike Modified: branches/JBPAPP_5/cluster/src/main/org/jboss/ha/singleton/HASingletonElectionPolicyQuorum.java =================================================================== --- branches/JBPAPP_5/cluster/src/main/org/jboss/ha/singleton/HASingletonElectionPolicyQuorum.java 2014-01-31 19:42:42 UTC (rev 114681) +++ branches/JBPAPP_5/cluster/src/main/org/jboss/ha/singleton/HASingletonElectionPolicyQuorum.java 2014-02-03 08:24:23 UTC (rev 114682) @@ -36,8 +36,8 @@ */ public class HASingletonElectionPolicyQuorum implements HASingletonElectionPolicyQuorumMBean, HASingletonElectionPolicy { protected final Logger logger = Logger.getLogger(getClass()); - // Attributes - private int quorum; + // Attributes: default = 1. + private int quorum = 1; @Override public void setQuorum(final int q) { Modified: branches/JBPAPP_5/cluster/src/main/org/jboss/ha/singleton/HASingletonElectionPolicySimpleQuorum.java =================================================================== --- branches/JBPAPP_5/cluster/src/main/org/jboss/ha/singleton/HASingletonElectionPolicySimpleQuorum.java 2014-01-31 19:42:42 UTC (rev 114681) +++ branches/JBPAPP_5/cluster/src/main/org/jboss/ha/singleton/HASingletonElectionPolicySimpleQuorum.java 2014-02-03 08:24:23 UTC (rev 114682) @@ -40,9 +40,6 @@ @Override public void setPosition(int pos) { - if (pos < 0) { - throw new IllegalArgumentException("Position must be positive!"); - } this.position = pos; } From jboss-cvs-commits at lists.jboss.org Mon Feb 3 16:40:16 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 3 Feb 2014 16:40:16 -0500 Subject: [jboss-cvs] JBossAS SVN: r114683 - branches. Message-ID: <201402032140.s13LeGYb021298@svn01.web.mwc.hst.phx2.redhat.com> Author: bmaxwell Date: 2014-02-03 16:40:15 -0500 (Mon, 03 Feb 2014) New Revision: 114683 Added: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/ Log: [JBPAPP-10980] create one off patch branch From jboss-cvs-commits at lists.jboss.org Mon Feb 3 16:52:58 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 3 Feb 2014 16:52:58 -0500 Subject: [jboss-cvs] JBossAS SVN: r114684 - in branches/JBPAPP_5_1_1_GA_JBPAPP-10980: cluster/src/etc and 40 other directories. Message-ID: <201402032152.s13LqwJK022995@svn01.web.mwc.hst.phx2.redhat.com> Author: bmaxwell Date: 2014-02-03 16:52:57 -0500 (Mon, 03 Feb 2014) New Revision: 114684 Added: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/TimerSample.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/TimerSampleBean.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/unit/ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/unit/OverloadTimerServiceTestCase.java Removed: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/TimerSample.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/TimerSampleBean.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/unit/ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/unit/OverloadTimerServiceTestCase.java Modified: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/.gitignore branches/JBPAPP_5_1_1_GA_JBPAPP-10980/cluster/src/etc/hapartition-jboss-beans.xml branches/JBPAPP_5_1_1_GA_JBPAPP-10980/cluster/src/main/org/jboss/ha/framework/server/lock/AbstractClusterLockSupport.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/cluster/src/main/org/jboss/ha/framework/server/lock/ClusterLockState.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/cluster/src/main/org/jboss/ha/framework/server/lock/NonGloballyExclusiveClusterLockSupport.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/cluster/src/main/org/jboss/ha/framework/server/lock/YieldingGloballyExclusiveClusterLockSupport.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/connector/src/main/org/jboss/resource/connectionmanager/xa/XAResourceWrapperImpl.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/connector/src/main/org/jboss/resource/connectionmanager/xa/XidWrapperImpl.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/ejb3/src/main/org/jboss/as/ejb3/timerservice/JBossTimerServiceFactory.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/main/src/bin/run.conf.bat branches/JBPAPP_5_1_1_GA_JBPAPP-10980/main/src/bin/run.sh branches/JBPAPP_5_1_1_GA_JBPAPP-10980/messaging/src/main/org/jboss/jms/server/destination/QueueMODefinition.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/bootstrap.xml branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/bootstrap/aop.xml branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/bootstrap/classloader.xml branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/bootstrap/deployers.xml branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/bootstrap/jmx.xml branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/bootstrap/logging.xml branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/bootstrap/vfs.xml branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/java.policy branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/jax-ws-catalog.xml branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/jboss-log4j.xml branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/jboss-service.xml branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/login-config.xml branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/props/ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/standardjboss.xml branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/standardjbosscmp-jdbc.xml branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/xmdesc/ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/xmdesc/NamingProviderURLWriter-xmbean.xml branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/minimal/bootstrap.xml branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/minimal/jboss-service.xml branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/deploy/legacy-invokers-service.xml branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/deployers/logbridge-jboss-beans.xml branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/main/org/jboss/deployment/FileNameVirtualFileFilter.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/main/org/jboss/ejb/txtimer/EJBTimerServiceImpl.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/main/org/jboss/ejb/txtimer/EJBTimerServiceImplMBean.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/main/org/jboss/ejb/txtimer/TimerImpl.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/main/org/jboss/ejb/txtimer/TimerServiceImpl.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/system/src/main/org/jboss/system/server/profileservice/repository/AbstractBootstrapProfileFactory.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/system/src/resources/parsing-tests/common/profiles/clustering.profile branches/JBPAPP_5_1_1_GA_JBPAPP-10980/system/src/resources/parsing-tests/common/profiles/ejb3.profile branches/JBPAPP_5_1_1_GA_JBPAPP-10980/system/src/resources/parsing-tests/common/profiles/jboss-web.profile branches/JBPAPP_5_1_1_GA_JBPAPP-10980/system/src/resources/parsing-tests/config/profiles/default.profile branches/JBPAPP_5_1_1_GA_JBPAPP-10980/system/src/resources/parsing-tests/config/profiles/seam.profile branches/JBPAPP_5_1_1_GA_JBPAPP-10980/system/src/tests/org/jboss/test/server/profileservice/support/MavenProfileMetaData.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/imports/sections/ejb3.xml branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/ejb2/ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/ejb3/ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/sar/ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/servlet/ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/test/ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/classloader/leak/test/Ejb3ClassloaderLeakTestBase.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/classloader/leak/test/IsolatedEarWithDualCommonsLoggingClassloaderLeakTestCase.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/classloader/leak/test/J2EEClassloaderLeakTestBase.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/FieldGranularityClassloaderLeakTestBase.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/J2EEClassloaderLeakTestBase.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/YieldingGloballyExclusiveClusterLockSupportUnitTestCase.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/cluster/web/notification/SessionSpecListenerAttribute.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/common/AbstractReplierMDB.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/common/EJB3TestCase.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp2260/TransactionMDB.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp2260/unit/ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/spring/test/SpringFacadeTestCase.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/resources/bootstrapdependencies/jbas5349/ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/tools/buildmagic/lib/ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/varia/src/main/org/jboss/services/binding/ServiceBindingMetadata.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/varia/src/main/org/jboss/services/binding/managed/ServiceBindingMapper.java branches/JBPAPP_5_1_1_GA_JBPAPP-10980/varia/src/resources/seam/jboss-structure.xml Log: [JBPAPP-10980] introduced a ScheduledExecutorService for handling the timeout callbacks Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980 ___________________________________________________________________ Added: svn:mergeinfo + /branches/JBPAPP_5_1:112630 Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/.gitignore ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/cluster/src/etc/hapartition-jboss-beans.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/cluster/src/main/org/jboss/ha/framework/server/lock/AbstractClusterLockSupport.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/cluster/src/main/org/jboss/ha/framework/server/lock/ClusterLockState.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/cluster/src/main/org/jboss/ha/framework/server/lock/NonGloballyExclusiveClusterLockSupport.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/cluster/src/main/org/jboss/ha/framework/server/lock/YieldingGloballyExclusiveClusterLockSupport.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/connector/src/main/org/jboss/resource/connectionmanager/xa/XAResourceWrapperImpl.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/connector/src/main/org/jboss/resource/connectionmanager/xa/XidWrapperImpl.java ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/ejb3/src/main/org/jboss/as/ejb3/timerservice/JBossTimerServiceFactory.java =================================================================== --- branches/JBPAPP_5_1_1_GA_JBPAPP-10980/ejb3/src/main/org/jboss/as/ejb3/timerservice/JBossTimerServiceFactory.java 2014-02-03 21:40:15 UTC (rev 114683) +++ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/ejb3/src/main/org/jboss/as/ejb3/timerservice/JBossTimerServiceFactory.java 2014-02-03 21:52:57 UTC (rev 114684) @@ -21,9 +21,6 @@ */ package org.jboss.as.ejb3.timerservice; -import javax.ejb.TimerService; -import javax.management.ObjectName; - import org.jboss.ejb.AllowedOperationsAssociation; import org.jboss.ejb.txtimer.EJBTimerService; import org.jboss.ejb3.timerservice.spi.TimedObjectInvoker; @@ -32,6 +29,9 @@ import org.jboss.mx.util.MBeanProxyExt; import org.jboss.mx.util.MBeanServerLocator; +import javax.ejb.TimerService; +import javax.management.ObjectName; + /** * Factory to create timer services which use the JBoss EJB Timer Service. * @@ -87,15 +87,7 @@ } catch (Exception e) { - //throw new EJBException("Could not remove timer service", e); - if (log.isTraceEnabled()) - { - log.trace("Unable to initialize timer service", e); - } - else - { - log.trace("Unable to initialize timer service"); - } + log.warn("Unable to remove timer service", e); } } Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/main/src/bin/run.conf.bat ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/main/src/bin/run.sh ___________________________________________________________________ Modified: svn:mergeinfo - /branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.sh:108548 + /branches/JBPAPP_4_2_0_GA_CP/system/src/bin/run.sh:108548 /branches/JBPAPP_5_1/main/src/bin/run.sh:112630 Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/messaging/src/main/org/jboss/jms/server/destination/QueueMODefinition.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/bootstrap/aop.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/bootstrap/classloader.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/bootstrap/deployers.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/bootstrap/jmx.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/bootstrap/logging.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/bootstrap/vfs.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/bootstrap.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/java.policy ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/jax-ws-catalog.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/jboss-log4j.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/jboss-service.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/login-config.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/props ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/standardjboss.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/standardjbosscmp-jdbc.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/xmdesc ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/all/xmdesc/NamingProviderURLWriter-xmbean.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/minimal/bootstrap.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/conf/minimal/jboss-service.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/deploy/legacy-invokers-service.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/etc/deployers/logbridge-jboss-beans.xml ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/main/org/jboss/deployment/FileNameVirtualFileFilter.java ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/main/org/jboss/ejb/txtimer/EJBTimerServiceImpl.java =================================================================== --- branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/main/org/jboss/ejb/txtimer/EJBTimerServiceImpl.java 2014-02-03 21:40:15 UTC (rev 114683) +++ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/main/org/jboss/ejb/txtimer/EJBTimerServiceImpl.java 2014-02-03 21:52:57 UTC (rev 114684) @@ -23,6 +23,20 @@ // $Id$ +import org.jboss.ejb.Container; +import org.jboss.ejb.ContainerMBean; +import org.jboss.logging.Logger; +import org.jboss.mx.util.MBeanProxyExt; +import org.jboss.system.ServiceMBeanSupport; +import org.jboss.tm.TransactionManagerFactory; +import org.jboss.tm.TransactionManagerLocator; + +import javax.ejb.EJBException; +import javax.ejb.Timer; +import javax.ejb.TimerService; +import javax.management.ObjectInstance; +import javax.management.ObjectName; +import javax.transaction.TransactionManager; import java.io.Serializable; import java.lang.reflect.Constructor; import java.util.Collection; @@ -33,21 +47,6 @@ import java.util.List; import java.util.Map; -import javax.ejb.EJBException; -import javax.ejb.Timer; -import javax.ejb.TimerService; -import javax.management.ObjectInstance; -import javax.management.ObjectName; -import javax.transaction.TransactionManager; - -import org.jboss.ejb.Container; -import org.jboss.ejb.ContainerMBean; -import org.jboss.logging.Logger; -import org.jboss.mx.util.MBeanProxyExt; -import org.jboss.system.ServiceMBeanSupport; -import org.jboss.tm.TransactionManagerFactory; -import org.jboss.tm.TransactionManagerLocator; - /** * A service that implements this interface provides an Tx aware EJBTimerService. * @@ -127,6 +126,9 @@ // Maps the timedObjectId to TimerServiceImpl objects private Map timerServiceMap = Collections.synchronizedMap(new HashMap()); + // A pool of timer that avoid creating one thread per task. + private Integer threadPoolSize = new Integer(50); + // Attributes ---------------------------------------------------- /** @@ -216,7 +218,27 @@ { this.transactionManagerFactory = factory; } - + + /** + * Get the ThreadPoolSize + * + * @jmx.managed-attribute + */ + public Integer getThreadPoolSize() + { + return threadPoolSize; + } + + /** + * Set the threadPoolSize + * + * @jmx.managed-attribute + */ + public void setThreadPoolSize(Integer threadPoolSize) + { + this.threadPoolSize = threadPoolSize; + } + // ServiceMBeanSupport Lifecycle --------------------------------- protected void startService() throws Exception @@ -228,7 +250,7 @@ transactionManager = transactionManagerFactory.getTransactionManager(); else transactionManager = TransactionManagerLocator.getInstance().locate(); - + // Get a proxy to the retry policy try { @@ -291,7 +313,7 @@ * The TimedObjectInvoker is constructed from the invokerClassName. * * @param containerId The string identifier for a class of TimedObjects - * @param instancePk The rimary key for an instance of a TimedObject, may be null + * @param instancePk The primary key for an instance of a TimedObject, may be null * @param container The Container that is associated with the TimerService * @return the TimerService */ @@ -329,7 +351,7 @@ if (timerService == null) { timerService = new TimerServiceImpl(timedObjectId, invoker, - transactionManager, persistencePolicy, retryPolicy, timerIdGenerator); + transactionManager, persistencePolicy, retryPolicy, timerIdGenerator, getThreadPoolSize()); log.debug("createTimerService: " + timerService); timerServiceMap.put(timedObjectId, timerService); } Modified: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/main/org/jboss/ejb/txtimer/EJBTimerServiceImplMBean.java =================================================================== --- branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/main/org/jboss/ejb/txtimer/EJBTimerServiceImplMBean.java 2014-02-03 21:40:15 UTC (rev 114683) +++ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/main/org/jboss/ejb/txtimer/EJBTimerServiceImplMBean.java 2014-02-03 21:52:57 UTC (rev 114684) @@ -21,12 +21,12 @@ */ package org.jboss.ejb.txtimer; -import javax.management.ObjectName; - import org.jboss.mx.util.ObjectNameFactory; import org.jboss.system.ServiceMBean; import org.jboss.tm.TransactionManagerFactory; +import javax.management.ObjectName; + /** * EJBTimerServiceImpl MBean interface. * @@ -61,6 +61,10 @@ /** The TransactionManagerFactory */ void setTransactionManagerFactory(TransactionManagerFactory factory); + Integer getThreadPoolSize(); + /** Sets the thread pool size for running timeout callbacks, takes effect on restart of the timer service */ + void setThreadPoolSize(Integer threadPoolSize); + // Operations ---------------------------------------------------- /** Modified: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/main/org/jboss/ejb/txtimer/TimerImpl.java =================================================================== --- branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/main/org/jboss/ejb/txtimer/TimerImpl.java 2014-02-03 21:40:15 UTC (rev 114683) +++ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/main/org/jboss/ejb/txtimer/TimerImpl.java 2014-02-03 21:52:57 UTC (rev 114684) @@ -23,10 +23,8 @@ // $Id$ -import java.io.Serializable; -import java.util.Date; -import java.util.Timer; -import java.util.TimerTask; +import org.jboss.ejb.AllowedOperationsAssociation; +import org.jboss.logging.Logger; import javax.ejb.EJBException; import javax.ejb.NoSuchObjectLocalException; @@ -34,9 +32,13 @@ import javax.transaction.Status; import javax.transaction.Synchronization; import javax.transaction.Transaction; +import java.io.Serializable; +import java.util.Date; +import java.util.TimerTask; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; -import org.jboss.ejb.AllowedOperationsAssociation; -import org.jboss.logging.Logger; +import static java.util.concurrent.TimeUnit.MILLISECONDS; /** * An implementation of an EJB Timer. @@ -96,7 +98,7 @@ private long nextExpire; private int timerState; - private Timer utilTimer; + private ScheduledFuture scheduledFuture; private int hashCode; /** @@ -119,6 +121,11 @@ setTimerState(CREATED); } + private ScheduledExecutorService executor() + { + return timerService.getScheduledExecutorService(); + } + void startTimer(Date firstTime, long periode) { this.startTimer(firstTime, firstTime, periode); @@ -252,7 +259,7 @@ if (timerState != EXPIRED) setTimerState(CANCELED); timerService.removeTimer(this); - utilTimer.cancel(); + scheduledFuture.cancel(false); } /** @@ -262,7 +269,8 @@ { if (timerState != EXPIRED) setTimerState(CANCELED); - utilTimer.cancel(); + if (scheduledFuture != null) + scheduledFuture.cancel(false); } /** @@ -273,7 +281,8 @@ log.debug("stopTimer: " + this); if (timerState != EXPIRED) setTimerState(CANCELED); - utilTimer.cancel(); + if (scheduledFuture != null) + scheduledFuture.cancel(false); } /** @@ -411,9 +420,6 @@ private void startInTx() { - // JBAS-4330, provide a meaningful name to the timer thread, needs jdk5+ - utilTimer = new Timer("EJB-Timer-" + timerId + timedObjectId); - if (timerService.getTransaction() != null) { // don't schedule the timeout yet @@ -443,14 +449,17 @@ private void scheduleTimeout() { + long initialDelay = nextExpire - System.currentTimeMillis(); + if (initialDelay < 0) + initialDelay = 0; if (periode > 0) { // schedule the periodic timer task - utilTimer.schedule(new TimerTaskImpl(this), new Date(nextExpire), periode); + executor().scheduleAtFixedRate(new TimerTaskImpl(this), initialDelay, periode, MILLISECONDS); } else { - utilTimer.schedule(new TimerTaskImpl(this), new Date(nextExpire)); + executor().schedule(new TimerTaskImpl(this), initialDelay, MILLISECONDS); } } @@ -460,7 +469,7 @@ */ private void triggerBacklogTimeoutNow() { - utilTimer.schedule(new TimerTaskImpl(this, true), new Date()); + executor().schedule(new TimerTaskImpl(this, true), 0, MILLISECONDS); } /** @@ -516,13 +525,32 @@ } } + public void afterCompletion(int status) + { + // JBPAPP-8073: JBossTM won't say anything useful if afterCompletion fails + // TwoPhaseCoordinator.afterCompletion - returned failure for com.arjuna.ats.internal.jta.resources.arjunacore.SynchronizationImple at 3c255a5a + try + { + afterCompletion2(status); + } + catch (Throwable t) + { + log.error("Aftercompletion failed", t); + if (t instanceof RuntimeException) + throw (RuntimeException) t; + if (t instanceof Error) + throw (Error) t; + throw new RuntimeException(t); + } + } + /** * This method is invoked after the transaction has committed or * rolled back. * * @param status The status of the completed transaction. */ - public void afterCompletion(int status) + private void afterCompletion2(int status) { if (status == Status.STATUS_COMMITTED) { Modified: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/main/org/jboss/ejb/txtimer/TimerServiceImpl.java =================================================================== --- branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/main/org/jboss/ejb/txtimer/TimerServiceImpl.java 2014-02-03 21:40:15 UTC (rev 114683) +++ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/main/org/jboss/ejb/txtimer/TimerServiceImpl.java 2014-02-03 21:52:57 UTC (rev 114684) @@ -23,6 +23,14 @@ // $Id$ +import org.jboss.logging.Logger; + +import javax.ejb.EJBException; +import javax.ejb.Timer; +import javax.ejb.TimerHandle; +import javax.transaction.SystemException; +import javax.transaction.Transaction; +import javax.transaction.TransactionManager; import java.io.Serializable; import java.util.ArrayList; import java.util.Collection; @@ -30,16 +38,11 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.atomic.AtomicInteger; -import javax.ejb.EJBException; -import javax.ejb.Timer; -import javax.ejb.TimerHandle; -import javax.transaction.SystemException; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; - -import org.jboss.logging.Logger; - /** * The TimerService provides enterprise bean components with access to the * container-provided Timer Service. The EJB Timer Service allows entity beans, stateless @@ -74,6 +77,8 @@ // Map private Map timers = new HashMap(); + private final ScheduledExecutorService scheduledExecutorService; + // Constructors -------------------------------------------------- /** @@ -82,16 +87,27 @@ * All the dependencies are supplied by the caller */ public TimerServiceImpl( - TimedObjectId timedObjectId, TimedObjectInvoker timedObjectInvoker, + final TimedObjectId timedObjectId, TimedObjectInvoker timedObjectInvoker, TransactionManager transactionManager, PersistencePolicy persistencePolicy, - RetryPolicy retryPolicy, TimerIdGenerator timerIdGenerator) + RetryPolicy retryPolicy, TimerIdGenerator timerIdGenerator, int corePoolSize) { this.timedObjectId = timedObjectId; this.timedObjectInvoker = timedObjectInvoker; this.transactionManager = transactionManager; this.persistencePolicy = persistencePolicy; this.timerIdGenerator = timerIdGenerator; - this.retryPolicy = retryPolicy; + this.retryPolicy = retryPolicy; + final AtomicInteger numThread = new AtomicInteger(0); + final ThreadFactory threadFactory = new ThreadFactory() + { + @Override + public Thread newThread(Runnable r) + { + // JBAS-4330, provide a meaningful name to the timer thread, needs jdk5+ + return new Thread(r, "EJB-Timer-" + numThread.incrementAndGet() + " " + timedObjectId); + } + }; + this.scheduledExecutorService = new ScheduledThreadPoolExecutor(corePoolSize, threadFactory); } // Public -------------------------------------------------------- @@ -107,6 +123,11 @@ } } + ScheduledExecutorService getScheduledExecutorService() + { + return scheduledExecutorService; + } + /** * Get the Timer for the given timedObjectId */ @@ -126,6 +147,8 @@ */ public void shutdown(boolean keepState) { + scheduledExecutorService.shutdown(); + // TODO: should we await termination? If so, how long? synchronized (timers) { Iterator it = timers.values().iterator(); Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/system/src/main/org/jboss/system/server/profileservice/repository/AbstractBootstrapProfileFactory.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/system/src/resources/parsing-tests/common/profiles/clustering.profile ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/system/src/resources/parsing-tests/common/profiles/ejb3.profile ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/system/src/resources/parsing-tests/common/profiles/jboss-web.profile ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/system/src/resources/parsing-tests/config/profiles/default.profile ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/system/src/resources/parsing-tests/config/profiles/seam.profile ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/system/src/tests/org/jboss/test/server/profileservice/support/MavenProfileMetaData.java ___________________________________________________________________ Deleted: svn:mergeinfo - Modified: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/imports/sections/ejb3.xml =================================================================== --- branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/imports/sections/ejb3.xml 2014-02-03 21:40:15 UTC (rev 114683) +++ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/imports/sections/ejb3.xml 2014-02-03 21:52:57 UTC (rev 114684) @@ -222,6 +222,16 @@ + + + + + + + + + + + jboss51xsd, + jbpapp8035"> Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/ejb2 ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/ejb3 ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/sar ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/servlet ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/bootstrapdependencies/jbas5349/test ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/classloader/leak/test/Ejb3ClassloaderLeakTestBase.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/classloader/leak/test/IsolatedEarWithDualCommonsLoggingClassloaderLeakTestCase.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/classloader/leak/test/J2EEClassloaderLeakTestBase.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/FieldGranularityClassloaderLeakTestBase.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/cluster/classloader/leak/test/J2EEClassloaderLeakTestBase.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/YieldingGloballyExclusiveClusterLockSupportUnitTestCase.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/cluster/web/notification/SessionSpecListenerAttribute.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/common/AbstractReplierMDB.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/common/EJB3TestCase.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp2260/TransactionMDB.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp2260/unit ___________________________________________________________________ Deleted: svn:mergeinfo - Deleted: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/TimerSample.java =================================================================== --- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/TimerSample.java 2012-02-09 12:35:24 UTC (rev 112630) +++ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/TimerSample.java 2014-02-03 21:52:57 UTC (rev 114684) @@ -1,37 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright (c) 2012, 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.ejb3.jbpapp8035; - -import javax.ejb.Remote; -import java.util.Date; - - at Remote -public interface TimerSample { - void cancelAllTimers(); - int getCount(); - void resetCount(); - void scheduleTimer(Date date); - void scheduleTimer(long milliseconds); - void scheduleTimer(long milliseconds, long period); - void scheduleTimers(long number, long milliseconds); - void scheduleTimerTxTimeout(long number); -} \ No newline at end of file Copied: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/TimerSample.java (from rev 112630, branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/TimerSample.java) =================================================================== --- branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/TimerSample.java (rev 0) +++ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/TimerSample.java 2014-02-03 21:52:57 UTC (rev 114684) @@ -0,0 +1,37 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright (c) 2012, 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.ejb3.jbpapp8035; + +import javax.ejb.Remote; +import java.util.Date; + + at Remote +public interface TimerSample { + void cancelAllTimers(); + int getCount(); + void resetCount(); + void scheduleTimer(Date date); + void scheduleTimer(long milliseconds); + void scheduleTimer(long milliseconds, long period); + void scheduleTimers(long number, long milliseconds); + void scheduleTimerTxTimeout(long number); +} \ No newline at end of file Deleted: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/TimerSampleBean.java =================================================================== --- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/TimerSampleBean.java 2012-02-09 12:35:24 UTC (rev 112630) +++ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/TimerSampleBean.java 2014-02-03 21:52:57 UTC (rev 114684) @@ -1,118 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright (c) 2012, 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.ejb3.jbpapp8035; - -import org.jboss.logging.Logger; - -import javax.annotation.Resource; -import javax.ejb.SessionContext; -import javax.ejb.Stateless; -import javax.ejb.Timeout; -import javax.ejb.Timer; -import java.util.Date; -import java.util.concurrent.atomic.AtomicInteger; - -/** - * Sample Timer sample bean used by the unit test. - * @author nicolasleroux - */ - at Stateless -public class TimerSampleBean implements TimerSample { - @Resource - private SessionContext ctx; - - private static AtomicInteger count = new AtomicInteger(0); - - public static final Logger log = Logger - .getLogger(TimerSampleBean.class); - - public int getCount() { - return count.intValue(); - } - - public void resetCount() { - count.set(0); - } - - public void scheduleTimer(long milliseconds) { - log.info("scheduleTimer with initial duration " + milliseconds); - ctx.getTimerService().createTimer( - milliseconds, "Hello World"); - } - - public void scheduleTimer(long milliseconds, long period) { - log.info("scheduleTimer with initial duration " + milliseconds + " and period " + period); - - ctx.getTimerService().createTimer( - milliseconds, period, "Hello World repeat"); - } - - public void scheduleTimer(Date date) { - log.info("scheduleTimer with date " + date); - - ctx.getTimerService().createTimer( - date, "Hello World "); - } - - public void scheduleTimerTxTimeout(long milliseconds) { - log.info("scheduleTimer with initial duration " + milliseconds); - ctx.getTimerService().createTimer( - milliseconds, "Hello World "); - try { - Thread.sleep(300200); - } catch(Exception e) { - e.printStackTrace(); - } - } - - public void cancelAllTimers() { - // Cancel the timers - for (Object t : ctx.getTimerService().getTimers()) { - ((Timer)t).cancel(); - } - } - - @Timeout - public void timeoutHandler(Timer timer) { - log.info("---------------------"); - log.info("* Received Timer event: " + timer.getInfo() + " in " + Thread.currentThread().getName()); - log.info("---------------------"); - sleep(100); - count.incrementAndGet(); - } - - public void scheduleTimers(long number, long milliseconds) { - for (int i = 0; i < number; i++) { - log.info("scheduleTimer with initial duration " + milliseconds); - ctx.getTimerService().createTimer( - milliseconds, "Hello World"); - } - } - - private static void sleep(final long millis) { - try { - Thread.sleep(millis); - } catch (InterruptedException e) { - // ignore - } - } -} Copied: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/TimerSampleBean.java (from rev 112630, branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/TimerSampleBean.java) =================================================================== --- branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/TimerSampleBean.java (rev 0) +++ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/TimerSampleBean.java 2014-02-03 21:52:57 UTC (rev 114684) @@ -0,0 +1,118 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright (c) 2012, 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.ejb3.jbpapp8035; + +import org.jboss.logging.Logger; + +import javax.annotation.Resource; +import javax.ejb.SessionContext; +import javax.ejb.Stateless; +import javax.ejb.Timeout; +import javax.ejb.Timer; +import java.util.Date; +import java.util.concurrent.atomic.AtomicInteger; + +/** + * Sample Timer sample bean used by the unit test. + * @author nicolasleroux + */ + at Stateless +public class TimerSampleBean implements TimerSample { + @Resource + private SessionContext ctx; + + private static AtomicInteger count = new AtomicInteger(0); + + public static final Logger log = Logger + .getLogger(TimerSampleBean.class); + + public int getCount() { + return count.intValue(); + } + + public void resetCount() { + count.set(0); + } + + public void scheduleTimer(long milliseconds) { + log.info("scheduleTimer with initial duration " + milliseconds); + ctx.getTimerService().createTimer( + milliseconds, "Hello World"); + } + + public void scheduleTimer(long milliseconds, long period) { + log.info("scheduleTimer with initial duration " + milliseconds + " and period " + period); + + ctx.getTimerService().createTimer( + milliseconds, period, "Hello World repeat"); + } + + public void scheduleTimer(Date date) { + log.info("scheduleTimer with date " + date); + + ctx.getTimerService().createTimer( + date, "Hello World "); + } + + public void scheduleTimerTxTimeout(long milliseconds) { + log.info("scheduleTimer with initial duration " + milliseconds); + ctx.getTimerService().createTimer( + milliseconds, "Hello World "); + try { + Thread.sleep(300200); + } catch(Exception e) { + e.printStackTrace(); + } + } + + public void cancelAllTimers() { + // Cancel the timers + for (Object t : ctx.getTimerService().getTimers()) { + ((Timer)t).cancel(); + } + } + + @Timeout + public void timeoutHandler(Timer timer) { + log.info("---------------------"); + log.info("* Received Timer event: " + timer.getInfo() + " in " + Thread.currentThread().getName()); + log.info("---------------------"); + sleep(100); + count.incrementAndGet(); + } + + public void scheduleTimers(long number, long milliseconds) { + for (int i = 0; i < number; i++) { + log.info("scheduleTimer with initial duration " + milliseconds); + ctx.getTimerService().createTimer( + milliseconds, "Hello World"); + } + } + + private static void sleep(final long millis) { + try { + Thread.sleep(millis); + } catch (InterruptedException e) { + // ignore + } + } +} Deleted: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/unit/OverloadTimerServiceTestCase.java =================================================================== --- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/unit/OverloadTimerServiceTestCase.java 2012-02-09 12:35:24 UTC (rev 112630) +++ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/unit/OverloadTimerServiceTestCase.java 2014-02-03 21:52:57 UTC (rev 114684) @@ -1,57 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright (c) 2012, 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.ejb3.jbpapp8035.unit; - -import junit.framework.Test; -import org.jboss.test.ejb3.common.EJB3TestCase; -import org.jboss.test.ejb3.jbpapp8035.TimerSample; - -/** - * @author Carlo de Wolf - */ -public class OverloadTimerServiceTestCase extends EJB3TestCase { - private TimerSample bean; - - public OverloadTimerServiceTestCase(String name) { - super(name); - } - - public static Test suite() throws Exception { - return getDeploySetup(OverloadTimerServiceTestCase.class, "jbpapp8035.jar"); - } - - @Override - protected void setUp() throws Exception { - super.setUp(); - - bean = lookup("TimerSampleBean/remote", TimerSample.class); - bean.cancelAllTimers(); - bean.resetCount(); - } - - public void testOverload() throws InterruptedException { - bean.scheduleTimers(1000, 1); - sleep(1000 * 100 / 50 + 1000); - int result = bean.getCount(); - assertEquals(1000, result); - } -} Copied: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/unit/OverloadTimerServiceTestCase.java (from rev 112630, branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/unit/OverloadTimerServiceTestCase.java) =================================================================== --- branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/unit/OverloadTimerServiceTestCase.java (rev 0) +++ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/ejb3/jbpapp8035/unit/OverloadTimerServiceTestCase.java 2014-02-03 21:52:57 UTC (rev 114684) @@ -0,0 +1,57 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright (c) 2012, 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.ejb3.jbpapp8035.unit; + +import junit.framework.Test; +import org.jboss.test.ejb3.common.EJB3TestCase; +import org.jboss.test.ejb3.jbpapp8035.TimerSample; + +/** + * @author Carlo de Wolf + */ +public class OverloadTimerServiceTestCase extends EJB3TestCase { + private TimerSample bean; + + public OverloadTimerServiceTestCase(String name) { + super(name); + } + + public static Test suite() throws Exception { + return getDeploySetup(OverloadTimerServiceTestCase.class, "jbpapp8035.jar"); + } + + @Override + protected void setUp() throws Exception { + super.setUp(); + + bean = lookup("TimerSampleBean/remote", TimerSample.class); + bean.cancelAllTimers(); + bean.resetCount(); + } + + public void testOverload() throws InterruptedException { + bean.scheduleTimers(1000, 1); + sleep(1000 * 100 / 50 + 1000); + int result = bean.getCount(); + assertEquals(1000, result); + } +} Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/main/org/jboss/test/spring/test/SpringFacadeTestCase.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/testsuite/src/resources/bootstrapdependencies/jbas5349 ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/tools/buildmagic/lib ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/varia/src/main/org/jboss/services/binding/ServiceBindingMetadata.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/varia/src/main/org/jboss/services/binding/managed/ServiceBindingMapper.java ___________________________________________________________________ Deleted: svn:mergeinfo - Property changes on: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/varia/src/resources/seam/jboss-structure.xml ___________________________________________________________________ Deleted: svn:mergeinfo - From jboss-cvs-commits at lists.jboss.org Mon Feb 3 16:53:33 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 3 Feb 2014 16:53:33 -0500 Subject: [jboss-cvs] JBossAS SVN: r114685 - branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/main/org/jboss/ejb/txtimer. Message-ID: <201402032153.s13LrXP0023018@svn01.web.mwc.hst.phx2.redhat.com> Author: bmaxwell Date: 2014-02-03 16:53:33 -0500 (Mon, 03 Feb 2014) New Revision: 114685 Modified: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/main/org/jboss/ejb/txtimer/TimerImpl.java Log: [JBPAPP-10980] fix NPE when cancelling timer within same tx Modified: branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/main/org/jboss/ejb/txtimer/TimerImpl.java =================================================================== --- branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/main/org/jboss/ejb/txtimer/TimerImpl.java 2014-02-03 21:52:57 UTC (rev 114684) +++ branches/JBPAPP_5_1_1_GA_JBPAPP-10980/server/src/main/org/jboss/ejb/txtimer/TimerImpl.java 2014-02-03 21:53:33 UTC (rev 114685) @@ -259,7 +259,9 @@ if (timerState != EXPIRED) setTimerState(CANCELED); timerService.removeTimer(this); - scheduledFuture.cancel(false); + // if started within a tx there is no future yet + if (scheduledFuture != null) + scheduledFuture.cancel(false); } /** From jboss-cvs-commits at lists.jboss.org Tue Feb 4 05:04:14 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 4 Feb 2014 05:04:14 -0500 Subject: [jboss-cvs] JBossAS SVN: r114686 - branches/JBPAPP_5/component-matrix. Message-ID: <201402041004.s14A4EmD019515@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-02-04 05:04:14 -0500 (Tue, 04 Feb 2014) New Revision: 114686 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: JBPAPP-10924 Upgrade HornetQ to 2.2.26.Final Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-02-03 21:53:33 UTC (rev 114685) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-02-04 10:04:14 UTC (rev 114686) @@ -46,7 +46,7 @@ 3.1.2.SP16 1.0.1.GA 1.4.8.SP9_patch_01 - 2.2.25.Final + 2.2.26.Final 2.1.14.GA 2.6.22.Final 3.8.2 From jboss-cvs-commits at lists.jboss.org Tue Feb 4 06:21:00 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 4 Feb 2014 06:21:00 -0500 Subject: [jboss-cvs] JBossAS SVN: r114687 - projects/jboss-aspects/trunk/transaction/src/main/java/org/jboss/aspects/tx. Message-ID: <201402041121.s14BL0bs002171@svn01.web.mwc.hst.phx2.redhat.com> Author: raggz Date: 2014-02-04 06:20:59 -0500 (Tue, 04 Feb 2014) New Revision: 114687 Modified: projects/jboss-aspects/trunk/transaction/src/main/java/org/jboss/aspects/tx/TxPolicy.java Log: Fix for JBASPECT-39. Modified: projects/jboss-aspects/trunk/transaction/src/main/java/org/jboss/aspects/tx/TxPolicy.java =================================================================== --- projects/jboss-aspects/trunk/transaction/src/main/java/org/jboss/aspects/tx/TxPolicy.java 2014-02-04 10:04:14 UTC (rev 114686) +++ projects/jboss-aspects/trunk/transaction/src/main/java/org/jboss/aspects/tx/TxPolicy.java 2014-02-04 11:20:59 UTC (rev 114687) @@ -152,7 +152,7 @@ { try { - if (tx != tm.getTransaction()) + if (!tx.equals(tm.getTransaction())) { throw new IllegalStateException("Wrong tx on thread: expected " + tx + ", actual " + tm.getTransaction()); } From jboss-cvs-commits at lists.jboss.org Tue Feb 4 07:25:10 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 4 Feb 2014 07:25:10 -0500 Subject: [jboss-cvs] JBossAS SVN: r114688 - in branches/JBPAPP_5/testsuite: src/main/org/jboss/test/cluster/defaultcfg/test and 1 other directories. Message-ID: <201402041225.s14CPAos014742@svn01.web.mwc.hst.phx2.redhat.com> Author: lthon Date: 2014-02-04 07:25:10 -0500 (Tue, 04 Feb 2014) New Revision: 114688 Added: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/HASingletonQuorumElectionPolicyTestCase.java branches/JBPAPP_5/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/QuorumElectionPolicyUnitTestCase.java branches/JBPAPP_5/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-quorum-electionpolicy-jboss-beans.xml Modified: branches/JBPAPP_5/testsuite/imports/sections/cluster.xml Log: [JBPAPP-10724] add tests for quorum HA singleton election policy Modified: branches/JBPAPP_5/testsuite/imports/sections/cluster.xml =================================================================== --- branches/JBPAPP_5/testsuite/imports/sections/cluster.xml 2014-02-04 11:20:59 UTC (rev 114687) +++ branches/JBPAPP_5/testsuite/imports/sections/cluster.xml 2014-02-04 12:25:10 UTC (rev 114688) @@ -100,6 +100,11 @@ file="${build.resources}/cluster/hasingleton/electionpolicy/ha-electionpolicy-jboss-beans.xml" overwrite="true"/> + + + + */ +public class HASingletonQuorumElectionPolicyTestCase extends JBossClusteredTestCase { + private final Properties env = new Properties(); + + public HASingletonQuorumElectionPolicyTestCase(String name) { + super(name); + env.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.jnp.interfaces.NamingContextFactory"); + } + + public static Test suite() throws Exception { + return getDeploySetup(HASingletonQuorumElectionPolicyTestCase.class, "ha-quorum-electionpolicy-jboss-beans.xml"); + } + + public void testMBeanElectionPolicy() throws Exception { + // Get MBeanServerConnections + MBeanServerConnection[] adaptors = this.getAdaptors(); + int size = adaptors.length; + assertTrue(size == 2); + + // 1st policy is quorum-based & the oldest, where quorum < number of servers => quorum achieved + { + ObjectName mbean = new ObjectName("jboss.examples:service=HASingletonQuorumMBeanExample_1"); + + Boolean n1 = (Boolean) adaptors[0].getAttribute(mbean, "MasterNode"); + Boolean n2 = (Boolean) adaptors[1].getAttribute(mbean, "MasterNode"); + + assertEquals(Boolean.TRUE, n1); + assertEquals(Boolean.FALSE, n2); + } + + // 2nd policy is quorum-based & the oldest, where quorum = number of servers => quorum achieved + { + ObjectName mbean = new ObjectName("jboss.examples:service=HASingletonQuorumMBeanExample_2"); + + Boolean n1 = (Boolean) adaptors[0].getAttribute(mbean, "MasterNode"); + Boolean n2 = (Boolean) adaptors[1].getAttribute(mbean, "MasterNode"); + + assertEquals(Boolean.TRUE, n1); + assertEquals(Boolean.FALSE, n2); + } + + // 3rd policy is quorum-based & the oldest, where quorum > number of servers => quorum NOT achieved + { + ObjectName mbean = new ObjectName("jboss.examples:service=HASingletonQuorumMBeanExample_3"); + + Boolean n1 = (Boolean) adaptors[0].getAttribute(mbean, "MasterNode"); + Boolean n2 = (Boolean) adaptors[1].getAttribute(mbean, "MasterNode"); + + assertEquals(Boolean.FALSE, n1); + assertEquals(Boolean.FALSE, n2); + } + + // 4th policy is quorum-based & choose the youngest, where quorum < number of servers => quorum achieved + { + ObjectName mbean = new ObjectName("jboss.examples:service=HASingletonQuorumMBeanExample_4"); + + Boolean n1 = (Boolean) adaptors[0].getAttribute(mbean, "MasterNode"); + Boolean n2 = (Boolean) adaptors[1].getAttribute(mbean, "MasterNode"); + + assertEquals(Boolean.FALSE, n1); + assertEquals(Boolean.TRUE, n2); + } + + // 5th policy is quorum-based & choose the youngest, where quorum = number of servers => quorum achieved + { + ObjectName mbean = new ObjectName("jboss.examples:service=HASingletonQuorumMBeanExample_5"); + + Boolean n1 = (Boolean) adaptors[0].getAttribute(mbean, "MasterNode"); + Boolean n2 = (Boolean) adaptors[1].getAttribute(mbean, "MasterNode"); + + assertEquals(Boolean.FALSE, n1); + assertEquals(Boolean.TRUE, n2); + } + + // 6th policy is quorum-based & choose the youngest, where quorum > number of servers => quorum NOT achieved + { + ObjectName mbean = new ObjectName("jboss.examples:service=HASingletonQuorumMBeanExample_6"); + + Boolean n1 = (Boolean) adaptors[0].getAttribute(mbean, "MasterNode"); + Boolean n2 = (Boolean) adaptors[1].getAttribute(mbean, "MasterNode"); + + assertEquals(Boolean.FALSE, n1); + assertEquals(Boolean.FALSE, n2); + } + } + + public void testPojoElectionPolicy() throws Exception { + String[] namingUrls = getNamingURLs(); + int size = namingUrls.length; + assertTrue(size == 2); // cluster size must be 2 for 3rd policy test + + // 1st policy is quorum-based & the oldest, where quorum < number of servers => quorum achieved + int exampleNumber = 1; + shouldHaveHaSingletonDeployed(namingUrls[0], exampleNumber); + shouldNotHaveHaSingletonDeployed(namingUrls[1], exampleNumber); + + // 2nd policy is quorum-based & the oldest, where quorum = number of servers => quorum achieved + exampleNumber = 2; + shouldHaveHaSingletonDeployed(namingUrls[0], exampleNumber); + shouldNotHaveHaSingletonDeployed(namingUrls[1], exampleNumber); + + // 3rd policy is quorum-based & the oldest, where quorum > number of servers => quorum NOT achieved + exampleNumber = 3; + shouldNotHaveHaSingletonDeployed(namingUrls[0], exampleNumber); + shouldNotHaveHaSingletonDeployed(namingUrls[1], exampleNumber); + + // 4th policy is quorum-based & choose the youngest, where quorum < number of servers => quorum achieved + exampleNumber = 4; + shouldNotHaveHaSingletonDeployed(namingUrls[0], exampleNumber); + shouldHaveHaSingletonDeployed(namingUrls[1], exampleNumber); + + // 5th policy is quorum-based & choose the youngest, where quorum = number of servers => quorum achieved + exampleNumber = 5; + shouldNotHaveHaSingletonDeployed(namingUrls[0], exampleNumber); + shouldHaveHaSingletonDeployed(namingUrls[1], exampleNumber); + + // 6th policy is quorum-based & choose the youngest, where quorum > number of servers => quorum NOT achieved + exampleNumber = 6; + shouldNotHaveHaSingletonDeployed(namingUrls[0], exampleNumber); + shouldNotHaveHaSingletonDeployed(namingUrls[1], exampleNumber); + } + + private void shouldHaveHaSingletonDeployed(String namingUrl, int exampleNumber) throws Exception { + env.setProperty(Context.PROVIDER_URL, namingUrl); + Context ctx = new InitialContext(env); + HASingletonPojoExample pojo = (HASingletonPojoExample) ctx.lookup("test/cluster/hasingleton/quorum/simplepojo/" + exampleNumber); + assertTrue("Pojo in " + namingUrl + " should be deployed as HA singleton", pojo.isMasterNode()); + } + + private void shouldNotHaveHaSingletonDeployed(String namingUrl, int exampleNumber) throws Exception { + env.setProperty(Context.PROVIDER_URL, namingUrl); + Context ctx = new InitialContext(env); + try { + ctx.lookup("test/cluster/hasingleton/quorum/simplepojo/" + exampleNumber); + fail("Should have thrown a NamingException indicating 'test not bound'"); + } catch (NamingException expected) {} + } + + // ignored because of JBPAPP-10970 + public void ignore_testQuorumStartStopPartition() throws Exception { + MBeanServerConnection[] adaptors = getAdaptors(); + String[] namingUrls = getNamingURLs(); + assertTrue(adaptors.length == 2); // expecting cluster size to be equal to the quorum + assertTrue(namingUrls.length == 2); + + ObjectName mbean = new ObjectName("jboss.examples:service=HASingletonQuorumMBeanExample_2"); + int exampleNumber = 2; + + assertEquals(Boolean.TRUE, adaptors[0].getAttribute(mbean, "MasterNode")); + assertEquals(Boolean.FALSE, adaptors[1].getAttribute(mbean, "MasterNode")); + shouldHaveHaSingletonDeployed(namingUrls[0], exampleNumber); + shouldNotHaveHaSingletonDeployed(namingUrls[1], exampleNumber); + + stopPartition(adaptors[1]); + + assertEquals(Boolean.FALSE, adaptors[0].getAttribute(mbean, "MasterNode")); + assertEquals(Boolean.FALSE, adaptors[1].getAttribute(mbean, "MasterNode")); + shouldNotHaveHaSingletonDeployed(namingUrls[0], exampleNumber); + shouldNotHaveHaSingletonDeployed(namingUrls[1], exampleNumber); + + startPartition(adaptors[1]); + + assertEquals(Boolean.TRUE, adaptors[0].getAttribute(mbean, "MasterNode")); + assertEquals(Boolean.FALSE, adaptors[1].getAttribute(mbean, "MasterNode")); + shouldHaveHaSingletonDeployed(namingUrls[0], exampleNumber); + shouldNotHaveHaSingletonDeployed(namingUrls[1], exampleNumber); + } + + protected void startPartition(MBeanServerConnection adaptor) throws Exception { + doStartStopPartition(adaptor, "start"); + } + + protected void stopPartition(MBeanServerConnection adaptor) throws Exception { + doStartStopPartition(adaptor, "stop"); + } + + private void doStartStopPartition(MBeanServerConnection adaptor, String startOrStop) throws Exception { + ObjectName partition = new ObjectName("jboss:service=QuorumElectionPolicyTestPartition"); + + Object[] params = new Object[0]; + String[] types = new String[0]; + adaptor.invoke(partition, startOrStop, params, types); + + Thread.sleep(2000); + } +} Added: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/QuorumElectionPolicyUnitTestCase.java =================================================================== --- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/QuorumElectionPolicyUnitTestCase.java (rev 0) +++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/QuorumElectionPolicyUnitTestCase.java 2014-02-04 12:25:10 UTC (rev 114688) @@ -0,0 +1,113 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2013, 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. + * + * 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.cluster.defaultcfg.test; + +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import junit.framework.TestCase; +import org.jboss.ha.framework.interfaces.ClusterNode; +import org.jboss.ha.framework.server.ClusterNodeImpl; +import org.jboss.ha.singleton.HASingletonElectionPolicyQuorum; +import org.jboss.ha.singleton.HASingletonElectionPolicySimpleQuorum; +import org.jgroups.stack.IpAddress; + +/** + * @author Ladislav Thon + */ +public class QuorumElectionPolicyUnitTestCase extends TestCase { + private InetAddress localAddress; + + @Override + protected void setUp() throws UnknownHostException { + localAddress = InetAddress.getByName("localhost"); + } + + public void testQuorumValue() { + doTestQuorumValue(new HASingletonElectionPolicyQuorum()); + } + + public void testQuorumValueSimple() { + doTestQuorumValue(new HASingletonElectionPolicySimpleQuorum()); + } + + public void testAchieveQuorum() { + doTestAchieveQuorum(new HASingletonElectionPolicyQuorum()); + } + + public void testAchieveQuorumSimple() { + doTestAchieveQuorum(new HASingletonElectionPolicySimpleQuorum()); + } + + public void testQuorumSimpleWithPosition() { + HASingletonElectionPolicySimpleQuorum policy = new HASingletonElectionPolicySimpleQuorum(); + + for (int i = -5; i < 6; i++) { + policy.setPosition(i); + doTestQuorumValue(policy); + doTestAchieveQuorum(policy); + } + } + + private void doTestQuorumValue(HASingletonElectionPolicyQuorum policy) { + for (int i = 1; i < 4; i++) { + policy.setQuorum(i); + } + + for (int i = 0; i > -3; i--) { + try { + policy.setQuorum(i); + fail("Expected IllegalArgumentException for quorum value " + i); + } catch (IllegalArgumentException expected) {} + } + } + + private void doTestAchieveQuorum(HASingletonElectionPolicyQuorum policy) { + List nodes = new ArrayList(Arrays.asList( + new ClusterNodeImpl(new IpAddress(localAddress, 10000)), + new ClusterNodeImpl(new IpAddress(localAddress, 10001)), + new ClusterNodeImpl(new IpAddress(localAddress, 10002)), + new ClusterNodeImpl(new IpAddress(localAddress, 10003)) + )); + + policy.setQuorum(2); + + assertNotNull(policy.elect(nodes)); + + nodes.remove(3); + assertNotNull(policy.elect(nodes)); + + nodes.remove(2); + assertNotNull(policy.elect(nodes)); + + nodes.remove(1); + assertNull(policy.elect(nodes)); + + nodes.remove(0); + assertNull(policy.elect(nodes)); + + assertTrue(nodes.isEmpty()); + } +} Added: branches/JBPAPP_5/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-quorum-electionpolicy-jboss-beans.xml =================================================================== --- branches/JBPAPP_5/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-quorum-electionpolicy-jboss-beans.xml (rev 0) +++ branches/JBPAPP_5/testsuite/src/resources/cluster/hasingleton/electionpolicy/ha-quorum-electionpolicy-jboss-beans.xml 2014-02-04 12:25:10 UTC (rev 114688) @@ -0,0 +1,377 @@ + + + + + + + + + + + @org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.examples:service=HASingletonQuorumMBeanExample_1", exposedInterface=org.jboss.ha.singleton.examples.HASingletonMBeanExampleMBean.class, registerDirectly=true) + + + + 1 + + + + + @org.jboss.aop.microcontainer.aspects.jmx.JMX(name="test:service=HASingletonQuorumController_1", exposedInterface=org.jboss.ha.singleton.HASingletonControllerMBean.class, registerDirectly=true) + + + + + + startSingleton + stopSingleton + true + + + + + @org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.examples:service=HASingletonQuorumMBeanExample_2", exposedInterface=org.jboss.ha.singleton.examples.HASingletonMBeanExampleMBean.class, registerDirectly=true) + + + + 2 + + + + + @org.jboss.aop.microcontainer.aspects.jmx.JMX(name="test:service=HASingletonQuorumController_2", exposedInterface=org.jboss.ha.singleton.HASingletonControllerMBean.class, registerDirectly=true) + + + + + + startSingleton + stopSingleton + true + + + + + @org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.examples:service=HASingletonQuorumMBeanExample_3", exposedInterface=org.jboss.ha.singleton.examples.HASingletonMBeanExampleMBean.class, registerDirectly=true) + + + + 3 + + + + + @org.jboss.aop.microcontainer.aspects.jmx.JMX(name="test:service=HASingletonQuorumController_3", exposedInterface=org.jboss.ha.singleton.HASingletonControllerMBean.class, registerDirectly=true) + + + + + + startSingleton + stopSingleton + true + + + + + @org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.examples:service=HASingletonQuorumMBeanExample_4", exposedInterface=org.jboss.ha.singleton.examples.HASingletonMBeanExampleMBean.class, registerDirectly=true) + + + + 1 + -1 + + + + + @org.jboss.aop.microcontainer.aspects.jmx.JMX(name="test:service=HASingletonQuorumController_4", exposedInterface=org.jboss.ha.singleton.HASingletonControllerMBean.class, registerDirectly=true) + + + + + + startSingleton + stopSingleton + true + + + + + @org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.examples:service=HASingletonQuorumMBeanExample_5", exposedInterface=org.jboss.ha.singleton.examples.HASingletonMBeanExampleMBean.class, registerDirectly=true) + + + + 2 + -1 + + + + + @org.jboss.aop.microcontainer.aspects.jmx.JMX(name="test:service=HASingletonQuorumController_5", exposedInterface=org.jboss.ha.singleton.HASingletonControllerMBean.class, registerDirectly=true) + + + + + + startSingleton + stopSingleton + true + + + + + @org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.examples:service=HASingletonQuorumMBeanExample_6", exposedInterface=org.jboss.ha.singleton.examples.HASingletonMBeanExampleMBean.class, registerDirectly=true) + + + + 3 + -1 + + + + + @org.jboss.aop.microcontainer.aspects.jmx.JMX(name="test:service=HASingletonQuorumController_6", exposedInterface=org.jboss.ha.singleton.HASingletonControllerMBean.class, registerDirectly=true) + + + + + + startSingleton + stopSingleton + true + + + + + + + + + test/cluster/hasingleton/quorum/simplepojo/1 + + + + + + + + + startSingleton + stopSingleton + + + + + test/cluster/hasingleton/quorum/simplepojo/2 + + + + + + + + + startSingleton + stopSingleton + + + + + test/cluster/hasingleton/quorum/simplepojo/3 + + + + + + + + + startSingleton + stopSingleton + + + + + test/cluster/hasingleton/quorum/simplepojo/4 + + + + + + + + + startSingleton + stopSingleton + + + + + test/cluster/hasingleton/quorum/simplepojo/5 + + + + + + + + + startSingleton + stopSingleton + + + + + test/cluster/hasingleton/quorum/simplepojo/6 + + + + + + + + + startSingleton + stopSingleton + + + + + + + + quorum-election-policy + + + + + + quorum-election-policy + + + + QuorumElectionPolicyCacheConfigSupply + + + + + + + + + ${jboss.default.jgroups.stack:udp} + + + REPEATABLE_READ + + + REPL_SYNC + + + false + + + 0 + + + 10 + + + QuorumElectionPolicyTestPartitionCache + + + true + + + 5000 + + + 20000 + + + 15000 + + true + + + + + + + + + + + quorum-election-policy + + + + + jboss:service=Naming + + @org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss:service=QuorumElectionPolicyTestPartition", exposedInterface=org.jboss.ha.framework.server.ClusterPartitionMBean.class) + + QuorumElectionPolicyCacheConfigSupply + + + + + + QuorumElectionPolicyTestPartition + + + ${jboss.bind.address} + + + 2000 + + + 5000 + + + + From jboss-cvs-commits at lists.jboss.org Wed Feb 5 08:56:45 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 5 Feb 2014 08:56:45 -0500 Subject: [jboss-cvs] JBossAS SVN: r114689 - in projects/security/security-spi/branches/Branch_2_0: acl and 6 other directories. Message-ID: <201402051356.s15DujAE010966@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek Date: 2014-02-05 08:56:45 -0500 (Wed, 05 Feb 2014) New Revision: 114689 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 release version 2.0.7.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-02-04 12:25:10 UTC (rev 114688) +++ projects/security/security-spi/branches/Branch_2_0/acl/pom.xml 2014-02-05 13:56:45 UTC (rev 114689) @@ -2,7 +2,7 @@ org.jboss.security jboss-security-spi-parent - 2.0.7-SNAPSHOT + 2.0.7.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-02-04 12:25:10 UTC (rev 114688) +++ projects/security/security-spi/branches/Branch_2_0/assembly/pom.xml 2014-02-05 13:56:45 UTC (rev 114689) @@ -2,7 +2,7 @@ org.jboss.security jboss-security-spi-parent - 2.0.7-SNAPSHOT + 2.0.7.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-02-04 12:25:10 UTC (rev 114688) +++ projects/security/security-spi/branches/Branch_2_0/authorization/pom.xml 2014-02-05 13:56:45 UTC (rev 114689) @@ -2,7 +2,7 @@ org.jboss.security jboss-security-spi-parent - 2.0.7-SNAPSHOT + 2.0.7.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-02-04 12:25:10 UTC (rev 114688) +++ projects/security/security-spi/branches/Branch_2_0/identity/pom.xml 2014-02-05 13:56:45 UTC (rev 114689) @@ -2,7 +2,7 @@ org.jboss.security jboss-security-spi-parent - 2.0.7-SNAPSHOT + 2.0.7.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-02-04 12:25:10 UTC (rev 114688) +++ projects/security/security-spi/branches/Branch_2_0/jboss-security-spi-as4/pom.xml 2014-02-05 13:56:45 UTC (rev 114689) @@ -2,7 +2,7 @@ org.jboss.security jboss-security-spi-parent - 2.0.7-SNAPSHOT + 2.0.7.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-02-04 12:25:10 UTC (rev 114688) +++ projects/security/security-spi/branches/Branch_2_0/parent/pom.xml 2014-02-05 13:56:45 UTC (rev 114689) @@ -8,7 +8,7 @@ org.jboss.security jboss-security-spi-parent pom - 2.0.7-SNAPSHOT + 2.0.7.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-02-04 12:25:10 UTC (rev 114688) +++ projects/security/security-spi/branches/Branch_2_0/pom.xml 2014-02-05 13:56:45 UTC (rev 114689) @@ -2,7 +2,7 @@ org.jboss.security jboss-security-spi-parent - 2.0.7-SNAPSHOT + 2.0.7.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-02-04 12:25:10 UTC (rev 114688) +++ projects/security/security-spi/branches/Branch_2_0/spi/pom.xml 2014-02-05 13:56:45 UTC (rev 114689) @@ -2,7 +2,7 @@ org.jboss.security jboss-security-spi-parent - 2.0.7-SNAPSHOT + 2.0.7.Final ../parent 4.0.0 From jboss-cvs-commits at lists.jboss.org Wed Feb 5 09:01:13 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 5 Feb 2014 09:01:13 -0500 Subject: [jboss-cvs] JBossAS SVN: r114690 - projects/security/security-spi/tags. Message-ID: <201402051401.s15E1DJq017429@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek Date: 2014-02-05 09:01:13 -0500 (Wed, 05 Feb 2014) New Revision: 114690 Added: projects/security/security-spi/tags/2.0.7.Final/ Log: tagging 2.0.7.Final From jboss-cvs-commits at lists.jboss.org Wed Feb 5 09:01:46 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 5 Feb 2014 09:01:46 -0500 Subject: [jboss-cvs] JBossAS SVN: r114691 - in projects/security/security-jboss-sx/branches/Branch_2_0: acl and 7 other directories. Message-ID: <201402051401.s15E1kbB017478@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek Date: 2014-02-05 09:01:45 -0500 (Wed, 05 Feb 2014) New Revision: 114691 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 release version 2.0.7.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-02-05 14:01:13 UTC (rev 114690) +++ projects/security/security-jboss-sx/branches/Branch_2_0/acl/pom.xml 2014-02-05 14:01:45 UTC (rev 114691) @@ -2,7 +2,7 @@ org.jboss.security jbosssx-parent - 2.0.7-SNAPSHOT + 2.0.7.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-02-05 14:01:13 UTC (rev 114690) +++ projects/security/security-jboss-sx/branches/Branch_2_0/assembly/pom.xml 2014-02-05 14:01:45 UTC (rev 114691) @@ -2,7 +2,7 @@ org.jboss.security jbosssx-parent - 2.0.7-SNAPSHOT + 2.0.7.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-02-05 14:01:13 UTC (rev 114690) +++ projects/security/security-jboss-sx/branches/Branch_2_0/identity/pom.xml 2014-02-05 14:01:45 UTC (rev 114691) @@ -2,7 +2,7 @@ org.jboss.security jbosssx-parent - 2.0.7-SNAPSHOT + 2.0.7.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-02-05 14:01:13 UTC (rev 114690) +++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx/pom.xml 2014-02-05 14:01:45 UTC (rev 114691) @@ -2,7 +2,7 @@ org.jboss.security jbosssx-parent - 2.0.7-SNAPSHOT + 2.0.7.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-02-05 14:01:13 UTC (rev 114690) +++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-bridge-as4/pom.xml 2014-02-05 14:01:45 UTC (rev 114691) @@ -2,7 +2,7 @@ org.jboss.security jbosssx-parent - 2.0.7-SNAPSHOT + 2.0.7.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-02-05 14:01:13 UTC (rev 114690) +++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-client/pom.xml 2014-02-05 14:01:45 UTC (rev 114691) @@ -7,7 +7,7 @@ 4.0.0 org.jboss.security jbosssx-client - 2.0.7-SNAPSHOT + 2.0.7.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-02-05 14:01:13 UTC (rev 114690) +++ projects/security/security-jboss-sx/branches/Branch_2_0/jbosssx-mc-int/pom.xml 2014-02-05 14:01:45 UTC (rev 114691) @@ -3,7 +3,7 @@ org.jboss.security jbosssx-parent - 2.0.7-SNAPSHOT + 2.0.7.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-02-05 14:01:13 UTC (rev 114690) +++ projects/security/security-jboss-sx/branches/Branch_2_0/parent/pom.xml 2014-02-05 14:01:45 UTC (rev 114691) @@ -8,7 +8,7 @@ org.jboss.security jbosssx-parent pom - 2.0.7-SNAPSHOT + 2.0.7.Final JBossSX - Parent http://labs.jboss.org/portal/jbosssecurity/ JBoss Security is a cross cutting project that handles security for the JEMS projects @@ -185,6 +185,6 @@ GA - 2.0.7-SNAPSHOT + 2.0.7.Final Modified: projects/security/security-jboss-sx/branches/Branch_2_0/pom.xml =================================================================== --- projects/security/security-jboss-sx/branches/Branch_2_0/pom.xml 2014-02-05 14:01:13 UTC (rev 114690) +++ projects/security/security-jboss-sx/branches/Branch_2_0/pom.xml 2014-02-05 14:01:45 UTC (rev 114691) @@ -7,7 +7,7 @@ 4.0.0 org.jboss.security jbosssx-pom - 2.0.7-SNAPSHOT + 2.0.7.Final pom JBoss Security Implementation for the JBAS - Parent http://labs.jboss.org/portal/jbosssecurity/ From jboss-cvs-commits at lists.jboss.org Wed Feb 5 09:08:58 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 5 Feb 2014 09:08:58 -0500 Subject: [jboss-cvs] JBossAS SVN: r114692 - projects/security/security-jboss-sx/tags. Message-ID: <201402051408.s15E8wgB017911@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek Date: 2014-02-05 09:08:58 -0500 (Wed, 05 Feb 2014) New Revision: 114692 Added: projects/security/security-jboss-sx/tags/2.0.7.Final/ Log: tagging 2.0.7.Final From jboss-cvs-commits at lists.jboss.org Wed Feb 5 09:20:45 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 5 Feb 2014 09:20:45 -0500 Subject: [jboss-cvs] JBossAS SVN: r114693 - branches/JBPAPP_5/component-matrix. Message-ID: <201402051420.s15EKjbh019263@svn01.web.mwc.hst.phx2.redhat.com> Author: pskopek Date: 2014-02-05 09:20:45 -0500 (Wed, 05 Feb 2014) New Revision: 114693 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: jboss security component upgrade: [SECURITY-782] Fixing {EXTC:timeout} detection problem. Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-02-05 14:08:58 UTC (rev 114692) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-02-05 14:20:45 UTC (rev 114693) @@ -86,7 +86,7 @@ 5.0.3.GA_CP02 2.0.4.GA 2.5.4.SP4_patch01 - 2.0.6.Final + 2.0.7.Final 2.0.6.Final 2.1.4.GA 1.0.6.FINAL From jboss-cvs-commits at lists.jboss.org Wed Feb 5 10:07:25 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 5 Feb 2014 10:07:25 -0500 Subject: [jboss-cvs] JBossAS SVN: r114694 - projects/jboss-aspects/tags. Message-ID: <201402051507.s15F7PsV030604@svn01.web.mwc.hst.phx2.redhat.com> Author: raggz Date: 2014-02-05 10:07:25 -0500 (Wed, 05 Feb 2014) New Revision: 114694 Added: projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.1.GA/ Log: New release 1.0.1.GA From jboss-cvs-commits at lists.jboss.org Wed Feb 5 18:28:23 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 5 Feb 2014 18:28:23 -0500 Subject: [jboss-cvs] JBossAS SVN: r114695 - projects/jboss-aspects/trunk/transaction. Message-ID: <201402052328.s15NSNSj004812@svn01.web.mwc.hst.phx2.redhat.com> Author: ALRubinger Date: 2014-02-05 18:28:23 -0500 (Wed, 05 Feb 2014) New Revision: 114695 Modified: projects/jboss-aspects/trunk/transaction/pom.xml Log: [JBASPECT-40] Bump version to 1.0.2.GA Modified: projects/jboss-aspects/trunk/transaction/pom.xml =================================================================== --- projects/jboss-aspects/trunk/transaction/pom.xml 2014-02-05 15:07:25 UTC (rev 114694) +++ projects/jboss-aspects/trunk/transaction/pom.xml 2014-02-05 23:28:23 UTC (rev 114695) @@ -7,7 +7,7 @@ 4.0.0 jboss-transaction-aspects - 1.0.1-SNAPSHOT + 1.0.2.GA jar JBoss Transaction Aspects http://www.jboss.org/jbossas/ From jboss-cvs-commits at lists.jboss.org Wed Feb 5 18:33:00 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 5 Feb 2014 18:33:00 -0500 Subject: [jboss-cvs] JBossAS SVN: r114696 - projects/jboss-aspects/trunk/transaction. Message-ID: <201402052333.s15NX0aV005330@svn01.web.mwc.hst.phx2.redhat.com> Author: ALRubinger Date: 2014-02-05 18:32:59 -0500 (Wed, 05 Feb 2014) New Revision: 114696 Modified: projects/jboss-aspects/trunk/transaction/pom.xml Log: [JBASPECT-40] Bump to new development version Modified: projects/jboss-aspects/trunk/transaction/pom.xml =================================================================== --- projects/jboss-aspects/trunk/transaction/pom.xml 2014-02-05 23:28:23 UTC (rev 114695) +++ projects/jboss-aspects/trunk/transaction/pom.xml 2014-02-05 23:32:59 UTC (rev 114696) @@ -7,7 +7,7 @@ 4.0.0 jboss-transaction-aspects - 1.0.2.GA + 1.0.3-SNAPSHOT jar JBoss Transaction Aspects http://www.jboss.org/jbossas/ From jboss-cvs-commits at lists.jboss.org Wed Feb 5 18:39:48 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 5 Feb 2014 18:39:48 -0500 Subject: [jboss-cvs] JBossAS SVN: r114697 - projects/jboss-aspects/trunk/transaction. Message-ID: <201402052339.s15Ndmfn005758@svn01.web.mwc.hst.phx2.redhat.com> Author: ALRubinger Date: 2014-02-05 18:39:48 -0500 (Wed, 05 Feb 2014) New Revision: 114697 Modified: projects/jboss-aspects/trunk/transaction/pom.xml Log: [JBASPECT-40] Bump version to 1.0.2.GA Modified: projects/jboss-aspects/trunk/transaction/pom.xml =================================================================== --- projects/jboss-aspects/trunk/transaction/pom.xml 2014-02-05 23:32:59 UTC (rev 114696) +++ projects/jboss-aspects/trunk/transaction/pom.xml 2014-02-05 23:39:48 UTC (rev 114697) @@ -7,7 +7,7 @@ 4.0.0 jboss-transaction-aspects - 1.0.3-SNAPSHOT + 1.0.2.GA jar JBoss Transaction Aspects http://www.jboss.org/jbossas/ From jboss-cvs-commits at lists.jboss.org Wed Feb 5 18:40:54 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 5 Feb 2014 18:40:54 -0500 Subject: [jboss-cvs] JBossAS SVN: r114698 - projects/jboss-aspects/tags. Message-ID: <201402052340.s15NesAS006203@svn01.web.mwc.hst.phx2.redhat.com> Author: ALRubinger Date: 2014-02-05 18:40:53 -0500 (Wed, 05 Feb 2014) New Revision: 114698 Added: projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.2.GA/ Log: [JBASPECT-40] Tag 1.0.2.GA From jboss-cvs-commits at lists.jboss.org Wed Feb 5 22:47:10 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 5 Feb 2014 22:47:10 -0500 Subject: [jboss-cvs] JBossAS SVN: r114699 - branches/JBPAPP_5/component-matrix. Message-ID: <201402060347.s163lAk5025074@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-02-05 22:47:09 -0500 (Wed, 05 Feb 2014) New Revision: 114699 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: JBPAPP-10897 Upgrade JBoss Security to 2.0.7 Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-02-05 23:40:53 UTC (rev 114698) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-02-06 03:47:09 UTC (rev 114699) @@ -87,7 +87,7 @@ 2.0.4.GA 2.5.4.SP4_patch01 2.0.7.Final - 2.0.6.Final + 2.0.7.Final 2.1.4.GA 1.0.6.FINAL 1.0.2.GA_CP03 From jboss-cvs-commits at lists.jboss.org Thu Feb 6 03:23:12 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 6 Feb 2014 03:23:12 -0500 Subject: [jboss-cvs] JBossAS SVN: r114700 - projects/jboss-aspects/trunk/transaction. Message-ID: <201402060823.s168NCd2021070@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-02-06 03:23:12 -0500 (Thu, 06 Feb 2014) New Revision: 114700 Modified: projects/jboss-aspects/trunk/transaction/pom.xml Log: JBASPECT-40: Revert to 80814 Modified: projects/jboss-aspects/trunk/transaction/pom.xml =================================================================== --- projects/jboss-aspects/trunk/transaction/pom.xml 2014-02-06 03:47:09 UTC (rev 114699) +++ projects/jboss-aspects/trunk/transaction/pom.xml 2014-02-06 08:23:12 UTC (rev 114700) @@ -7,7 +7,7 @@ 4.0.0 jboss-transaction-aspects - 1.0.2.GA + 1.0.1-SNAPSHOT jar JBoss Transaction Aspects http://www.jboss.org/jbossas/ From jboss-cvs-commits at lists.jboss.org Thu Feb 6 03:29:50 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 6 Feb 2014 03:29:50 -0500 Subject: [jboss-cvs] JBossAS SVN: r114701 - projects/jboss-aspects/trunk/transaction. Message-ID: <201402060829.s168TobT022156@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-02-06 03:29:49 -0500 (Thu, 06 Feb 2014) New Revision: 114701 Modified: projects/jboss-aspects/trunk/transaction/pom.xml Log: [maven-release-plugin] prepare release jboss-transaction-aspects-1.0.3.GA Modified: projects/jboss-aspects/trunk/transaction/pom.xml =================================================================== --- projects/jboss-aspects/trunk/transaction/pom.xml 2014-02-06 08:23:12 UTC (rev 114700) +++ projects/jboss-aspects/trunk/transaction/pom.xml 2014-02-06 08:29:49 UTC (rev 114701) @@ -7,7 +7,7 @@ 4.0.0 jboss-transaction-aspects - 1.0.1-SNAPSHOT + 1.0.3.GA jar JBoss Transaction Aspects http://www.jboss.org/jbossas/ @@ -73,4 +73,10 @@ + + + scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.3.GA + scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.3.GA + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.3.GA + From jboss-cvs-commits at lists.jboss.org Thu Feb 6 03:29:57 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 6 Feb 2014 03:29:57 -0500 Subject: [jboss-cvs] JBossAS SVN: r114702 - in projects/jboss-aspects/tags: jboss-transaction-aspects-1.0.3.GA and 1 other directory. Message-ID: <201402060829.s168TvCE022174@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-02-06 03:29:57 -0500 (Thu, 06 Feb 2014) New Revision: 114702 Added: projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.3.GA/ projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.3.GA/pom.xml Removed: projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.3.GA/pom.xml Log: [maven-release-plugin] copy for tag jboss-transaction-aspects-1.0.3.GA Deleted: projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.3.GA/pom.xml =================================================================== --- projects/jboss-aspects/trunk/transaction/pom.xml 2014-02-06 03:47:09 UTC (rev 114699) +++ projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.3.GA/pom.xml 2014-02-06 08:29:57 UTC (rev 114702) @@ -1,76 +0,0 @@ - - - org.jboss.aspects - jboss-aspects-build - 1.0.1.CR5 - ../build - - 4.0.0 - jboss-transaction-aspects - 1.0.2.GA - jar - JBoss Transaction Aspects - http://www.jboss.org/jbossas/ - JBoss Transaction Aspects - - - - src/resources/main - - - - - src/resources/tests - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - - - - - - org.jboss - jboss-common-core - - - - org.jboss.logging - jboss-logging-spi - - - - org.jboss.aop - jboss-aop - - - - org.jboss.javaee - jboss-transaction-api - - - - org.jboss.integration - jboss-transaction-spi - - - - - - Copied: projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.3.GA/pom.xml (from rev 114701, projects/jboss-aspects/trunk/transaction/pom.xml) =================================================================== --- projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.3.GA/pom.xml (rev 0) +++ projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.3.GA/pom.xml 2014-02-06 08:29:57 UTC (rev 114702) @@ -0,0 +1,82 @@ + + + org.jboss.aspects + jboss-aspects-build + 1.0.1.CR5 + ../build + + 4.0.0 + jboss-transaction-aspects + 1.0.3.GA + jar + JBoss Transaction Aspects + http://www.jboss.org/jbossas/ + JBoss Transaction Aspects + + + + src/resources/main + + + + + src/resources/tests + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + + + + + + org.jboss + jboss-common-core + + + + org.jboss.logging + jboss-logging-spi + + + + org.jboss.aop + jboss-aop + + + + org.jboss.javaee + jboss-transaction-api + + + + org.jboss.integration + jboss-transaction-spi + + + + + + + + scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.3.GA + scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.3.GA + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.3.GA + + From jboss-cvs-commits at lists.jboss.org Thu Feb 6 03:30:00 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 6 Feb 2014 03:30:00 -0500 Subject: [jboss-cvs] JBossAS SVN: r114703 - projects/jboss-aspects/trunk/transaction. Message-ID: <201402060830.s168U0h2022192@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-02-06 03:30:00 -0500 (Thu, 06 Feb 2014) New Revision: 114703 Modified: projects/jboss-aspects/trunk/transaction/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: projects/jboss-aspects/trunk/transaction/pom.xml =================================================================== --- projects/jboss-aspects/trunk/transaction/pom.xml 2014-02-06 08:29:57 UTC (rev 114702) +++ projects/jboss-aspects/trunk/transaction/pom.xml 2014-02-06 08:30:00 UTC (rev 114703) @@ -7,7 +7,7 @@ 4.0.0 jboss-transaction-aspects - 1.0.3.GA + 1.0.4-SNAPSHOT jar JBoss Transaction Aspects http://www.jboss.org/jbossas/ @@ -73,10 +73,4 @@ - - - scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.3.GA - scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.3.GA - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.3.GA - From jboss-cvs-commits at lists.jboss.org Thu Feb 6 03:44:15 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 6 Feb 2014 03:44:15 -0500 Subject: [jboss-cvs] JBossAS SVN: r114704 - projects/jboss-aspects/trunk/transaction. Message-ID: <201402060844.s168iF2I023608@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-02-06 03:44:14 -0500 (Thu, 06 Feb 2014) New Revision: 114704 Modified: projects/jboss-aspects/trunk/transaction/pom.xml Log: JBASPECT-40: upgrade to build-1.0.2-1 Modified: projects/jboss-aspects/trunk/transaction/pom.xml =================================================================== --- projects/jboss-aspects/trunk/transaction/pom.xml 2014-02-06 08:30:00 UTC (rev 114703) +++ projects/jboss-aspects/trunk/transaction/pom.xml 2014-02-06 08:44:14 UTC (rev 114704) @@ -2,7 +2,7 @@ org.jboss.aspects jboss-aspects-build - 1.0.1.CR5 + 1.0.2-1 ../build 4.0.0 From jboss-cvs-commits at lists.jboss.org Thu Feb 6 03:45:27 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 6 Feb 2014 03:45:27 -0500 Subject: [jboss-cvs] JBossAS SVN: r114705 - projects/jboss-aspects/trunk/transaction. Message-ID: <201402060845.s168jRw3023990@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-02-06 03:45:27 -0500 (Thu, 06 Feb 2014) New Revision: 114705 Modified: projects/jboss-aspects/trunk/transaction/pom.xml Log: [maven-release-plugin] prepare release jboss-transaction-aspects-1.0.4.GA Modified: projects/jboss-aspects/trunk/transaction/pom.xml =================================================================== --- projects/jboss-aspects/trunk/transaction/pom.xml 2014-02-06 08:44:14 UTC (rev 114704) +++ projects/jboss-aspects/trunk/transaction/pom.xml 2014-02-06 08:45:27 UTC (rev 114705) @@ -7,7 +7,7 @@ 4.0.0 jboss-transaction-aspects - 1.0.4-SNAPSHOT + 1.0.4.GA jar JBoss Transaction Aspects http://www.jboss.org/jbossas/ @@ -73,4 +73,10 @@ + + + scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.4.GA + scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.4.GA + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.4.GA + From jboss-cvs-commits at lists.jboss.org Thu Feb 6 03:45:35 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 6 Feb 2014 03:45:35 -0500 Subject: [jboss-cvs] JBossAS SVN: r114706 - in projects/jboss-aspects/tags: jboss-transaction-aspects-1.0.4.GA and 1 other directory. Message-ID: <201402060845.s168jZn1024013@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-02-06 03:45:34 -0500 (Thu, 06 Feb 2014) New Revision: 114706 Added: projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.4.GA/ projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.4.GA/pom.xml Removed: projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.4.GA/pom.xml Log: [maven-release-plugin] copy for tag jboss-transaction-aspects-1.0.4.GA Deleted: projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.4.GA/pom.xml =================================================================== --- projects/jboss-aspects/trunk/transaction/pom.xml 2014-02-06 03:47:09 UTC (rev 114699) +++ projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.4.GA/pom.xml 2014-02-06 08:45:34 UTC (rev 114706) @@ -1,76 +0,0 @@ - - - org.jboss.aspects - jboss-aspects-build - 1.0.1.CR5 - ../build - - 4.0.0 - jboss-transaction-aspects - 1.0.2.GA - jar - JBoss Transaction Aspects - http://www.jboss.org/jbossas/ - JBoss Transaction Aspects - - - - src/resources/main - - - - - src/resources/tests - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - test-jar - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - - - - - - - org.jboss - jboss-common-core - - - - org.jboss.logging - jboss-logging-spi - - - - org.jboss.aop - jboss-aop - - - - org.jboss.javaee - jboss-transaction-api - - - - org.jboss.integration - jboss-transaction-spi - - - - - - Copied: projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.4.GA/pom.xml (from rev 114705, projects/jboss-aspects/trunk/transaction/pom.xml) =================================================================== --- projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.4.GA/pom.xml (rev 0) +++ projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.4.GA/pom.xml 2014-02-06 08:45:34 UTC (rev 114706) @@ -0,0 +1,82 @@ + + + org.jboss.aspects + jboss-aspects-build + 1.0.2-1 + ../build + + 4.0.0 + jboss-transaction-aspects + 1.0.4.GA + jar + JBoss Transaction Aspects + http://www.jboss.org/jbossas/ + JBoss Transaction Aspects + + + + src/resources/main + + + + + src/resources/tests + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + test-jar + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + + + + + + + org.jboss + jboss-common-core + + + + org.jboss.logging + jboss-logging-spi + + + + org.jboss.aop + jboss-aop + + + + org.jboss.javaee + jboss-transaction-api + + + + org.jboss.integration + jboss-transaction-spi + + + + + + + + scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.4.GA + scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.4.GA + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.4.GA + + From jboss-cvs-commits at lists.jboss.org Thu Feb 6 03:45:38 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 6 Feb 2014 03:45:38 -0500 Subject: [jboss-cvs] JBossAS SVN: r114707 - projects/jboss-aspects/trunk/transaction. Message-ID: <201402060845.s168jcpU024031@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-02-06 03:45:38 -0500 (Thu, 06 Feb 2014) New Revision: 114707 Modified: projects/jboss-aspects/trunk/transaction/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: projects/jboss-aspects/trunk/transaction/pom.xml =================================================================== --- projects/jboss-aspects/trunk/transaction/pom.xml 2014-02-06 08:45:34 UTC (rev 114706) +++ projects/jboss-aspects/trunk/transaction/pom.xml 2014-02-06 08:45:38 UTC (rev 114707) @@ -7,7 +7,7 @@ 4.0.0 jboss-transaction-aspects - 1.0.4.GA + 1.0.5-SNAPSHOT jar JBoss Transaction Aspects http://www.jboss.org/jbossas/ @@ -73,10 +73,4 @@ - - - scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.4.GA - scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.4.GA - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/jbossas/projects/jboss-aspects/tags/jboss-transaction-aspects-1.0.4.GA - From jboss-cvs-commits at lists.jboss.org Thu Feb 6 08:35:13 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 6 Feb 2014 08:35:13 -0500 Subject: [jboss-cvs] JBossAS SVN: r114708 - branches/JBPAPP_5/component-matrix. Message-ID: <201402061335.s16DZDqr022363@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-02-06 08:35:13 -0500 (Thu, 06 Feb 2014) New Revision: 114708 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: JBPAPP-10982 Upgrade transactional aspects to 1.0.4.GA Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-02-06 08:45:38 UTC (rev 114707) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-02-06 13:35:13 UTC (rev 114708) @@ -61,7 +61,7 @@ 1.0.3 1.0.0.GA 1.0.2 - 1.0.0.GA + 1.0.4.GA 3.2.11.GA 3.0.1.GA 2.0.12.GA From jboss-cvs-commits at lists.jboss.org Thu Feb 6 12:20:51 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 6 Feb 2014 12:20:51 -0500 Subject: [jboss-cvs] JBossAS SVN: r114709 - in branches/JBPAPP_5/testsuite: src/main/org/jboss/test/web/test and 2 other directories. Message-ID: <201402061720.s16HKpHd006303@svn01.web.mwc.hst.phx2.redhat.com> Author: rhatlapa Date: 2014-02-06 12:20:51 -0500 (Thu, 06 Feb 2014) New Revision: 114709 Added: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/web/test/PageContextTestCase.java branches/JBPAPP_5/testsuite/src/resources/web/page-context/ branches/JBPAPP_5/testsuite/src/resources/web/page-context/invalidate-context.jsp branches/JBPAPP_5/testsuite/src/resources/web/page-context/web.xml Modified: branches/JBPAPP_5/testsuite/imports/sections/web.xml Log: Test for PageContext invalidation JBWEB-284 (JBPAPP-10891) Modified: branches/JBPAPP_5/testsuite/imports/sections/web.xml =================================================================== --- branches/JBPAPP_5/testsuite/imports/sections/web.xml 2014-02-06 13:35:13 UTC (rev 114708) +++ branches/JBPAPP_5/testsuite/imports/sections/web.xml 2014-02-06 17:20:51 UTC (rev 114709) @@ -980,5 +980,14 @@ + + + + + + + + Added: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/web/test/PageContextTestCase.java =================================================================== --- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/web/test/PageContextTestCase.java (rev 0) +++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/web/test/PageContextTestCase.java 2014-02-06 17:20:51 UTC (rev 114709) @@ -0,0 +1,89 @@ +/* + * 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. + * + * 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.web.test; + +import java.net.URL; + +import junit.framework.Test; + +import junit.framework.TestSuite; + +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.HttpMethodBase; +import org.apache.commons.httpclient.methods.GetMethod; +import org.jboss.test.JBossTestCase; +import org.jboss.test.JBossTestSetup; +import org.jboss.test.util.web.HttpUtils; +/** + * @author rhatlapa at redhat.com + */ +public class PageContextTestCase extends JBossTestCase +{ + public PageContextTestCase(String name) + { + super(name); + } + + + public static Test suite() throws Exception + { + TestSuite suite = new TestSuite(); + suite.addTest(new TestSuite(PageContextTestCase.class)); + + // Create an initializer for the test suite + Test wrapper = new JBossTestSetup(suite) + { + protected void setUp() throws Exception + { + super.setUp(); + deploy("page-context.war"); + } + protected void tearDown() throws Exception + { + undeploy("page-context.war"); + super.tearDown(); + } + }; + return wrapper; + + } + + + /** + * Test a jsp page that checks whether page context is properly destroyed and put to appripriate state + * see: JBWEB-284 one-off: PageContextImpl.doFindAttribute can improperly throw IllegalStateException + */ + public void testActiveRequestCaching() throws Exception + { + URL url = new URL(HttpUtils.getBaseURL() + "page-context/invalidate-context.jsp"); + HttpClient client = new HttpClient(); + HttpMethodBase request = new GetMethod(url.toString()); + client.executeMethod(request); + + String response = request.getResponseBodyAsString(); + if (response == null) + { + throw new Exception("Unable to get response from server."); + } + assertTrue("Response expected to contain String 'PASSED, page contains: " + response, response.contains("PASSED")); + } +} \ No newline at end of file Property changes on: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/web/test/PageContextTestCase.java ___________________________________________________________________ Added: svn:keywords + Date LastChangedDate Revision LastChangedRevision Rev Author LastChangedBy HeadURL URL Id Added: svn:eol-style + native Added: branches/JBPAPP_5/testsuite/src/resources/web/page-context/invalidate-context.jsp =================================================================== --- branches/JBPAPP_5/testsuite/src/resources/web/page-context/invalidate-context.jsp (rev 0) +++ branches/JBPAPP_5/testsuite/src/resources/web/page-context/invalidate-context.jsp 2014-02-06 17:20:51 UTC (rev 114709) @@ -0,0 +1,18 @@ +<% + session.setAttribute("foo", "foovalue"); + out.print("Before invalidating session value of attribute foo: " + pageContext.findAttribute("foo") + "
"); + session.invalidate(); + Object obj = null; + try { + obj = pageContext.findAttribute("foo"); + out.print("After invalidating sesssion value of attribute foo: " + obj + "
"); + if (obj == null) { + out.print("PASSED Session correctly invalidated => Issue with PageContextImpl.doFindAttribute is fixed"); + } else { + out.print("FAILED Session wasn't correctly invalidated, attribute should be null"); + } + } catch (Exception ex) { + out.print("FAILED Issue with PageContextImplDoFindAttribute is not fixed (unexpected exception detected): " + ex.toString()); + + } +%> Added: branches/JBPAPP_5/testsuite/src/resources/web/page-context/web.xml =================================================================== --- branches/JBPAPP_5/testsuite/src/resources/web/page-context/web.xml (rev 0) +++ branches/JBPAPP_5/testsuite/src/resources/web/page-context/web.xml 2014-02-06 17:20:51 UTC (rev 114709) @@ -0,0 +1,7 @@ + + + + Property changes on: branches/JBPAPP_5/testsuite/src/resources/web/page-context/web.xml ___________________________________________________________________ Added: svn:mime-type + text/xml Added: svn:keywords + Date LastChangedDate Revision LastChangedRevision Rev Author LastChangedBy HeadURL URL Id Added: svn:eol-style + native From jboss-cvs-commits at lists.jboss.org Mon Feb 10 13:29:46 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 10 Feb 2014 13:29:46 -0500 Subject: [jboss-cvs] JBossAS SVN: r114710 - in branches/JBPAPP_5: security/src and 3 other directories. Message-ID: <201402101829.s1AITkD0031663@svn01.web.mwc.hst.phx2.redhat.com> Author: sguilhen at redhat.com Date: 2014-02-10 13:29:46 -0500 (Mon, 10 Feb 2014) New Revision: 114710 Added: branches/JBPAPP_5/security/src/main/org/jboss/security/auth/AuthenticationTimedCachePolicyFactory.java branches/JBPAPP_5/security/src/main/org/jboss/security/auth/CachePolicyFactory.java branches/JBPAPP_5/security/src/main/org/jboss/security/auth/NullCachePolicyFactory.java Modified: branches/JBPAPP_5/ branches/JBPAPP_5/security/src/ branches/JBPAPP_5/security/src/main/org/jboss/security/integration/JNDIBasedSecurityManagement.java branches/JBPAPP_5/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java Log: JBPAPP-5378 Add a CachePolicyFactory that can be injected into JNDIBasedSecurityManagement Property changes on: branches/JBPAPP_5 ___________________________________________________________________ Added: svn:global-ignores + *.iml Property changes on: branches/JBPAPP_5/security/src ___________________________________________________________________ Added: svn:ignore + *.iml Added: branches/JBPAPP_5/security/src/main/org/jboss/security/auth/AuthenticationTimedCachePolicyFactory.java =================================================================== --- branches/JBPAPP_5/security/src/main/org/jboss/security/auth/AuthenticationTimedCachePolicyFactory.java (rev 0) +++ branches/JBPAPP_5/security/src/main/org/jboss/security/auth/AuthenticationTimedCachePolicyFactory.java 2014-02-10 18:29:46 UTC (rev 114710) @@ -0,0 +1,17 @@ +package org.jboss.security.auth; + +import org.jboss.util.CachePolicy; +import org.jboss.util.TimedCachePolicy; + +import java.io.Serializable; + +public class AuthenticationTimedCachePolicyFactory implements CachePolicyFactory, Serializable { + + public CachePolicy createCachePolicy(final String securityDomain, final int defaultCacheTimeout, final int defaultCacheResolution) { + final TimedCachePolicy cachePolicy = + new AuthenticationTimedCachePolicy(defaultCacheTimeout, true, defaultCacheResolution); + cachePolicy.create(); + cachePolicy.start(); + return cachePolicy; + } +} Added: branches/JBPAPP_5/security/src/main/org/jboss/security/auth/CachePolicyFactory.java =================================================================== --- branches/JBPAPP_5/security/src/main/org/jboss/security/auth/CachePolicyFactory.java (rev 0) +++ branches/JBPAPP_5/security/src/main/org/jboss/security/auth/CachePolicyFactory.java 2014-02-10 18:29:46 UTC (rev 114710) @@ -0,0 +1,13 @@ +package org.jboss.security.auth; + +import org.jboss.util.CachePolicy; + +/** + *

+ * Interface that must be implemented by factories of {@code CachePolicy} objects. + *

+ */ +public interface CachePolicyFactory { + + CachePolicy createCachePolicy(final String securityDomain, final int defaultCacheTimeout, final int defaultCacheResolution); +} Added: branches/JBPAPP_5/security/src/main/org/jboss/security/auth/NullCachePolicyFactory.java =================================================================== --- branches/JBPAPP_5/security/src/main/org/jboss/security/auth/NullCachePolicyFactory.java (rev 0) +++ branches/JBPAPP_5/security/src/main/org/jboss/security/auth/NullCachePolicyFactory.java 2014-02-10 18:29:46 UTC (rev 114710) @@ -0,0 +1,18 @@ +package org.jboss.security.auth; + +import org.jboss.util.CachePolicy; + +import java.io.Serializable; + +/** + *

+ * A {@link org.jboss.security.auth.CachePolicyFactory} implementation that returns {@code null} policies. This can be + * used to disable the security cache. + *

+ */ +public class NullCachePolicyFactory implements CachePolicyFactory, Serializable { + + public CachePolicy createCachePolicy(final String securityDomain, final int defaultCacheTimeout, final int defaultCacheResolution) { + return null; + } +} Modified: branches/JBPAPP_5/security/src/main/org/jboss/security/integration/JNDIBasedSecurityManagement.java =================================================================== --- branches/JBPAPP_5/security/src/main/org/jboss/security/integration/JNDIBasedSecurityManagement.java 2014-02-06 17:20:51 UTC (rev 114709) +++ branches/JBPAPP_5/security/src/main/org/jboss/security/integration/JNDIBasedSecurityManagement.java 2014-02-10 18:29:46 UTC (rev 114710) @@ -45,6 +45,8 @@ import org.jboss.security.audit.AuditManager; import org.jboss.security.auth.AuthenticationCacheFlushThread; import org.jboss.security.auth.AuthenticationTimedCachePolicy; +import org.jboss.security.auth.AuthenticationTimedCachePolicyFactory; +import org.jboss.security.auth.CachePolicyFactory; import org.jboss.security.auth.callback.JBossCallbackHandler; import org.jboss.security.config.SecurityConfiguration; import org.jboss.security.identitytrust.IdentityTrustManager; @@ -93,6 +95,7 @@ protected boolean enableAudit = true; private CachePolicy cachePolicy = null; + private CachePolicyFactory cachePolicyFactory = new AuthenticationTimedCachePolicyFactory(); private transient ConcurrentHashMap authMgrMap = null; private transient ConcurrentHashMap authzMgrMap = null; @@ -283,7 +286,12 @@ public void setCachePolicy(CachePolicy cp) { this.cachePolicy = cp; - } + } + + public void setCachePolicyFactory(CachePolicyFactory factory) + { + this.cachePolicyFactory = factory; + } public void setBaseContext(String ctx) { @@ -367,7 +375,8 @@ { log.debug("Creating SDC for domain="+securityDomain); AuthenticationManager am = createAuthenticationManager(securityDomain); - CachePolicy cache = createDefaultCachePolicy(); + CachePolicy cache = this.cachePolicyFactory.createCachePolicy(securityDomain, SecurityConstantsBridge.defaultCacheTimeout, + SecurityConstantsBridge.defaultCacheResolution); //Set security cache if the auth manager implementation supports it setSecurityDomainCache(am, cache); //Set DeepCopySubject option if supported @@ -389,7 +398,6 @@ * Legacy registration of JaasSecurityDomain instance with the JNDI * Object Factory internal hashmap * @param domain - * @param jsd * @throws Exception */ @ManagementOperation(description = "Register the specified security domain", @@ -397,15 +405,17 @@ public void registerJaasSecurityDomainInstance(JaasSecurityDomain domain) throws Exception { String domainName = domain.getSecurityDomain(); - SecurityDomainContext sdc = (SecurityDomainContext) securityMgrMap.get(domainName); + SecurityDomainContext sdc = securityMgrMap.get(domainName); if(sdc != null) { sdc.setAuthenticationManager(domain); + setSecurityDomainCache(domain, sdc.getAuthenticationCache()); } else { sdc = createSecurityDomainContext(domainName); sdc.setAuthenticationManager(domain); + setSecurityDomainCache(domain, sdc.getAuthenticationCache()); } securityMgrMap.put(domainName, sdc); } @@ -414,7 +424,6 @@ * Legacy deregistration of JaasSecurityDomain instance with the JNDI * Object Factory internal hashmap * @param securityDomain - * @param jsd * @throws Exception */ @ManagementOperation(description = "Deregister the specified security domain", @@ -519,7 +528,6 @@ /** Use reflection to attempt to set the authentication cache on the * securityMgr argument. * @param securityMgr the security manager - * @param cachePolicy the cache policy implementation */ private static void setDeepCopySubjectMode(AuthenticationManager securityMgr) { @@ -539,21 +547,6 @@ } /** - * Create a Default Cache Policy - * @return - */ - private CachePolicy createDefaultCachePolicy() - { - TimedCachePolicy cachePolicy = - new AuthenticationTimedCachePolicy(SecurityConstantsBridge.defaultCacheTimeout, - true, - SecurityConstantsBridge.defaultCacheResolution); - cachePolicy.create(); - cachePolicy.start(); - return cachePolicy; - } - - /** * Since the maps are transient, initialize them */ private void initialize() Modified: branches/JBPAPP_5/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java =================================================================== --- branches/JBPAPP_5/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java 2014-02-06 17:20:51 UTC (rev 114709) +++ branches/JBPAPP_5/security/src/main/org/jboss/security/plugins/JaasSecurityManagerService.java 2014-02-10 18:29:46 UTC (rev 114710) @@ -554,13 +554,15 @@ */ public synchronized void registerSecurityDomain(String securityDomain, SecurityDomain instance) { - log.debug("Added "+securityDomain+", "+instance+" to map"); - CachePolicy authCache = lookupCachePolicy(securityDomain); - - SecurityDomainContext sdc = new SecurityDomainContext(instance, authCache); - securityDomainCtxMap.put(securityDomain, sdc); - // See if the security mgr supports an externalized cache policy - setSecurityDomainCache(instance, authCache); + log.debug("Adding "+securityDomain+", "+instance+" to map"); + try + { + securityManagement.registerJaasSecurityDomainInstance((JaasSecurityDomain) instance); + } + catch (Exception e) + { + log.warn("Failed to register security domain", e); + } } /** Access the CachePolicy for the securityDomain. From jboss-cvs-commits at lists.jboss.org Tue Feb 11 11:43:37 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 11 Feb 2014 11:43:37 -0500 Subject: [jboss-cvs] JBossAS SVN: r114711 - in branches/JBPAPP_5/testsuite: imports/sections and 8 other directories. Message-ID: <201402111643.s1BGhb5I019329@svn01.web.mwc.hst.phx2.redhat.com> Author: istudens at redhat.com Date: 2014-02-11 11:43:37 -0500 (Tue, 11 Feb 2014) New Revision: 114711 Added: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/web/servlets/SendFileServlet.java branches/JBPAPP_5/testsuite/src/main/org/jboss/test/web/test/SendFileUnitTestCase.java branches/JBPAPP_5/testsuite/src/resources/test-configs/secmgr/ branches/JBPAPP_5/testsuite/src/resources/test-configs/secmgr/deploy/ branches/JBPAPP_5/testsuite/src/resources/test-configs/secmgr/deploy/jbossweb.sar/ branches/JBPAPP_5/testsuite/src/resources/test-configs/secmgr/deploy/jbossweb.sar/server.xml branches/JBPAPP_5/testsuite/src/resources/web/sendfile/ branches/JBPAPP_5/testsuite/src/resources/web/sendfile/web.xml Modified: branches/JBPAPP_5/testsuite/build.xml branches/JBPAPP_5/testsuite/imports/sections/web.xml Log: adding a test-case for JBPAPP-10023 Modified: branches/JBPAPP_5/testsuite/build.xml =================================================================== --- branches/JBPAPP_5/testsuite/build.xml 2014-02-10 18:29:46 UTC (rev 114710) +++ branches/JBPAPP_5/testsuite/build.xml 2014-02-11 16:43:37 UTC (rev 114711) @@ -1377,6 +1377,7 @@ + Modified: branches/JBPAPP_5/testsuite/imports/sections/web.xml =================================================================== --- branches/JBPAPP_5/testsuite/imports/sections/web.xml 2014-02-10 18:29:46 UTC (rev 114710) +++ branches/JBPAPP_5/testsuite/imports/sections/web.xml 2014-02-11 16:43:37 UTC (rev 114711) @@ -988,6 +988,13 @@ + + + + + + Added: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/web/servlets/SendFileServlet.java =================================================================== --- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/web/servlets/SendFileServlet.java (rev 0) +++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/web/servlets/SendFileServlet.java 2014-02-11 16:43:37 UTC (rev 114711) @@ -0,0 +1,59 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, 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. + * + * 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.web.servlets; + +import org.jboss.logging.Logger; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.Writer; + +/** + * It is for testing the security of org.apache.tomcat.sendfile function. + * It tries to read /etc/passwd file. + * + * @author istudens at redhat.com + * @version $Revision: 81036 $ + */ +public class SendFileServlet extends HttpServlet +{ + static Logger log = Logger.getLogger(SendFileServlet.class); + + private static final long serialVersionUID = 1L; + + @Override + public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + doPost(request, response); + } + + @Override + public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + Writer writer = response.getWriter(); + request.setAttribute("org.apache.tomcat.sendfile.filename","/etc/passwd"); + request.setAttribute("org.apache.tomcat.sendfile.start",Long.valueOf(0)); + request.setAttribute("org.apache.tomcat.sendfile.end",Long.valueOf(99999999)); + writer.write("CVE-2011-2526: You are not affected!"); + } +} Added: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/web/test/SendFileUnitTestCase.java =================================================================== --- branches/JBPAPP_5/testsuite/src/main/org/jboss/test/web/test/SendFileUnitTestCase.java (rev 0) +++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/web/test/SendFileUnitTestCase.java 2014-02-11 16:43:37 UTC (rev 114711) @@ -0,0 +1,79 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2014, 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. + * + * 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.web.test; + +import junit.framework.Test; +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.HttpMethodBase; +import org.jboss.test.JBossTestCase; +import org.jboss.test.util.web.HttpUtils; + +import java.net.HttpURLConnection; +import java.net.URL; + +/** + * Tests the security of org.apache.tomcat.sendfile function. + * + * See https://issues.jboss.org/browse/JBPAPP-10023 + * + * @author istudens at redhat.com + * @version $Revision: 85945 $ + */ +public class SendFileUnitTestCase extends JBossTestCase + +{ + private String baseURL = HttpUtils.getBaseURL(); + + public static Test suite() throws Exception + { + return getDeploySetup(SendFileUnitTestCase.class, "sendfile.war"); + } + + public SendFileUnitTestCase(String name) + { + super(name); + } + + public void testSendFile() throws Exception + { + log.info("++++++ testSendFile"); + URL url = new URL(baseURL+"sendfile/sendfile"); + HttpClient httpClient = new HttpClient(); + HttpMethodBase request = HttpUtils.createMethod(url, HttpUtils.GET); + + //sending a blank request + int responseCode = httpClient.executeMethod(request); + String responseBody = request.getResponseBodyAsString(); + + log.debug("response code: " + responseCode); + log.debug("response: " + responseBody); + + if (responseCode == HttpURLConnection.HTTP_OK) { + assertTrue("sendfile is vulnerably open to any system file", responseBody.indexOf("You are not affected") > 0); + } else if (responseCode == HttpURLConnection.HTTP_INTERNAL_ERROR) { + assertTrue("java.io.FilePermission expected", responseBody.indexOf("java.io.FilePermission") > 0); + } else { + fail("unexpected response code " + responseCode); + } + } + +} Added: branches/JBPAPP_5/testsuite/src/resources/test-configs/secmgr/deploy/jbossweb.sar/server.xml =================================================================== --- branches/JBPAPP_5/testsuite/src/resources/test-configs/secmgr/deploy/jbossweb.sar/server.xml (rev 0) +++ branches/JBPAPP_5/testsuite/src/resources/test-configs/secmgr/deploy/jbossweb.sar/server.xml 2014-02-11 16:43:37 UTC (rev 114711) @@ -0,0 +1,168 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Added: branches/JBPAPP_5/testsuite/src/resources/web/sendfile/web.xml =================================================================== --- branches/JBPAPP_5/testsuite/src/resources/web/sendfile/web.xml (rev 0) +++ branches/JBPAPP_5/testsuite/src/resources/web/sendfile/web.xml 2014-02-11 16:43:37 UTC (rev 114711) @@ -0,0 +1,19 @@ + + + + Test of org.apache.tomcat.sendfile + + + SendFileServlet + org.jboss.test.web.servlets.SendFileServlet + + + + SendFileServlet + /sendfile + + Property changes on: branches/JBPAPP_5/testsuite/src/resources/web/sendfile/web.xml ___________________________________________________________________ Added: svn:mime-type + text/plain From jboss-cvs-commits at lists.jboss.org Wed Feb 12 10:46:46 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 12 Feb 2014 10:46:46 -0500 Subject: [jboss-cvs] JBossAS SVN: r114712 - branches/JBPAPP_5/component-matrix. Message-ID: <201402121546.s1CFkkhN018946@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-02-12 10:46:46 -0500 (Wed, 12 Feb 2014) New Revision: 114712 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: JBPAPP-10609 Upgrade JBossWeb to version 2.1.15.GA for EAP 5.3.0 Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-02-11 16:43:37 UTC (rev 114711) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-02-12 15:46:46 UTC (rev 114712) @@ -47,7 +47,7 @@ 1.0.1.GA 1.4.8.SP9_patch_01 2.2.26.Final - 2.1.14.GA + 2.1.15.GA 2.6.22.Final 3.8.2 3.4.0.GA_CP06 From jboss-cvs-commits at lists.jboss.org Wed Feb 12 15:38:29 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 12 Feb 2014 15:38:29 -0500 Subject: [jboss-cvs] JBossAS SVN: r114713 - projects/jboss-jca/branches. Message-ID: <201402122038.s1CKcTHT016599@svn01.web.mwc.hst.phx2.redhat.com> Author: jolee Date: 2014-02-12 15:38:28 -0500 (Wed, 12 Feb 2014) New Revision: 114713 Added: projects/jboss-jca/branches/IRONJACAMAR_1_0_17_FINAL_BZ1063924/ Log: BZ1063924: (JBJCA-1101) XAException::XA_RB?\226?\136?\151 isn't fatal From jboss-cvs-commits at lists.jboss.org Wed Feb 12 16:04:54 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 12 Feb 2014 16:04:54 -0500 Subject: [jboss-cvs] JBossAS SVN: r114714 - projects/jboss-jca/branches. Message-ID: <201402122104.s1CL4s9E025515@svn01.web.mwc.hst.phx2.redhat.com> Author: jolee Date: 2014-02-12 16:04:53 -0500 (Wed, 12 Feb 2014) New Revision: 114714 Removed: projects/jboss-jca/branches/IRONJACAMAR_1_0_17_FINAL_BZ1063924/ Log: recursion happened on branch creation, removing From jboss-cvs-commits at lists.jboss.org Wed Feb 12 16:06:52 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 12 Feb 2014 16:06:52 -0500 Subject: [jboss-cvs] JBossAS SVN: r114715 - projects/jboss-jca/branches. Message-ID: <201402122106.s1CL6qVk025909@svn01.web.mwc.hst.phx2.redhat.com> Author: jolee Date: 2014-02-12 16:06:52 -0500 (Wed, 12 Feb 2014) New Revision: 114715 Added: projects/jboss-jca/branches/IRONJACAMAR_1_0_17_FINAL_BZ1063924/ Log: BZ1063924 From jboss-cvs-commits at lists.jboss.org Wed Feb 12 16:20:59 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 12 Feb 2014 16:20:59 -0500 Subject: [jboss-cvs] JBossAS SVN: r114716 - projects/jboss-jca/branches/IRONJACAMAR_1_0_17_FINAL_BZ1063924/adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa. Message-ID: <201402122120.s1CLKxAE027263@svn01.web.mwc.hst.phx2.redhat.com> Author: jolee Date: 2014-02-12 16:20:59 -0500 (Wed, 12 Feb 2014) New Revision: 114716 Modified: projects/jboss-jca/branches/IRONJACAMAR_1_0_17_FINAL_BZ1063924/adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa/XAManagedConnection.java Log: BZ1063924: (JBJCA-1101) XAException::XA_RB?\226?\136?\151 isn't fatal Modified: projects/jboss-jca/branches/IRONJACAMAR_1_0_17_FINAL_BZ1063924/adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa/XAManagedConnection.java =================================================================== --- projects/jboss-jca/branches/IRONJACAMAR_1_0_17_FINAL_BZ1063924/adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa/XAManagedConnection.java 2014-02-12 21:06:52 UTC (rev 114715) +++ projects/jboss-jca/branches/IRONJACAMAR_1_0_17_FINAL_BZ1063924/adapters/src/main/java/org/jboss/jca/adapters/jdbc/xa/XAManagedConnection.java 2014-02-12 21:20:59 UTC (rev 114716) @@ -296,7 +296,10 @@ } catch (XAException e) { - broadcastConnectionError(e); + if (isFailedXA(e.errorCode)) + { + broadcastConnectionError(e); + } throw e; } @@ -393,7 +396,7 @@ private boolean isFailedXA(int errorCode) { - return (errorCode == XAException.XAER_RMERR || errorCode == XAException.XAER_RMFAIL); + return !(errorCode >= XAException.XA_RBBASE && errorCode < XAException.XA_RBEND); } /** From jboss-cvs-commits at lists.jboss.org Thu Feb 13 04:48:57 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 13 Feb 2014 04:48:57 -0500 Subject: [jboss-cvs] JBossAS SVN: r114717 - branches/JBPAPP_5/component-matrix. Message-ID: <201402130948.s1D9mvbH020313@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-02-13 04:48:57 -0500 (Thu, 13 Feb 2014) New Revision: 114717 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: JBPAPP-10981 Upgrade to JBoss Cache 3.2.12 Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-02-12 21:20:59 UTC (rev 114716) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-02-13 09:48:57 UTC (rev 114717) @@ -62,7 +62,7 @@ 1.0.0.GA 1.0.2 1.0.4.GA - 3.2.11.GA + 3.2.12.GA 3.0.1.GA 2.0.12.GA 2.0.3.Final From jboss-cvs-commits at lists.jboss.org Thu Feb 13 04:54:54 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 13 Feb 2014 04:54:54 -0500 Subject: [jboss-cvs] JBossAS SVN: r114718 - branches/JBPAPP_5/component-matrix. Message-ID: <201402130954.s1D9ssLi020848@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-02-13 04:54:54 -0500 (Thu, 13 Feb 2014) New Revision: 114718 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: JBPAPP-10984 Release and upgrade JBossWS-Native for EAP 5.3.0 Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-02-13 09:48:57 UTC (rev 114717) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-02-13 09:54:54 UTC (rev 114718) @@ -43,7 +43,7 @@ 1.1.0.SP11 3.1.2.SP14 1.1.2.SP8 - 3.1.2.SP16 + 3.1.2.SP17 1.0.1.GA 1.4.8.SP9_patch_01 2.2.26.Final From jboss-cvs-commits at lists.jboss.org Thu Feb 13 09:50:31 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 13 Feb 2014 09:50:31 -0500 Subject: [jboss-cvs] JBossAS SVN: r114719 - branches/JBPAPP_5/testsuite/imports/config. Message-ID: <201402131450.s1DEoV3s019924@svn01.web.mwc.hst.phx2.redhat.com> Author: pjelinek Date: 2014-02-13 09:50:31 -0500 (Thu, 13 Feb 2014) New Revision: 114719 Modified: branches/JBPAPP_5/testsuite/imports/config/tests-clustering.xml Log: JBPAPP-10987: fix clustering tests on Windows Modified: branches/JBPAPP_5/testsuite/imports/config/tests-clustering.xml =================================================================== --- branches/JBPAPP_5/testsuite/imports/config/tests-clustering.xml 2014-02-13 09:54:54 UTC (rev 114718) +++ branches/JBPAPP_5/testsuite/imports/config/tests-clustering.xml 2014-02-13 14:50:31 UTC (rev 114719) @@ -629,6 +629,21 @@ + + + + + + + + + + + + + + + - - - + From jboss-cvs-commits at lists.jboss.org Thu Feb 13 10:09:16 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 13 Feb 2014 10:09:16 -0500 Subject: [jboss-cvs] JBossAS SVN: r114720 - branches/JBPAPP_5/build. Message-ID: <201402131509.s1DF9GRi028017@svn01.web.mwc.hst.phx2.redhat.com> Author: rhatlapa Date: 2014-02-13 10:09:16 -0500 (Thu, 13 Feb 2014) New Revision: 114720 Modified: branches/JBPAPP_5/build/jbossas-5.patch Log: Fixing lines in jbossas-5.patch it pointed to wrong lines resulting in, fixed now [patch] Hunk #1 FAILED at 17. [patch] 1 out of 1 hunk FAILED -- saving rejects to file server/standard/deploy/ROOT.war/index.html.rej Modified: branches/JBPAPP_5/build/jbossas-5.patch =================================================================== --- branches/JBPAPP_5/build/jbossas-5.patch 2014-02-13 14:50:31 UTC (rev 114719) +++ branches/JBPAPP_5/build/jbossas-5.patch 2014-02-13 15:09:16 UTC (rev 114720) @@ -1,7 +1,7 @@ diff -Naur server/standard/deploy/ROOT.war/index.html server/standard/deploy/ROOT.war/index.html --- server/standard/deploy/ROOT.war/index.html 2009-08-18 21:53:40.000000000 -0400 +++ server/standard/deploy/ROOT.war/index.html 2009-08-19 08:48:47.000000000 -0400 -@@ -17,10 +17,8 @@ +@@ -17,9 +17,7 @@

Manage this JBoss EAP Instance

    @@ -15,7 +15,7 @@ diff -Naur server/web/deploy/ROOT.war/index.html server/web/deploy/ROOT.war/index.html --- server/web/deploy/ROOT.war/index.html 2009-08-18 21:53:43.000000000 -0400 +++ server/web/deploy/ROOT.war/index.html 2009-08-19 08:07:35.000000000 -0400 -@@ -19,8 +19,7 @@ +@@ -19,7 +19,6 @@
    • Admin Console
    • JMX Console
      • From jboss-cvs-commits at lists.jboss.org Thu Feb 13 11:29:37 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 13 Feb 2014 11:29:37 -0500 Subject: [jboss-cvs] JBossAS SVN: r114721 - branches/JBPAPP_5/component-matrix. Message-ID: <201402131629.s1DGTbL7010956@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-02-13 11:29:37 -0500 (Thu, 13 Feb 2014) New Revision: 114721 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: JBPAPP-10924 Upgrade HornetQ to 2.2.27.Final Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-02-13 15:09:16 UTC (rev 114720) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-02-13 16:29:37 UTC (rev 114721) @@ -46,7 +46,7 @@ 3.1.2.SP17 1.0.1.GA 1.4.8.SP9_patch_01 - 2.2.26.Final + 2.2.27.Final 2.1.15.GA 2.6.22.Final 3.8.2 From jboss-cvs-commits at lists.jboss.org Thu Feb 13 20:04:50 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 13 Feb 2014 20:04:50 -0500 Subject: [jboss-cvs] JBossAS SVN: r114722 - branches. Message-ID: <201402140104.s1E14oGr026085@svn01.web.mwc.hst.phx2.redhat.com> Author: aogburn Date: 2014-02-13 20:04:50 -0500 (Thu, 13 Feb 2014) New Revision: 114722 Added: branches/JBPAPP_5_2_0_GA_JBPAPP-10995/ Log: [JBPAPP-10995] create one off patch branch From jboss-cvs-commits at lists.jboss.org Thu Feb 13 20:48:10 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 13 Feb 2014 20:48:10 -0500 Subject: [jboss-cvs] JBossAS SVN: r114723 - branches/JBPAPP_5_2_0_GA_JBPAPP-10995. Message-ID: <201402140148.s1E1mAkt030797@svn01.web.mwc.hst.phx2.redhat.com> Author: aogburn Date: 2014-02-13 20:48:09 -0500 (Thu, 13 Feb 2014) New Revision: 114723 Removed: branches/JBPAPP_5_2_0_GA_JBPAPP-10995/adminclient/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/aspects/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/build/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/client/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/cluster/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/component-matrix/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/connector/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/console/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/deployment/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/ds-builder/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/ejb3/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/embedded/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/hibernate-int/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/hornetq-int/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/iiop/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/j2se/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/jbossas/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/jmx-remoting/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/jmx/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/main/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/management/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/mbeans/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/messaging/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/pom.xml branches/JBPAPP_5_2_0_GA_JBPAPP-10995/profileservice/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/security/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/server/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/spring-int/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/system-jmx/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/system/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/testsuite/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/thirdparty/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/tomcat/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/tools/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/varia/ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/webservices/ Log: [JBPAPP-10995] clear branch Deleted: branches/JBPAPP_5_2_0_GA_JBPAPP-10995/pom.xml =================================================================== --- branches/JBPAPP_5_2_0_GA_JBPAPP-10995/pom.xml 2014-02-14 01:04:50 UTC (rev 114722) +++ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/pom.xml 2014-02-14 01:48:09 UTC (rev 114723) @@ -1,407 +0,0 @@ - - - org.jboss.jbossas - jboss-as-component-matrix - 5.2.0 - component-matrix - - 4.0.0 - org.jboss.jbossas - jboss-as-parent - 5.2.0 - pom - JBoss Application Server Parent POM - http://www.jboss.org/jbossas - JBoss Application Server (aggregator) - - - scm:svn:http://anonsvn.jboss.org/repos/jbossas/branches/Branch_5_x - scm:svn:https://svn.jboss.org/repos/jbossas/branches/Branch_5_x - http://fisheye.jboss.org/browse/JBossAS - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - false - false - - - - org.apache.maven.plugins - maven-jar-plugin - 2.2 - - - - - true - - - true - - - - ${pom.url} - - - - - - org.apache.maven.plugins - maven-assembly-plugin - 2.2-beta-3 - - - - - true - - - true - - - - ${pom.url} - - - - - - org.codehaus.mojo - idlj-maven-plugin - 1.0 - - - org.codehaus.mojo - javacc-maven-plugin - 2.4.1 - - - org.codehaus.mojo - rmic-maven-plugin - 1.0 - - - org.codehaus.mojo - build-helper-maven-plugin - 1.2 - - - org.apache.maven.plugins - maven-antrun-plugin - 1.3 - - - - - - - org.codehaus.mojo - jboss-packaging-maven-plugin - 2.0-beta-1 - true - - - - - - - - - org.jboss.jbossas - jboss-as-aspects - ${project.version} - - - org.jboss.jbossas - jboss-as-cluster - ${project.version} - - - org.jboss.jbossas - jboss-as-cluster - ${project.version} - jboss-ha-legacy-client - - - org.jboss.jbossas - jboss-as-connector - ${project.version} - - - org.jboss.jbossas - jboss-as-deployment - ${project.version} - - - org.jboss.jbossas - jboss-as-ejb3 - ${project.version} - - - org.jboss.jbossas - jboss-as-ejb3 - ${project.version} - client - - - org.jboss.jbossas - jboss-as-iiop - ${project.version} - - - org.jboss.jbossas - jboss-as-iiop - ${project.version} - client - - - org.jboss.jbossas - jboss-as-j2se - ${project.version} - - - org.jboss.jbossas - jboss-as-j2se - ${project.version} - test-jar - - - org.jboss.jbossas - jboss-as-server - ${project.version} - - - org.jboss.jbossas - jboss-as-server - ${project.version} - client - - - org.jboss.jbossas - jboss-as-server - ${project.version} - jmx-invoker-adaptor-client - - - org.jboss.jbossas - jboss-as-jbossmq - ${project.version} - - - org.jboss.jbossas - jboss-as-jmx - ${project.version} - - - org.jboss.jbossas - jboss-as-main - ${project.version} - - - org.jboss.jbossas - jboss-as-main - ${project.version} - client - - - org.jboss.jbossas - jboss-as-management - ${project.version} - - - org.jboss.jbossas - jboss-as-management - ${project.version} - jsr77-client - - - org.jboss.jbossas - jboss-as-mbeans - ${project.version} - - - org.jboss.jbossas - jboss-as-profileservice - ${project.version} - - - org.jboss.jbossas - jboss-as-profileservice - ${project.version} - client - - - org.jboss.jbossas - jboss-as-security - ${project.version} - - - org.jboss.jbossas - jboss-as-system - ${project.version} - - - org.jboss.jbossas - jboss-as-system - ${project.version} - profileservice-spi - - - org.jboss.jbossas - jboss-as-system - ${project.version} - client - - - org.jboss.jbossas - jboss-as-system-jmx - ${project.version} - - - org.jboss.jbossas - jboss-as-system-jmx - ${project.version} - client - - - org.jboss.jbossas - jboss-as-varia - ${project.version} - - - org.jboss.jbossas - jboss-as-tomcat - ${project.version} - - - org.jboss.jbossas - jboss-as-webservices - ${project.version} - - - - - - - - - default-build - - - !integrated-build - - - - component-matrix - main - j2se - mbeans - jmx - system - system-jmx - security - server - deployment - jbossas - jmx-remoting - messaging - cluster - varia - iiop - aspects - profileservice - connector - management - ejb3 - tomcat - webservices - hibernate-int - console - spring-int - - client - build - adminclient - - - - - - integrated-build - - - integrated-build - - - - component-matrix - thirdparty - - - - - enforce - - - !skip-enforce - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 1.0-alpha-4 - - - enforce-java-maven-versions - - enforce - - - - - 2.0.9 - - - 1.5 - - - - - - enforce-plugin-versions - - enforce - - - - - Best Practice is to always define plugin versions! - true - true - true - clean,deploy,site - - - false - - - - - - - - - - From jboss-cvs-commits at lists.jboss.org Thu Feb 13 20:48:46 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 13 Feb 2014 20:48:46 -0500 Subject: [jboss-cvs] JBossAS SVN: r114724 - branches/JBPAPP_5_2_0_GA_JBPAPP-10995. Message-ID: <201402140148.s1E1mk6B030818@svn01.web.mwc.hst.phx2.redhat.com> Author: aogburn Date: 2014-02-13 20:48:46 -0500 (Thu, 13 Feb 2014) New Revision: 114724 Removed: branches/JBPAPP_5_2_0_GA_JBPAPP-10995/.gitignore Log: [JBPAPP-10995] clear branch Deleted: branches/JBPAPP_5_2_0_GA_JBPAPP-10995/.gitignore =================================================================== --- branches/JBPAPP_5_2_0_GA_JBPAPP-10995/.gitignore 2014-02-14 01:48:09 UTC (rev 114723) +++ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/.gitignore 2014-02-14 01:48:46 UTC (rev 114724) @@ -1,17 +0,0 @@ -.svn -svn-commit.tmp -*.iml -/*/output -/.idea -/bootstrap/target -/build/build.log -/build/local.properties -/jbossas/jmx-remoting/output -/jbossas/remoting/output -/maven-repository -/testsuite/build.log -/testsuite/run.tstamp -# not really, but a temp stop-gap -/thirdparty/* -!/thirdparty/pom.xml -!/thirdparty/readme.txt From jboss-cvs-commits at lists.jboss.org Thu Feb 13 22:07:54 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 13 Feb 2014 22:07:54 -0500 Subject: [jboss-cvs] JBossAS SVN: r114726 - in branches/JBPAPP_5_2_0_GA_JBPAPP-10995: integration/EAP4/src/main/org/jboss/jms/server/endpoint and 5 other directories. Message-ID: <201402140307.s1E37scA019167@svn01.web.mwc.hst.phx2.redhat.com> Author: aogburn Date: 2014-02-13 22:07:53 -0500 (Thu, 13 Feb 2014) New Revision: 114726 Modified: branches/JBPAPP_5_2_0_GA_JBPAPP-10995/integration/AS5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java branches/JBPAPP_5_2_0_GA_JBPAPP-10995/integration/EAP4/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java branches/JBPAPP_5_2_0_GA_JBPAPP-10995/integration/EAP5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java branches/JBPAPP_5_2_0_GA_JBPAPP-10995/src/main/org/jboss/jms/client/container/JmsClientAspectXMLLoader.java branches/JBPAPP_5_2_0_GA_JBPAPP-10995/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java branches/JBPAPP_5_2_0_GA_JBPAPP-10995/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java branches/JBPAPP_5_2_0_GA_JBPAPP-10995/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java branches/JBPAPP_5_2_0_GA_JBPAPP-10995/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java Log: [JBPAPP-10995] commit fix Modified: branches/JBPAPP_5_2_0_GA_JBPAPP-10995/integration/AS5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java =================================================================== --- branches/JBPAPP_5_2_0_GA_JBPAPP-10995/integration/AS5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2014-02-14 02:00:44 UTC (rev 114725) +++ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/integration/AS5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2014-02-14 03:07:53 UTC (rev 114726) @@ -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/JBPAPP_5_2_0_GA_JBPAPP-10995/integration/EAP4/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java =================================================================== --- branches/JBPAPP_5_2_0_GA_JBPAPP-10995/integration/EAP4/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2014-02-14 02:00:44 UTC (rev 114725) +++ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/integration/EAP4/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2014-02-14 03:07:53 UTC (rev 114726) @@ -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/JBPAPP_5_2_0_GA_JBPAPP-10995/integration/EAP5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java =================================================================== --- branches/JBPAPP_5_2_0_GA_JBPAPP-10995/integration/EAP5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2014-02-14 02:00:44 UTC (rev 114725) +++ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/integration/EAP5/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2014-02-14 03:07:53 UTC (rev 114726) @@ -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; - - // Need to synchronized to prevent a deadlock - // See http://jira.jboss.com/jira/browse/JBMESSAGING-797 - synchronized (AspectManager.instance()) - { - connAdvised = new ConnectionAdvised(endpoint); - } - + ConnectionAdvised 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/JBPAPP_5_2_0_GA_JBPAPP-10995/src/main/org/jboss/jms/client/container/JmsClientAspectXMLLoader.java =================================================================== --- branches/JBPAPP_5_2_0_GA_JBPAPP-10995/src/main/org/jboss/jms/client/container/JmsClientAspectXMLLoader.java 2014-02-14 02:00:44 UTC (rev 114725) +++ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/src/main/org/jboss/jms/client/container/JmsClientAspectXMLLoader.java 2014-02-14 03:07:53 UTC (rev 114726) @@ -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; - try - { - is = new ByteArrayInputStream(config); + docBuilderFactory = DocumentBuilderFactory.newInstance(); - DocumentBuilderFactory docBuilderFactory = null; - - docBuilderFactory = DocumentBuilderFactory.newInstance(); - - docBuilderFactory.setValidating(false); - - InputSource source = new InputSource(is); - - URL url = AspectXmlLoader.class.getResource("/jboss-aop_1_0.dtd"); - - source.setSystemId(url.toString()); - - DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder(); - - docBuilder.setEntityResolver(new Resolver()); - - Document doc = docBuilder.parse(source); - - this.deployXML(doc, null, this.getClass().getClassLoader()); - } - finally + docBuilderFactory.setValidating(false); + + InputSource source = new InputSource(is); + + URL url = AspectXmlLoader.class.getResource("/jboss-aop_1_0.dtd"); + + source.setSystemId(url.toString()); + + DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder(); + + docBuilder.setEntityResolver(new Resolver()); + + Document doc = docBuilder.parse(source); + + this.deployXML(doc, null, this.getClass().getClassLoader()); + } + finally + { + if (is != null) { - if (is != null) - { - is.close(); - } + is.close(); } } } Modified: branches/JBPAPP_5_2_0_GA_JBPAPP-10995/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java =================================================================== --- branches/JBPAPP_5_2_0_GA_JBPAPP-10995/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java 2014-02-14 02:00:44 UTC (rev 114725) +++ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java 2014-02-14 03:07:53 UTC (rev 114726) @@ -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/JBPAPP_5_2_0_GA_JBPAPP-10995/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java =================================================================== --- branches/JBPAPP_5_2_0_GA_JBPAPP-10995/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java 2014-02-14 02:00:44 UTC (rev 114725) +++ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java 2014-02-14 03:07:53 UTC (rev 114726) @@ -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; @@ -371,13 +370,8 @@ // 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 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); - } + // fail if I wrapped it during registerConneciton. + sce = new ConnectionAdvised(sce); try { sce.closing(-1); @@ -469,13 +463,8 @@ } // 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); - } + // get the connection. Then anyone + conn = new ConnectionAdvised(conn); try { conn.closing(-1); Modified: branches/JBPAPP_5_2_0_GA_JBPAPP-10995/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java =================================================================== --- branches/JBPAPP_5_2_0_GA_JBPAPP-10995/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java 2014-02-14 02:00:44 UTC (rev 114725) +++ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java 2014-02-14 03:07:53 UTC (rev 114726) @@ -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/JBPAPP_5_2_0_GA_JBPAPP-10995/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java =================================================================== --- branches/JBPAPP_5_2_0_GA_JBPAPP-10995/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java 2014-02-14 02:00:44 UTC (rev 114725) +++ branches/JBPAPP_5_2_0_GA_JBPAPP-10995/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java 2014-02-14 03:07:53 UTC (rev 114726) @@ -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; @@ -2024,15 +2023,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 = @@ -2344,15 +2336,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 = @@ -2408,15 +2393,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 Thu Feb 13 22:39:20 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 13 Feb 2014 22:39:20 -0500 Subject: [jboss-cvs] JBossAS SVN: r114727 - branches/JBPAPP_5/component-matrix. Message-ID: <201402140339.s1E3dKNr022600@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-02-13 22:39:20 -0500 (Thu, 13 Feb 2014) New Revision: 114727 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: JBPAPP-10992 Upgrade to jboss-negotiation 2.1.5.Final Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-02-14 03:07:53 UTC (rev 114726) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-02-14 03:39:20 UTC (rev 114727) @@ -88,7 +88,7 @@ 2.5.4.SP4_patch01 2.0.7.Final 2.0.7.Final - 2.1.4.GA + 2.1.5.Final 1.0.6.FINAL 1.0.2.GA_CP03 1.0.0.GA From jboss-cvs-commits at lists.jboss.org Fri Feb 14 01:28:21 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Fri, 14 Feb 2014 01:28:21 -0500 Subject: [jboss-cvs] JBossAS SVN: r114728 - branches/JBPAPP_5/component-matrix. Message-ID: <201402140628.s1E6SL3I027004@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-02-14 01:28:21 -0500 (Fri, 14 Feb 2014) New Revision: 114728 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: JBPAPP-10993 Upgrade from 2.7.1-patch-06-brew to 2.7.1-patch-07-brew Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-02-14 03:39:20 UTC (rev 114727) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-02-14 06:28:21 UTC (rev 114728) @@ -30,7 +30,7 @@ - 2.7.1-patch-06 + 2.7.1-patch-07 2.3.2-jboss-5 2.3.2-jboss-5 2.3.2-jboss-5 From jboss-cvs-commits at lists.jboss.org Fri Feb 14 13:53:49 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Fri, 14 Feb 2014 13:53:49 -0500 Subject: [jboss-cvs] JBossAS SVN: r114729 - projects/security/security-negotiation/branches. Message-ID: <201402141853.s1EIrnXU021019@svn01.web.mwc.hst.phx2.redhat.com> Author: dehort Date: 2014-02-14 13:53:49 -0500 (Fri, 14 Feb 2014) New Revision: 114729 Added: projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1065448/ Log: [bz-1065448] Creating a branch for a one-off patch From jboss-cvs-commits at lists.jboss.org Fri Feb 14 13:56:13 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Fri, 14 Feb 2014 13:56:13 -0500 Subject: [jboss-cvs] JBossAS SVN: r114730 - projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1065448/jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation. Message-ID: <201402141856.s1EIuDZA021421@svn01.web.mwc.hst.phx2.redhat.com> Author: dehort Date: 2014-02-14 13:56:13 -0500 (Fri, 14 Feb 2014) New Revision: 114730 Modified: projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1065448/jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation/AdvancedLdapLoginModule.java Log: [bz-1065448] Fixed the AdvancedLdap login module where it handles a uid that contains a slash char Modified: projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1065448/jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation/AdvancedLdapLoginModule.java =================================================================== --- projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1065448/jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation/AdvancedLdapLoginModule.java 2014-02-14 18:53:49 UTC (rev 114729) +++ projects/security/security-negotiation/branches/security-negotiation-2.2.5.Final-bz-1065448/jboss-negotiation-extras/src/main/java/org/jboss/security/negotiation/AdvancedLdapLoginModule.java 2014-02-14 18:56:13 UTC (rev 114730) @@ -42,6 +42,7 @@ import javax.naming.directory.SearchResult; import javax.naming.ldap.InitialLdapContext; import javax.naming.ldap.LdapContext; +import javax.naming.CompositeName; import javax.security.auth.Subject; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.login.LoginContext; @@ -472,7 +473,7 @@ String name = sr.getName(); String userDN = null; if (sr.isRelative() == true) - userDN = name + "," + baseCtxDN; + userDN = new CompositeName(name).get(0) + "," + baseCtxDN; else throw new LoginException("Can't follow referal for authentication: " + name); From jboss-cvs-commits at lists.jboss.org Sat Feb 15 02:53:26 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Sat, 15 Feb 2014 02:53:26 -0500 Subject: [jboss-cvs] JBossAS SVN: r114731 - branches/JBPAPP_5/component-matrix. Message-ID: <201402150753.s1F7rQKj022475@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-02-15 02:53:24 -0500 (Sat, 15 Feb 2014) New Revision: 114731 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: JBPAPP-10992: revert r114727 Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-02-14 18:56:13 UTC (rev 114730) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-02-15 07:53:24 UTC (rev 114731) @@ -88,7 +88,7 @@ 2.5.4.SP4_patch01 2.0.7.Final 2.0.7.Final - 2.1.5.Final + 2.1.4.GA 1.0.6.FINAL 1.0.2.GA_CP03 1.0.0.GA From jboss-cvs-commits at lists.jboss.org Sun Feb 16 08:11:34 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Sun, 16 Feb 2014 08:11:34 -0500 Subject: [jboss-cvs] JBossAS SVN: r114732 - projects/ejb3/branches/jboss-ejb3-core-1.3. Message-ID: <201402161311.s1GDBY2C019564@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-02-16 08:11:33 -0500 (Sun, 16 Feb 2014) New Revision: 114732 Modified: projects/ejb3/branches/jboss-ejb3-core-1.3/pom.xml Log: EJBTHREE-2303: specify an explicit verion of maven-enforcer-plugin Modified: projects/ejb3/branches/jboss-ejb3-core-1.3/pom.xml =================================================================== --- projects/ejb3/branches/jboss-ejb3-core-1.3/pom.xml 2014-02-15 07:53:24 UTC (rev 114731) +++ projects/ejb3/branches/jboss-ejb3-core-1.3/pom.xml 2014-02-16 13:11:33 UTC (rev 114732) @@ -49,6 +49,15 @@ + + + + maven-enforcer-plugin + 1.2 + + + + From jboss-cvs-commits at lists.jboss.org Mon Feb 17 01:00:47 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 17 Feb 2014 01:00:47 -0500 Subject: [jboss-cvs] JBossAS SVN: r114733 - in branches/JBPAPP_5: connector/src/main/org/jboss/resource/adapter/jdbc and 3 other directories. Message-ID: <201402170600.s1H60lTB008786@svn01.web.mwc.hst.phx2.redhat.com> Author: jameslivingston Date: 2014-02-17 01:00:46 -0500 (Mon, 17 Feb 2014) New Revision: 114733 Modified: branches/JBPAPP_5/build/build.xml branches/JBPAPP_5/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnection.java branches/JBPAPP_5/connector/src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnectionFactory.java branches/JBPAPP_5/connector/src/main/org/jboss/resource/adapter/jdbc/local/LocalManagedConnectionFactory.java branches/JBPAPP_5/connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnectionFactory.java branches/JBPAPP_5/server/build.xml Log: [JBPAPP-10968] remove ManagedConnectionFactory bottleneck added by JBPAPP-7464 fix. Modified: branches/JBPAPP_5/build/build.xml =================================================================== --- branches/JBPAPP_5/build/build.xml 2014-02-16 13:11:33 UTC (rev 114732) +++ branches/JBPAPP_5/build/build.xml 2014-02-17 06:00:46 UTC (rev 114733) @@ -1390,7 +1390,7 @@ - + @@ -1436,7 +1436,7 @@ - + In fact, we have a problem here. Theoretically, there is a possible * name collision between config properties and "user"/"password". */ - protected synchronized Properties getConnectionProperties(Subject subject, ConnectionRequestInfo cri) + protected synchronized Properties getConnectionProperties(Properties connectionProps, Subject subject, ConnectionRequestInfo cri) throws ResourceException { if (cri != null && cri.getClass() != WrappedConnectionRequestInfo.class) throw new JBossResourceException("Wrong kind of ConnectionRequestInfo: " + cri.getClass()); Properties props = new Properties(); - props.putAll(connectionProps); + + if (connectionProps != null && connectionProps.size() > 0) + props.putAll(connectionProps); + if (subject != null) { if (SubjectActions.addMatchingProperties(subject, props, this) == true) Modified: branches/JBPAPP_5/connector/src/main/org/jboss/resource/adapter/jdbc/local/LocalManagedConnectionFactory.java =================================================================== --- branches/JBPAPP_5/connector/src/main/org/jboss/resource/adapter/jdbc/local/LocalManagedConnectionFactory.java 2014-02-16 13:11:33 UTC (rev 114732) +++ branches/JBPAPP_5/connector/src/main/org/jboss/resource/adapter/jdbc/local/LocalManagedConnectionFactory.java 2014-02-17 06:00:46 UTC (rev 114733) @@ -66,6 +66,9 @@ protected String connectionProperties; + /** The connection properties */ + protected final Properties connectionProps = new Properties(); + public LocalManagedConnectionFactory() { @@ -165,10 +168,10 @@ } } - public synchronized ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo cri) + public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo cri) throws javax.resource.ResourceException { - Properties props = getConnectionProperties(subject, cri); + Properties props = getConnectionProperties(connectionProps, subject, cri); // Some friendly drivers (Oracle, you guessed right) modify the props you supply. // Since we use our copy to identify compatibility in matchManagedConnection, we need // a pristine copy for our own use. So give the friendly driver a copy. @@ -385,7 +388,7 @@ public ManagedConnection matchManagedConnections(final Set mcs, final Subject subject, final ConnectionRequestInfo cri) throws ResourceException { - Properties newProps = getConnectionProperties(subject, cri); + Properties newProps = getConnectionProperties(connectionProps, subject, cri); for (Iterator i = mcs.iterator(); i.hasNext();) { Modified: branches/JBPAPP_5/connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnectionFactory.java =================================================================== --- branches/JBPAPP_5/connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnectionFactory.java 2014-02-16 13:11:33 UTC (rev 114732) +++ branches/JBPAPP_5/connector/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnectionFactory.java 2014-02-17 06:00:46 UTC (rev 114733) @@ -418,7 +418,7 @@ this.isSameRMOverrideValue = isSameRMOverrideValue; } - public synchronized ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo cri) + public ManagedConnection createManagedConnection(Subject subject, ConnectionRequestInfo cri) throws javax.resource.ResourceException { if(xadsSelector == null) @@ -457,7 +457,7 @@ throws javax.resource.ResourceException { XAConnection xaConnection = null; - Properties props = getConnectionProperties(subject, cri); + Properties props = getConnectionProperties(null, subject, cri); try { final String user = props.getProperty("user"); @@ -495,7 +495,7 @@ public ManagedConnection matchManagedConnections(Set mcs, Subject subject, ConnectionRequestInfo cri) throws ResourceException { - Properties newProps = getConnectionProperties(subject, cri); + Properties newProps = getConnectionProperties(null, subject, cri); for (Iterator i = mcs.iterator(); i.hasNext();) { Object o = i.next(); @@ -519,6 +519,19 @@ } return null; } + + /** + * Is the properties equal + * @param other The other properties + * @return True if equal, otherwise false + */ + private boolean isEqual(Map other) + { + synchronized (xaProps) + { + return xaProps.equals(other); + } + } public int hashCode() { @@ -538,7 +551,7 @@ if (getClass() != other.getClass()) return false; XAManagedConnectionFactory otherMcf = (XAManagedConnectionFactory) other; - return this.xaDataSourceClass.equals(otherMcf.xaDataSourceClass) && this.xaProps.equals(otherMcf.xaProps) + return this.xaDataSourceClass.equals(otherMcf.xaDataSourceClass) && isEqual(otherMcf.xaProps) && ((this.userName == null) ? otherMcf.userName == null : this.userName.equals(otherMcf.userName)) && ((this.password == null) ? otherMcf.password == null : this.password.equals(otherMcf.password)) && this.transactionIsolation == otherMcf.transactionIsolation; Modified: branches/JBPAPP_5/server/build.xml =================================================================== --- branches/JBPAPP_5/server/build.xml 2014-02-16 13:11:33 UTC (rev 114732) +++ branches/JBPAPP_5/server/build.xml 2014-02-17 06:00:46 UTC (rev 114733) @@ -96,7 +96,7 @@ - + From jboss-cvs-commits at lists.jboss.org Mon Feb 17 01:07:09 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 17 Feb 2014 01:07:09 -0500 Subject: [jboss-cvs] JBossAS SVN: r114734 - in branches/JBPAPP_5: server and 1 other directory. Message-ID: <201402170607.s1H679n8009697@svn01.web.mwc.hst.phx2.redhat.com> Author: jameslivingston Date: 2014-02-17 01:07:09 -0500 (Mon, 17 Feb 2014) New Revision: 114734 Modified: branches/JBPAPP_5/build/build.xml branches/JBPAPP_5/server/build.xml Log: [JBPAPP-10968] remove ManagedConnectionFactory bottleneck added by JBPAPP-7464 fix. Modified: branches/JBPAPP_5/build/build.xml =================================================================== --- branches/JBPAPP_5/build/build.xml 2014-02-17 06:00:46 UTC (rev 114733) +++ branches/JBPAPP_5/build/build.xml 2014-02-17 06:07:09 UTC (rev 114734) @@ -1390,7 +1390,7 @@ - + @@ -1436,7 +1436,7 @@ - + - + From jboss-cvs-commits at lists.jboss.org Mon Feb 17 03:01:04 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 17 Feb 2014 03:01:04 -0500 Subject: [jboss-cvs] JBossAS SVN: r114735 - tags. Message-ID: <201402170801.s1H8142W001996@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-02-17 03:01:04 -0500 (Mon, 17 Feb 2014) New Revision: 114735 Added: tags/JBPAPP_5_3_0_ER1/ Log: Tag EAP 5.3.0 ER1 From jboss-cvs-commits at lists.jboss.org Mon Feb 17 06:50:49 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 17 Feb 2014 06:50:49 -0500 Subject: [jboss-cvs] JBossAS SVN: r114736 - in tags/JBPAPP_5_3_0_ER1: adminclient and 32 other directories. Message-ID: <201402171150.s1HBonW5014730@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-02-17 06:50:48 -0500 (Mon, 17 Feb 2014) New Revision: 114736 Modified: tags/JBPAPP_5_3_0_ER1/adminclient/pom.xml tags/JBPAPP_5_3_0_ER1/aspects/pom.xml tags/JBPAPP_5_3_0_ER1/build/build.properties tags/JBPAPP_5_3_0_ER1/build/pom.xml tags/JBPAPP_5_3_0_ER1/client/pom.xml tags/JBPAPP_5_3_0_ER1/cluster/pom.xml tags/JBPAPP_5_3_0_ER1/component-matrix/pom.xml tags/JBPAPP_5_3_0_ER1/connector/pom.xml tags/JBPAPP_5_3_0_ER1/console/pom.xml tags/JBPAPP_5_3_0_ER1/deployment/pom.xml tags/JBPAPP_5_3_0_ER1/ejb3/pom.xml tags/JBPAPP_5_3_0_ER1/embedded/pom.xml tags/JBPAPP_5_3_0_ER1/hibernate-int/pom.xml tags/JBPAPP_5_3_0_ER1/iiop/pom.xml tags/JBPAPP_5_3_0_ER1/j2se/pom.xml tags/JBPAPP_5_3_0_ER1/jbossas/jmx-remoting/pom.xml tags/JBPAPP_5_3_0_ER1/jbossas/pom.xml tags/JBPAPP_5_3_0_ER1/jbossas/remoting/pom.xml tags/JBPAPP_5_3_0_ER1/jmx-remoting/pom.xml tags/JBPAPP_5_3_0_ER1/jmx/pom.xml tags/JBPAPP_5_3_0_ER1/main/pom.xml tags/JBPAPP_5_3_0_ER1/management/pom.xml tags/JBPAPP_5_3_0_ER1/mbeans/pom.xml tags/JBPAPP_5_3_0_ER1/messaging/pom.xml tags/JBPAPP_5_3_0_ER1/pom.xml tags/JBPAPP_5_3_0_ER1/profileservice/pom.xml tags/JBPAPP_5_3_0_ER1/security/pom.xml tags/JBPAPP_5_3_0_ER1/server/pom.xml tags/JBPAPP_5_3_0_ER1/spring-int/pom.xml tags/JBPAPP_5_3_0_ER1/system-jmx/pom.xml tags/JBPAPP_5_3_0_ER1/system/pom.xml tags/JBPAPP_5_3_0_ER1/thirdparty/pom.xml tags/JBPAPP_5_3_0_ER1/tomcat/pom.xml tags/JBPAPP_5_3_0_ER1/varia/pom.xml tags/JBPAPP_5_3_0_ER1/webservices/pom.xml Log: Updated version to EAP 5.3.0.ER1 Modified: tags/JBPAPP_5_3_0_ER1/adminclient/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/adminclient/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/adminclient/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -4,7 +4,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 Modified: tags/JBPAPP_5_3_0_ER1/aspects/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/aspects/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/aspects/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/build/build.properties =================================================================== --- tags/JBPAPP_5_3_0_ER1/build/build.properties 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/build/build.properties 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,6 +3,6 @@ version.major=5 version.minor=3 version.revision=0 -version.tag=Branch +version.tag=ER1 version.name=EAP Modified: tags/JBPAPP_5_3_0_ER1/build/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/build/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/build/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/client/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/client/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/client/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/cluster/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/cluster/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/cluster/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/component-matrix/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/component-matrix/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/component-matrix/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -20,7 +20,7 @@ org.jboss.jbossas jboss-as-component-matrix pom - 5.3.0-SNAPSHOT + 5.3.0.ER1 JBossAS Component Matrix Contract for Consumers of JBossAS Components, defining and Modified: tags/JBPAPP_5_3_0_ER1/connector/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/connector/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/connector/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/console/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/console/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/console/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/deployment/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/deployment/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/deployment/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/ejb3/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/ejb3/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/ejb3/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/embedded/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/embedded/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/embedded/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/hibernate-int/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/hibernate-int/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/hibernate-int/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/iiop/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/iiop/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/iiop/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/j2se/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/j2se/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/j2se/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/jbossas/jmx-remoting/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/jbossas/jmx-remoting/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/jbossas/jmx-remoting/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-jbossas - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/jbossas/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/jbossas/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/jbossas/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/jbossas/remoting/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/jbossas/remoting/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/jbossas/remoting/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-jbossas - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/jmx/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/jmx/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/jmx/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/jmx-remoting/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/jmx-remoting/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/jmx-remoting/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/main/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/main/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/main/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/management/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/management/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/management/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/mbeans/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/mbeans/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/mbeans/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/messaging/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/messaging/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/messaging/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-component-matrix - 5.3.0-SNAPSHOT + 5.3.0.ER1 component-matrix 4.0.0 Modified: tags/JBPAPP_5_3_0_ER1/profileservice/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/profileservice/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/profileservice/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/security/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/security/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/security/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/server/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/server/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/server/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/spring-int/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/spring-int/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/spring-int/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/system/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/system/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/system/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/system-jmx/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/system-jmx/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/system-jmx/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/thirdparty/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/thirdparty/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/thirdparty/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/tomcat/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/tomcat/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/tomcat/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/varia/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/varia/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/varia/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/webservices/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/webservices/pom.xml 2014-02-17 08:01:04 UTC (rev 114735) +++ tags/JBPAPP_5_3_0_ER1/webservices/pom.xml 2014-02-17 11:50:48 UTC (rev 114736) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER1 4.0.0 org.jboss.jbossas From jboss-cvs-commits at lists.jboss.org Tue Feb 18 00:49:54 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 18 Feb 2014 00:49:54 -0500 Subject: [jboss-cvs] JBossAS SVN: r114737 - tags/JBPAPP_5_3_0_ER1/tools/etc/buildmagic. Message-ID: <201402180549.s1I5nsMd017589@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-02-18 00:49:53 -0500 (Tue, 18 Feb 2014) New Revision: 114737 Modified: tags/JBPAPP_5_3_0_ER1/tools/etc/buildmagic/buildmagic.ent Log: Change 'Branch' to 'ER1' Modified: tags/JBPAPP_5_3_0_ER1/tools/etc/buildmagic/buildmagic.ent =================================================================== --- tags/JBPAPP_5_3_0_ER1/tools/etc/buildmagic/buildmagic.ent 2014-02-17 11:50:48 UTC (rev 114736) +++ tags/JBPAPP_5_3_0_ER1/tools/etc/buildmagic/buildmagic.ent 2014-02-18 05:49:53 UTC (rev 114737) @@ -107,7 +107,7 @@ - + From jboss-cvs-commits at lists.jboss.org Tue Feb 18 19:54:49 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 18 Feb 2014 19:54:49 -0500 Subject: [jboss-cvs] JBossAS SVN: r114738 - tags/JBPAPP_5_3_0_ER1/tools/etc/buildmagic. Message-ID: <201402190054.s1J0snUO001896@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-02-18 19:54:49 -0500 (Tue, 18 Feb 2014) New Revision: 114738 Modified: tags/JBPAPP_5_3_0_ER1/tools/etc/buildmagic/buildmagic.ent Log: Update 5.2.0 to 5.3.0 Modified: tags/JBPAPP_5_3_0_ER1/tools/etc/buildmagic/buildmagic.ent =================================================================== --- tags/JBPAPP_5_3_0_ER1/tools/etc/buildmagic/buildmagic.ent 2014-02-18 05:49:53 UTC (rev 114737) +++ tags/JBPAPP_5_3_0_ER1/tools/etc/buildmagic/buildmagic.ent 2014-02-19 00:54:49 UTC (rev 114738) @@ -105,7 +105,7 @@ - + From jboss-cvs-commits at lists.jboss.org Tue Feb 18 20:25:27 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Tue, 18 Feb 2014 20:25:27 -0500 Subject: [jboss-cvs] JBossAS SVN: r114739 - in tags/JBPAPP_5_3_0_ER1: adminclient and 34 other directories. Message-ID: <201402190125.s1J1PRD4011719@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-02-18 20:25:27 -0500 (Tue, 18 Feb 2014) New Revision: 114739 Modified: tags/JBPAPP_5_3_0_ER1/adminclient/pom.xml tags/JBPAPP_5_3_0_ER1/aspects/pom.xml tags/JBPAPP_5_3_0_ER1/build/build.properties tags/JBPAPP_5_3_0_ER1/build/pom.xml tags/JBPAPP_5_3_0_ER1/client/pom.xml tags/JBPAPP_5_3_0_ER1/cluster/pom.xml tags/JBPAPP_5_3_0_ER1/component-matrix/pom.xml tags/JBPAPP_5_3_0_ER1/connector/pom.xml tags/JBPAPP_5_3_0_ER1/console/pom.xml tags/JBPAPP_5_3_0_ER1/deployment/pom.xml tags/JBPAPP_5_3_0_ER1/ejb3/pom.xml tags/JBPAPP_5_3_0_ER1/embedded/pom.xml tags/JBPAPP_5_3_0_ER1/hibernate-int/pom.xml tags/JBPAPP_5_3_0_ER1/iiop/pom.xml tags/JBPAPP_5_3_0_ER1/j2se/pom.xml tags/JBPAPP_5_3_0_ER1/jbossas/jmx-remoting/pom.xml tags/JBPAPP_5_3_0_ER1/jbossas/pom.xml tags/JBPAPP_5_3_0_ER1/jbossas/remoting/pom.xml tags/JBPAPP_5_3_0_ER1/jmx-remoting/pom.xml tags/JBPAPP_5_3_0_ER1/jmx/pom.xml tags/JBPAPP_5_3_0_ER1/main/pom.xml tags/JBPAPP_5_3_0_ER1/management/pom.xml tags/JBPAPP_5_3_0_ER1/mbeans/pom.xml tags/JBPAPP_5_3_0_ER1/messaging/pom.xml tags/JBPAPP_5_3_0_ER1/pom.xml tags/JBPAPP_5_3_0_ER1/profileservice/pom.xml tags/JBPAPP_5_3_0_ER1/security/pom.xml tags/JBPAPP_5_3_0_ER1/server/pom.xml tags/JBPAPP_5_3_0_ER1/spring-int/pom.xml tags/JBPAPP_5_3_0_ER1/system-jmx/pom.xml tags/JBPAPP_5_3_0_ER1/system/pom.xml tags/JBPAPP_5_3_0_ER1/testsuite/build.xml tags/JBPAPP_5_3_0_ER1/thirdparty/pom.xml tags/JBPAPP_5_3_0_ER1/tomcat/pom.xml tags/JBPAPP_5_3_0_ER1/tools/etc/buildmagic/buildmagic.ent tags/JBPAPP_5_3_0_ER1/tools/etc/buildmagic/version-info.xml tags/JBPAPP_5_3_0_ER1/varia/pom.xml tags/JBPAPP_5_3_0_ER1/webservices/pom.xml Log: Set version.tag='' and remove ER1 from sub-projects pom.xml Modified: tags/JBPAPP_5_3_0_ER1/adminclient/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/adminclient/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/adminclient/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -4,7 +4,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 Modified: tags/JBPAPP_5_3_0_ER1/aspects/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/aspects/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/aspects/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/build/build.properties =================================================================== --- tags/JBPAPP_5_3_0_ER1/build/build.properties 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/build/build.properties 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,6 +3,6 @@ version.major=5 version.minor=3 version.revision=0 -version.tag=ER1 +version.tag= version.name=EAP Modified: tags/JBPAPP_5_3_0_ER1/build/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/build/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/build/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/client/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/client/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/client/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/cluster/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/cluster/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/cluster/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/component-matrix/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/component-matrix/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/component-matrix/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -20,7 +20,7 @@ org.jboss.jbossas jboss-as-component-matrix pom - 5.3.0.ER1 + 5.3.0 JBossAS Component Matrix Contract for Consumers of JBossAS Components, defining and Modified: tags/JBPAPP_5_3_0_ER1/connector/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/connector/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/connector/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/console/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/console/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/console/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/deployment/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/deployment/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/deployment/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/ejb3/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/ejb3/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/ejb3/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/embedded/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/embedded/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/embedded/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/hibernate-int/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/hibernate-int/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/hibernate-int/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/iiop/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/iiop/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/iiop/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/j2se/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/j2se/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/j2se/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/jbossas/jmx-remoting/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/jbossas/jmx-remoting/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/jbossas/jmx-remoting/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-jbossas - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/jbossas/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/jbossas/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/jbossas/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/jbossas/remoting/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/jbossas/remoting/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/jbossas/remoting/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-jbossas - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/jmx/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/jmx/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/jmx/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/jmx-remoting/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/jmx-remoting/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/jmx-remoting/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/main/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/main/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/main/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/management/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/management/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/management/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/mbeans/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/mbeans/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/mbeans/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/messaging/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/messaging/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/messaging/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-component-matrix - 5.3.0.ER1 + 5.3.0 component-matrix 4.0.0 Modified: tags/JBPAPP_5_3_0_ER1/profileservice/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/profileservice/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/profileservice/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/security/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/security/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/security/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/server/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/server/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/server/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/spring-int/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/spring-int/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/spring-int/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/system/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/system/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/system/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/system-jmx/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/system-jmx/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/system-jmx/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/testsuite/build.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/testsuite/build.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/testsuite/build.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -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_ER1/thirdparty/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/thirdparty/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/thirdparty/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/tomcat/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/tomcat/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/tomcat/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/tools/etc/buildmagic/buildmagic.ent =================================================================== --- tags/JBPAPP_5_3_0_ER1/tools/etc/buildmagic/buildmagic.ent 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/tools/etc/buildmagic/buildmagic.ent 2014-02-19 01:25:27 UTC (rev 114739) @@ -107,20 +107,20 @@ - + - + - + + value="${version.major}.${version.minor}.${version.revision} (build: SVNTag=${version.cvstag} date=${build.id})"/> Modified: tags/JBPAPP_5_3_0_ER1/tools/etc/buildmagic/version-info.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/tools/etc/buildmagic/version-info.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/tools/etc/buildmagic/version-info.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -16,17 +16,17 @@ - + - + + value="${version.major}.${version.minor}.${version.revision} (build: SVNTag=${version.cvstag} date=${build.id})"/> Modified: tags/JBPAPP_5_3_0_ER1/varia/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/varia/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/varia/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER1/webservices/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER1/webservices/pom.xml 2014-02-19 00:54:49 UTC (rev 114738) +++ tags/JBPAPP_5_3_0_ER1/webservices/pom.xml 2014-02-19 01:25:27 UTC (rev 114739) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER1 + 5.3.0 4.0.0 org.jboss.jbossas From jboss-cvs-commits at lists.jboss.org Thu Feb 20 10:45:09 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 20 Feb 2014 10:45:09 -0500 Subject: [jboss-cvs] JBossAS SVN: r114740 - branches/JBPAPP_5/testsuite. Message-ID: <201402201545.s1KFj9JB015046@svn01.web.mwc.hst.phx2.redhat.com> Author: rhatlapa Date: 2014-02-20 10:45:09 -0500 (Thu, 20 Feb 2014) New Revision: 114740 Modified: branches/JBPAPP_5/testsuite/build.bat Log: Fix for JBPAPP-10996, on 32 bit Windows maximum memory setting to 1303m Modified: branches/JBPAPP_5/testsuite/build.bat =================================================================== --- branches/JBPAPP_5/testsuite/build.bat 2014-02-19 01:25:27 UTC (rev 114739) +++ branches/JBPAPP_5/testsuite/build.bat 2014-02-20 15:45:09 UTC (rev 114740) @@ -25,7 +25,7 @@ set CLASSPATH= set ANT_HOME= -set ANT_OPTS=%ANT_OPTS% -Xmx2024m -Djava.protocol.handler.pkgs=org.jboss.net.protocol -Dbuild.script=build.bat +set ANT_OPTS=%ANT_OPTS% -Xmx1303m -Djava.protocol.handler.pkgs=org.jboss.net.protocol -Dbuild.script=build.bat REM ****************************************************** REM - "for" loops have been unrolled for compatibility From jboss-cvs-commits at lists.jboss.org Thu Feb 20 11:56:39 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 20 Feb 2014 11:56:39 -0500 Subject: [jboss-cvs] Picketbox SVN: r506 - trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi. Message-ID: <201402201656.s1KGudld029799@svn01.web.mwc.hst.phx2.redhat.com> Author: dehort Date: 2014-02-20 11:56:38 -0500 (Thu, 20 Feb 2014) New Revision: 506 Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java Log: [SECURITY-796] Fixed an issue where the LdapExtended login module does not handle a user that has a slash character in the uid Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java =================================================================== --- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java 2014-01-29 09:16:33 UTC (rev 505) +++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java 2014-02-20 16:56:38 UTC (rev 506) @@ -40,6 +40,7 @@ import javax.naming.directory.SearchResult; import javax.naming.ldap.InitialLdapContext; import javax.naming.ldap.LdapContext; +import javax.naming.CompositeName; import javax.security.auth.Subject; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.login.LoginException; @@ -547,7 +548,7 @@ if (userDN == null) { if (sr.isRelative() == true) { - userDN = name + ("".equals(baseDN) ? "" : "," + baseDN); + userDN = new CompositeName(name).get(0) + ("".equals(baseDN) ? "" : "," + baseDN); } else { throw PicketBoxMessages.MESSAGES.unableToFollowReferralForAuth(name); From jboss-cvs-commits at lists.jboss.org Thu Feb 20 12:09:12 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 20 Feb 2014 12:09:12 -0500 Subject: [jboss-cvs] Picketbox SVN: r507 - branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi. Message-ID: <201402201709.s1KH9Cxk004422@svn01.web.mwc.hst.phx2.redhat.com> Author: dehort Date: 2014-02-20 12:09:12 -0500 (Thu, 20 Feb 2014) New Revision: 507 Modified: branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java Log: [bz-1067599] Fixed an issue where the LdapExtended login module does not handle a user that has a slash character in the uid Modified: branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java =================================================================== --- branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java 2014-02-20 16:56:38 UTC (rev 506) +++ branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/spi/LdapExtLoginModule.java 2014-02-20 17:09:12 UTC (rev 507) @@ -40,6 +40,7 @@ import javax.naming.directory.SearchResult; import javax.naming.ldap.InitialLdapContext; import javax.naming.ldap.LdapContext; +import javax.naming.CompositeName; import javax.security.auth.Subject; import javax.security.auth.callback.CallbackHandler; import javax.security.auth.login.LoginException; @@ -547,7 +548,7 @@ if (userDN == null) { if (sr.isRelative() == true) { - userDN = name + ("".equals(baseDN) ? "" : "," + baseDN); + userDN = new CompositeName(name).get(0) + ("".equals(baseDN) ? "" : "," + baseDN); } else { throw PicketBoxMessages.MESSAGES.unableToFollowReferralForAuth(name); From jboss-cvs-commits at lists.jboss.org Thu Feb 20 12:27:55 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 20 Feb 2014 12:27:55 -0500 Subject: [jboss-cvs] Picketbox SVN: r508 - trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/mapping/providers/role. Message-ID: <201402201727.s1KHRtMg006909@svn01.web.mwc.hst.phx2.redhat.com> Author: dehort Date: 2014-02-20 12:27:54 -0500 (Thu, 20 Feb 2014) New Revision: 508 Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/mapping/providers/role/Util.java Log: [SECURITY-797] Fixed a bug where the DatabaseRolesMappingProvider will attempt to use an empty result set if the rolesQuery returns an empty set. This causes the authentication attempt to fail. Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/mapping/providers/role/Util.java =================================================================== --- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/mapping/providers/role/Util.java 2014-02-20 17:09:12 UTC (rev 507) +++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/mapping/providers/role/Util.java 2014-02-20 17:27:54 UTC (rev 508) @@ -221,13 +221,15 @@ { PicketBoxLogger.LOGGER.traceQueryWithEmptyResult(); } - - do + else { - String name = rs.getString(1); - roleGroup.addRole(new SimpleRole(name)); + do + { + String name = rs.getString(1); + roleGroup.addRole(new SimpleRole(name)); + } + while (rs.next()); } - while (rs.next()); } catch (NamingException ex) { @@ -295,4 +297,4 @@ catch(Exception e) {} } -} \ No newline at end of file +} From jboss-cvs-commits at lists.jboss.org Thu Feb 20 12:39:54 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 20 Feb 2014 12:39:54 -0500 Subject: [jboss-cvs] Picketbox SVN: r509 - branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/mapping/providers/role. Message-ID: <201402201739.s1KHds5a007848@svn01.web.mwc.hst.phx2.redhat.com> Author: dehort Date: 2014-02-20 12:39:54 -0500 (Thu, 20 Feb 2014) New Revision: 509 Modified: branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/mapping/providers/role/Util.java Log: [bz-1067612] Fixed a bug where the DatabaseRolesMappingProvider will attempt to use an empty result set if the rolesQuery returns an empty set. This causes the authentication attempt to fail. Modified: branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/mapping/providers/role/Util.java =================================================================== --- branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/mapping/providers/role/Util.java 2014-02-20 17:27:54 UTC (rev 508) +++ branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/mapping/providers/role/Util.java 2014-02-20 17:39:54 UTC (rev 509) @@ -221,13 +221,15 @@ { PicketBoxLogger.LOGGER.traceQueryWithEmptyResult(); } - - do + else { - String name = rs.getString(1); - roleGroup.addRole(new SimpleRole(name)); + do + { + String name = rs.getString(1); + roleGroup.addRole(new SimpleRole(name)); + } + while (rs.next()); } - while (rs.next()); } catch (NamingException ex) { @@ -295,4 +297,4 @@ catch(Exception e) {} } -} \ No newline at end of file +} From jboss-cvs-commits at lists.jboss.org Thu Feb 20 13:29:13 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 20 Feb 2014 13:29:13 -0500 Subject: [jboss-cvs] JBoss Messaging SVN: r8619 - admin. Message-ID: <201402201829.s1KITDvg019829@svn01.web.mwc.hst.phx2.redhat.com> Author: apache Date: 2014-02-20 13:29:13 -0500 (Thu, 20 Feb 2014) New Revision: 8619 Modified: admin/authz_svn.conf Log: updated authz with new embargo users Modified: admin/authz_svn.conf =================================================================== --- admin/authz_svn.conf 2014-01-16 02:39:12 UTC (rev 8618) +++ admin/authz_svn.conf 2014-02-20 18:29:13 UTC (rev 8619) @@ -17,7 +17,7 @@ *= @embargo-users=rw [groups] -embargo-users=vtunka,yang.yonng,dfj,dlofthouse,darran.lofthouse at jboss.com,abn,weinanli,asoldano,thoger,pskopek,mbenitez,tkobayas at redhat.com,theute,mvanco,vramik,pskopek at redhat.com,anil.saldhana at jboss.com,fbogyai,jcacek,olukas,bleathem,lfryc,jpapouse,ppitonak,spinder,gaol,dosoudil,dosoudil at redhat.com,ron.sigal at jboss.com,manaRH +embargo-users=vtunka,yang.yonng,dfj,dlofthouse,darran.lofthouse at jboss.com,abn,weinanli,asoldano,thoger,pskopek,mbenitez,tkobayas at redhat.com,theute,mvanco,vramik,pskopek at redhat.com,anil.saldhana at jboss.com,fbogyai,jcacek,olukas,bleathem,lfryc,jpapouse,ppitonak,spinder,gaol,dosoudil,dosoudil at redhat.com,ron.sigal at jboss.com,manaRH,sguilhen at redhat.com #### #### Group Definitions From jboss-cvs-commits at lists.jboss.org Thu Feb 20 13:31:30 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 20 Feb 2014 13:31:30 -0500 Subject: [jboss-cvs] Picketlink SVN: r1586 - admin. Message-ID: <201402201831.s1KIVUkf021004@svn01.web.mwc.hst.phx2.redhat.com> Author: apache Date: 2014-02-20 13:31:30 -0500 (Thu, 20 Feb 2014) New Revision: 1586 Modified: admin/authz_svn.conf Log: updated authz with new embargo users Modified: admin/authz_svn.conf =================================================================== --- admin/authz_svn.conf 2014-01-16 02:41:31 UTC (rev 1585) +++ admin/authz_svn.conf 2014-02-20 18:31:30 UTC (rev 1586) @@ -20,7 +20,7 @@ *= @embargo-users=rw [groups] -embargo-users=vtunka,yang.yonng,dfj,dlofthouse,darran.lofthouse at jboss.com,abn,weinanli,asoldano,thoger,pskopek,mbenitez,tkobayas at redhat.com,theute,mvanco,vramik,pskopek at redhat.com,anil.saldhana at jboss.com,fbogyai,jcacek,olukas,bleathem,lfryc,jpapouse,ppitonak,spinder,gaol,dosoudil,dosoudil at redhat.com,ron.sigal at jboss.com,manaRH +embargo-users=vtunka,yang.yonng,dfj,dlofthouse,darran.lofthouse at jboss.com,abn,weinanli,asoldano,thoger,pskopek,mbenitez,tkobayas at redhat.com,theute,mvanco,vramik,pskopek at redhat.com,anil.saldhana at jboss.com,fbogyai,jcacek,olukas,bleathem,lfryc,jpapouse,ppitonak,spinder,gaol,dosoudil,dosoudil at redhat.com,ron.sigal at jboss.com,manaRH,sguilhen at redhat.com #### #### Group Definitions From jboss-cvs-commits at lists.jboss.org Thu Feb 20 15:02:42 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 20 Feb 2014 15:02:42 -0500 Subject: [jboss-cvs] Picketbox SVN: r511 - in branches/eap62: picketbox/src/main/java/org/picketbox/factories and 10 other directories. Message-ID: <201402202002.s1KK2gOD011414@svn01.web.mwc.hst.phx2.redhat.com> Author: sguilhen at redhat.com Date: 2014-02-20 15:02:40 -0500 (Thu, 20 Feb 2014) New Revision: 511 Modified: branches/eap62/ branches/eap62/picketbox/src/main/java/org/picketbox/factories/SecurityFactory.java branches/eap62/security-jboss-sx/identity/src/main/java/org/jboss/security/identity/plugins/IdentityFactory.java branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/AppPolicy.java branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/ExternalPasswordCache.java branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/SecurityRolesAssociation.java branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/Util.java branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/login/XMLLoginConfigImpl.java branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/SecurityConfiguration.java branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/StandaloneConfiguration.java branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/plugins/ClassLoaderLocatorFactory.java branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/plugins/TransactionManagerLocator.java branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/plugins/audit/JBossAuditManager.java branches/eap62/security-spi/identity/src/main/java/org/jboss/security/identity/RoleFactory.java branches/eap62/security-spi/spi/src/main/java/org/jboss/security/SecurityContextAssociation.java branches/eap62/security-spi/spi/src/main/java/org/jboss/security/SecurityContextFactory.java branches/eap62/security-spi/spi/src/main/java/org/jboss/security/factories/AuthorizationManagerFactory.java branches/eap62/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVaultFactory.java Log: [BZ1050058] Adding Java Security Manager checks. 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 /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 Modified: branches/eap62/picketbox/src/main/java/org/picketbox/factories/SecurityFactory.java =================================================================== --- branches/eap62/picketbox/src/main/java/org/picketbox/factories/SecurityFactory.java 2014-02-20 18:31:32 UTC (rev 510) +++ branches/eap62/picketbox/src/main/java/org/picketbox/factories/SecurityFactory.java 2014-02-20 20:02:40 UTC (rev 511) @@ -87,6 +87,10 @@ */ public static AuthenticationManager getAuthenticationManager(String securityDomain) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityFactory.class.getName() + ".getAuthenticationManager")); + } validate(); return securityManagement.getAuthenticationManager(securityDomain); } @@ -98,6 +102,10 @@ */ public static AuthorizationManager getAuthorizationManager(String securityDomain) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityFactory.class.getName()+ ".getAuthorizationManager")); + } validate(); return securityManagement.getAuthorizationManager(securityDomain); } @@ -109,6 +117,10 @@ */ public static AuditManager getAuditManager(String securityDomain) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityFactory.class.getName() + ".getAuditManager")); + } validate(); return securityManagement.getAuditManager(securityDomain); } @@ -120,6 +132,10 @@ */ public static MappingManager getMappingManager(String securityDomain) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityFactory.class.getName() + ".getMappingManager")); + } validate(); return securityManagement.getMappingManager(securityDomain); } @@ -130,6 +146,10 @@ */ public static ISecurityManagement getSecurityManagement() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityFactory.class.getName() + ".getSecurityManagement")); + } return securityManagement; } @@ -139,6 +159,10 @@ */ public static void setSecurityManagement(ISecurityManagement iSecurityManagement) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityFactory.class.getName() + ".setSecurityManagement")); + } securityManagement = iSecurityManagement; } @@ -150,6 +174,10 @@ */ public static void prepare() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityFactory.class.getName() + ".prepare")); + } if(Configuration.getConfiguration() instanceof ApplicationPolicyRegistration == false) { standaloneConfiguration.setParentConfig(parentConfiguration); @@ -163,6 +191,10 @@ */ public static SecurityContext establishSecurityContext(String securityDomainName) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityFactory.class.getName() + ".establishSecurityContext")); + } SecurityContext securityContext = null; try { @@ -181,6 +213,10 @@ */ public static void release() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityFactory.class.getName() + ".release")); + } Configuration config = Configuration.getConfiguration(); if(config == standaloneConfiguration) { @@ -190,6 +226,10 @@ private static void validate() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityFactory.class.getName() + ".validate")); + } assert(securityManagement != null); } } \ No newline at end of file Modified: branches/eap62/security-jboss-sx/identity/src/main/java/org/jboss/security/identity/plugins/IdentityFactory.java =================================================================== --- branches/eap62/security-jboss-sx/identity/src/main/java/org/jboss/security/identity/plugins/IdentityFactory.java 2014-02-20 18:31:32 UTC (rev 510) +++ branches/eap62/security-jboss-sx/identity/src/main/java/org/jboss/security/identity/plugins/IdentityFactory.java 2014-02-20 20:02:40 UTC (rev 511) @@ -86,6 +86,10 @@ private static Object loadClass(String className, String ctorArg) throws Exception { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(IdentityFactory.class.getName() + ".loadClass")); + } Class clazz = SecurityActions.getClass(className); Constructor ctr = clazz.getConstructor(new Class[] {String.class}); @@ -95,6 +99,10 @@ private static Object loadClass(String className, String ctorArg1, String ctorArg2) throws Exception { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(IdentityFactory.class.getName() + ".loadClass")); + } Class clazz = SecurityActions.getClass(className); Constructor ctr = clazz.getConstructor(new Class[] {String.class, String.class}); @@ -104,6 +112,10 @@ private static Object loadClass(String className, String ctorArg1, Role ctorArg2) throws Exception { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(IdentityFactory.class.getName() + ".loadClass")); + } Class clazz = SecurityActions.getClass(className); Constructor ctr = clazz.getConstructor(new Class[] {String.class, Role.class}); Modified: branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/AppPolicy.java =================================================================== --- branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/AppPolicy.java 2014-02-20 18:31:32 UTC (rev 510) +++ branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/AppPolicy.java 2014-02-20 20:02:40 UTC (rev 511) @@ -83,6 +83,10 @@ public static void setDefaultAppPolicy(AppPolicy policy) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(AppPolicy.class.getName() + ".setDefaultAppPolicy")); + } if( policy == null ) throw PicketBoxMessages.MESSAGES.invalidNullArgument("policy"); defaultAppPolicy = policy; Modified: branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/ExternalPasswordCache.java =================================================================== --- branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/ExternalPasswordCache.java 2014-02-20 18:31:32 UTC (rev 510) +++ branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/ExternalPasswordCache.java 2014-02-20 20:02:40 UTC (rev 511) @@ -54,6 +54,10 @@ } public static ExternalPasswordCache getExternalPasswordCacheInstance() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(ExternalPasswordCache.class.getName() + ".getExternalPasswordCacheInstance")); + } return PASSWORD_CACHE; } Modified: branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/SecurityRolesAssociation.java =================================================================== --- branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/SecurityRolesAssociation.java 2014-02-20 18:31:32 UTC (rev 510) +++ branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/SecurityRolesAssociation.java 2014-02-20 20:02:40 UTC (rev 511) @@ -24,7 +24,6 @@ import java.util.Map; import java.util.Set; -import org.jboss.logging.Logger; /** * The SecurityRolesAssociation uses a ThreadLocal to associate the SecurityRoleMetaData @@ -49,6 +48,10 @@ */ public static Map> getSecurityRoles() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityRolesAssociation.class.getName() + ".getSecurityRoles")); + } return (Map>) threadSecurityRoleMapping.get(); } @@ -57,6 +60,10 @@ */ public static void setSecurityRoles(Map> securityRoles) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityRolesAssociation.class.getName() + ".setSecurityRoles")); + } PicketBoxLogger.LOGGER.traceSecRolesAssociationSetSecurityRoles(securityRoles); if(securityRoles == null) threadSecurityRoleMapping.remove(); Modified: branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/Util.java =================================================================== --- branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/Util.java 2014-02-20 18:31:32 UTC (rev 510) +++ branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/Util.java 2014-02-20 20:02:40 UTC (rev 511) @@ -33,6 +33,7 @@ import java.util.ArrayList; import java.util.StringTokenizer; + /** * Util. * @@ -68,6 +69,10 @@ public static char[] loadPassword(String passwordCmd) throws Exception { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(Util.class.getName() + ".loadPassword")); + } char[] password = null; String passwordCmdType = null; Modified: branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/login/XMLLoginConfigImpl.java =================================================================== --- branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/login/XMLLoginConfigImpl.java 2014-02-20 18:31:32 UTC (rev 510) +++ branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/auth/login/XMLLoginConfigImpl.java 2014-02-20 20:02:40 UTC (rev 511) @@ -99,6 +99,10 @@ */ public static XMLLoginConfigImpl getInstance() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(XMLLoginConfigImpl.class.getName() + ".getInstance")); + } return instance; } Modified: branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/SecurityConfiguration.java =================================================================== --- branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/SecurityConfiguration.java 2014-02-20 18:31:32 UTC (rev 510) +++ branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/SecurityConfiguration.java 2014-02-20 20:02:40 UTC (rev 511) @@ -46,6 +46,10 @@ */ public static void addApplicationPolicy(ApplicationPolicy applicationPolicy) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".addApplicationPolicy")); + } if(applicationPolicy == null) throw PicketBoxMessages.MESSAGES.invalidNullArgument("applicationPolicy"); appPolicies.put(applicationPolicy.getName(), applicationPolicy); @@ -57,6 +61,10 @@ */ public static void removeApplicationPolicy(String name) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".removeApplicationPolicy")); + } appPolicies.remove(name); } @@ -67,41 +75,73 @@ */ public static ApplicationPolicy getApplicationPolicy(String policyName) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".getApplicationPolicy")); + } return (ApplicationPolicy)appPolicies.get(policyName); } public static String getCipherAlgorithm() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".getCipherAlgorithm")); + } return cipherAlgorithm; } public static void setCipherAlgorithm(String ca) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".setCipherAlgorithm")); + } cipherAlgorithm = ca; } public static Key getCipherKey() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".getCipherKey")); + } return cipherKey; } public static void setCipherKey(Key ca) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".setCipherKey")); + } cipherKey = ca; } public static AlgorithmParameterSpec getCipherSpec() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".getCipherSpec")); + } return cipherSpec; } public static void setCipherSpec(AlgorithmParameterSpec aps) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".setCipherSpec")); + } cipherSpec = aps; } public static int getIterationCount() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".getIterationCount")); + } return iterationCount; } @@ -110,12 +150,20 @@ */ public static void setIterationCount(int count) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".setIterationCount")); + } iterationCount = count; } public static String getSalt() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".getSalt")); + } return salt; } /** Set the salt used with PBE based on the keystore password. @@ -123,6 +171,10 @@ */ public static void setSalt(String s) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".setSalt")); + } salt = s; } @@ -132,6 +184,10 @@ */ public static String getKeyStoreType() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".getKeyStoreType")); + } return keyStoreType; } /** Set the type of KeyStore implementation to use. This is @@ -139,12 +195,20 @@ */ public static void setKeyStoreType(String type) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".setKeyStoreType")); + } keyStoreType = type; } /** Get the KeyStore database URL string. */ public static String getKeyStoreURL() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".getKeyStoreURL")); + } return keyStoreURL; } /** Set the KeyStore database URL string. This is used to obtain @@ -152,6 +216,10 @@ */ public static void setKeyStoreURL(String storeURL) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".setKeyStoreURL")); + } keyStoreURL = storeURL; } @@ -159,6 +227,10 @@ */ public static String getKeyStorePass() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".getKeyStorePass")); + } return keyStorePass ; } @@ -166,6 +238,10 @@ */ public static void setKeyStorePass(String password) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".setKeyStorePass")); + } keyStorePass = password; } @@ -174,6 +250,10 @@ */ public static String getTrustStoreType() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".getTrustStoreType")); + } return trustStoreType; } @@ -182,6 +262,10 @@ */ public static void setTrustStoreType(String type) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".setTrustStoreType")); + } trustStoreType = type; } @@ -189,6 +273,10 @@ */ public static String getTrustStorePass() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".getTrustStorePass")); + } return trustStorePass; } @@ -196,6 +284,10 @@ */ public static void setTrustStorePass(String password) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".setTrustStorePass")); + } trustStorePass = password; } @@ -203,6 +295,10 @@ */ public static String getTrustStoreURL() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".getTrustStoreURL")); + } return trustStoreURL; } @@ -211,16 +307,28 @@ */ public static void setTrustStoreURL(String storeURL) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".setTrustStoreURL")); + } trustStoreURL = storeURL; } public static boolean isDeepCopySubjectMode() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".isDeepCopySubjectMode")); + } return deepCopySubjectMode; } public static void setDeepCopySubjectMode(boolean dcsm) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityConfiguration.class.getName() + ".setDeepCopySubjectMode")); + } deepCopySubjectMode = dcsm; } } \ No newline at end of file Modified: branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/StandaloneConfiguration.java =================================================================== --- branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/StandaloneConfiguration.java 2014-02-20 18:31:32 UTC (rev 510) +++ branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/config/StandaloneConfiguration.java 2014-02-20 20:02:40 UTC (rev 511) @@ -60,7 +60,11 @@ public static StandaloneConfiguration getInstance() { - if(_instance == null) + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(StandaloneConfiguration.class.getName() + ".getInstance")); + } + if(_instance == null) _instance = new StandaloneConfiguration(); return _instance; } @@ -144,4 +148,4 @@ return entry; } -} \ No newline at end of file +} Modified: branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/plugins/ClassLoaderLocatorFactory.java =================================================================== --- branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/plugins/ClassLoaderLocatorFactory.java 2014-02-20 18:31:32 UTC (rev 510) +++ branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/plugins/ClassLoaderLocatorFactory.java 2014-02-20 20:02:40 UTC (rev 511) @@ -21,6 +21,7 @@ */ package org.jboss.security.plugins; + /** * Simple factory for {@code ClassLoaderLocator} * @author Anil Saldhana @@ -36,11 +37,19 @@ */ public static void set(ClassLoaderLocator cl) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(ClassLoaderLocatorFactory.class.getName() + ".set")); + } theLocator = cl; } public static ClassLoaderLocator get() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(ClassLoaderLocatorFactory.class.getName() + ".get")); + } return theLocator; } } \ No newline at end of file Modified: branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/plugins/TransactionManagerLocator.java =================================================================== --- branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/plugins/TransactionManagerLocator.java 2014-02-20 18:31:32 UTC (rev 510) +++ branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/plugins/TransactionManagerLocator.java 2014-02-20 20:02:40 UTC (rev 511) @@ -90,6 +90,10 @@ public static void setTransactionManager(TransactionManager transactionManager) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(TransactionManagerLocator.class.getName() + ".setTransactionManager")); + } TransactionManagerLocator.transactionManager = transactionManager; } } \ No newline at end of file Modified: branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/plugins/audit/JBossAuditManager.java =================================================================== --- branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/plugins/audit/JBossAuditManager.java 2014-02-20 18:31:32 UTC (rev 510) +++ branches/eap62/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/plugins/audit/JBossAuditManager.java 2014-02-20 20:02:40 UTC (rev 511) @@ -86,6 +86,10 @@ public static AuditContext getAuditContext(String securityDomain) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(JBossAuditManager.class.getName() + ".getAuditContext")); + } AuditContext ac = (AuditContext)contexts.get(securityDomain); if(ac == null) ac = defaultContext; @@ -94,6 +98,10 @@ public static void addAuditContext(String securityDomain, AuditContext ac) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(JBossAuditManager.class.getName() + ".addAuditContext")); + } contexts.put(securityDomain, ac); } Modified: branches/eap62/security-spi/identity/src/main/java/org/jboss/security/identity/RoleFactory.java =================================================================== --- branches/eap62/security-spi/identity/src/main/java/org/jboss/security/identity/RoleFactory.java 2014-02-20 18:31:32 UTC (rev 510) +++ branches/eap62/security-spi/identity/src/main/java/org/jboss/security/identity/RoleFactory.java 2014-02-20 20:02:40 UTC (rev 511) @@ -26,6 +26,7 @@ import java.security.PrivilegedActionException; import java.security.PrivilegedExceptionAction; + /** * Factory to create roles * @author Anil.Saldhana at redhat.com @@ -85,11 +86,19 @@ public static void setSimpleRoleClass(String fqn) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(RoleFactory.class.getName() + ".setSimpleRoleClass")); + } SIMPLE_ROLE_CLASS = fqn; } public static void setSimpleRoleGroupClass(String fqn) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(RoleFactory.class.getName() + ".setSimpleRoleGroupClass")); + } SIMPLE_ROLEGROUP_CLASS = fqn; } } Modified: branches/eap62/security-spi/spi/src/main/java/org/jboss/security/SecurityContextAssociation.java =================================================================== --- branches/eap62/security-spi/spi/src/main/java/org/jboss/security/SecurityContextAssociation.java 2014-02-20 18:31:32 UTC (rev 510) +++ branches/eap62/security-spi/spi/src/main/java/org/jboss/security/SecurityContextAssociation.java 2014-02-20 20:02:40 UTC (rev 511) @@ -106,6 +106,10 @@ */ public static void setClient() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityContextAssociation.class.getName() + ".setClient")); + } SERVER = false; } @@ -205,6 +209,10 @@ */ public static RunAs peekRunAsIdentity() { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityContextAssociation.class.getName() + ".peekRunAsIdentity")); + } RunAs ra = null; SecurityContext sc = SecurityContextAssociation.getSecurityContext(); if (sc != null) Modified: branches/eap62/security-spi/spi/src/main/java/org/jboss/security/SecurityContextFactory.java =================================================================== --- branches/eap62/security-spi/spi/src/main/java/org/jboss/security/SecurityContextFactory.java 2014-02-20 18:31:32 UTC (rev 510) +++ branches/eap62/security-spi/spi/src/main/java/org/jboss/security/SecurityContextFactory.java 2014-02-20 20:02:40 UTC (rev 511) @@ -23,7 +23,6 @@ import java.lang.reflect.Constructor; import java.security.Principal; - import javax.security.auth.Subject; @@ -174,6 +173,10 @@ public static SecurityContext createSecurityContext(String securityDomain, Class clazz) throws Exception { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityContextFactory.class.getName() + ".createSecurityContext")); + } if(securityDomain == null) throw PicketBoxMessages.MESSAGES.invalidNullArgument("security domain"); if(clazz == null) @@ -185,6 +188,10 @@ private static SecurityContext createSecurityContext(String securityDomain, Constructor constructor) throws Exception { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityContextFactory.class.getName() + ".createSecurityContext")); + } if (securityDomain == null) throw PicketBoxMessages.MESSAGES.invalidNullArgument("security domain"); if (constructor == null) @@ -222,6 +229,10 @@ public static SecurityContext createSecurityContext(Principal p, Object cred, Subject s, String securityDomain, ClassLoader classLoader) throws Exception { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityContextFactory.class.getName() + ".createSecurityContext")); + } SecurityContext jsc = createSecurityContext(securityDomain, classLoader); jsc.getUtil().createSubjectInfo(p,cred,s); return jsc; @@ -266,6 +277,10 @@ */ public static SecurityContextUtil createUtil(SecurityContext sc, ClassLoader classLoader) throws Exception { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityContextFactory.class.getName() + ".createUtil")); + } Constructor ctr = defaultUtilConstructor; if(ctr == null) @@ -298,6 +313,10 @@ */ public static SecurityContextUtil createUtil(SecurityContext sc, String utilFQN, ClassLoader classLoader) throws Exception { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityContextFactory.class.getName() + ".createUtil")); + } Class clazz = loadClass(utilFQN, classLoader); //Get the CTR Constructor ctr = @@ -313,6 +332,10 @@ public static SecurityContextUtil createUtil(SecurityContext sc, Class utilClazz) throws Exception { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityContextFactory.class.getName() + ".createUtil")); + } //Get the CTR Constructor ctr = utilClazz.getConstructor(new Class[]{SecurityContext.class}); return ctr.newInstance(new Object[]{sc}); @@ -324,6 +347,10 @@ */ public static void setDefaultSecurityContextFQN(String fqn) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityContextFactory.class.getName() + ".setDefaultSecurityContextFQN")); + } defaultFQN = fqn; defaultSecurityContextClass = null; defaultSecurityContextConstructor = null; @@ -336,6 +363,10 @@ */ public static void setDefaultSecurityContextUtilFQN(String fqn) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityContextFactory.class.getName() + ".setDefaultSecurityContextUtilFQN")); + } defaultUtilClassFQN = fqn; defaultUtilClass = null; //reset defaultUtilConstructor = null; Modified: branches/eap62/security-spi/spi/src/main/java/org/jboss/security/factories/AuthorizationManagerFactory.java =================================================================== --- branches/eap62/security-spi/spi/src/main/java/org/jboss/security/factories/AuthorizationManagerFactory.java 2014-02-20 18:31:32 UTC (rev 510) +++ branches/eap62/security-spi/spi/src/main/java/org/jboss/security/factories/AuthorizationManagerFactory.java 2014-02-20 20:02:40 UTC (rev 511) @@ -41,6 +41,10 @@ public static AuthorizationManager getAuthorizationManager(String securityDomain) throws Exception { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(AuthorizationManagerFactory.class.getName() + ".getAuthorizationManager")); + } Class clazz = SecurityActions.loadClass(fqn); Constructor ctr = clazz.getConstructor(new Class[] { String.class} ); return (AuthorizationManager) ctr.newInstance(new Object[] {securityDomain}); @@ -48,6 +52,10 @@ public static void setFQN(String name) { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(AuthorizationManagerFactory.class.getName() + ".setFQN")); + } fqn = name; } } \ No newline at end of file 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-02-20 18:31:32 UTC (rev 510) +++ branches/eap62/security-spi/spi/src/main/java/org/jboss/security/vault/SecurityVaultFactory.java 2014-02-20 20:02:40 UTC (rev 511) @@ -53,6 +53,10 @@ */ public static SecurityVault get(String fqn) throws SecurityVaultException { + SecurityManager sm = System.getSecurityManager(); + if (sm != null) { + sm.checkPermission(new RuntimePermission(SecurityVaultFactory.class.getName() + ".get")); + } if(fqn == null) return get(); From jboss-cvs-commits at lists.jboss.org Thu Feb 20 17:08:45 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 20 Feb 2014 17:08:45 -0500 Subject: [jboss-cvs] Picketbox SVN: r512 - in branches/eap62: assembly and 18 other directories. Message-ID: <201402202208.s1KM8jxn005039@svn01.web.mwc.hst.phx2.redhat.com> Author: sguilhen at redhat.com Date: 2014-02-20 17:08:44 -0500 (Thu, 20 Feb 2014) New Revision: 512 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: BZ1067580 Prepare the PB 4.0.19.SP4 release Modified: branches/eap62/assembly/pom.xml =================================================================== --- branches/eap62/assembly/pom.xml 2014-02-20 20:02:40 UTC (rev 511) +++ branches/eap62/assembly/pom.xml 2014-02-20 22:08:44 UTC (rev 512) @@ -2,7 +2,7 @@ org.picketbox picketbox-parent - 4.0.19.SP2 + 4.0.19.SP4 ../parent 4.0.0 Modified: branches/eap62/parent/pom.xml =================================================================== --- branches/eap62/parent/pom.xml 2014-02-20 20:02:40 UTC (rev 511) +++ branches/eap62/parent/pom.xml 2014-02-20 22:08:44 UTC (rev 512) @@ -8,7 +8,7 @@ org.picketbox picketbox-parent pom - 4.0.19.SP2 + 4.0.19.SP4 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.SP2 - scm:svn:https://svn.jboss.org/repos/picketbox/tags/4.0.19.SP2 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/tags/4.0.19.SP4 + scm:svn:https://svn.jboss.org/repos/picketbox/tags/4.0.19.SP4 Modified: branches/eap62/picketbox/pom.xml =================================================================== --- branches/eap62/picketbox/pom.xml 2014-02-20 20:02:40 UTC (rev 511) +++ branches/eap62/picketbox/pom.xml 2014-02-20 22:08:44 UTC (rev 512) @@ -8,7 +8,7 @@ 4.0.0 org.picketbox picketbox-bare - 4.0.19.SP2 + 4.0.19.SP4 jar Picketbox http://jboss.org/picketbox Modified: branches/eap62/picketbox-infinispan/pom.xml =================================================================== --- branches/eap62/picketbox-infinispan/pom.xml 2014-02-20 20:02:40 UTC (rev 511) +++ branches/eap62/picketbox-infinispan/pom.xml 2014-02-20 22:08:44 UTC (rev 512) @@ -8,7 +8,7 @@ 4.0.0 org.picketbox picketbox-infinispan - 4.0.19.SP2 + 4.0.19.SP4 jar Picketbox Infinispan http://jboss.org/picketbox Modified: branches/eap62/pom.xml =================================================================== --- branches/eap62/pom.xml 2014-02-20 20:02:40 UTC (rev 511) +++ branches/eap62/pom.xml 2014-02-20 22:08:44 UTC (rev 512) @@ -2,7 +2,7 @@ org.picketbox picketbox-parent - 4.0.19.SP2 + 4.0.19.SP4 parent Modified: branches/eap62/security-jboss-sx/acl/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/acl/pom.xml 2014-02-20 20:02:40 UTC (rev 511) +++ branches/eap62/security-jboss-sx/acl/pom.xml 2014-02-20 22:08:44 UTC (rev 512) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP2 + 4.0.19.SP4 ../parent 4.0.0 Modified: branches/eap62/security-jboss-sx/assembly/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/assembly/pom.xml 2014-02-20 20:02:40 UTC (rev 511) +++ branches/eap62/security-jboss-sx/assembly/pom.xml 2014-02-20 22:08:44 UTC (rev 512) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP2 + 4.0.19.SP4 ../parent 4.0.0 Modified: branches/eap62/security-jboss-sx/identity/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/identity/pom.xml 2014-02-20 20:02:40 UTC (rev 511) +++ branches/eap62/security-jboss-sx/identity/pom.xml 2014-02-20 22:08:44 UTC (rev 512) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP2 + 4.0.19.SP4 ../parent 4.0.0 Modified: branches/eap62/security-jboss-sx/jbosssx/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/jbosssx/pom.xml 2014-02-20 20:02:40 UTC (rev 511) +++ branches/eap62/security-jboss-sx/jbosssx/pom.xml 2014-02-20 22:08:44 UTC (rev 512) @@ -3,7 +3,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP2 + 4.0.19.SP4 ../parent 4.0.0 Modified: branches/eap62/security-jboss-sx/jbosssx-client/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/jbosssx-client/pom.xml 2014-02-20 20:02:40 UTC (rev 511) +++ branches/eap62/security-jboss-sx/jbosssx-client/pom.xml 2014-02-20 22:08:44 UTC (rev 512) @@ -7,7 +7,7 @@ 4.0.0 org.picketbox jbosssx-client - 4.0.19.SP2 + 4.0.19.SP4 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-02-20 20:02:40 UTC (rev 511) +++ branches/eap62/security-jboss-sx/parent/pom.xml 2014-02-20 22:08:44 UTC (rev 512) @@ -8,7 +8,7 @@ org.picketbox jbosssx-parent pom - 4.0.19.SP2 + 4.0.19.SP4 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.SP2 - scm:svn:https://svn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.19.SP2 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.19.SP4 + scm:svn:https://svn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.19.SP4 @@ -148,6 +148,6 @@ GA - 4.0.19.SP2 + 4.0.19.SP4 Modified: branches/eap62/security-jboss-sx/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/pom.xml 2014-02-20 20:02:40 UTC (rev 511) +++ branches/eap62/security-jboss-sx/pom.xml 2014-02-20 22:08:44 UTC (rev 512) @@ -7,7 +7,7 @@ 4.0.0 org.picketbox jbosssx-pom - 4.0.19.SP2 + 4.0.19.SP4 pom PicketBox Implementation - Parent http://jboss.org/picketbox Modified: branches/eap62/security-spi/acl/pom.xml =================================================================== --- branches/eap62/security-spi/acl/pom.xml 2014-02-20 20:02:40 UTC (rev 511) +++ branches/eap62/security-spi/acl/pom.xml 2014-02-20 22:08:44 UTC (rev 512) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP2 + 4.0.19.SP4 ../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.SP2 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP2 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP2 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP4 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP4 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP4 Modified: branches/eap62/security-spi/assembly/pom.xml =================================================================== --- branches/eap62/security-spi/assembly/pom.xml 2014-02-20 20:02:40 UTC (rev 511) +++ branches/eap62/security-spi/assembly/pom.xml 2014-02-20 22:08:44 UTC (rev 512) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP2 + 4.0.19.SP4 ../parent 4.0.0 Modified: branches/eap62/security-spi/authorization/pom.xml =================================================================== --- branches/eap62/security-spi/authorization/pom.xml 2014-02-20 20:02:40 UTC (rev 511) +++ branches/eap62/security-spi/authorization/pom.xml 2014-02-20 22:08:44 UTC (rev 512) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP2 + 4.0.19.SP4 ../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.SP2 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP2 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP2 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP4 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP4 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP4 Modified: branches/eap62/security-spi/common/pom.xml =================================================================== --- branches/eap62/security-spi/common/pom.xml 2014-02-20 20:02:40 UTC (rev 511) +++ branches/eap62/security-spi/common/pom.xml 2014-02-20 22:08:44 UTC (rev 512) @@ -5,7 +5,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP2 + 4.0.19.SP4 ../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.SP2 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP2 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP2 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP4 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP4 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP4 Modified: branches/eap62/security-spi/identity/pom.xml =================================================================== --- branches/eap62/security-spi/identity/pom.xml 2014-02-20 20:02:40 UTC (rev 511) +++ branches/eap62/security-spi/identity/pom.xml 2014-02-20 22:08:44 UTC (rev 512) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP2 + 4.0.19.SP4 ../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.SP2 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP2 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP2 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP4 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP4 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP4 Modified: branches/eap62/security-spi/parent/pom.xml =================================================================== --- branches/eap62/security-spi/parent/pom.xml 2014-02-20 20:02:40 UTC (rev 511) +++ branches/eap62/security-spi/parent/pom.xml 2014-02-20 22:08:44 UTC (rev 512) @@ -8,7 +8,7 @@ org.picketbox picketbox-spi-parent pom - 4.0.19.SP2 + 4.0.19.SP4 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.SP2 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP2 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP4 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP4 Modified: branches/eap62/security-spi/pom.xml =================================================================== --- branches/eap62/security-spi/pom.xml 2014-02-20 20:02:40 UTC (rev 511) +++ branches/eap62/security-spi/pom.xml 2014-02-20 22:08:44 UTC (rev 512) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP2 + 4.0.19.SP4 parent 4.0.0 Modified: branches/eap62/security-spi/spi/pom.xml =================================================================== --- branches/eap62/security-spi/spi/pom.xml 2014-02-20 20:02:40 UTC (rev 511) +++ branches/eap62/security-spi/spi/pom.xml 2014-02-20 22:08:44 UTC (rev 512) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP2 + 4.0.19.SP4 ../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.SP2 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP2 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP2 + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP4 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP4 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP4 From jboss-cvs-commits at lists.jboss.org Thu Feb 20 17:32:48 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 20 Feb 2014 17:32:48 -0500 Subject: [jboss-cvs] Picketbox SVN: r513 - tags. Message-ID: <201402202232.s1KMWmhu008036@svn01.web.mwc.hst.phx2.redhat.com> Author: sguilhen at redhat.com Date: 2014-02-20 17:32:47 -0500 (Thu, 20 Feb 2014) New Revision: 513 Added: tags/4.0.19.SP4/ Log: BZ1067580 Tag PicketBox 4.0.19.SP4 From jboss-cvs-commits at lists.jboss.org Thu Feb 20 17:33:51 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 20 Feb 2014 17:33:51 -0500 Subject: [jboss-cvs] Picketbox SVN: r514 - in branches/eap62: assembly and 18 other directories. Message-ID: <201402202233.s1KMXpWA008067@svn01.web.mwc.hst.phx2.redhat.com> Author: sguilhen at redhat.com Date: 2014-02-20 17:33:50 -0500 (Thu, 20 Feb 2014) New Revision: 514 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: BZ1067580 Set next development version Modified: branches/eap62/assembly/pom.xml =================================================================== --- branches/eap62/assembly/pom.xml 2014-02-20 22:32:47 UTC (rev 513) +++ branches/eap62/assembly/pom.xml 2014-02-20 22:33:50 UTC (rev 514) @@ -2,7 +2,7 @@ org.picketbox picketbox-parent - 4.0.19.SP4 + 4.0.19.SP5-SNAPSHOT ../parent 4.0.0 Modified: branches/eap62/parent/pom.xml =================================================================== --- branches/eap62/parent/pom.xml 2014-02-20 22:32:47 UTC (rev 513) +++ branches/eap62/parent/pom.xml 2014-02-20 22:33:50 UTC (rev 514) @@ -8,7 +8,7 @@ org.picketbox picketbox-parent pom - 4.0.19.SP4 + 4.0.19.SP5-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.SP4 - scm:svn:https://svn.jboss.org/repos/picketbox/tags/4.0.19.SP4 + 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 Modified: branches/eap62/picketbox/pom.xml =================================================================== --- branches/eap62/picketbox/pom.xml 2014-02-20 22:32:47 UTC (rev 513) +++ branches/eap62/picketbox/pom.xml 2014-02-20 22:33:50 UTC (rev 514) @@ -8,7 +8,7 @@ 4.0.0 org.picketbox picketbox-bare - 4.0.19.SP4 + 4.0.19.SP5-SNAPSHOT jar Picketbox http://jboss.org/picketbox Modified: branches/eap62/picketbox-infinispan/pom.xml =================================================================== --- branches/eap62/picketbox-infinispan/pom.xml 2014-02-20 22:32:47 UTC (rev 513) +++ branches/eap62/picketbox-infinispan/pom.xml 2014-02-20 22:33:50 UTC (rev 514) @@ -8,7 +8,7 @@ 4.0.0 org.picketbox picketbox-infinispan - 4.0.19.SP4 + 4.0.19.SP5-SNAPSHOT jar Picketbox Infinispan http://jboss.org/picketbox Modified: branches/eap62/pom.xml =================================================================== --- branches/eap62/pom.xml 2014-02-20 22:32:47 UTC (rev 513) +++ branches/eap62/pom.xml 2014-02-20 22:33:50 UTC (rev 514) @@ -2,7 +2,7 @@ org.picketbox picketbox-parent - 4.0.19.SP4 + 4.0.19.SP5-SNAPSHOT parent Modified: branches/eap62/security-jboss-sx/acl/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/acl/pom.xml 2014-02-20 22:32:47 UTC (rev 513) +++ branches/eap62/security-jboss-sx/acl/pom.xml 2014-02-20 22:33:50 UTC (rev 514) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP4 + 4.0.19.SP5-SNAPSHOT ../parent 4.0.0 Modified: branches/eap62/security-jboss-sx/assembly/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/assembly/pom.xml 2014-02-20 22:32:47 UTC (rev 513) +++ branches/eap62/security-jboss-sx/assembly/pom.xml 2014-02-20 22:33:50 UTC (rev 514) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP4 + 4.0.19.SP5-SNAPSHOT ../parent 4.0.0 Modified: branches/eap62/security-jboss-sx/identity/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/identity/pom.xml 2014-02-20 22:32:47 UTC (rev 513) +++ branches/eap62/security-jboss-sx/identity/pom.xml 2014-02-20 22:33:50 UTC (rev 514) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP4 + 4.0.19.SP5-SNAPSHOT ../parent 4.0.0 Modified: branches/eap62/security-jboss-sx/jbosssx/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/jbosssx/pom.xml 2014-02-20 22:32:47 UTC (rev 513) +++ branches/eap62/security-jboss-sx/jbosssx/pom.xml 2014-02-20 22:33:50 UTC (rev 514) @@ -3,7 +3,7 @@ org.picketbox jbosssx-parent - 4.0.19.SP4 + 4.0.19.SP5-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-02-20 22:32:47 UTC (rev 513) +++ branches/eap62/security-jboss-sx/jbosssx-client/pom.xml 2014-02-20 22:33:50 UTC (rev 514) @@ -7,7 +7,7 @@ 4.0.0 org.picketbox jbosssx-client - 4.0.19.SP4 + 4.0.19.SP5-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-02-20 22:32:47 UTC (rev 513) +++ branches/eap62/security-jboss-sx/parent/pom.xml 2014-02-20 22:33:50 UTC (rev 514) @@ -8,7 +8,7 @@ org.picketbox jbosssx-parent pom - 4.0.19.SP4 + 4.0.19.SP5-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.SP4 - scm:svn:https://svn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.19.SP4 + 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 @@ -148,6 +148,6 @@ GA - 4.0.19.SP4 + 4.0.19.SP5-SNAPSHOT Modified: branches/eap62/security-jboss-sx/pom.xml =================================================================== --- branches/eap62/security-jboss-sx/pom.xml 2014-02-20 22:32:47 UTC (rev 513) +++ branches/eap62/security-jboss-sx/pom.xml 2014-02-20 22:33:50 UTC (rev 514) @@ -7,7 +7,7 @@ 4.0.0 org.picketbox jbosssx-pom - 4.0.19.SP4 + 4.0.19.SP5-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-02-20 22:32:47 UTC (rev 513) +++ branches/eap62/security-spi/acl/pom.xml 2014-02-20 22:33:50 UTC (rev 514) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP4 + 4.0.19.SP5-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.SP4 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP4 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP4 + 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 Modified: branches/eap62/security-spi/assembly/pom.xml =================================================================== --- branches/eap62/security-spi/assembly/pom.xml 2014-02-20 22:32:47 UTC (rev 513) +++ branches/eap62/security-spi/assembly/pom.xml 2014-02-20 22:33:50 UTC (rev 514) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP4 + 4.0.19.SP5-SNAPSHOT ../parent 4.0.0 Modified: branches/eap62/security-spi/authorization/pom.xml =================================================================== --- branches/eap62/security-spi/authorization/pom.xml 2014-02-20 22:32:47 UTC (rev 513) +++ branches/eap62/security-spi/authorization/pom.xml 2014-02-20 22:33:50 UTC (rev 514) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP4 + 4.0.19.SP5-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.SP4 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP4 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP4 + 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 Modified: branches/eap62/security-spi/common/pom.xml =================================================================== --- branches/eap62/security-spi/common/pom.xml 2014-02-20 22:32:47 UTC (rev 513) +++ branches/eap62/security-spi/common/pom.xml 2014-02-20 22:33:50 UTC (rev 514) @@ -5,7 +5,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP4 + 4.0.19.SP5-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.SP4 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP4 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP4 + 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 Modified: branches/eap62/security-spi/identity/pom.xml =================================================================== --- branches/eap62/security-spi/identity/pom.xml 2014-02-20 22:32:47 UTC (rev 513) +++ branches/eap62/security-spi/identity/pom.xml 2014-02-20 22:33:50 UTC (rev 514) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP4 + 4.0.19.SP5-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.SP4 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP4 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP4 + 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 Modified: branches/eap62/security-spi/parent/pom.xml =================================================================== --- branches/eap62/security-spi/parent/pom.xml 2014-02-20 22:32:47 UTC (rev 513) +++ branches/eap62/security-spi/parent/pom.xml 2014-02-20 22:33:50 UTC (rev 514) @@ -8,7 +8,7 @@ org.picketbox picketbox-spi-parent pom - 4.0.19.SP4 + 4.0.19.SP5-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.SP4 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP4 + 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 Modified: branches/eap62/security-spi/pom.xml =================================================================== --- branches/eap62/security-spi/pom.xml 2014-02-20 22:32:47 UTC (rev 513) +++ branches/eap62/security-spi/pom.xml 2014-02-20 22:33:50 UTC (rev 514) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP4 + 4.0.19.SP5-SNAPSHOT parent 4.0.0 Modified: branches/eap62/security-spi/spi/pom.xml =================================================================== --- branches/eap62/security-spi/spi/pom.xml 2014-02-20 22:32:47 UTC (rev 513) +++ branches/eap62/security-spi/spi/pom.xml 2014-02-20 22:33:50 UTC (rev 514) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.19.SP4 + 4.0.19.SP5-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.SP4 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.19.SP4 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.19.SP4 + 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 From jboss-cvs-commits at lists.jboss.org Mon Feb 24 02:42:09 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 24 Feb 2014 02:42:09 -0500 Subject: [jboss-cvs] JBossAS SVN: r114742 - branches/JBPAPP_5/component-matrix. Message-ID: <201402240742.s1O7g93G008119@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-02-24 02:42:09 -0500 (Mon, 24 Feb 2014) New Revision: 114742 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: JBPAPP-11004 Upgrade JBossWS Native to 3.1.2.SP18 Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-02-20 18:29:11 UTC (rev 114741) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-02-24 07:42:09 UTC (rev 114742) @@ -43,7 +43,7 @@ 1.1.0.SP11 3.1.2.SP14 1.1.2.SP8 - 3.1.2.SP17 + 3.1.2.SP18 1.0.1.GA 1.4.8.SP9_patch_01 2.2.27.Final From jboss-cvs-commits at lists.jboss.org Mon Feb 24 02:47:58 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 24 Feb 2014 02:47:58 -0500 Subject: [jboss-cvs] JBossAS SVN: r114743 - branches/JBPAPP_5/component-matrix. Message-ID: <201402240747.s1O7lwon008540@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-02-24 02:47:58 -0500 (Mon, 24 Feb 2014) New Revision: 114743 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: JBPAPP-10999 Upgrade JBoss Remoting to 2.5.4.SP5 Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-02-24 07:42:09 UTC (rev 114742) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-02-24 07:47:58 UTC (rev 114743) @@ -85,7 +85,7 @@ 2.0.11.GA 5.0.3.GA_CP02 2.0.4.GA - 2.5.4.SP4_patch01 + 2.5.4.SP5 2.0.7.Final 2.0.7.Final 2.1.4.GA From jboss-cvs-commits at lists.jboss.org Mon Feb 24 03:02:31 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 24 Feb 2014 03:02:31 -0500 Subject: [jboss-cvs] JBossAS SVN: r114744 - branches/JBPAPP_5/component-matrix. Message-ID: <201402240802.s1O82V8j015959@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-02-24 03:02:30 -0500 (Mon, 24 Feb 2014) New Revision: 114744 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: JBPAPP-10677 CVE-2012-5783 - commons-httpclient fix (EAP 5) Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-02-24 07:47:58 UTC (rev 114743) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-02-24 08:02:30 UTC (rev 114744) @@ -207,7 +207,7 @@ apache-httpclient commons-httpclient - 3.1 + 3.1-patch-01 test From jboss-cvs-commits at lists.jboss.org Mon Feb 24 11:40:18 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 24 Feb 2014 11:40:18 -0500 Subject: [jboss-cvs] Picketbox SVN: r515 - in trunk: assembly and 18 other directories. Message-ID: <201402241640.s1OGeI2U025383@svn01.web.mwc.hst.phx2.redhat.com> Author: sguilhen at redhat.com Date: 2014-02-24 11:40:17 -0500 (Mon, 24 Feb 2014) New Revision: 515 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: SECURITY-802: Prepare PicketBox 4.0.21.Beta1 release Modified: trunk/assembly/pom.xml =================================================================== --- trunk/assembly/pom.xml 2014-02-20 22:33:50 UTC (rev 514) +++ trunk/assembly/pom.xml 2014-02-24 16:40:17 UTC (rev 515) @@ -2,7 +2,7 @@ org.picketbox picketbox-parent - 4.0.21.Beta1-SNAPSHOT + 4.0.21.Beta1 ../parent 4.0.0 Modified: trunk/parent/pom.xml =================================================================== --- trunk/parent/pom.xml 2014-02-20 22:33:50 UTC (rev 514) +++ trunk/parent/pom.xml 2014-02-24 16:40:17 UTC (rev 515) @@ -8,7 +8,7 @@ org.picketbox picketbox-parent pom - 4.0.21.Beta1-SNAPSHOT + 4.0.21.Beta1 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.Beta1-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/tags/4.0.21.Beta1-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/tags/4.0.21.Beta1 + scm:svn:https://svn.jboss.org/repos/picketbox/tags/4.0.21.Beta1 Modified: trunk/picketbox/pom.xml =================================================================== --- trunk/picketbox/pom.xml 2014-02-20 22:33:50 UTC (rev 514) +++ trunk/picketbox/pom.xml 2014-02-24 16:40:17 UTC (rev 515) @@ -8,7 +8,7 @@ 4.0.0 org.picketbox picketbox-bare - 4.0.21.Beta1-SNAPSHOT + 4.0.21.Beta1 jar Picketbox http://jboss.org/picketbox Modified: trunk/picketbox-infinispan/pom.xml =================================================================== --- trunk/picketbox-infinispan/pom.xml 2014-02-20 22:33:50 UTC (rev 514) +++ trunk/picketbox-infinispan/pom.xml 2014-02-24 16:40:17 UTC (rev 515) @@ -8,7 +8,7 @@ 4.0.0 org.picketbox picketbox-infinispan - 4.0.21.Beta1-SNAPSHOT + 4.0.21.Beta1 jar Picketbox Infinispan http://jboss.org/picketbox Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-20 22:33:50 UTC (rev 514) +++ trunk/pom.xml 2014-02-24 16:40:17 UTC (rev 515) @@ -2,7 +2,7 @@ org.picketbox picketbox-parent - 4.0.21.Beta1-SNAPSHOT + 4.0.21.Beta1 parent Modified: trunk/security-jboss-sx/acl/pom.xml =================================================================== --- trunk/security-jboss-sx/acl/pom.xml 2014-02-20 22:33:50 UTC (rev 514) +++ trunk/security-jboss-sx/acl/pom.xml 2014-02-24 16:40:17 UTC (rev 515) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.21.Beta1-SNAPSHOT + 4.0.21.Beta1 ../parent 4.0.0 Modified: trunk/security-jboss-sx/assembly/pom.xml =================================================================== --- trunk/security-jboss-sx/assembly/pom.xml 2014-02-20 22:33:50 UTC (rev 514) +++ trunk/security-jboss-sx/assembly/pom.xml 2014-02-24 16:40:17 UTC (rev 515) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.21.Beta1-SNAPSHOT + 4.0.21.Beta1 ../parent 4.0.0 Modified: trunk/security-jboss-sx/identity/pom.xml =================================================================== --- trunk/security-jboss-sx/identity/pom.xml 2014-02-20 22:33:50 UTC (rev 514) +++ trunk/security-jboss-sx/identity/pom.xml 2014-02-24 16:40:17 UTC (rev 515) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.21.Beta1-SNAPSHOT + 4.0.21.Beta1 ../parent 4.0.0 Modified: trunk/security-jboss-sx/jbosssx/pom.xml =================================================================== --- trunk/security-jboss-sx/jbosssx/pom.xml 2014-02-20 22:33:50 UTC (rev 514) +++ trunk/security-jboss-sx/jbosssx/pom.xml 2014-02-24 16:40:17 UTC (rev 515) @@ -3,7 +3,7 @@ org.picketbox jbosssx-parent - 4.0.21.Beta1-SNAPSHOT + 4.0.21.Beta1 ../parent 4.0.0 Modified: trunk/security-jboss-sx/jbosssx-client/pom.xml =================================================================== --- trunk/security-jboss-sx/jbosssx-client/pom.xml 2014-02-20 22:33:50 UTC (rev 514) +++ trunk/security-jboss-sx/jbosssx-client/pom.xml 2014-02-24 16:40:17 UTC (rev 515) @@ -7,7 +7,7 @@ 4.0.0 org.picketbox jbosssx-client - 4.0.21.Beta1-SNAPSHOT + 4.0.21.Beta1 jar PicketBox Client http://www.jboss.org/picketbox Modified: trunk/security-jboss-sx/parent/pom.xml =================================================================== --- trunk/security-jboss-sx/parent/pom.xml 2014-02-20 22:33:50 UTC (rev 514) +++ trunk/security-jboss-sx/parent/pom.xml 2014-02-24 16:40:17 UTC (rev 515) @@ -8,7 +8,7 @@ org.picketbox jbosssx-parent pom - 4.0.21.Beta1-SNAPSHOT + 4.0.21.Beta1 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.Beta1-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.21.Beta1-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.21.Beta1 + scm:svn:https://svn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.21.Beta1 @@ -148,6 +148,6 @@ GA - 4.0.21.Beta1-SNAPSHOT + 4.0.21.Beta1 Modified: trunk/security-jboss-sx/pom.xml =================================================================== --- trunk/security-jboss-sx/pom.xml 2014-02-20 22:33:50 UTC (rev 514) +++ trunk/security-jboss-sx/pom.xml 2014-02-24 16:40:17 UTC (rev 515) @@ -7,7 +7,7 @@ 4.0.0 org.picketbox jbosssx-pom - 4.0.21.Beta1-SNAPSHOT + 4.0.21.Beta1 pom PicketBox Implementation - Parent http://jboss.org/picketbox Modified: trunk/security-spi/acl/pom.xml =================================================================== --- trunk/security-spi/acl/pom.xml 2014-02-20 22:33:50 UTC (rev 514) +++ trunk/security-spi/acl/pom.xml 2014-02-24 16:40:17 UTC (rev 515) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta1-SNAPSHOT + 4.0.21.Beta1 ../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.Beta1-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1-SNAPSHOT - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta1-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta1 Modified: trunk/security-spi/assembly/pom.xml =================================================================== --- trunk/security-spi/assembly/pom.xml 2014-02-20 22:33:50 UTC (rev 514) +++ trunk/security-spi/assembly/pom.xml 2014-02-24 16:40:17 UTC (rev 515) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta1-SNAPSHOT + 4.0.21.Beta1 ../parent 4.0.0 Modified: trunk/security-spi/authorization/pom.xml =================================================================== --- trunk/security-spi/authorization/pom.xml 2014-02-20 22:33:50 UTC (rev 514) +++ trunk/security-spi/authorization/pom.xml 2014-02-24 16:40:17 UTC (rev 515) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta1-SNAPSHOT + 4.0.21.Beta1 ../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.Beta1-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1-SNAPSHOT - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta1-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta1 Modified: trunk/security-spi/common/pom.xml =================================================================== --- trunk/security-spi/common/pom.xml 2014-02-20 22:33:50 UTC (rev 514) +++ trunk/security-spi/common/pom.xml 2014-02-24 16:40:17 UTC (rev 515) @@ -5,7 +5,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta1-SNAPSHOT + 4.0.21.Beta1 ../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.Beta1-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1-SNAPSHOT - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta1-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta1 Modified: trunk/security-spi/identity/pom.xml =================================================================== --- trunk/security-spi/identity/pom.xml 2014-02-20 22:33:50 UTC (rev 514) +++ trunk/security-spi/identity/pom.xml 2014-02-24 16:40:17 UTC (rev 515) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta1-SNAPSHOT + 4.0.21.Beta1 ../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.Beta1-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1-SNAPSHOT - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta1-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta1 Modified: trunk/security-spi/parent/pom.xml =================================================================== --- trunk/security-spi/parent/pom.xml 2014-02-20 22:33:50 UTC (rev 514) +++ trunk/security-spi/parent/pom.xml 2014-02-24 16:40:17 UTC (rev 515) @@ -8,7 +8,7 @@ org.picketbox picketbox-spi-parent pom - 4.0.21.Beta1-SNAPSHOT + 4.0.21.Beta1 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.Beta1-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1 Modified: trunk/security-spi/pom.xml =================================================================== --- trunk/security-spi/pom.xml 2014-02-20 22:33:50 UTC (rev 514) +++ trunk/security-spi/pom.xml 2014-02-24 16:40:17 UTC (rev 515) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta1-SNAPSHOT + 4.0.21.Beta1 parent 4.0.0 Modified: trunk/security-spi/spi/pom.xml =================================================================== --- trunk/security-spi/spi/pom.xml 2014-02-20 22:33:50 UTC (rev 514) +++ trunk/security-spi/spi/pom.xml 2014-02-24 16:40:17 UTC (rev 515) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta1-SNAPSHOT + 4.0.21.Beta1 ../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.Beta1-SNAPSHOT - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1-SNAPSHOT - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta1-SNAPSHOT + scm:svn:http://anonsvn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1 + scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1 + http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta1 From jboss-cvs-commits at lists.jboss.org Mon Feb 24 13:11:35 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 24 Feb 2014 13:11:35 -0500 Subject: [jboss-cvs] Picketbox SVN: r516 - tags. Message-ID: <201402241811.s1OIBZSH016126@svn01.web.mwc.hst.phx2.redhat.com> Author: sguilhen at redhat.com Date: 2014-02-24 13:11:34 -0500 (Mon, 24 Feb 2014) New Revision: 516 Added: tags/4.0.21.Beta1/ Log: SECURITY-802 Tag PicketBox 4.0.21.Beta1 From jboss-cvs-commits at lists.jboss.org Mon Feb 24 13:19:16 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 24 Feb 2014 13:19:16 -0500 Subject: [jboss-cvs] Picketbox SVN: r517 - in trunk: assembly and 18 other directories. Message-ID: <201402241819.s1OIJG3Y016767@svn01.web.mwc.hst.phx2.redhat.com> Author: sguilhen at redhat.com Date: 2014-02-24 13:19:16 -0500 (Mon, 24 Feb 2014) New Revision: 517 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: SECURITY-802 Set next development version Modified: trunk/assembly/pom.xml =================================================================== --- trunk/assembly/pom.xml 2014-02-24 18:11:34 UTC (rev 516) +++ trunk/assembly/pom.xml 2014-02-24 18:19:16 UTC (rev 517) @@ -2,7 +2,7 @@ org.picketbox picketbox-parent - 4.0.21.Beta1 + 4.0.21.Beta2-SNAPSHOT ../parent 4.0.0 Modified: trunk/parent/pom.xml =================================================================== --- trunk/parent/pom.xml 2014-02-24 18:11:34 UTC (rev 516) +++ trunk/parent/pom.xml 2014-02-24 18:19:16 UTC (rev 517) @@ -8,7 +8,7 @@ org.picketbox picketbox-parent pom - 4.0.21.Beta1 + 4.0.21.Beta2-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.Beta1 - scm:svn:https://svn.jboss.org/repos/picketbox/tags/4.0.21.Beta1 + 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 Modified: trunk/picketbox/pom.xml =================================================================== --- trunk/picketbox/pom.xml 2014-02-24 18:11:34 UTC (rev 516) +++ trunk/picketbox/pom.xml 2014-02-24 18:19:16 UTC (rev 517) @@ -8,7 +8,7 @@ 4.0.0 org.picketbox picketbox-bare - 4.0.21.Beta1 + 4.0.21.Beta2-SNAPSHOT jar Picketbox http://jboss.org/picketbox Modified: trunk/picketbox-infinispan/pom.xml =================================================================== --- trunk/picketbox-infinispan/pom.xml 2014-02-24 18:11:34 UTC (rev 516) +++ trunk/picketbox-infinispan/pom.xml 2014-02-24 18:19:16 UTC (rev 517) @@ -8,7 +8,7 @@ 4.0.0 org.picketbox picketbox-infinispan - 4.0.21.Beta1 + 4.0.21.Beta2-SNAPSHOT jar Picketbox Infinispan http://jboss.org/picketbox Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-24 18:11:34 UTC (rev 516) +++ trunk/pom.xml 2014-02-24 18:19:16 UTC (rev 517) @@ -2,7 +2,7 @@ org.picketbox picketbox-parent - 4.0.21.Beta1 + 4.0.21.Beta2-SNAPSHOT parent Modified: trunk/security-jboss-sx/acl/pom.xml =================================================================== --- trunk/security-jboss-sx/acl/pom.xml 2014-02-24 18:11:34 UTC (rev 516) +++ trunk/security-jboss-sx/acl/pom.xml 2014-02-24 18:19:16 UTC (rev 517) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.21.Beta1 + 4.0.21.Beta2-SNAPSHOT ../parent 4.0.0 Modified: trunk/security-jboss-sx/assembly/pom.xml =================================================================== --- trunk/security-jboss-sx/assembly/pom.xml 2014-02-24 18:11:34 UTC (rev 516) +++ trunk/security-jboss-sx/assembly/pom.xml 2014-02-24 18:19:16 UTC (rev 517) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.21.Beta1 + 4.0.21.Beta2-SNAPSHOT ../parent 4.0.0 Modified: trunk/security-jboss-sx/identity/pom.xml =================================================================== --- trunk/security-jboss-sx/identity/pom.xml 2014-02-24 18:11:34 UTC (rev 516) +++ trunk/security-jboss-sx/identity/pom.xml 2014-02-24 18:19:16 UTC (rev 517) @@ -2,7 +2,7 @@ org.picketbox jbosssx-parent - 4.0.21.Beta1 + 4.0.21.Beta2-SNAPSHOT ../parent 4.0.0 Modified: trunk/security-jboss-sx/jbosssx/pom.xml =================================================================== --- trunk/security-jboss-sx/jbosssx/pom.xml 2014-02-24 18:11:34 UTC (rev 516) +++ trunk/security-jboss-sx/jbosssx/pom.xml 2014-02-24 18:19:16 UTC (rev 517) @@ -3,7 +3,7 @@ org.picketbox jbosssx-parent - 4.0.21.Beta1 + 4.0.21.Beta2-SNAPSHOT ../parent 4.0.0 Modified: trunk/security-jboss-sx/jbosssx-client/pom.xml =================================================================== --- trunk/security-jboss-sx/jbosssx-client/pom.xml 2014-02-24 18:11:34 UTC (rev 516) +++ trunk/security-jboss-sx/jbosssx-client/pom.xml 2014-02-24 18:19:16 UTC (rev 517) @@ -7,7 +7,7 @@ 4.0.0 org.picketbox jbosssx-client - 4.0.21.Beta1 + 4.0.21.Beta2-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-02-24 18:11:34 UTC (rev 516) +++ trunk/security-jboss-sx/parent/pom.xml 2014-02-24 18:19:16 UTC (rev 517) @@ -8,7 +8,7 @@ org.picketbox jbosssx-parent pom - 4.0.21.Beta1 + 4.0.21.Beta2-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.Beta1 - scm:svn:https://svn.jboss.org/repos/picketbox/security-jboss-sx/tags/4.0.21.Beta1 + 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 @@ -148,6 +148,6 @@ GA - 4.0.21.Beta1 + 4.0.21.Beta2-SNAPSHOT Modified: trunk/security-jboss-sx/pom.xml =================================================================== --- trunk/security-jboss-sx/pom.xml 2014-02-24 18:11:34 UTC (rev 516) +++ trunk/security-jboss-sx/pom.xml 2014-02-24 18:19:16 UTC (rev 517) @@ -7,7 +7,7 @@ 4.0.0 org.picketbox jbosssx-pom - 4.0.21.Beta1 + 4.0.21.Beta2-SNAPSHOT pom PicketBox Implementation - Parent http://jboss.org/picketbox Modified: trunk/security-spi/acl/pom.xml =================================================================== --- trunk/security-spi/acl/pom.xml 2014-02-24 18:11:34 UTC (rev 516) +++ trunk/security-spi/acl/pom.xml 2014-02-24 18:19:16 UTC (rev 517) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta1 + 4.0.21.Beta2-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.Beta1 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta1 + 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 Modified: trunk/security-spi/assembly/pom.xml =================================================================== --- trunk/security-spi/assembly/pom.xml 2014-02-24 18:11:34 UTC (rev 516) +++ trunk/security-spi/assembly/pom.xml 2014-02-24 18:19:16 UTC (rev 517) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta1 + 4.0.21.Beta2-SNAPSHOT ../parent 4.0.0 Modified: trunk/security-spi/authorization/pom.xml =================================================================== --- trunk/security-spi/authorization/pom.xml 2014-02-24 18:11:34 UTC (rev 516) +++ trunk/security-spi/authorization/pom.xml 2014-02-24 18:19:16 UTC (rev 517) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta1 + 4.0.21.Beta2-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.Beta1 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta1 + 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 Modified: trunk/security-spi/common/pom.xml =================================================================== --- trunk/security-spi/common/pom.xml 2014-02-24 18:11:34 UTC (rev 516) +++ trunk/security-spi/common/pom.xml 2014-02-24 18:19:16 UTC (rev 517) @@ -5,7 +5,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta1 + 4.0.21.Beta2-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.Beta1 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta1 + 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 Modified: trunk/security-spi/identity/pom.xml =================================================================== --- trunk/security-spi/identity/pom.xml 2014-02-24 18:11:34 UTC (rev 516) +++ trunk/security-spi/identity/pom.xml 2014-02-24 18:19:16 UTC (rev 517) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta1 + 4.0.21.Beta2-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.Beta1 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta1 + 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 Modified: trunk/security-spi/parent/pom.xml =================================================================== --- trunk/security-spi/parent/pom.xml 2014-02-24 18:11:34 UTC (rev 516) +++ trunk/security-spi/parent/pom.xml 2014-02-24 18:19:16 UTC (rev 517) @@ -8,7 +8,7 @@ org.picketbox picketbox-spi-parent pom - 4.0.21.Beta1 + 4.0.21.Beta2-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.Beta1 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1 + 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 Modified: trunk/security-spi/pom.xml =================================================================== --- trunk/security-spi/pom.xml 2014-02-24 18:11:34 UTC (rev 516) +++ trunk/security-spi/pom.xml 2014-02-24 18:19:16 UTC (rev 517) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta1 + 4.0.21.Beta2-SNAPSHOT parent 4.0.0 Modified: trunk/security-spi/spi/pom.xml =================================================================== --- trunk/security-spi/spi/pom.xml 2014-02-24 18:11:34 UTC (rev 516) +++ trunk/security-spi/spi/pom.xml 2014-02-24 18:19:16 UTC (rev 517) @@ -2,7 +2,7 @@ org.picketbox picketbox-spi-parent - 4.0.21.Beta1 + 4.0.21.Beta2-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.Beta1 - scm:svn:https://svn.jboss.org/repos/picketbox/security-spi/tags/4.0.21.Beta1 - http://viewvc.jboss.org/cgi-bin/viewvc.cgi/picketbox/security-spi/tags/4.0.21.Beta1 + 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 From jboss-cvs-commits at lists.jboss.org Mon Feb 24 23:19:37 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Mon, 24 Feb 2014 23:19:37 -0500 Subject: [jboss-cvs] JBossAS SVN: r114745 - branches/JBPAPP_5/main/src/bin. Message-ID: <201402250419.s1P4JbAB015201@svn01.web.mwc.hst.phx2.redhat.com> Author: aogburn Date: 2014-02-24 23:19:36 -0500 (Mon, 24 Feb 2014) New Revision: 114745 Modified: branches/JBPAPP_5/main/src/bin/run.bat branches/JBPAPP_5/main/src/bin/run.sh Log: [EAP5-57] Enable Garbage Collection Logging by Default Modified: branches/JBPAPP_5/main/src/bin/run.bat =================================================================== --- branches/JBPAPP_5/main/src/bin/run.bat 2014-02-24 08:02:30 UTC (rev 114744) +++ branches/JBPAPP_5/main/src/bin/run.bat 2014-02-25 04:19:36 UTC (rev 114745) @@ -90,6 +90,54 @@ ) ) +rem Setup directories, note directories with spaces do not work +set "CONSOLIDATED_OPTS=%JAVA_OPTS% %ARGS%" +:DIRLOOP +echo(%CONSOLIDATED_OPTS% | findstr /r /c:"^-Djboss.server.base.dir" > nul && ( + for /f "tokens=1,2* delims==" %%a IN ("%CONSOLIDATED_OPTS%") DO ( + for /f %%i IN ("%%b") DO set "JBOSS_BASE_DIR=%%~fi" + ) +) +echo(%CONSOLIDATED_OPTS% | findstr /r /c:"^-Djboss.server.log.dir" > nul && ( + for /f "tokens=1,2* delims==" %%a IN ("%CONSOLIDATED_OPTS%") DO ( + for /f %%i IN ("%%b") DO set "JBOSS_LOG_DIR=%%~fi" + ) +) + +for /f "tokens=1* delims= " %%i IN ("%CONSOLIDATED_OPTS%") DO ( + if %%i == "" ( + goto ENDDIRLOOP + ) else ( + set CONSOLIDATED_OPTS=%%j + GOTO DIRLOOP + ) +) + +:ENDDIRLOOP + +rem Set the log dir if it hasn't been already +if "x%JBOSS_LOG_DIR%" == "x" ( + if not "x%JBOSS_BASE_DIR%" == "x" ( + set "JBOSS_LOG_DIR=%JBOSS_BASE_DIR%\%PROFILE_DIR%\log" + ) else ( + set "JBOSS_LOG_DIR=%JBOSS_HOME%\server\%PROFILE_DIR%\log" + ) +) + +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 + 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%" + ) +) + rem Add -server to the JVM options, if supported "%JAVA%" -server -version 2>&1 | findstr /I hotspot > nul if not errorlevel == 1 ( Modified: branches/JBPAPP_5/main/src/bin/run.sh =================================================================== --- branches/JBPAPP_5/main/src/bin/run.sh 2014-02-24 08:02:30 UTC (rev 114744) +++ branches/JBPAPP_5/main/src/bin/run.sh 2014-02-25 04:19:36 UTC (rev 114745) @@ -35,6 +35,11 @@ JBOSS_BASE_DIR=`echo $SWITCH|sed 's/\-Djboss.server.base.dir=//'` fi + echo "$SWITCH" | grep "^\-Djboss.server.log.dir=" #> /dev/null + if [ $? -eq 0 ]; then + 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=//'` @@ -273,6 +278,59 @@ fi 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 + # Check JAVA_OPTS for a specified log directory + if $linux || $solaris; then + for var in $JAVA_OPTS + do + # Remove quotes + p=`echo $var | tr -d '"'` + case $p in + -Djboss.server.log.dir=*) + JBOSS_LOG_DIR=`readlink -m ${p#*=}` + ;; + esac + done + fi + + # No readlink -m on BSD + if $darwin; then + for var in $JAVA_OPTS + do + # Remove quotes + p=`echo $var | tr -d '"'` + case $p in + -Djboss.server.log.dir=*) + JBOSS_LOG_DIR=`cd ${p#*=} ; pwd -P` + ;; + esac + done + fi + + # Determine the log directory if not set already + if [ "x$JBOSS_LOG_DIR" = "x" ]; then + if [ "x$JBOSS_BASE_DIR" != "x" ]; then + JBOSS_LOG_DIR="$JBOSS_BASE_DIR/$JBOSSCONF/log" + else + JBOSS_LOG_DIR="$JBOSS_HOME/server/$JBOSSCONF/log" + fi + fi + + # For Cygwin, switch paths to Windows format + if $cygwin; then + JBOSS_LOG_DIR=`cygpath --path --windows "$JBOSS_LOG_DIR"` + 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" +fi + # Setup JBoss specific properties JAVA_OPTS="-Dprogram.name=$PROGNAME $JAVA_OPTS" From jboss-cvs-commits at lists.jboss.org Wed Feb 26 04:23:11 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 26 Feb 2014 04:23:11 -0500 Subject: [jboss-cvs] JBossAS SVN: r114746 - branches/JBPAPP_5/component-matrix. Message-ID: <201402260923.s1Q9NBFP031143@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-02-26 04:23:11 -0500 (Wed, 26 Feb 2014) New Revision: 114746 Modified: branches/JBPAPP_5/component-matrix/pom.xml Log: Update jbossts to 4.6.1.GA_CP13-patch-01 (JBPAPP-10428) Modified: branches/JBPAPP_5/component-matrix/pom.xml =================================================================== --- branches/JBPAPP_5/component-matrix/pom.xml 2014-02-25 04:19:36 UTC (rev 114745) +++ branches/JBPAPP_5/component-matrix/pom.xml 2014-02-26 09:23:11 UTC (rev 114746) @@ -39,7 +39,7 @@ 2.1 1.0-MR1 2.0.1 - 4.6.1.GA_CP13 + 4.6.1.GA_CP13-patch-01 1.1.0.SP11 3.1.2.SP14 1.1.2.SP8 From jboss-cvs-commits at lists.jboss.org Wed Feb 26 17:16:06 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 26 Feb 2014 17:16:06 -0500 Subject: [jboss-cvs] JBossAS SVN: r114747 - tags. Message-ID: <201402262216.s1QMG606002136@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-02-26 17:16:06 -0500 (Wed, 26 Feb 2014) New Revision: 114747 Added: tags/JBPAPP_5_3_0_ER2/ Log: Tag EAP 5.3.0 ER2 From jboss-cvs-commits at lists.jboss.org Wed Feb 26 18:32:58 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Wed, 26 Feb 2014 18:32:58 -0500 Subject: [jboss-cvs] JBossAS SVN: r114748 - in tags/JBPAPP_5_3_0_ER2: adminclient and 32 other directories. Message-ID: <201402262332.s1QNWwAL017051@svn01.web.mwc.hst.phx2.redhat.com> Author: wolfc Date: 2014-02-26 18:32:57 -0500 (Wed, 26 Feb 2014) New Revision: 114748 Modified: tags/JBPAPP_5_3_0_ER2/adminclient/pom.xml tags/JBPAPP_5_3_0_ER2/aspects/pom.xml tags/JBPAPP_5_3_0_ER2/build/build.properties tags/JBPAPP_5_3_0_ER2/build/pom.xml tags/JBPAPP_5_3_0_ER2/client/pom.xml tags/JBPAPP_5_3_0_ER2/cluster/pom.xml tags/JBPAPP_5_3_0_ER2/component-matrix/pom.xml tags/JBPAPP_5_3_0_ER2/connector/pom.xml tags/JBPAPP_5_3_0_ER2/console/pom.xml tags/JBPAPP_5_3_0_ER2/deployment/pom.xml tags/JBPAPP_5_3_0_ER2/ejb3/pom.xml tags/JBPAPP_5_3_0_ER2/embedded/pom.xml tags/JBPAPP_5_3_0_ER2/hibernate-int/pom.xml tags/JBPAPP_5_3_0_ER2/iiop/pom.xml tags/JBPAPP_5_3_0_ER2/j2se/pom.xml tags/JBPAPP_5_3_0_ER2/jbossas/jmx-remoting/pom.xml tags/JBPAPP_5_3_0_ER2/jbossas/pom.xml tags/JBPAPP_5_3_0_ER2/jbossas/remoting/pom.xml tags/JBPAPP_5_3_0_ER2/jmx-remoting/pom.xml tags/JBPAPP_5_3_0_ER2/jmx/pom.xml tags/JBPAPP_5_3_0_ER2/main/pom.xml tags/JBPAPP_5_3_0_ER2/management/pom.xml tags/JBPAPP_5_3_0_ER2/mbeans/pom.xml tags/JBPAPP_5_3_0_ER2/messaging/pom.xml tags/JBPAPP_5_3_0_ER2/pom.xml tags/JBPAPP_5_3_0_ER2/profileservice/pom.xml tags/JBPAPP_5_3_0_ER2/security/pom.xml tags/JBPAPP_5_3_0_ER2/server/pom.xml tags/JBPAPP_5_3_0_ER2/spring-int/pom.xml tags/JBPAPP_5_3_0_ER2/system-jmx/pom.xml tags/JBPAPP_5_3_0_ER2/system/pom.xml tags/JBPAPP_5_3_0_ER2/thirdparty/pom.xml tags/JBPAPP_5_3_0_ER2/tomcat/pom.xml tags/JBPAPP_5_3_0_ER2/varia/pom.xml tags/JBPAPP_5_3_0_ER2/webservices/pom.xml Log: Updated version to EAP 5.3.0.ER2 Modified: tags/JBPAPP_5_3_0_ER2/adminclient/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/adminclient/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/adminclient/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -4,7 +4,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 Modified: tags/JBPAPP_5_3_0_ER2/aspects/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/aspects/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/aspects/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/build/build.properties =================================================================== --- tags/JBPAPP_5_3_0_ER2/build/build.properties 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/build/build.properties 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,6 +3,6 @@ version.major=5 version.minor=3 version.revision=0 -version.tag=Branch +version.tag=ER2 version.name=EAP Modified: tags/JBPAPP_5_3_0_ER2/build/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/build/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/build/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/client/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/client/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/client/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/cluster/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/cluster/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/cluster/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/component-matrix/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/component-matrix/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/component-matrix/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -20,7 +20,7 @@ org.jboss.jbossas jboss-as-component-matrix pom - 5.3.0-SNAPSHOT + 5.3.0.ER2 JBossAS Component Matrix Contract for Consumers of JBossAS Components, defining and Modified: tags/JBPAPP_5_3_0_ER2/connector/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/connector/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/connector/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/console/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/console/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/console/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/deployment/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/deployment/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/deployment/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/ejb3/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/ejb3/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/ejb3/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/embedded/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/embedded/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/embedded/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/hibernate-int/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/hibernate-int/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/hibernate-int/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/iiop/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/iiop/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/iiop/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/j2se/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/j2se/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/j2se/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/jbossas/jmx-remoting/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/jbossas/jmx-remoting/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/jbossas/jmx-remoting/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-jbossas - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/jbossas/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/jbossas/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/jbossas/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/jbossas/remoting/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/jbossas/remoting/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/jbossas/remoting/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-jbossas - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/jmx/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/jmx/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/jmx/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/jmx-remoting/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/jmx-remoting/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/jmx-remoting/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/main/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/main/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/main/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/management/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/management/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/management/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/mbeans/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/mbeans/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/mbeans/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/messaging/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/messaging/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/messaging/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-component-matrix - 5.3.0-SNAPSHOT + 5.3.0.ER2 component-matrix 4.0.0 Modified: tags/JBPAPP_5_3_0_ER2/profileservice/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/profileservice/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/profileservice/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/security/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/security/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/security/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/server/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/server/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/server/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/spring-int/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/spring-int/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/spring-int/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/system/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/system/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/system/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/system-jmx/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/system-jmx/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/system-jmx/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/thirdparty/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/thirdparty/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/thirdparty/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/tomcat/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/tomcat/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/tomcat/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/varia/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/varia/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/varia/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/webservices/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/webservices/pom.xml 2014-02-26 22:16:06 UTC (rev 114747) +++ tags/JBPAPP_5_3_0_ER2/webservices/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0-SNAPSHOT + 5.3.0.ER2 4.0.0 org.jboss.jbossas From jboss-cvs-commits at lists.jboss.org Thu Feb 27 00:18:56 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 27 Feb 2014 00:18:56 -0500 Subject: [jboss-cvs] JBossAS SVN: r114749 - in tags/JBPAPP_5_3_0_ER2: adminclient and 34 other directories. Message-ID: <201402270518.s1R5IutQ026906@svn01.web.mwc.hst.phx2.redhat.com> Author: huwang Date: 2014-02-27 00:18:55 -0500 (Thu, 27 Feb 2014) New Revision: 114749 Modified: tags/JBPAPP_5_3_0_ER2/adminclient/pom.xml tags/JBPAPP_5_3_0_ER2/aspects/pom.xml tags/JBPAPP_5_3_0_ER2/build/build.properties tags/JBPAPP_5_3_0_ER2/build/pom.xml tags/JBPAPP_5_3_0_ER2/client/pom.xml tags/JBPAPP_5_3_0_ER2/cluster/pom.xml tags/JBPAPP_5_3_0_ER2/component-matrix/pom.xml tags/JBPAPP_5_3_0_ER2/connector/pom.xml tags/JBPAPP_5_3_0_ER2/console/pom.xml tags/JBPAPP_5_3_0_ER2/deployment/pom.xml tags/JBPAPP_5_3_0_ER2/ejb3/pom.xml tags/JBPAPP_5_3_0_ER2/embedded/pom.xml tags/JBPAPP_5_3_0_ER2/hibernate-int/pom.xml tags/JBPAPP_5_3_0_ER2/iiop/pom.xml tags/JBPAPP_5_3_0_ER2/j2se/pom.xml tags/JBPAPP_5_3_0_ER2/jbossas/jmx-remoting/pom.xml tags/JBPAPP_5_3_0_ER2/jbossas/pom.xml tags/JBPAPP_5_3_0_ER2/jbossas/remoting/pom.xml tags/JBPAPP_5_3_0_ER2/jmx-remoting/pom.xml tags/JBPAPP_5_3_0_ER2/jmx/pom.xml tags/JBPAPP_5_3_0_ER2/main/pom.xml tags/JBPAPP_5_3_0_ER2/management/pom.xml tags/JBPAPP_5_3_0_ER2/mbeans/pom.xml tags/JBPAPP_5_3_0_ER2/messaging/pom.xml tags/JBPAPP_5_3_0_ER2/pom.xml tags/JBPAPP_5_3_0_ER2/profileservice/pom.xml tags/JBPAPP_5_3_0_ER2/security/pom.xml tags/JBPAPP_5_3_0_ER2/server/pom.xml tags/JBPAPP_5_3_0_ER2/spring-int/pom.xml tags/JBPAPP_5_3_0_ER2/system-jmx/pom.xml tags/JBPAPP_5_3_0_ER2/system/pom.xml tags/JBPAPP_5_3_0_ER2/testsuite/build.xml tags/JBPAPP_5_3_0_ER2/thirdparty/pom.xml tags/JBPAPP_5_3_0_ER2/tomcat/pom.xml tags/JBPAPP_5_3_0_ER2/tools/etc/buildmagic/buildmagic.ent tags/JBPAPP_5_3_0_ER2/tools/etc/buildmagic/version-info.xml tags/JBPAPP_5_3_0_ER2/varia/pom.xml tags/JBPAPP_5_3_0_ER2/webservices/pom.xml Log: Set version.tag='' and remove ER2 from sub-projects pom.xml Modified: tags/JBPAPP_5_3_0_ER2/adminclient/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/adminclient/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/adminclient/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -4,7 +4,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 Modified: tags/JBPAPP_5_3_0_ER2/aspects/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/aspects/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/aspects/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/build/build.properties =================================================================== --- tags/JBPAPP_5_3_0_ER2/build/build.properties 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/build/build.properties 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,6 +3,6 @@ version.major=5 version.minor=3 version.revision=0 -version.tag=ER2 +version.tag= version.name=EAP Modified: tags/JBPAPP_5_3_0_ER2/build/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/build/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/build/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/client/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/client/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/client/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/cluster/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/cluster/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/cluster/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/component-matrix/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/component-matrix/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/component-matrix/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -20,7 +20,7 @@ org.jboss.jbossas jboss-as-component-matrix pom - 5.3.0.ER2 + 5.3.0 JBossAS Component Matrix Contract for Consumers of JBossAS Components, defining and Modified: tags/JBPAPP_5_3_0_ER2/connector/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/connector/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/connector/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/console/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/console/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/console/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/deployment/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/deployment/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/deployment/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/ejb3/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/ejb3/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/ejb3/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/embedded/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/embedded/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/embedded/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/hibernate-int/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/hibernate-int/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/hibernate-int/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/iiop/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/iiop/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/iiop/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/j2se/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/j2se/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/j2se/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/jbossas/jmx-remoting/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/jbossas/jmx-remoting/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/jbossas/jmx-remoting/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-jbossas - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/jbossas/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/jbossas/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/jbossas/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/jbossas/remoting/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/jbossas/remoting/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/jbossas/remoting/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-jbossas - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/jmx/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/jmx/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/jmx/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/jmx-remoting/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/jmx-remoting/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/jmx-remoting/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/main/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/main/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/main/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/management/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/management/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/management/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/mbeans/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/mbeans/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/mbeans/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/messaging/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/messaging/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/messaging/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-component-matrix - 5.3.0.ER2 + 5.3.0 component-matrix 4.0.0 Modified: tags/JBPAPP_5_3_0_ER2/profileservice/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/profileservice/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/profileservice/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/security/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/security/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/security/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/server/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/server/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/server/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/spring-int/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/spring-int/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/spring-int/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/system/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/system/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/system/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/system-jmx/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/system-jmx/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/system-jmx/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/testsuite/build.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/testsuite/build.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/testsuite/build.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -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_ER2/thirdparty/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/thirdparty/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/thirdparty/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/tomcat/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/tomcat/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/tomcat/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/tools/etc/buildmagic/buildmagic.ent =================================================================== --- tags/JBPAPP_5_3_0_ER2/tools/etc/buildmagic/buildmagic.ent 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/tools/etc/buildmagic/buildmagic.ent 2014-02-27 05:18:55 UTC (rev 114749) @@ -105,22 +105,22 @@ - + - + - + - + + value="${version.major}.${version.minor}.${version.revision} (build: SVNTag=${version.cvstag} date=${build.id})"/> Modified: tags/JBPAPP_5_3_0_ER2/tools/etc/buildmagic/version-info.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/tools/etc/buildmagic/version-info.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/tools/etc/buildmagic/version-info.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -16,17 +16,17 @@ - + - + + value="${version.major}.${version.minor}.${version.revision} (build: SVNTag=${version.cvstag} date=${build.id})"/> Modified: tags/JBPAPP_5_3_0_ER2/varia/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/varia/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/varia/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas Modified: tags/JBPAPP_5_3_0_ER2/webservices/pom.xml =================================================================== --- tags/JBPAPP_5_3_0_ER2/webservices/pom.xml 2014-02-26 23:32:57 UTC (rev 114748) +++ tags/JBPAPP_5_3_0_ER2/webservices/pom.xml 2014-02-27 05:18:55 UTC (rev 114749) @@ -3,7 +3,7 @@ org.jboss.jbossas jboss-as-parent - 5.3.0.ER2 + 5.3.0 4.0.0 org.jboss.jbossas From jboss-cvs-commits at lists.jboss.org Thu Feb 27 11:08:18 2014 From: jboss-cvs-commits at lists.jboss.org (jboss-cvs-commits at lists.jboss.org) Date: Thu, 27 Feb 2014 11:08:18 -0500 Subject: [jboss-cvs] JBossAS SVN: r114750 - branches/JBPAPP_5/testsuite/src/main/org/jboss/test/jca/test. Message-ID: <201402271608.s1RG8Inv005018@svn01.web.mwc.hst.phx2.redhat.com> Author: pjelinek Date: 2014-02-27 11:08:18 -0500 (Thu, 27 Feb 2014) New Revision: 114750 Modified: branches/JBPAPP_5/testsuite/src/main/org/jboss/test/jca/test/HAConnectionFactoryUnitTestCase.java Log: [JBPAPP-11000] skip testFailoverLocalMCF to prevent breaking whole testsuite 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 05:18:55 UTC (rev 114749) +++ branches/JBPAPP_5/testsuite/src/main/org/jboss/test/jca/test/HAConnectionFactoryUnitTestCase.java 2014-02-27 16:08:18 UTC (rev 114750) @@ -53,7 +53,7 @@ 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, "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 +66,13 @@ //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(); } - +*/ public void testFailoverXaMCF() throws Exception { HAConnectionSessionHome home = (HAConnectionSessionHome)getInitialContext().lookup("HAConnectionSession");