You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sh...@apache.org on 2008/03/13 12:36:13 UTC

svn commit: r636723 [1/13] - in /geronimo/devtools/eclipse-plugin/trunk/plugins: org.apache.geronimo.deployment.v11.jaxbmodel/ org.apache.geronimo.deployment.v11.jaxbmodel/META-INF/ org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/ org.a...

Author: shivahr
Date: Thu Mar 13 04:36:06 2008
New Revision: 636723

URL: http://svn.apache.org/viewvc?rev=636723&view=rev
Log:
GERONIMODEVTOOLS-296 Set svn properties on newly added files

Modified:
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/.classpath   (props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/.project   (props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/META-INF/MANIFEST.MF   (props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/pom.xml   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/corba-css-config-2.0.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/corba-tss-config-2.0.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-application-1.1.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-application-client-1.1.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-connector-1.1.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-javabean-xmlattribute-1.0.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-login-config-1.1.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-module-1.1.xjb   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-module-1.1.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-naming-1.1.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-security-1.1.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-web-1.1.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/openejb-jar-2.1.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/openejb-pkgen-2.0.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/.classpath   (props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/.project   (props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/META-INF/MANIFEST.MF   (props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/pom.xml   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/resources/attributes-1.2.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/resources/geronimo-application-2.0.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/resources/geronimo-application-client-2.0.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/resources/geronimo-connector-1.2.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/resources/geronimo-credential-store-1.0.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/resources/geronimo-javabean-xmlattribute-1.0.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/resources/geronimo-login-config-2.0.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/resources/geronimo-module-1.2.xjb   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/resources/geronimo-module-1.2.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/resources/geronimo-naming-1.2.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/resources/geronimo-openejb-2.0.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/resources/geronimo-security-1.2.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/resources/geronimo-security-2.0.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/resources/geronimo-subject-info-1.0.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/resources/geronimo-web-2.0.1.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v21.jaxbmodel/src/main/resources/plugins-1.3.xsd   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/jaxb/JAXBObjectFactory.java   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.core/src/org/apache/geronimo/st/core/jaxb/JAXBUtils.java   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/providers/AdapterFactory.java   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/providers/ContentProvider.java   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.ui/src/org/apache/geronimo/st/ui/providers/LabelProvider.java   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/jaxb/JAXBModelUtils.java   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v20.core/src/org/apache/geronimo/st/v20/core/jaxb/JAXBObjectFactoryImpl.java   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/jaxb/JAXBModelUtils.java   (contents, props changed)
    geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.st.v21.core/src/org/apache/geronimo/st/v21/core/jaxb/JAXBObjectFactoryImpl.java   (contents, props changed)

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/.classpath
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/.project
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/META-INF/MANIFEST.MF
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/pom.xml?rev=636723&r1=636722&r2=636723&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/pom.xml Thu Mar 13 04:36:06 2008
@@ -1,74 +1,74 @@
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one or more
-  ~ contributor license agreements.  See the NOTICE file distributed with
-  ~ this work for additional information regarding copyright ownership.
-  ~ The ASF licenses this file to You under the Apache License, Version 2.0
-  ~ (the "License"); you may not use this file except in compliance with
-  ~ the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-<!-- $Rev$ $Date$ -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  
-  <artifactId>org.apache.geronimo.deployment.v11.jaxbmodel</artifactId>
-  <packaging>jar</packaging>
-  <name>${artifactId}</name>
-  <parent>
-      <groupId>org.apache.geronimo.devtools</groupId>
-      <artifactId>eclipse-plugins-parent</artifactId>
-      <version>2.1.0</version>
-      <relativePath>../pom.xml</relativePath>
-  </parent>
-    
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.xml.bind</groupId>
-      <artifactId>jaxb-api</artifactId>
-      <version>2.1</version>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-       <plugin>
-          <groupId>com.sun.tools.xjc.maven2</groupId>
-          <artifactId>maven-jaxb-plugin</artifactId>
-          <version>1.1</version>
-          <executions>
-            <execution>
-              <goals>
-                <goal>generate</goal>
-              </goals>
-            </execution>
-          </executions>
-          <configuration>
-              <strict>false</strict>
-              <args>-extension</args>
-          </configuration>
-       </plugin>
-       <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-          </configuration>
-       </plugin>
-    </plugins>
-  </build>
-</project>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<!-- $Rev$ $Date$ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  
+  <artifactId>org.apache.geronimo.deployment.v11.jaxbmodel</artifactId>
+  <packaging>jar</packaging>
+  <name>${artifactId}</name>
+  <parent>
+      <groupId>org.apache.geronimo.devtools</groupId>
+      <artifactId>eclipse-plugins-parent</artifactId>
+      <version>2.1.0</version>
+      <relativePath>../pom.xml</relativePath>
+  </parent>
+    
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.1</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+       <plugin>
+          <groupId>com.sun.tools.xjc.maven2</groupId>
+          <artifactId>maven-jaxb-plugin</artifactId>
+          <version>1.1</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>generate</goal>
+              </goals>
+            </execution>
+          </executions>
+          <configuration>
+              <strict>false</strict>
+              <args>-extension</args>
+          </configuration>
+       </plugin>
+       <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+          </configuration>
+       </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/corba-css-config-2.0.xsd
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/corba-css-config-2.0.xsd?rev=636723&r1=636722&r2=636723&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/corba-css-config-2.0.xsd (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/corba-css-config-2.0.xsd Thu Mar 13 04:36:06 2008
@@ -1,248 +1,248 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ================================================================
- Redistribution and use of this software and associated documentation
- ("Software"), with or without modification, are permitted provided
- that the following conditions are met:
-
- 1. Redistributions of source code must retain copyright
-    statements and notices.  Redistributions must also contain a
-    copy of this document.
-
- 2. Redistributions in binary form must reproduce this list of
-    conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-
- 3. The name "OpenEJB" must not be used to endorse or promote
-    products derived from this Software without prior written
-    permission of The OpenEJB Group.  For written permission,
-    please contact openejb-group@openejb.sf.net.
-
- 4. Products derived from this Software may not be called "OpenEJB"
-    nor may "OpenEJB" appear in their names without prior written
-    permission of The OpenEJB Group. OpenEJB is a registered
-    trademark of The OpenEJB Group.
-
- 5. Due credit should be given to the OpenEJB Project
-    (http://openejb.org/).
-
- THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the OpenEJB Project.  For more information
- please see <http://openejb.org/>.
-
- ================================================================ -->
-
-<xsd:schema
-    xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0"
-    targetNamespace="http://www.openejb.org/xml/ns/corba-css-config-2.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-    elementFormDefault="qualified"
-    attributeFormDefault="unqualified"
-    version="1.0">
-
-    <xsd:element name="css" type="css:cssType"/>
-
-    <xsd:complexType name="cssType">
-        <xsd:sequence>
-            <xsd:element name="description" type="css:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="compoundSecMechTypeList" minOccurs="0">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="compoundSecMech" type="css:compoundSecMechType" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                    <xsd:attribute name="stateful" type="xsd:boolean" use="optional" default="false"/>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:complexType name="descriptionType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute ref="xml:lang"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="compoundSecMechType">
-        <xsd:sequence>
-            <xsd:element name="description" type="css:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:group ref="css:transportMechGroup" minOccurs="0"/>
-            <xsd:group ref="css:asMechGroup" minOccurs="0"/>
-            <xsd:element name="sasMech" type="css:sasMechType" minOccurs="0"/>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:group name="transportMechGroup">
-        <xsd:choice>
-            <xsd:element name="SSL" type="css:SSLType"/>
-            <xsd:element name="SECIOP" type="css:SECIOPType"/>
-        </xsd:choice>
-    </xsd:group>
-
-    <xsd:complexType name="SSLType">
-        <xsd:sequence>
-            <xsd:element name="description" type="css:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="supports" type="css:associationOptionList"/>
-            <xsd:element name="requires" type="css:associationOptionList"/>
-            <xsd:group ref="css:trustGroup" minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="handshakeTimeout" type="xsd:short"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="SECIOPType">
-        <xsd:sequence>
-            <xsd:element name="description" type="css:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="supports" type="css:associationOptionList"/>
-            <xsd:element name="requires" type="css:associationOptionList"/>
-            <xsd:group ref="css:trustGroup"/>
-        </xsd:sequence>
-        <xsd:attribute name="mechOID" type="xsd:string"/>
-        <xsd:attribute name="targetName" type="xsd:string"/>
-    </xsd:complexType>
-
-    <xsd:group name="trustGroup">
-        <xsd:choice>
-            <xsd:element name="trustEveryone" type="css:trustEveryoneType"/>
-            <xsd:element name="trustNoone" type="css:trustNooneType"/>
-            <xsd:element name="trustList">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="entity" type="css:entityType" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:choice>
-    </xsd:group>
-
-    <xsd:complexType name="trustEveryoneType">
-        <xsd:complexContent>
-            <xsd:restriction base="xsd:anyType"/>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="trustNooneType">
-        <xsd:complexContent>
-            <xsd:restriction base="xsd:anyType"/>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="entityType">
-        <xsd:complexContent>
-            <xsd:restriction base="xsd:anyType">
-                <xsd:attribute name="hostname" type="xsd:string" use="optional"/>
-                <xsd:attribute name="distinguishedName" type="xsd:string" use="optional"/>
-            </xsd:restriction>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:group name="asMechGroup">
-        <xsd:choice>
-            <xsd:element name="GSSUPStatic" type="css:GSSUPStaticType"/>
-            <xsd:element name="GSSUPDynamic" type="css:GSSUPDynamicType"/>
-        </xsd:choice>
-    </xsd:group>
-
-    <xsd:complexType name="GSSUPStaticType">
-        <xsd:complexContent>
-            <xsd:restriction base="xsd:anyType">
-                <xsd:attribute name="username" type="xsd:string"/>
-                <xsd:attribute name="password" type="xsd:string"/>
-                <xsd:attribute name="domain" type="xsd:string"/>
-            </xsd:restriction>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="GSSUPDynamicType">
-        <xsd:complexContent>
-            <xsd:restriction base="xsd:anyType">
-                <xsd:attribute name="domain" type="xsd:string" use="optional"/>
-            </xsd:restriction>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="sasMechType">
-        <xsd:sequence>
-            <xsd:element name="description" type="css:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:group ref="css:ittGroup"/>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:group name="ittGroup">
-        <xsd:choice>
-            <xsd:element name="ITTAbsent" type="css:ITTAbsentType"/>
-            <xsd:element name="ITTAnonymous" type="css:ITTAnonymousType"/>
-            <xsd:element name="ITTPrincipalNameStatic" type="css:ITTPrincipalNameStaticType"/>
-            <xsd:element name="ITTPrincipalNameDynamic" type="css:ITTPrincipalNameDynamicType"/>
-        </xsd:choice>
-    </xsd:group>
-
-    <xsd:complexType name="ITTAbsentType">
-        <xsd:complexContent>
-            <xsd:restriction base="xsd:anyType"/>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="ITTAnonymousType">
-        <xsd:complexContent>
-            <xsd:restriction base="xsd:anyType"/>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="ITTPrincipalNameStaticType">
-        <xsd:complexContent>
-            <xsd:restriction base="xsd:anyType">
-                <xsd:attribute name="name" type="xsd:string"/>
-                <xsd:attribute name="oid" type="xsd:string" use="optional"/>
-            </xsd:restriction>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="ITTPrincipalNameDynamicType">
-        <xsd:complexContent>
-            <xsd:restriction base="xsd:anyType">
-                <xsd:attribute name="principal-class" type="xsd:string"/>
-                <xsd:attribute name="domain" type="xsd:string" use="optional"/>
-                <xsd:attribute name="realm" type="xsd:string" use="optional"/>
-                <xsd:attribute name="oid" type="xsd:string" use="optional"/>
-            </xsd:restriction>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:simpleType name="associationOption">
-        <xsd:restriction base="xsd:token">
-            <xsd:enumeration value="NoProtection"/>
-            <xsd:enumeration value="Integrity"/>
-            <xsd:enumeration value="Confidentiality"/>
-            <xsd:enumeration value="DetectReplay"/>
-            <xsd:enumeration value="DetectMisordering"/>
-            <xsd:enumeration value="EstablishTrustInTarget"/>
-            <xsd:enumeration value="EstablishTrustInClient"/>
-            <xsd:enumeration value="NoDelegation"/>
-            <xsd:enumeration value="SimpleDelegation"/>
-            <xsd:enumeration value="CompositeDelegation"/>
-            <xsd:enumeration value="IdentityAssertion"/>
-            <xsd:enumeration value="DelegationByClient"/>
-        </xsd:restriction>
-    </xsd:simpleType>
-
-    <xsd:simpleType name="associationOptionList">
-        <xsd:list itemType="css:associationOption"/>
-    </xsd:simpleType>
-
-</xsd:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ================================================================
+ Redistribution and use of this software and associated documentation
+ ("Software"), with or without modification, are permitted provided
+ that the following conditions are met:
+
+ 1. Redistributions of source code must retain copyright
+    statements and notices.  Redistributions must also contain a
+    copy of this document.
+
+ 2. Redistributions in binary form must reproduce this list of
+    conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. The name "OpenEJB" must not be used to endorse or promote
+    products derived from this Software without prior written
+    permission of The OpenEJB Group.  For written permission,
+    please contact openejb-group@openejb.sf.net.
+
+ 4. Products derived from this Software may not be called "OpenEJB"
+    nor may "OpenEJB" appear in their names without prior written
+    permission of The OpenEJB Group. OpenEJB is a registered
+    trademark of The OpenEJB Group.
+
+ 5. Due credit should be given to the OpenEJB Project
+    (http://openejb.org/).
+
+ THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+ NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ ====================================================================
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the OpenEJB Project.  For more information
+ please see <http://openejb.org/>.
+
+ ================================================================ -->
+
+<xsd:schema
+    xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0"
+    targetNamespace="http://www.openejb.org/xml/ns/corba-css-config-2.0"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+    elementFormDefault="qualified"
+    attributeFormDefault="unqualified"
+    version="1.0">
+
+    <xsd:element name="css" type="css:cssType"/>
+
+    <xsd:complexType name="cssType">
+        <xsd:sequence>
+            <xsd:element name="description" type="css:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="compoundSecMechTypeList" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="compoundSecMech" type="css:compoundSecMechType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                    <xsd:attribute name="stateful" type="xsd:boolean" use="optional" default="false"/>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:complexType name="descriptionType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute ref="xml:lang"/>
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="compoundSecMechType">
+        <xsd:sequence>
+            <xsd:element name="description" type="css:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:group ref="css:transportMechGroup" minOccurs="0"/>
+            <xsd:group ref="css:asMechGroup" minOccurs="0"/>
+            <xsd:element name="sasMech" type="css:sasMechType" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:group name="transportMechGroup">
+        <xsd:choice>
+            <xsd:element name="SSL" type="css:SSLType"/>
+            <xsd:element name="SECIOP" type="css:SECIOPType"/>
+        </xsd:choice>
+    </xsd:group>
+
+    <xsd:complexType name="SSLType">
+        <xsd:sequence>
+            <xsd:element name="description" type="css:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="supports" type="css:associationOptionList"/>
+            <xsd:element name="requires" type="css:associationOptionList"/>
+            <xsd:group ref="css:trustGroup" minOccurs="0"/>
+        </xsd:sequence>
+        <xsd:attribute name="handshakeTimeout" type="xsd:short"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="SECIOPType">
+        <xsd:sequence>
+            <xsd:element name="description" type="css:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="supports" type="css:associationOptionList"/>
+            <xsd:element name="requires" type="css:associationOptionList"/>
+            <xsd:group ref="css:trustGroup"/>
+        </xsd:sequence>
+        <xsd:attribute name="mechOID" type="xsd:string"/>
+        <xsd:attribute name="targetName" type="xsd:string"/>
+    </xsd:complexType>
+
+    <xsd:group name="trustGroup">
+        <xsd:choice>
+            <xsd:element name="trustEveryone" type="css:trustEveryoneType"/>
+            <xsd:element name="trustNoone" type="css:trustNooneType"/>
+            <xsd:element name="trustList">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="entity" type="css:entityType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:choice>
+    </xsd:group>
+
+    <xsd:complexType name="trustEveryoneType">
+        <xsd:complexContent>
+            <xsd:restriction base="xsd:anyType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="trustNooneType">
+        <xsd:complexContent>
+            <xsd:restriction base="xsd:anyType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="entityType">
+        <xsd:complexContent>
+            <xsd:restriction base="xsd:anyType">
+                <xsd:attribute name="hostname" type="xsd:string" use="optional"/>
+                <xsd:attribute name="distinguishedName" type="xsd:string" use="optional"/>
+            </xsd:restriction>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:group name="asMechGroup">
+        <xsd:choice>
+            <xsd:element name="GSSUPStatic" type="css:GSSUPStaticType"/>
+            <xsd:element name="GSSUPDynamic" type="css:GSSUPDynamicType"/>
+        </xsd:choice>
+    </xsd:group>
+
+    <xsd:complexType name="GSSUPStaticType">
+        <xsd:complexContent>
+            <xsd:restriction base="xsd:anyType">
+                <xsd:attribute name="username" type="xsd:string"/>
+                <xsd:attribute name="password" type="xsd:string"/>
+                <xsd:attribute name="domain" type="xsd:string"/>
+            </xsd:restriction>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="GSSUPDynamicType">
+        <xsd:complexContent>
+            <xsd:restriction base="xsd:anyType">
+                <xsd:attribute name="domain" type="xsd:string" use="optional"/>
+            </xsd:restriction>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="sasMechType">
+        <xsd:sequence>
+            <xsd:element name="description" type="css:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:group ref="css:ittGroup"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:group name="ittGroup">
+        <xsd:choice>
+            <xsd:element name="ITTAbsent" type="css:ITTAbsentType"/>
+            <xsd:element name="ITTAnonymous" type="css:ITTAnonymousType"/>
+            <xsd:element name="ITTPrincipalNameStatic" type="css:ITTPrincipalNameStaticType"/>
+            <xsd:element name="ITTPrincipalNameDynamic" type="css:ITTPrincipalNameDynamicType"/>
+        </xsd:choice>
+    </xsd:group>
+
+    <xsd:complexType name="ITTAbsentType">
+        <xsd:complexContent>
+            <xsd:restriction base="xsd:anyType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="ITTAnonymousType">
+        <xsd:complexContent>
+            <xsd:restriction base="xsd:anyType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="ITTPrincipalNameStaticType">
+        <xsd:complexContent>
+            <xsd:restriction base="xsd:anyType">
+                <xsd:attribute name="name" type="xsd:string"/>
+                <xsd:attribute name="oid" type="xsd:string" use="optional"/>
+            </xsd:restriction>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="ITTPrincipalNameDynamicType">
+        <xsd:complexContent>
+            <xsd:restriction base="xsd:anyType">
+                <xsd:attribute name="principal-class" type="xsd:string"/>
+                <xsd:attribute name="domain" type="xsd:string" use="optional"/>
+                <xsd:attribute name="realm" type="xsd:string" use="optional"/>
+                <xsd:attribute name="oid" type="xsd:string" use="optional"/>
+            </xsd:restriction>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:simpleType name="associationOption">
+        <xsd:restriction base="xsd:token">
+            <xsd:enumeration value="NoProtection"/>
+            <xsd:enumeration value="Integrity"/>
+            <xsd:enumeration value="Confidentiality"/>
+            <xsd:enumeration value="DetectReplay"/>
+            <xsd:enumeration value="DetectMisordering"/>
+            <xsd:enumeration value="EstablishTrustInTarget"/>
+            <xsd:enumeration value="EstablishTrustInClient"/>
+            <xsd:enumeration value="NoDelegation"/>
+            <xsd:enumeration value="SimpleDelegation"/>
+            <xsd:enumeration value="CompositeDelegation"/>
+            <xsd:enumeration value="IdentityAssertion"/>
+            <xsd:enumeration value="DelegationByClient"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="associationOptionList">
+        <xsd:list itemType="css:associationOption"/>
+    </xsd:simpleType>
+
+</xsd:schema>

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/corba-css-config-2.0.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/corba-css-config-2.0.xsd
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/corba-css-config-2.0.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/corba-tss-config-2.0.xsd
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/corba-tss-config-2.0.xsd?rev=636723&r1=636722&r2=636723&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/corba-tss-config-2.0.xsd (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/corba-tss-config-2.0.xsd Thu Mar 13 04:36:06 2008
@@ -1,301 +1,301 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- ================================================================
- Redistribution and use of this software and associated documentation
- ("Software"), with or without modification, are permitted provided
- that the following conditions are met:
-
- 1. Redistributions of source code must retain copyright
-    statements and notices.  Redistributions must also contain a
-    copy of this document.
-
- 2. Redistributions in binary form must reproduce this list of
-    conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-
- 3. The name "OpenEJB" must not be used to endorse or promote
-    products derived from this Software without prior written
-    permission of The OpenEJB Group.  For written permission,
-    please contact openejb-group@openejb.sf.net.
-
- 4. Products derived from this Software may not be called "OpenEJB"
-    nor may "OpenEJB" appear in their names without prior written
-    permission of The OpenEJB Group. OpenEJB is a registered
-    trademark of The OpenEJB Group.
-
- 5. Due credit should be given to the OpenEJB Project
-    (http://openejb.org/).
-
- THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
- ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
- NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- OF THE POSSIBILITY OF SUCH DAMAGE.
-
- ====================================================================
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the OpenEJB Project.  For more information
- please see <http://openejb.org/>.
-
- ================================================================ -->
-
-<xsd:schema
-    xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0"
-    targetNamespace="http://www.openejb.org/xml/ns/corba-tss-config-2.0"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-    xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1"
-    elementFormDefault="qualified"
-    attributeFormDefault="unqualified"
-    version="1.0">
-
-    <xsd:element name="tss" type="tss:tssType"/>
-
-    <xsd:complexType name="tssType">
-        <xsd:sequence>
-            <xsd:element name="description" type="tss:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="default-principal" type="security:default-principalType" minOccurs="0"/>
-            <xsd:group ref="tss:transportMechGroup" minOccurs="0"/>
-            <xsd:element name="compoundSecMechTypeList" minOccurs="0">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="compoundSecMech" type="tss:compoundSecMechType" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                    <xsd:attribute name="stateful" type="xsd:boolean" use="optional" default="false"/>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="inherit" type="xsd:boolean" use="optional" default="false"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="descriptionType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute ref="xml:lang"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <xsd:group name="transportMechGroup">
-        <xsd:choice>
-            <xsd:element name="SSL" type="tss:SSLType"/>
-            <xsd:element name="SECIOP" type="tss:SECIOPType"/>
-        </xsd:choice>
-    </xsd:group>
-
-    <xsd:complexType name="SSLType">
-        <xsd:sequence>
-            <xsd:element name="description" type="tss:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="supports" type="tss:associationOptionList"/>
-            <xsd:element name="requires" type="tss:associationOptionList"/>
-            <xsd:group ref="tss:trustGroup" minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="port" type="xsd:short" use="required"/>
-        <xsd:attribute name="hostname" type="xsd:string" use="required"/>
-        <xsd:attribute name="handshakeTimeout" type="xsd:short"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="SECIOPType">
-        <xsd:sequence>
-            <xsd:element name="description" type="tss:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="supports" type="tss:associationOptionList"/>
-            <xsd:element name="requires" type="tss:associationOptionList"/>
-            <xsd:element name="transportAddress" type="tss:transportAddressType" maxOccurs="unbounded"/>
-            <xsd:group ref="tss:trustGroup"/>
-        </xsd:sequence>
-        <xsd:attribute name="mechOID" type="xsd:string"/>
-        <xsd:attribute name="targetName" type="xsd:string"/>
-    </xsd:complexType>
-
-    <xsd:group name="trustGroup">
-        <xsd:choice>
-            <xsd:element name="trustEveryone" type="tss:trustEveryoneType"/>
-            <xsd:element name="trustNoone" type="tss:trustNooneType"/>
-            <xsd:element name="trustList">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:element name="entity" type="tss:entityType" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                </xsd:complexType>
-            </xsd:element>
-        </xsd:choice>
-    </xsd:group>
-
-    <xsd:complexType name="trustEveryoneType">
-        <xsd:complexContent>
-            <xsd:restriction base="xsd:anyType"/>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="trustNooneType">
-        <xsd:complexContent>
-            <xsd:restriction base="xsd:anyType"/>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="entityType">
-        <xsd:complexContent>
-            <xsd:restriction base="xsd:anyType">
-                <xsd:attribute name="hostname" type="xsd:string" use="optional"/>
-                <xsd:attribute name="distinguishedName" type="xsd:string" use="optional"/>
-            </xsd:restriction>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="transportAddressType">
-        <xsd:simpleContent>
-            <xsd:extension base="xsd:string">
-                <xsd:attribute name="port" type="xsd:short"/>
-                <xsd:attribute name="hostname" type="xsd:string"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="compoundSecMechType">
-        <xsd:sequence>
-            <xsd:element name="description" type="tss:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:group ref="tss:asMechGroup" minOccurs="0"/>
-            <xsd:element name="sasMech" type="tss:sasMechType" minOccurs="0"/>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:group name="asMechGroup">
-        <xsd:choice>
-            <xsd:element name="GSSUP" type="tss:GSSUPType"/>
-        </xsd:choice>
-    </xsd:group>
-
-    <xsd:complexType name="GSSUPType">
-        <xsd:sequence>
-            <xsd:element name="description" type="tss:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="targetName" type="xsd:string"/>
-        <xsd:attribute name="required" type="xsd:boolean" use="optional" default="false"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="sasMechType">
-        <xsd:sequence>
-            <xsd:element name="description" type="tss:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
-            <xsd:element name="serviceConfigurationList" minOccurs="0">
-                <xsd:complexType>
-                    <xsd:sequence>
-                        <xsd:group ref="tss:serviceConfigurationGroup" maxOccurs="unbounded"/>
-                    </xsd:sequence>
-                    <xsd:attribute name="required" type="xsd:boolean" use="optional" default="false"/>
-                </xsd:complexType>
-            </xsd:element>
-            <xsd:element name="identityTokenTypes" type="tss:identityTokenTypeList"/>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:group name="serviceConfigurationGroup">
-        <xsd:choice>
-            <xsd:element name="generalName" type="tss:generalNameType"/>
-            <xsd:element name="gssExportedName" type="tss:gssExportedNameType"/>
-        </xsd:choice>
-    </xsd:group>
-
-    <xsd:complexType name="generalNameType">
-        <xsd:complexContent>
-            <xsd:restriction base="xsd:anyType">
-                <xsd:attribute name="privilegeAuthority" type="xsd:string"/>
-            </xsd:restriction>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="gssExportedNameType">
-        <xsd:complexContent>
-            <xsd:restriction base="xsd:anyType">
-                <xsd:attribute name="OID" type="xsd:string"/>
-                <xsd:attribute name="privilegeAuthority" type="xsd:string"/>
-            </xsd:restriction>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:simpleType name="associationOption">
-        <xsd:restriction base="xsd:token">
-            <xsd:enumeration value="NoProtection"/>
-            <xsd:enumeration value="Integrity"/>
-            <xsd:enumeration value="Confidentiality"/>
-            <xsd:enumeration value="DetectReplay"/>
-            <xsd:enumeration value="DetectMisordering"/>
-            <xsd:enumeration value="EstablishTrustInTarget"/>
-            <xsd:enumeration value="EstablishTrustInClient"/>
-            <xsd:enumeration value="NoDelegation"/>
-            <xsd:enumeration value="SimpleDelegation"/>
-            <xsd:enumeration value="CompositeDelegation"/>
-            <xsd:enumeration value="IdentityAssertion"/>
-            <xsd:enumeration value="DelegationByClient"/>
-        </xsd:restriction>
-    </xsd:simpleType>
-
-    <xsd:simpleType name="associationOptionList">
-        <xsd:list itemType="tss:associationOption"/>
-    </xsd:simpleType>
-
-    <xsd:complexType name="identityTokenTypeList">
-        <xsd:sequence>
-            <xsd:choice>
-                <xsd:element name="ITTAbsent" type="tss:ITTAbsentType"/>
-                <xsd:group ref="tss:ittGroup"/>
-            </xsd:choice>
-        </xsd:sequence>
-    </xsd:complexType>
-
-    <xsd:group name="ittGroup">
-        <xsd:sequence>
-            <xsd:element name="ITTAnonymous" type="tss:ITTAnonymousType" minOccurs="0"/>
-            <xsd:element name="ITTPrincipalNameGSSUP" type="tss:ITTPrincipalNameGSSUPType" minOccurs="0"/>
-            <xsd:element name="ITTDistinguishedName" type="tss:ITTDistinguishedNameType" minOccurs="0"/>
-            <xsd:element name="ITTX509CertChain" type="tss:ITTX509CertChainType" minOccurs="0"/>
-        </xsd:sequence>
-    </xsd:group>
-
-    <xsd:complexType name="ITTAbsentType">
-        <xsd:complexContent>
-            <xsd:restriction base="xsd:anyType"/>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="ITTAnonymousType">
-        <xsd:complexContent>
-            <xsd:restriction base="xsd:anyType"/>
-        </xsd:complexContent>
-    </xsd:complexType>
-
-    <xsd:complexType name="ITTPrincipalNameGSSUPType">
-        <!--        <xsd:complexContent>-->
-        <!--            <xsd:restriction base="xsd:anyType"/>-->
-        <!--        </xsd:complexContent>-->
-        <xsd:sequence/>
-        <xsd:attribute name="principal-class" type="xsd:string"/>
-        <xsd:attribute name="domain" type="xsd:string" use="optional"/>
-        <xsd:attribute name="realm" type="xsd:string" use="optional"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="ITTDistinguishedNameType">
-<!--        <xsd:complexContent>-->
-<!--            <xsd:restriction base="xsd:anyType"/>-->
-<!--        </xsd:complexContent>-->
-        <xsd:sequence/>
-        <xsd:attribute name="realm"  type="xsd:string" use="optional"/>
-        <xsd:attribute name="domain"  type="xsd:string" use="optional"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="ITTX509CertChainType">
-<!--        <xsd:complexContent>-->
-<!--            <xsd:restriction base="xsd:anyType"/>-->
-<!--        </xsd:complexContent>-->
-        <xsd:sequence/>
-        <xsd:attribute name="realm"  type="xsd:string" use="optional"/>
-        <xsd:attribute name="domain"  type="xsd:string" use="optional"/>
-    </xsd:complexType>
-
-</xsd:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- ================================================================
+ Redistribution and use of this software and associated documentation
+ ("Software"), with or without modification, are permitted provided
+ that the following conditions are met:
+
+ 1. Redistributions of source code must retain copyright
+    statements and notices.  Redistributions must also contain a
+    copy of this document.
+
+ 2. Redistributions in binary form must reproduce this list of
+    conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+
+ 3. The name "OpenEJB" must not be used to endorse or promote
+    products derived from this Software without prior written
+    permission of The OpenEJB Group.  For written permission,
+    please contact openejb-group@openejb.sf.net.
+
+ 4. Products derived from this Software may not be called "OpenEJB"
+    nor may "OpenEJB" appear in their names without prior written
+    permission of The OpenEJB Group. OpenEJB is a registered
+    trademark of The OpenEJB Group.
+
+ 5. Due credit should be given to the OpenEJB Project
+    (http://openejb.org/).
+
+ THIS SOFTWARE IS PROVIDED BY THE OPENEJB GROUP AND CONTRIBUTORS
+ ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+ NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ THE OPENEJB GROUP OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ ====================================================================
+
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the OpenEJB Project.  For more information
+ please see <http://openejb.org/>.
+
+ ================================================================ -->
+
+<xsd:schema
+    xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0"
+    targetNamespace="http://www.openejb.org/xml/ns/corba-tss-config-2.0"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+    xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1"
+    elementFormDefault="qualified"
+    attributeFormDefault="unqualified"
+    version="1.0">
+
+    <xsd:element name="tss" type="tss:tssType"/>
+
+    <xsd:complexType name="tssType">
+        <xsd:sequence>
+            <xsd:element name="description" type="tss:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="default-principal" type="security:default-principalType" minOccurs="0"/>
+            <xsd:group ref="tss:transportMechGroup" minOccurs="0"/>
+            <xsd:element name="compoundSecMechTypeList" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="compoundSecMech" type="tss:compoundSecMechType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                    <xsd:attribute name="stateful" type="xsd:boolean" use="optional" default="false"/>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="inherit" type="xsd:boolean" use="optional" default="false"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="descriptionType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute ref="xml:lang"/>
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:group name="transportMechGroup">
+        <xsd:choice>
+            <xsd:element name="SSL" type="tss:SSLType"/>
+            <xsd:element name="SECIOP" type="tss:SECIOPType"/>
+        </xsd:choice>
+    </xsd:group>
+
+    <xsd:complexType name="SSLType">
+        <xsd:sequence>
+            <xsd:element name="description" type="tss:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="supports" type="tss:associationOptionList"/>
+            <xsd:element name="requires" type="tss:associationOptionList"/>
+            <xsd:group ref="tss:trustGroup" minOccurs="0"/>
+        </xsd:sequence>
+        <xsd:attribute name="port" type="xsd:short" use="required"/>
+        <xsd:attribute name="hostname" type="xsd:string" use="required"/>
+        <xsd:attribute name="handshakeTimeout" type="xsd:short"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="SECIOPType">
+        <xsd:sequence>
+            <xsd:element name="description" type="tss:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="supports" type="tss:associationOptionList"/>
+            <xsd:element name="requires" type="tss:associationOptionList"/>
+            <xsd:element name="transportAddress" type="tss:transportAddressType" maxOccurs="unbounded"/>
+            <xsd:group ref="tss:trustGroup"/>
+        </xsd:sequence>
+        <xsd:attribute name="mechOID" type="xsd:string"/>
+        <xsd:attribute name="targetName" type="xsd:string"/>
+    </xsd:complexType>
+
+    <xsd:group name="trustGroup">
+        <xsd:choice>
+            <xsd:element name="trustEveryone" type="tss:trustEveryoneType"/>
+            <xsd:element name="trustNoone" type="tss:trustNooneType"/>
+            <xsd:element name="trustList">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:element name="entity" type="tss:entityType" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                </xsd:complexType>
+            </xsd:element>
+        </xsd:choice>
+    </xsd:group>
+
+    <xsd:complexType name="trustEveryoneType">
+        <xsd:complexContent>
+            <xsd:restriction base="xsd:anyType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="trustNooneType">
+        <xsd:complexContent>
+            <xsd:restriction base="xsd:anyType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="entityType">
+        <xsd:complexContent>
+            <xsd:restriction base="xsd:anyType">
+                <xsd:attribute name="hostname" type="xsd:string" use="optional"/>
+                <xsd:attribute name="distinguishedName" type="xsd:string" use="optional"/>
+            </xsd:restriction>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="transportAddressType">
+        <xsd:simpleContent>
+            <xsd:extension base="xsd:string">
+                <xsd:attribute name="port" type="xsd:short"/>
+                <xsd:attribute name="hostname" type="xsd:string"/>
+            </xsd:extension>
+        </xsd:simpleContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="compoundSecMechType">
+        <xsd:sequence>
+            <xsd:element name="description" type="tss:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:group ref="tss:asMechGroup" minOccurs="0"/>
+            <xsd:element name="sasMech" type="tss:sasMechType" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:group name="asMechGroup">
+        <xsd:choice>
+            <xsd:element name="GSSUP" type="tss:GSSUPType"/>
+        </xsd:choice>
+    </xsd:group>
+
+    <xsd:complexType name="GSSUPType">
+        <xsd:sequence>
+            <xsd:element name="description" type="tss:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
+        </xsd:sequence>
+        <xsd:attribute name="targetName" type="xsd:string"/>
+        <xsd:attribute name="required" type="xsd:boolean" use="optional" default="false"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="sasMechType">
+        <xsd:sequence>
+            <xsd:element name="description" type="tss:descriptionType" minOccurs="0" maxOccurs="unbounded"/>
+            <xsd:element name="serviceConfigurationList" minOccurs="0">
+                <xsd:complexType>
+                    <xsd:sequence>
+                        <xsd:group ref="tss:serviceConfigurationGroup" maxOccurs="unbounded"/>
+                    </xsd:sequence>
+                    <xsd:attribute name="required" type="xsd:boolean" use="optional" default="false"/>
+                </xsd:complexType>
+            </xsd:element>
+            <xsd:element name="identityTokenTypes" type="tss:identityTokenTypeList"/>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:group name="serviceConfigurationGroup">
+        <xsd:choice>
+            <xsd:element name="generalName" type="tss:generalNameType"/>
+            <xsd:element name="gssExportedName" type="tss:gssExportedNameType"/>
+        </xsd:choice>
+    </xsd:group>
+
+    <xsd:complexType name="generalNameType">
+        <xsd:complexContent>
+            <xsd:restriction base="xsd:anyType">
+                <xsd:attribute name="privilegeAuthority" type="xsd:string"/>
+            </xsd:restriction>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="gssExportedNameType">
+        <xsd:complexContent>
+            <xsd:restriction base="xsd:anyType">
+                <xsd:attribute name="OID" type="xsd:string"/>
+                <xsd:attribute name="privilegeAuthority" type="xsd:string"/>
+            </xsd:restriction>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:simpleType name="associationOption">
+        <xsd:restriction base="xsd:token">
+            <xsd:enumeration value="NoProtection"/>
+            <xsd:enumeration value="Integrity"/>
+            <xsd:enumeration value="Confidentiality"/>
+            <xsd:enumeration value="DetectReplay"/>
+            <xsd:enumeration value="DetectMisordering"/>
+            <xsd:enumeration value="EstablishTrustInTarget"/>
+            <xsd:enumeration value="EstablishTrustInClient"/>
+            <xsd:enumeration value="NoDelegation"/>
+            <xsd:enumeration value="SimpleDelegation"/>
+            <xsd:enumeration value="CompositeDelegation"/>
+            <xsd:enumeration value="IdentityAssertion"/>
+            <xsd:enumeration value="DelegationByClient"/>
+        </xsd:restriction>
+    </xsd:simpleType>
+
+    <xsd:simpleType name="associationOptionList">
+        <xsd:list itemType="tss:associationOption"/>
+    </xsd:simpleType>
+
+    <xsd:complexType name="identityTokenTypeList">
+        <xsd:sequence>
+            <xsd:choice>
+                <xsd:element name="ITTAbsent" type="tss:ITTAbsentType"/>
+                <xsd:group ref="tss:ittGroup"/>
+            </xsd:choice>
+        </xsd:sequence>
+    </xsd:complexType>
+
+    <xsd:group name="ittGroup">
+        <xsd:sequence>
+            <xsd:element name="ITTAnonymous" type="tss:ITTAnonymousType" minOccurs="0"/>
+            <xsd:element name="ITTPrincipalNameGSSUP" type="tss:ITTPrincipalNameGSSUPType" minOccurs="0"/>
+            <xsd:element name="ITTDistinguishedName" type="tss:ITTDistinguishedNameType" minOccurs="0"/>
+            <xsd:element name="ITTX509CertChain" type="tss:ITTX509CertChainType" minOccurs="0"/>
+        </xsd:sequence>
+    </xsd:group>
+
+    <xsd:complexType name="ITTAbsentType">
+        <xsd:complexContent>
+            <xsd:restriction base="xsd:anyType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="ITTAnonymousType">
+        <xsd:complexContent>
+            <xsd:restriction base="xsd:anyType"/>
+        </xsd:complexContent>
+    </xsd:complexType>
+
+    <xsd:complexType name="ITTPrincipalNameGSSUPType">
+        <!--        <xsd:complexContent>-->
+        <!--            <xsd:restriction base="xsd:anyType"/>-->
+        <!--        </xsd:complexContent>-->
+        <xsd:sequence/>
+        <xsd:attribute name="principal-class" type="xsd:string"/>
+        <xsd:attribute name="domain" type="xsd:string" use="optional"/>
+        <xsd:attribute name="realm" type="xsd:string" use="optional"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="ITTDistinguishedNameType">
+<!--        <xsd:complexContent>-->
+<!--            <xsd:restriction base="xsd:anyType"/>-->
+<!--        </xsd:complexContent>-->
+        <xsd:sequence/>
+        <xsd:attribute name="realm"  type="xsd:string" use="optional"/>
+        <xsd:attribute name="domain"  type="xsd:string" use="optional"/>
+    </xsd:complexType>
+
+    <xsd:complexType name="ITTX509CertChainType">
+<!--        <xsd:complexContent>-->
+<!--            <xsd:restriction base="xsd:anyType"/>-->
+<!--        </xsd:complexContent>-->
+        <xsd:sequence/>
+        <xsd:attribute name="realm"  type="xsd:string" use="optional"/>
+        <xsd:attribute name="domain"  type="xsd:string" use="optional"/>
+    </xsd:complexType>
+
+</xsd:schema>

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/corba-tss-config-2.0.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/corba-tss-config-2.0.xsd
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/corba-tss-config-2.0.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-application-1.1.xsd
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-application-1.1.xsd?rev=636723&r1=636722&r2=636723&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-application-1.1.xsd (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-application-1.1.xsd Thu Mar 13 04:36:06 2008
@@ -1,130 +1,130 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<!-- $Rev$ $Date$ -->
-
-<xs:schema
-    xmlns:geronimo="http://geronimo.apache.org/xml/ns/j2ee/application-1.1"
-    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/application-1.1"
-    xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1"
-    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    elementFormDefault="qualified"
-    attributeFormDefault="unqualified"
-    version="1.0">
-
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.1" schemaLocation="geronimo-security-1.1.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-module-1.1.xsd"/>
-
-    <xs:element name="application" type="geronimo:applicationType"/>
-
-    <xs:complexType name="applicationType">
-        <xs:sequence>
-            <xs:element ref="sys:environment"/>
-
-            <xs:element name="module" type="geronimo:moduleType" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element name="ext-module" type="geronimo:ext-moduleType" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="security:security" minOccurs="0"/>
-            <xs:element ref="sys:gbean" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-
-        <!--TODO application name should be settable using name-key in the environment.  Does this work? -->
-        <xs:attribute name="application-name" type="xs:string" use="optional"/>
-    </xs:complexType>
-
-    <xs:complexType name="moduleType">
-        <xs:annotation>
-            <xs:documentation>
-	Mirrors the moduleType defined by application_1_4.xsd and adds an
-	optional alt-dd element defining a Geronimo specific deployment descriptor.
-            </xs:documentation>
-        </xs:annotation>
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="connector" type="geronimo:pathType"/>
-                <xs:element name="ejb" type="geronimo:pathType"/>
-                <xs:element name="java" type="geronimo:pathType"/>
-                <xs:element name="web" type="geronimo:pathType"/>
-            </xs:choice>
-            <xs:choice>
-                <xs:element name="alt-dd" type="geronimo:pathType">
-                    <xs:annotation>
-                        <xs:documentation>
-  Specifies an optional URI to the post-assembly version of the Geronimo
-  specific deployment descriptor file for a particular J2EE module.
-                        </xs:documentation>
-                    </xs:annotation>
-                </xs:element>
-                <xs:any namespace="##other" processContents="lax"/>
-            </xs:choice>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="ext-moduleType">
-        <xs:annotation>
-            <xs:documentation>
-	Mirrors the moduleType defined by application_1_4.xsd and adds an
-	optional alt-dd element defining a Geronimo specific deployment descriptor.
-            </xs:documentation>
-        </xs:annotation>
-        <xs:sequence>
-            <xs:choice>
-                <xs:annotation>
-                    <xs:documentation>
-            This is the name for the module, not the path inside the ear.
-                    </xs:documentation>
-                </xs:annotation>
-                <xs:element name="connector" type="geronimo:pathType"/>
-                <xs:element name="ejb" type="geronimo:pathType"/>
-                <xs:element name="java" type="geronimo:pathType"/>
-                <xs:element name="web" type="geronimo:pathType"/>
-            </xs:choice>
-            <xs:choice>
-                <xs:element name="internal-path" type="xs:token"/>
-                <xs:element name="external-path" type="xs:token"/>
-            </xs:choice>
-            <!--TODO consider an alt-spec-dd element-->
-            <!--Do not allow vendor plan inside ear.  If it is in the ear, this does not need to be an external module -->
-            <xs:any namespace="##other" processContents="lax"/>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="pathType">
-        <xs:annotation>
-            <xs:documentation>
-  Mirrors j2ee:pathType.
-            </xs:documentation>
-        </xs:annotation>
-        <xs:simpleContent>
-            <xs:restriction base="geronimo:string"/>
-        </xs:simpleContent>
-    </xs:complexType>
-
-    <xs:complexType name="string">
-        <xs:annotation>
-            <xs:documentation>
-   Mirrors j2ee:string.
-            </xs:documentation>
-        </xs:annotation>
-        <xs:simpleContent>
-            <xs:extension base="xs:token">
-                <xs:attribute name="id" type="xs:ID"/>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<!-- $Rev$ $Date$ -->
+
+<xs:schema
+    xmlns:geronimo="http://geronimo.apache.org/xml/ns/j2ee/application-1.1"
+    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/application-1.1"
+    xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1"
+    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    elementFormDefault="qualified"
+    attributeFormDefault="unqualified"
+    version="1.0">
+
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.1" schemaLocation="geronimo-security-1.1.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-module-1.1.xsd"/>
+
+    <xs:element name="application" type="geronimo:applicationType"/>
+
+    <xs:complexType name="applicationType">
+        <xs:sequence>
+            <xs:element ref="sys:environment"/>
+
+            <xs:element name="module" type="geronimo:moduleType" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element name="ext-module" type="geronimo:ext-moduleType" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element ref="security:security" minOccurs="0"/>
+            <xs:element ref="sys:gbean" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+
+        <!--TODO application name should be settable using name-key in the environment.  Does this work? -->
+        <xs:attribute name="application-name" type="xs:string" use="optional"/>
+    </xs:complexType>
+
+    <xs:complexType name="moduleType">
+        <xs:annotation>
+            <xs:documentation>
+	Mirrors the moduleType defined by application_1_4.xsd and adds an
+	optional alt-dd element defining a Geronimo specific deployment descriptor.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:choice>
+                <xs:element name="connector" type="geronimo:pathType"/>
+                <xs:element name="ejb" type="geronimo:pathType"/>
+                <xs:element name="java" type="geronimo:pathType"/>
+                <xs:element name="web" type="geronimo:pathType"/>
+            </xs:choice>
+            <xs:choice>
+                <xs:element name="alt-dd" type="geronimo:pathType">
+                    <xs:annotation>
+                        <xs:documentation>
+  Specifies an optional URI to the post-assembly version of the Geronimo
+  specific deployment descriptor file for a particular J2EE module.
+                        </xs:documentation>
+                    </xs:annotation>
+                </xs:element>
+                <xs:any namespace="##other" processContents="lax"/>
+            </xs:choice>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="ext-moduleType">
+        <xs:annotation>
+            <xs:documentation>
+	Mirrors the moduleType defined by application_1_4.xsd and adds an
+	optional alt-dd element defining a Geronimo specific deployment descriptor.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:choice>
+                <xs:annotation>
+                    <xs:documentation>
+            This is the name for the module, not the path inside the ear.
+                    </xs:documentation>
+                </xs:annotation>
+                <xs:element name="connector" type="geronimo:pathType"/>
+                <xs:element name="ejb" type="geronimo:pathType"/>
+                <xs:element name="java" type="geronimo:pathType"/>
+                <xs:element name="web" type="geronimo:pathType"/>
+            </xs:choice>
+            <xs:choice>
+                <xs:element name="internal-path" type="xs:token"/>
+                <xs:element name="external-path" type="xs:token"/>
+            </xs:choice>
+            <!--TODO consider an alt-spec-dd element-->
+            <!--Do not allow vendor plan inside ear.  If it is in the ear, this does not need to be an external module -->
+            <xs:any namespace="##other" processContents="lax"/>
+        </xs:sequence>
+    </xs:complexType>
+
+    <xs:complexType name="pathType">
+        <xs:annotation>
+            <xs:documentation>
+  Mirrors j2ee:pathType.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:simpleContent>
+            <xs:restriction base="geronimo:string"/>
+        </xs:simpleContent>
+    </xs:complexType>
+
+    <xs:complexType name="string">
+        <xs:annotation>
+            <xs:documentation>
+   Mirrors j2ee:string.
+            </xs:documentation>
+        </xs:annotation>
+        <xs:simpleContent>
+            <xs:extension base="xs:token">
+                <xs:attribute name="id" type="xs:ID"/>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+
+</xs:schema>

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-application-1.1.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-application-1.1.xsd
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-application-1.1.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-application-client-1.1.xsd
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-application-client-1.1.xsd?rev=636723&r1=636722&r2=636723&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-application-client-1.1.xsd (original)
+++ geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-application-client-1.1.xsd Thu Mar 13 04:36:06 2008
@@ -1,77 +1,77 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<!-- $Rev$ $Date$ -->
-
-<xs:schema
-    xmlns:geronimo="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1"
-    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1"
-    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1"
-    xmlns:connector="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1"
-    xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1"
-    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    elementFormDefault="qualified"
-    attributeFormDefault="unqualified"
-    version="1.0">
-
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.1" schemaLocation="geronimo-naming-1.1.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.1" schemaLocation="geronimo-security-1.1.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1" schemaLocation="geronimo-connector-1.1.xsd"/>
-    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-module-1.1.xsd"/>
-
-    <xs:element name="application-client" type="geronimo:application-clientType"/>
-
-    <xs:complexType name="application-clientType">
-        <xs:sequence>
-            <xs:element ref="sys:client-environment"/>
-            <xs:element ref="sys:server-environment"/>
-
-            <xs:element ref="naming:gbean-ref" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="naming:ejb-ref" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="naming:service-ref" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="naming:resource-ref" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="naming:resource-env-ref" minOccurs="0" maxOccurs="unbounded"/>
-            <xs:element ref="naming:message-destination" minOccurs="0" maxOccurs="unbounded"/>
-
-            <xs:element ref="security:default-principal" minOccurs="0"/>
-
-            <xs:sequence minOccurs="0">
-                <xs:element name="realm-name" type="xs:string"/>
-                <xs:element name="callback-handler" type="xs:string" minOccurs="0"/>
-            </xs:sequence>
-
-
-            <xs:element name="resource" type="geronimo:resourceType" minOccurs="0" maxOccurs="unbounded"/>
-
-            <xs:element ref="sys:gbean" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-
-    </xs:complexType>
-
-    <xs:complexType name="resourceType">
-        <xs:sequence>
-            <xs:choice>
-                <xs:element name="external-rar" type="xs:string"/>
-                <xs:element name="internal-rar" type="xs:string"/>
-            </xs:choice>
-            <xs:element ref="connector:connector"/>
-        </xs:sequence>
-    </xs:complexType>
-
-
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<!-- $Rev$ $Date$ -->
+
+<xs:schema
+    xmlns:geronimo="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1"
+    targetNamespace="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1"
+    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1"
+    xmlns:connector="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1"
+    xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1"
+    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.1"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    elementFormDefault="qualified"
+    attributeFormDefault="unqualified"
+    version="1.0">
+
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/naming-1.1" schemaLocation="geronimo-naming-1.1.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/security-1.1" schemaLocation="geronimo-security-1.1.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1" schemaLocation="geronimo-connector-1.1.xsd"/>
+    <xs:import namespace="http://geronimo.apache.org/xml/ns/deployment-1.1" schemaLocation="geronimo-module-1.1.xsd"/>
+
+    <xs:element name="application-client" type="geronimo:application-clientType"/>
+
+    <xs:complexType name="application-clientType">
+        <xs:sequence>
+            <xs:element ref="sys:client-environment"/>
+            <xs:element ref="sys:server-environment"/>
+
+            <xs:element ref="naming:gbean-ref" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element ref="naming:ejb-ref" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element ref="naming:service-ref" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element ref="naming:resource-ref" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element ref="naming:resource-env-ref" minOccurs="0" maxOccurs="unbounded"/>
+            <xs:element ref="naming:message-destination" minOccurs="0" maxOccurs="unbounded"/>
+
+            <xs:element ref="security:default-principal" minOccurs="0"/>
+
+            <xs:sequence minOccurs="0">
+                <xs:element name="realm-name" type="xs:string"/>
+                <xs:element name="callback-handler" type="xs:string" minOccurs="0"/>
+            </xs:sequence>
+
+
+            <xs:element name="resource" type="geronimo:resourceType" minOccurs="0" maxOccurs="unbounded"/>
+
+            <xs:element ref="sys:gbean" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+
+    </xs:complexType>
+
+    <xs:complexType name="resourceType">
+        <xs:sequence>
+            <xs:choice>
+                <xs:element name="external-rar" type="xs:string"/>
+                <xs:element name="internal-rar" type="xs:string"/>
+            </xs:choice>
+            <xs:element ref="connector:connector"/>
+        </xs:sequence>
+    </xs:complexType>
+
+
+</xs:schema>

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-application-client-1.1.xsd
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-application-client-1.1.xsd
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/devtools/eclipse-plugin/trunk/plugins/org.apache.geronimo.deployment.v11.jaxbmodel/src/main/resources/geronimo-application-client-1.1.xsd
------------------------------------------------------------------------------
    svn:mime-type = text/xml