You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/05/28 20:40:55 UTC
svn commit: r661043 - in /geronimo/server/branches/2.1:
framework/modules/geronimo-service-builder/src/main/xsd/
framework/modules/geronimo-system/src/main/xsd/
plugins/client/geronimo-client-builder/src/main/xsd/
plugins/connector/geronimo-connector-b...
Author: gawor
Date: Wed May 28 11:40:54 2008
New Revision: 661043
URL: http://svn.apache.org/viewvc?rev=661043&view=rev
Log:
update xsd:documentation with proper xsd namespaces and locations (GERONIMO-4075)
Modified:
geronimo/server/branches/2.1/framework/modules/geronimo-service-builder/src/main/xsd/geronimo-module-1.2.xsd
geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/xsd/attributes-1.2.xsd
geronimo/server/branches/2.1/plugins/client/geronimo-client-builder/src/main/xsd/geronimo-application-client-2.0.xsd
geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/main/xsd/geronimo-connector-1.2.xsd
geronimo/server/branches/2.1/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd
geronimo/server/branches/2.1/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd
geronimo/server/branches/2.1/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-login-config-2.0.xsd
geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.2.xsd
geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-config-1.0.1.xsd
geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.1.xsd
geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-config-1.0.xsd
Modified: geronimo/server/branches/2.1/framework/modules/geronimo-service-builder/src/main/xsd/geronimo-module-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-service-builder/src/main/xsd/geronimo-module-1.2.xsd?rev=661043&r1=661042&r2=661043&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-service-builder/src/main/xsd/geronimo-module-1.2.xsd (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-service-builder/src/main/xsd/geronimo-module-1.2.xsd Wed May 28 11:40:54 2008
@@ -32,15 +32,16 @@
deployment plan is provided externally, the deployment descriptor
can be named anything and provided to the deploy tool. All the
Service deployment plan must specify the top level element as module
- with namespace specified as xmlns=
- "http://geronimo.apache.org/xml/ns/j2ee/deployment-1.2". The default
+ with namespace specified as
+ xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2". The default
location for this document is
- http://geronimo.apache.org/schemas-1.2/geronimo-module-1.2.xsd.
+ http://geronimo.apache.org/xml/ns/deployment-1.2
+
Typical Geronimo Service Deployment plan will look like this:
<![CDATA[
<?xml version="1.0" encoding="UTF-8"?>
<module
- xmlns="http://geronimo.apache.org/xml/ns/j2ee/deployment-1.2">
+ xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
<environment>
...
</environment>
Modified: geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/xsd/attributes-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/xsd/attributes-1.2.xsd?rev=661043&r1=661042&r2=661043&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/xsd/attributes-1.2.xsd (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-system/src/main/xsd/attributes-1.2.xsd Wed May 28 11:40:54 2008
@@ -28,9 +28,10 @@
This is an XML Schema Definition for storing manageable attribute
values. All the schema's or plans using elements of this schema must
specify the top level element with one of the namespace specified as
- "http://geronimo.apache.org/xml/ns/j2ee/attributes-1.2". The default
+ "http://geronimo.apache.org/xml/ns/attributes-1.2". The default
location for this document is:
- http://geronimo.apache.org/schemas-1.1/attributes-1.2.xsd.
+ http://geronimo.apache.org/xml/ns/attributes-1.2
+
The definition of the XML format for storing manageable attribute
values. Should look like this:
<![CDATA[
Modified: geronimo/server/branches/2.1/plugins/client/geronimo-client-builder/src/main/xsd/geronimo-application-client-2.0.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/client/geronimo-client-builder/src/main/xsd/geronimo-application-client-2.0.xsd?rev=661043&r1=661042&r2=661043&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/client/geronimo-client-builder/src/main/xsd/geronimo-application-client-2.0.xsd (original)
+++ geronimo/server/branches/2.1/plugins/client/geronimo-client-builder/src/main/xsd/geronimo-application-client-2.0.xsd Wed May 28 11:40:54 2008
@@ -41,7 +41,7 @@
specified as
xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0".
The default location for this document is
- http://geronimo.apache.org/schemas-1.2/geronimo-application-client-2.0.xsd
+ http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0
</xs:documentation>
</xs:annotation>
Modified: geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/main/xsd/geronimo-connector-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/main/xsd/geronimo-connector-1.2.xsd?rev=661043&r1=661042&r2=661043&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/main/xsd/geronimo-connector-1.2.xsd (original)
+++ geronimo/server/branches/2.1/plugins/connector/geronimo-connector-builder/src/main/xsd/geronimo-connector-1.2.xsd Wed May 28 11:40:54 2008
@@ -38,7 +38,7 @@
element as connector with namespace specified as xmlns=
"http://geronimo.apache.org/xml/ns/j2ee/connector-1.2". The default
location for this document is
- http://geronimo.apache.org/schemas-1.2/geronimo-connector-1.2.xsd
+ http://geronimo.apache.org/xml/ns/j2ee/connector-1.2
</xs:documentation>
</xs:annotation>
<xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.2"
Modified: geronimo/server/branches/2.1/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd?rev=661043&r1=661042&r2=661043&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd (original)
+++ geronimo/server/branches/2.1/plugins/j2ee/geronimo-j2ee-builder/src/main/xsd/geronimo-application-2.0.xsd Wed May 28 11:40:54 2008
@@ -36,7 +36,7 @@
with namespace specified as xmlns =
"http://geronimo.apache.org/xml/ns/j2ee/application-2.0". The
default location for this document is
- http://geronimo.apache.org/schemas-1.2/geronimo-application-2.0.xsd
+ http://geronimo.apache.org/xml/ns/j2ee/application-2.0
</xs:documentation>
</xs:annotation>
Modified: geronimo/server/branches/2.1/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd?rev=661043&r1=661042&r2=661043&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd (original)
+++ geronimo/server/branches/2.1/plugins/j2ee/geronimo-naming-builder/src/main/xsd/geronimo-naming-1.2.xsd Wed May 28 11:40:54 2008
@@ -32,9 +32,9 @@
geronimo-jetty-2.0.2.xsd. All the schema's or plans using elements of
this schema must specify the top level element with one of the
namespace specified as
- "http://geronimo.apache.org/xml/ns/j2ee/naming-1.2". The default
+ "http://geronimo.apache.org/xml/ns/naming-1.2". The default
location for this document is
- http://geronimo.apache.org/schemas-1.2/geronimo-naming-1.2.xsd.
+ http://geronimo.apache.org/xml/ns/naming-1.2
</xsd:documentation>
</xsd:annotation>
Modified: geronimo/server/branches/2.1/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-login-config-2.0.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-login-config-2.0.xsd?rev=661043&r1=661042&r2=661043&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-login-config-2.0.xsd (original)
+++ geronimo/server/branches/2.1/plugins/j2ee/geronimo-security-builder/src/main/xsd/geronimo-login-config-2.0.xsd Wed May 28 11:40:54 2008
@@ -33,8 +33,9 @@
specified by the level element as login-config with namespace
specified as xmlns =
"http://geronimo.apache.org/xml/ns/loginconfig-2.0". The default
- location for this document is somewhere vaguely related to
- http://geronimo.apache.org/schemas-1.2/geronimo-login-config-2.0.xsd
+ location for this document is:
+ http://geronimo.apache.org/xml/ns/loginconfig-2.0
+
The definition of the XML format for storing login-config should
look like this:
<![CDATA[
Modified: geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.2.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.2.xsd?rev=661043&r1=661042&r2=661043&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.2.xsd (original)
+++ geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-2.0.2.xsd Wed May 28 11:40:54 2008
@@ -38,9 +38,9 @@
included in the EAR and referenced by an alt-dd element of the EAR
deployment plan. All the web application deployment plan must
specify the top level element as web-app with namespace specified as
- xmlns="http://geronimo.apache.org/xml/ns/j2ee/jetty-1.2". The
+ xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.2". The
default location for this document is
- http://geronimo.apache.org/schemas-1.2/geronimo-jetty-2.0.xsd
+ http://geronimo.apache.org/xml/ns/j2ee/web/jetty-2.0.2
</xs:documentation>
</xs:annotation>
Modified: geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-config-1.0.1.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-config-1.0.1.xsd?rev=661043&r1=661042&r2=661043&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-config-1.0.1.xsd (original)
+++ geronimo/server/branches/2.1/plugins/jetty/geronimo-jetty6-builder/src/main/xsd/geronimo-jetty-config-1.0.1.xsd Wed May 28 11:40:54 2008
@@ -29,9 +29,9 @@
container-config element of web application plan. The top level
element included in container-config is jetty with namespace
specified as
- xmlns="http://geronimo.apache.org/xml/ns/j2ee/jetty-config-1.0". The
+ xmlns="http://geronimo.apache.org/xml/ns/web/jetty/config-1.0.1". The
default location for this document is
- http://geronimo.apache.org/schemas-1.2/geronimo-jetty-config-1.0.1.xsd
+ http://geronimo.apache.org/xml/ns/web/jetty/config-1.0.1
</xs:documentation>
</xs:annotation>
<xs:element name="jetty" type="jetty:jetty-configType">
Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.1.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.1.xsd?rev=661043&r1=661042&r2=661043&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.1.xsd (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-2.0.1.xsd Wed May 28 11:40:54 2008
@@ -38,9 +38,9 @@
included in the EAR and referenced by an alt-dd element of the EAR
deployment plan. All the web application deployment plan must
specify the top level element as web-app with namespace specified as
- xmlns="http://geronimo.apache.org/xml/ns/j2ee/tomcat-1.2". The
+ xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1". The
default location for this document is
- http://geronimo.apache.org/schemas-1.2/geronimo-tomcat-2.0.xsd
+ http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-2.0.1
</xs:documentation>
</xs:annotation>
Modified: geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-config-1.0.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-config-1.0.xsd?rev=661043&r1=661042&r2=661043&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-config-1.0.xsd (original)
+++ geronimo/server/branches/2.1/plugins/tomcat/geronimo-tomcat6-builder/src/main/xsd/geronimo-tomcat-config-1.0.xsd Wed May 28 11:40:54 2008
@@ -30,9 +30,9 @@
container-config element of web application plan. The top level
element included in container-config is tomcat with namespace
specified as
- xmlns="http://geronimo.apache.org/xml/ns/j2ee/tomcat-config-1.0".
+ xmlns="http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0".
The default location for this document is
- http://geronimo.apache.org/schemas-1.2/geronimo-tomcat-config-1.0.xsd
+ http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0
</xs:documentation>
</xs:annotation>
<xs:element name="tomcat" type="tomcat:tomcat-configType">