geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r560772 - in /geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main: java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java xsd/geronimo-security-2.0.xsd
Date Sun, 29 Jul 2007 17:43:05 GMT
Author: djencks
Date: Sun Jul 29 10:43:05 2007
New Revision: 560772

URL: http://svn.apache.org/viewvc?view=rev&rev=560772
Log:
GERONIMO-2687 change element name from credential-store to credential-store-ref so we can
embed a credential-store config in the future

Modified:
    geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java
    geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-security-2.0.xsd

Modified: geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java?view=diff&rev=560772&r1=560771&r2=560772
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/java/org/apache/geronimo/security/deployment/GeronimoSecurityBuilderImpl.java
Sun Jul 29 10:43:05 2007
@@ -60,7 +60,6 @@
 import org.apache.geronimo.xbeans.geronimo.security.GerSecurityDocument;
 import org.apache.geronimo.xbeans.geronimo.security.GerSecurityType;
 import org.apache.geronimo.xbeans.geronimo.security.GerSubjectInfoType;
-import org.apache.geronimo.xbeans.geronimo.security.GerCredentialStoreType;
 import org.apache.xmlbeans.QNameSet;
 import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
@@ -106,10 +105,9 @@
                 throw new DeploymentException("Role mapper gbean already present", e);
             }
             AbstractNameQuery credentialStoreName;
-            if (securityType.isSetCredentialStore()) {
-                GerCredentialStoreType credentialStoreType = securityType.getCredentialStore();
-                PatternType patternType = credentialStoreType.getPattern();
-                credentialStoreName = SingleGBeanBuilder.buildAbstractNameQuery(patternType,
NameFactory.GERONIMO_SERVICE, Collections.singleton(CredentialStore.class.getName()));
+            if (securityType.isSetCredentialStoreRef()) {
+                PatternType credentialStoreType = securityType.getCredentialStoreRef();
+                credentialStoreName = SingleGBeanBuilder.buildAbstractNameQuery(credentialStoreType,
NameFactory.GERONIMO_SERVICE, Collections.singleton(CredentialStore.class.getName()));
             } else {
                 credentialStoreName = this.credentialStoreName;
             }

Modified: geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-security-2.0.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-security-2.0.xsd?view=diff&rev=560772&r1=560771&r2=560772
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-security-2.0.xsd
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-security-builder/src/main/xsd/geronimo-security-2.0.xsd
Sun Jul 29 10:43:05 2007
@@ -35,7 +35,7 @@
     <xsd:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2"  schemaLocation="geronimo-module-1.2.xsd"/>
 
     <xsd:element name="security" type="geronimo:securityType" substitutionGroup="app:security"/>
-    <xsd:element name="credential-store" type="geronimo:credential-storeType"/>
+    <xsd:element name="credential-store" type="sys:patternType"/>
     <xsd:element name="default-subject" type="geronimo:subject-infoType"/>
 
     <xsd:complexType name="securityType">
@@ -53,7 +53,7 @@
                 <xsd:sequence>
                     <xsd:element name="description" type="geronimo:descriptionType" minOccurs="0"
                                  maxOccurs="unbounded"/>
-                    <xsd:element name="credential-store" type="geronimo:credential-storeType"
minOccurs="0"/>
+                    <xsd:element name="credential-store-ref" type="sys:patternType" minOccurs="0"/>
                     <xsd:element name="default-subject" type="geronimo:subject-infoType"
minOccurs="0"/>
                     <xsd:element name="role-mappings" type="geronimo:role-mappingsType"
minOccurs="0"/>
                 </xsd:sequence>
@@ -163,19 +163,19 @@
         </xsd:sequence>
     </xsd:complexType>
 
-    <xsd:complexType name="credential-storeType">
-        <xsd:sequence>
-            <xsd:element name="pattern" type="sys:patternType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        The pattern element defines a components of the
-                        abstract name of GBean referred. It (optionally) includes
-                        the groupId, artifactId, version,
-                        module, type, and name of the GBean module.
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-    </xsd:complexType>
+    <!--<xsd:complexType name="credential-storeType">-->
+        <!--<xsd:sequence>-->
+            <!--<xsd:element name="pattern" type="sys:patternType">-->
+                <!--<xsd:annotation>-->
+                    <!--<xsd:documentation>-->
+                        <!--The pattern element defines a components of the-->
+                        <!--abstract name of GBean referred. It (optionally) includes-->
+                        <!--the groupId, artifactId, version,-->
+                        <!--module, type, and name of the GBean module.-->
+                    <!--</xsd:documentation>-->
+                <!--</xsd:annotation>-->
+            <!--</xsd:element>-->
+        <!--</xsd:sequence>-->
+    <!--</xsd:complexType>-->
 
 </xsd:schema>



Mime
View raw message