Tomasz Skutnik wrote:
> I've submitted 3 patches on SourceForge that finish the job. Your CVS
> update was not complete (see description in patch no 1).
>
> Review and submitt if you please.
>
> --
>
> Tomasz Skutnik
> <[EMAIL PROTECTED]>
>
>
> _______________________________________________
> Jboss-development mailing list
> [EMAIL PROTECTED]
> http://lists.sourceforge.net/lists/listinfo/jboss-development
>
>
Sorry. I've had some problems submittin patches. Here there are.
Scooter
Only in jboss/jbosspool/: build
Only in jboss/jbosspool/: dist
diff -r -u --exclude=*CVS* jboss.orig/jbosspool/src/resources/jdbc-rar/META-INF/ra.xml
jboss/jbosspool/src/resources/jdbc-rar/META-INF/ra.xml
--- jboss.orig/jbosspool/src/resources/jdbc-rar/META-INF/ra.xml Wed Jul 18 04:52:40
2001
+++ jboss/jbosspool/src/resources/jdbc-rar/META-INF/ra.xml Wed Jul 18 09:37:08
+2001
@@ -72,10 +72,10 @@
<config-property-name>Driver</config-property-name>
<config-property-type>java.lang.String</config-property-type>
</config-property>
- <auth-mechanism>
- <auth-mech-type>basic-password</auth-mech-type>
+ <authentication-mechanism>
+
+<authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
<credential-interface>javax.resource.security.PasswordCredential</credential-interface>
- </auth-mechanism>
+ </authentication-mechanism>
<reauthentication-support>false</reauthentication-support>
</resourceadapter>
</connector>
Only in jboss/jbosscx/: build
Only in jboss/jbosscx/: dist
diff -r -u --exclude=*CVS*
jboss.orig/jbosscx/src/main/org/jboss/resource/RARMetaData.java
jboss/jbosscx/src/main/org/jboss/resource/RARMetaData.java
--- jboss.orig/jbosscx/src/main/org/jboss/resource/RARMetaData.java Wed Jul 18
04:53:51 2001
+++ jboss/jbosscx/src/main/org/jboss/resource/RARMetaData.java Wed Jul 18 09:12:40
+2001
@@ -345,12 +345,12 @@
log.warning("Loading "+getElementContent(element).trim());
}
- private void setAuthMechanism(Element element) throws DeploymentException
+ private void setAuthenticationMechanism(Element element) throws DeploymentException
{
invokeChildren(element);
}
- private void setAuthMechType(Element element) throws DeploymentException
+ private void setAuthenticationMechanismType(Element element) throws
+DeploymentException
{
authMechType = getElementContent(element);
}
diff -r -u --exclude=*CVS*
jboss.orig/jbosscx/src/main/org/jboss/resource/security/ManyToOnePrincipalMapping.java
jboss/jbosscx/src/main/org/jboss/resource/security/ManyToOnePrincipalMapping.java
---
jboss.orig/jbosscx/src/main/org/jboss/resource/security/ManyToOnePrincipalMapping.java
Tue Feb 6 07:54:41 2001
+++ jboss/jbosscx/src/main/org/jboss/resource/security/ManyToOnePrincipalMapping.java
+ Wed Jul 18 13:41:41 2001
@@ -61,7 +61,7 @@
Subject subject = new Subject();
subject.getPrincipals().add(resourcePrincipal);
- if (metadata.getAuthMechType().equals("basic-password"))
+ if (metadata.getAuthMechType().equals("BasicPassword"))
{
// The spec says that we need a new instance of this every
// time, because it is specific to a managed connection
@@ -74,7 +74,7 @@
}
else
{
- throw new RuntimeException("Unsupported auth-mech-type: '" +
+ throw new RuntimeException("Unsupported authentication-mechanism-type: '" +
metadata.getAuthMechType() + "'");
}
diff -r -u --exclude=*CVS*
jboss.orig/jboss/src/resources/org/jboss/jms/ra/META-INF/ra.xml
jboss/jboss/src/resources/org/jboss/jms/ra/META-INF/ra.xml
--- jboss.orig/jboss/src/resources/org/jboss/jms/ra/META-INF/ra.xml Wed Jul 18
05:01:52 2001
+++ jboss/jboss/src/resources/org/jboss/jms/ra/META-INF/ra.xml Wed Jul 18 09:17:41
+2001
@@ -18,10 +18,10 @@
<config-property-type>java.lang.String</config-property-type>
<config-property-value>java:DefaultJMSProvider</config-property-value>
</config-property>
- <auth-mechanism>
- <auth-mech-type>basic-password</auth-mech-type>
+ <authentication-mechanism>
+
+<authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
<credential-interface>javax.resource.security.PasswordCredential</credential-interface>
- </auth-mechanism>
+ </authentication-mechanism>
<reauthentication-support>false</reauthentication-support>
</resourceadapter>
</connector>
diff -r -u --exclude=*CVS*
jboss.orig/jboss/src/resources/org/jboss/metadata/connector_1_0.dtd
jboss/jboss/src/resources/org/jboss/metadata/connector_1_0.dtd
--- jboss.orig/jboss/src/resources/org/jboss/metadata/connector_1_0.dtd Fri Feb 2
11:12:48 2001
+++ jboss/jboss/src/resources/org/jboss/metadata/connector_1_0.dtd Wed Jul 18
+09:34:22 2001
@@ -101,7 +101,7 @@
one or more authentication mechanisms supported and additional
required security permissions.
-If there is no auth-mechanism specified as part of resource adapter
+If there is no authentication-mechanism specified as part of resource adapter
element then the resource adapter does not support any standard
security authentication mechanisms as part of security contract.
The application server ignores the security part of the system
@@ -112,22 +112,22 @@
managedconnectionfactory-class, connectionfactory-interface,
connectionfactory-impl-class, connection-interface,
connection-impl-class, transaction-support, config-property*,
-auth-mechanism*, reauthentication-support, security-permission*
+authentication-mechanism*, reauthentication-support, security-permission*
)>
<!--
-The element auth-mechanism specifies an authentication mechanism
+The element authentication-mechanism specifies an authentication mechanism
supported by the resource adapter. Note that this support is for
the resource adapter and not for the underlying EIS instance. The
optional description specifies any resource adapter specific requirement
for the support of security contract and authentication mechanism.
-Note that basic-password mech-type should support the
-javax.resource.spi.security.PasswordCredential interface. The kerbv5
+Note that BasicPassword mech-type should support the
+javax.resource.spi.security.PasswordCredential interface. The Kerbv5
mech-type should support the javax.resource.spi.security.Generic-
Credential interface.
-->
-<!ELEMENT auth-mechanism (description?, auth-mech-type, credential-interface)>
+<!ELEMENT authentication-mechanism (description?, authentication-mechanism-type,
+credential-interface)>
<!--
The element credential-interface specifies the interface that the
@@ -145,17 +145,17 @@
<!ELEMENT credential-interface (#PCDATA)>
<!--
-The element auth-mech-type specifies type of an authentication
+The element authentication-mechanism-type specifies type of an authentication
mechanism.
The example values are:
- <auth-mech-type>basic-password</auth-mech-type>
- <auth-mech-type>kerbv5</auth-mech-type>
+ <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
+ <authentication-mechanism-type>Kerbv5</authentication-mechanism-type>
Any additional security mechanisms are outside the scope of the
Connector architecture specification.
-->
-<!ELEMENT auth-mech-type (#PCDATA)>
+<!ELEMENT authentication-mechanism-type (#PCDATA)>
<!--
The element connectionfactory-interface specifies the fully-qualified
@@ -250,7 +250,7 @@
The following are the legal values of config-property-type:
java.lang.Boolean, java.lang.String, java.lang.Integer,
java.lang.Double, java.lang.Byte, java.lang.Short,
- java.lang.Long, java.lang.Float
+ java.lang.Long, java.lang.Float, java.lang.Character
Example: <config-property-type>java.lang.String</config-property-type>
-->
@@ -437,8 +437,8 @@
standard information into the standard deployment descriptor.
-->
-<!ATTLIST auth-mechanism id ID #IMPLIED>
-<!ATTLIST auth-mech-type id ID #IMPLIED>
+<!ATTLIST authentication-mechanism id ID #IMPLIED>
+<!ATTLIST authentication-mechanism-type id ID #IMPLIED>
<!ATTLIST config-property id ID #IMPLIED>
<!ATTLIST config-property-name id ID #IMPLIED>
<!ATTLIST config-property-value id ID #IMPLIED>
