[jboss-cvs] JBossAS SVN: r111950 - in projects/jboss-jca/branches/Branch_1_0: core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 5 13:41:06 EDT 2011
Author: jesper.pedersen
Date: 2011-08-05 13:41:06 -0400 (Fri, 05 Aug 2011)
New Revision: 111950
Modified:
projects/jboss-jca/branches/Branch_1_0/build.xml
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubject.java
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceRecoveryImpl.java
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
Log:
[JBJCA-645] PicketBox 4.0.1
Modified: projects/jboss-jca/branches/Branch_1_0/build.xml
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/build.xml 2011-08-05 17:32:23 UTC (rev 111949)
+++ projects/jboss-jca/branches/Branch_1_0/build.xml 2011-08-05 17:41:06 UTC (rev 111950)
@@ -130,7 +130,7 @@
<property name="version.jboss.naming" value="5.0.3.GA"/>
<property name="version.jboss.netty" value="3.2.1.Final"/>
<property name="version.jboss.papaki" value="1.0.0.Beta3"/>
- <property name="version.jboss.picketbox" value="4.0.0.Final"/>
+ <property name="version.jboss.picketbox" value="4.0.1"/>
<property name="version.jboss.security" value="2.1.0.20090318"/>
<property name="version.jboss.shrinkwrap" value="1.0.0-beta-3"/>
<property name="version.jboss.shrinkwrap.descriptors" value="1.0.0-beta-1"/>
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubject.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubject.java 2011-08-05 17:32:23 UTC (rev 111949)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubject.java 2011-08-05 17:41:06 UTC (rev 111950)
@@ -38,9 +38,6 @@
import javax.security.auth.Subject;
import org.jboss.logging.Logger;
-import org.jboss.security.SecurityContext;
-import org.jboss.security.SecurityContextAssociation;
-import org.jboss.security.SecurityContextFactory;
import org.jboss.security.SubjectFactory;
/**
@@ -121,24 +118,6 @@
{
try
{
- if (SecurityContextAssociation.getSecurityContext() == null)
- {
- // Create a security context on the association
- SecurityContext securityContext = SecurityContextFactory.createSecurityContext(securityDomain);
- SecurityContextAssociation.setSecurityContext(securityContext);
-
- // Unauthenticated
- Subject unauthenticated = new Subject();
-
- // Leave the subject empty as we don't have any information to do the
- // authentication with - and we only need it to be able to get the
- // real subject from the SubjectFactory
-
- // Set the authenticated subject
- securityContext.getSubjectInfo().setAuthenticatedSubject(unauthenticated);
- }
-
- // Use the unauthenticated subject to get the real subject instance
Subject subject = subjectFactory.createSubject(securityDomain);
Set<PasswordCredential> pcs = subject.getPrivateCredentials(PasswordCredential.class);
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceRecoveryImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceRecoveryImpl.java 2011-08-05 17:32:23 UTC (rev 111949)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/tx/jbossts/XAResourceRecoveryImpl.java 2011-08-05 17:41:06 UTC (rev 111950)
@@ -38,9 +38,6 @@
import javax.transaction.xa.XAResource;
import org.jboss.logging.Logger;
-import org.jboss.security.SecurityContext;
-import org.jboss.security.SecurityContextAssociation;
-import org.jboss.security.SecurityContextFactory;
import org.jboss.security.SimplePrincipal;
import org.jboss.security.SubjectFactory;
@@ -282,27 +279,11 @@
// Security-domain use-case
try
{
- // Create a security context on the association
- SecurityContext securityContext = SecurityContextFactory
- .createSecurityContext(recoverSecurityDomain);
- SecurityContextAssociation.setSecurityContext(securityContext);
-
- // Unauthenticated
- Subject unauthenticated = new Subject();
-
- // Leave the subject empty as we don't have any information to do the
- // authentication with - and we only need it to be able to get the
- // real subject from the SubjectFactory
-
- // Set the authenticated subject
- securityContext.getSubjectInfo().setAuthenticatedSubject(unauthenticated);
-
// Select the domain
String domain = recoverSecurityDomain;
if (domain != null && subjectFactory != null)
{
- // Use the unauthenticated subject to get the real recovery subject instance
Subject subject = subjectFactory.createSubject(domain);
Set<PasswordCredential> pcs = subject.getPrivateCredentials(PasswordCredential.class);
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java 2011-08-05 17:32:23 UTC (rev 111949)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java 2011-08-05 17:41:06 UTC (rev 111950)
@@ -72,9 +72,6 @@
import javax.security.auth.Subject;
import org.jboss.logging.Messages;
-import org.jboss.security.SecurityContext;
-import org.jboss.security.SecurityContextAssociation;
-import org.jboss.security.SecurityContextFactory;
import org.jboss.security.SubjectFactory;
/**
@@ -1006,21 +1003,6 @@
{
try
{
- // Create a security context on the association
- SecurityContext securityContext = SecurityContextFactory.createSecurityContext(securityDomain);
- SecurityContextAssociation.setSecurityContext(securityContext);
-
- // Unauthenticated
- Subject unauthenticated = new Subject();
-
- // Leave the subject empty as we don't have any information to do the
- // authentication with - and we only need it to be able to get the
- // real subject from the SubjectFactory
-
- // Set the authenticated subject
- securityContext.getSubjectInfo().setAuthenticatedSubject(unauthenticated);
-
- // Use the unauthenticated subject to get the real subject instance
Subject subject = subjectFactory.createSubject(securityDomain);
Set<PasswordCredential> pcs = subject.getPrivateCredentials(PasswordCredential.class);
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2011-08-05 17:32:23 UTC (rev 111949)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2011-08-05 17:41:06 UTC (rev 111950)
@@ -102,9 +102,6 @@
import javax.transaction.TransactionManager;
import org.jboss.logging.Messages;
-import org.jboss.security.SecurityContext;
-import org.jboss.security.SecurityContextAssociation;
-import org.jboss.security.SecurityContextFactory;
import org.jboss.security.SubjectFactory;
/**
@@ -1988,21 +1985,6 @@
{
try
{
- // Create a security context on the association
- SecurityContext securityContext = SecurityContextFactory.createSecurityContext(securityDomain);
- SecurityContextAssociation.setSecurityContext(securityContext);
-
- // Unauthenticated
- Subject unauthenticated = new Subject();
-
- // Leave the subject empty as we don't have any information to do the
- // authentication with - and we only need it to be able to get the
- // real subject from the SubjectFactory
-
- // Set the authenticated subject
- securityContext.getSubjectInfo().setAuthenticatedSubject(unauthenticated);
-
- // Use the unauthenticated subject to get the real subject instance
Subject subject = subjectFactory.createSubject(securityDomain);
Set<PasswordCredential> pcs = subject.getPrivateCredentials(PasswordCredential.class);
More information about the jboss-cvs-commits
mailing list