You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2007/06/16 10:17:57 UTC
svn commit: r547885 - in /geronimo/server/trunk/modules:
geronimo-client-builder/src/main/schema/
geronimo-corba-builder/src/main/schema/
geronimo-j2ee-builder/src/main/schema/
geronimo-tomcat6-builder/src/main/schema/
geronimo-web-2.5-builder/src/main...
Author: djencks
Date: Sat Jun 16 01:17:56 2007
New Revision: 547885
URL: http://svn.apache.org/viewvc?view=rev&rev=547885
Log:
GERONIMO-2687, mostly schema doc cleanup
Modified:
geronimo/server/trunk/modules/geronimo-client-builder/src/main/schema/geronimo-application-client-1.2.xsd
geronimo/server/trunk/modules/geronimo-corba-builder/src/main/schema/corba-tss-config-2.1.xsd
geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/schema/geronimo-application-1.2.xsd
geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/schema/geronimo-tomcat-1.2.xsd
geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/schema/geronimo-web-1.2.xsd
Modified: geronimo/server/trunk/modules/geronimo-client-builder/src/main/schema/geronimo-application-client-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-client-builder/src/main/schema/geronimo-application-client-1.2.xsd?view=diff&rev=547885&r1=547884&r2=547885
==============================================================================
--- geronimo/server/trunk/modules/geronimo-client-builder/src/main/schema/geronimo-application-client-1.2.xsd (original)
+++ geronimo/server/trunk/modules/geronimo-client-builder/src/main/schema/geronimo-application-client-1.2.xsd Sat Jun 16 01:17:56 2007
@@ -57,7 +57,7 @@
</xs:annotation>
</xs:import>
<xs:import namespace="http://geronimo.apache.org/xml/ns/security-2.0"
- schemaLocation="geronimo-security-1.2.xsd">
+ schemaLocation="geronimo-security-2.0.xsd">
<xs:annotation>
<xs:documentation>
Import Geronimo security deployment plans. The imported plan
Modified: geronimo/server/trunk/modules/geronimo-corba-builder/src/main/schema/corba-tss-config-2.1.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-corba-builder/src/main/schema/corba-tss-config-2.1.xsd?view=diff&rev=547885&r1=547884&r2=547885
==============================================================================
--- geronimo/server/trunk/modules/geronimo-corba-builder/src/main/schema/corba-tss-config-2.1.xsd (original)
+++ geronimo/server/trunk/modules/geronimo-corba-builder/src/main/schema/corba-tss-config-2.1.xsd Sat Jun 16 01:17:56 2007
@@ -22,7 +22,6 @@
xmlns:tss="http://openejb.apache.org/xml/ns/corba-tss-config-2.1"
targetNamespace="http://openejb.apache.org/xml/ns/corba-tss-config-2.1"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:security="http://geronimo.apache.org/xml/ns/security-1.2"
elementFormDefault="qualified"
attributeFormDefault="unqualified"
version="1.0">
Modified: geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/schema/geronimo-application-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/schema/geronimo-application-1.2.xsd?view=diff&rev=547885&r1=547884&r2=547885
==============================================================================
--- geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/schema/geronimo-application-1.2.xsd (original)
+++ geronimo/server/trunk/modules/geronimo-j2ee-builder/src/main/schema/geronimo-application-1.2.xsd Sat Jun 16 01:17:56 2007
@@ -40,9 +40,6 @@
</xs:documentation>
</xs:annotation>
- <!--xmlns:security="http://geronimo.apache.org/xml/ns/security-1.2"-->
- <!--<xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.2" schemaLocation="geronimo-security-1.2.xsd"/>-->
-
<xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2"
schemaLocation="geronimo-module-1.2.xsd">
<xs:annotation>
@@ -108,10 +105,6 @@
</xs:annotation>
</xs:element>
- <!--<xs:element ref="security:security" minOccurs="0"/>-->
- <!--<xs:any namespace="http://geronimo.apache.org/xml/ns/security-1.2" processContents="lax" minOccurs="0"/>-->
- <!--<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>-->
-
<xs:element ref="geronimo:security" minOccurs="0">
<xs:annotation>
<xs:documentation>
@@ -243,7 +236,7 @@
An abstract abstract-securityType used to indicate, all web and
EJB modules must make the appropriate access checks as outlined
in the JACC spec. This type will be extended and implemented by
- geronimo-security-1.2.xsd file.
+ geronimo-security-2.0.xsd file.
</xs:documentation>
</xs:annotation>
<xs:sequence></xs:sequence>
Modified: geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/schema/geronimo-tomcat-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/schema/geronimo-tomcat-1.2.xsd?view=diff&rev=547885&r1=547884&r2=547885
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/schema/geronimo-tomcat-1.2.xsd (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6-builder/src/main/schema/geronimo-tomcat-1.2.xsd Sat Jun 16 01:17:56 2007
@@ -218,7 +218,7 @@
<xs:annotation>
<xs:documentation>
Reference to security element defined in imported
- "geronimo-security-1.2.xsd"
+ "geronimo-security-2.0.xsd"
</xs:documentation>
</xs:annotation>
</xs:element>
Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/schema/geronimo-web-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/schema/geronimo-web-1.2.xsd?view=diff&rev=547885&r1=547884&r2=547885
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/schema/geronimo-web-1.2.xsd (original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/schema/geronimo-web-1.2.xsd Sat Jun 16 01:17:56 2007
@@ -31,7 +31,6 @@
version="1.0">
<xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.2" schemaLocation="geronimo-naming-1.2.xsd"/>
- <!--<xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.2" schemaLocation="geronimo-security-1.2.xsd"/>-->
<xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" schemaLocation="geronimo-application-1.2.xsd"/>
<xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.2" schemaLocation="geronimo-module-1.2.xsd"/>