geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickmcgu...@apache.org
Subject svn commit: r945060 - in /geronimo/external/branches/openejb-3.1.3-r942249: ./ container/openejb-activemq4/src/main/resources/ container/openejb-core/src/main/resources/ container/openejb-core/src/main/resources/schema/ container/openejb-osgi/src/main/...
Date Mon, 17 May 2010 10:18:03 GMT
Author: rickmcguire
Date: Mon May 17 10:18:03 2010
New Revision: 945060

URL: http://svn.apache.org/viewvc?rev=945060&view=rev
Log:
fix copyright/LICENSE problems

Modified:
    geronimo/external/branches/openejb-3.1.3-r942249/LICENSE
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/login.config
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/main/resources/login.config
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/main/resources/schema/ejb-jar_1_1.xsd
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/src/main/resources/default.openejb.conf
    geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/src/main/resources/login.config
    geronimo/external/branches/openejb-3.1.3-r942249/pom.xml

Modified: geronimo/external/branches/openejb-3.1.3-r942249/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/LICENSE?rev=945060&r1=945059&r2=945060&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/LICENSE (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/LICENSE Mon May 17 10:18:03 2010
@@ -231,3 +231,67 @@ for container/openejb-core/src/test/java
  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.
+
+-------------------------------------------------------------------------
+for container/openejb-jee/src/main/resources/META-INF/schema/xml.xsd and
+server/openejb-axis/src/main/resources/META-INF/schema/soap_encoding_1_1.xsd
+
+
+=========================================================================
+==  W3C License                                                        ==
+=========================================================================
+
+W3C® SOFTWARE NOTICE AND LICENSE
+http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+This work (and included software, documentation such as READMEs, or other
+related items) is being provided by the copyright holders under the following
+license. By obtaining, using and/or copying this work, you (the licensee) agree
+that you have read, understood, and will comply with the following terms and
+conditions.
+
+Permission to copy, modify, and distribute this software and its documentation,
+with or without modification, for any purpose and without fee or royalty is
+hereby granted, provided that you include the following on ALL copies of the
+software and documentation or portions thereof, including modifications:
+
+  1. The full text of this NOTICE in a location viewable to users of the
+     redistributed or derivative work.
+  2. Any pre-existing intellectual property disclaimers, notices, or terms
+     and conditions. If none exist, the W3C Software Short Notice should be
+     included (hypertext is preferred, text is permitted) within the body
+     of any redistributed or derivative code.
+  3. Notice of any changes or modifications to the files, including the date
+     changes were made. (We recommend you provide URIs to the location from
+     which the code is derived.)
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE
+NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT
+THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY
+PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or
+publicity pertaining to the software without specific, written prior permission.
+Title to copyright in this software and any associated documentation will at
+all times remain with copyright holders.
+
+____________________________________
+
+This formulation of W3C's notice and license became active on December 31 2002.
+This version removes the copyright ownership notice such that this license can
+be used with materials other than those owned by the W3C, reflects that ERCIM
+is now a host of the W3C, includes references to this specific dated version of
+the license, and removes the ambiguous grant of "use". Otherwise, this version
+is the same as the previous version and is written so as to preserve the Free
+Software Foundation's assessment of GPL compatibility and OSI's certification
+under the Open Source Definition. Please see our Copyright FAQ for common
+questions about using materials from our site, including specific terms and
+conditions for packages like libwww, Amaya, and Jigsaw. Other questions about
+this notice can be directed to site-policy@w3.org.
+
+Joseph Reagle <site-policy@w3.org>
+

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/login.config
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/login.config?rev=945060&r1=945059&r2=945060&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/login.config
(original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-activemq4/src/main/resources/login.config
Mon May 17 10:18:03 2010
@@ -1,3 +1,19 @@
+/**
+ *  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.
+ */
 PropertiesLogin {
     org.apache.openejb.core.security.jaas.PropertiesLoginModule required
         Debug=true

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/main/resources/login.config
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/main/resources/login.config?rev=945060&r1=945059&r2=945060&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/main/resources/login.config
(original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/main/resources/login.config
Mon May 17 10:18:03 2010
@@ -1,3 +1,19 @@
+/**
+ *  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.
+ */
 PropertiesLogin {
     org.apache.openejb.core.security.jaas.PropertiesLoginModule required
         Debug=true

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/main/resources/schema/ejb-jar_1_1.xsd
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/main/resources/schema/ejb-jar_1_1.xsd?rev=945060&r1=945059&r2=945060&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/main/resources/schema/ejb-jar_1_1.xsd
(original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-core/src/main/resources/schema/ejb-jar_1_1.xsd
Mon May 17 10:18:03 2010
@@ -1,10 +1,30 @@
 <?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$ -->
+
 <xsd:schema xmlns="http://www.openejb.org/ejb-jar/1.1" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
targetNamespace="http://www.openejb.org/ejb-jar/1.1">
 
     <!--===========================================================
     This is the XML Schema for the EJB 1.1 deployment descriptor.
     ============================================================-->
-    
+
     <!--
     The assembly-descriptor element contains application-assembly infor-mation.
     The application-assembly information consists of the following parts:
@@ -27,7 +47,7 @@
 			<xsd:attribute name="id" type="xsd:ID" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
-	
+
     <!--
     The cmp-field element describes a container-managed field. The field
     element includes an optional description of the field, and the name of
@@ -43,7 +63,7 @@
 			<xsd:attribute name="id" type="xsd:ID" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
-	
+
     <!--
     The container-transaction element specifies how the container must
     manage transaction scopes for the enterprise bean's method invoca-tions.
@@ -51,7 +71,7 @@
     method elements, and a transaction attribute.The transaction
     attribute is to be applied to all the specified methods.
     Used in: assembly-descriptor
-    -->    
+    -->
     <xsd:element name="container-transaction">
 		<xsd:complexType>
 			<xsd:sequence>
@@ -62,8 +82,8 @@
 			<xsd:attribute name="id" type="xsd:ID" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
-	
-    
+
+
     <!--
     The description element is used by the ejb-jar file producer to pro-vide
     text describing the parent element.
@@ -75,9 +95,9 @@
     Used in: cmp-field, container-transaction, ejb-jar, entity,
     env-entry, ejb-ref, method, method-permission, resource-ref, secu-rity-
     role, security-role-ref, and session.
-    -->    
+    -->
     <xsd:element name="description" type="xsd:string"/>
-    
+
     <!--
     The display-name element contains a short name that is intended to be
     display by tools.
@@ -86,8 +106,8 @@
     <display-name>Employee Self Service</display-name>
     -->
     <xsd:element name="display-name" type="xsd:string" />
-	
-    
+
+
     <!--
     The ejb-class element contains the fully-qualified name of the enter-prise
     bean's class.
@@ -96,7 +116,7 @@
     <ejb-class>com.wombat.empl.EmployeeServiceBean</ejb-class>
     -->
     <xsd:element name="ejb-class" type="ClassName" />
-	
+
     <!--
     The optional ejb-client-jar element specifies a JAR file that con-tains
     the class files necessary for a client program to access the
@@ -107,7 +127,7 @@
     <ejb-client-jar>employee_service_client.jar</ejb-client-jar>
     -->
     <xsd:element name="ejb-client-jar" type="xsd:string" />
-	
+
     <!--
     The ejb-jar element is the root element of the EJB deployment descrip-tor.
     It contains an optional description of the ejb-jar file, optional
@@ -130,12 +150,12 @@
 			<xsd:attribute name="id" type="xsd:ID" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
-	
+
     <!--
     The ejb-link element is used in the ejb-ref element to specify that an
     EJB reference is linked to another enterprise bean in the ejb-jar
     file.
-    
+
     The value of the ejb-link element must be the ejb-name of an enter-prise
     bean in the same ejb-jar file, or in another ejb-jar file in the
     same J2EE application unit.
@@ -144,7 +164,7 @@
     <ejb-link>EmployeeRecord</ejb-link>
     -->
     <xsd:element name="ejb-link" type="xsd:string" />
-	
+
     <!--
     The ejb-name element specifies an enterprise bean's name. This name is
     assigned by the ejb-jar file producer to name the enterprise bean in
@@ -160,9 +180,9 @@
     Used in: entity, method, and session
     Example:
     <ejb-name>EmployeeService</ejb-name>
-    -->    
+    -->
     <xsd:element name="ejb-name" type="xsd:string" />
-	
+
     <!--
     The ejb-ref element is used for the declaration of a reference to
     another enterprise bean's home. The declaration consists of an
@@ -202,7 +222,7 @@
 			<xsd:attribute name="id" type="xsd:ID" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
-	
+
     <!--
     The ejb-ref-name element contains the name of an EJB reference. The
     EJB reference is an entry in the enterprise bean's environment.
@@ -212,7 +232,7 @@
     <ejb-ref-name>ejb/Payroll</ejb-ref-name>
     -->
     <xsd:element name="ejb-ref-name" type="xsd:string" />
-    
+
     <!--
     The ejb-ref-type element contains the expected type of the referenced
     enterprise bean.
@@ -222,7 +242,7 @@
     Used in: ejb-ref
     -->
     <xsd:element name="ejb-ref-type" type="EntityOrSession" />
-	
+
     <!--
     The enterprise-beans element contains the declarations of one or more
     enterprise beans.
@@ -236,7 +256,7 @@
 			<xsd:attribute name="id" type="xsd:ID" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
-	
+
     <!--
     The entity element declares an entity bean. The declaration consists
     of: an optional description; optional display name; optional small
@@ -287,8 +307,8 @@
 			<xsd:attribute name="id" type="xsd:ID" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
-	
-    
+
+
     <!--
     The env-entry element contains the declaration of an enterprise
     bean's environment entries. The declaration consists of an optional
@@ -306,8 +326,8 @@
 			<xsd:attribute name="id" type="xsd:ID" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
-	
-    
+
+
     <!--
     The env-entry-name element contains the name of an enterprise bean's
     environment entry.
@@ -316,7 +336,7 @@
     <env-entry-name>minAmount</env-entry-name>
     -->
     <xsd:element name="env-entry-name" type="xsd:string" />
-    
+
     <!--
     The env-entry-type element contains the fully-qualified Java type of
     the environment entry value that is expected by the enterprise bean's
@@ -329,7 +349,7 @@
     <env-entry-type>java.lang.Boolean</env-entry-type>
     -->
     <xsd:element name="env-entry-type" type="ClassName" />
-	
+
     <!--
     The env-entry-value element contains the value of an enterprise
     bean's environment entry.
@@ -338,7 +358,7 @@
     <env-entry-value>100.00</env-entry-value>
     -->
     <xsd:element name="env-entry-value" type="xsd:string" />
-    
+
     <!--
     The field-name element specifies the name of a container managed
     field. The name must be a public field of the enterprise bean class or
@@ -348,7 +368,7 @@
     <field-name>firstName</field-Name>
     -->
     <xsd:element name="field-name" type="xsd:string" />
-	
+
     <!--
     The home element contains the fully-qualified name of the enterprise
     bean's home interface.
@@ -358,7 +378,7 @@
     -->
     <xsd:element name="home" type="ClassName" />
     <xsd:element name="local-home" type="ClassName" />
-    
+
     <!--
     The large-icon element contains the name of a file containing a large
     (32 x 32) icon image. The file name is relative path within the
@@ -370,7 +390,7 @@
     <large-icon>employee-service-icon32x32.jpg</large-icon>
     -->
 	<xsd:element name="large-icon" type="GifOrJpeg" />
-    
+
     <!--
     The method element is used to denote a method of an enterprise bean's
     home or remote interface, or a set of methods. The ejb-name element
@@ -382,25 +402,25 @@
     a single method among multiple methods with an overloaded method
     name.
     There are three possible styles of the method element syntax:
-    
+
     1.  <method>
             <ejb-name>EJBNAME</ejb-name>
             <method-name>*</method-name>
         </method>
-    
+
     This style is used to refer to all the methods of the specified
     enterprise bean's home and remote interfaces.
-    
+
     2.  <method>
             <ejb-name>EJBNAME</ejb-name>
             <method-name>METHOD</method-name>
         </method>>
-    
+
     This style is used to refer to the specified method of the
     specified enterprise bean. If there are multiple methods with
     the same overloaded name, the element of this style refers to
     all the methods with the overloaded name.
-    
+
     3.  <method>
             <ejb-name>EJBNAME</ejb-name>
             <method-name>METHOD</method-name>
@@ -411,7 +431,7 @@
                 <method-param>PARAM-n</method-param>
             </method-params>
         <method>
-    
+
     This style is used to refer to a single method within a set of
     methods with an overloaded name. PARAM-1 through PARAM-n are the
     fully-qualified Java types of the method's input parameters (if
@@ -419,24 +439,24 @@
     contains no method-param elements). Arrays are specified by the
     array element's type, followed by one or more pair of square
     brackets (e.g. int[][]).
-    
+
     Used in: method-permission and container-transaction
     Examples:
-    
+
     Style 1: The following method element refers to all the methods of
     the EmployeeService bean's home and remote interfaces:
         <method>
             <ejb-name>EmployeeService</ejb-name>
             <method-name>*</method-name>
         </method>
-    
+
     Style 2: The following method element refers to all the create
     methods of the EmployeeService bean's home interface:
         <method>
             <ejb-name>EmployeeService</ejb-name>
             <method-name>create</method-name>
         </method>
-    
+
     Style 3: The following method element refers to the
     create(String firstName, String LastName) method of the
     EmployeeService bean's home interface.
@@ -448,13 +468,13 @@
                 <method-param>java.lang.String</method-param>
             </method-params>
         </method>
-    
+
     The following example illustrates a Style 3 element with
     more complex parameter types. The method
     foobar(char s, int i, int[] iar, mypackage.MyClass mycl,
     mypackage.MyClass[][] myclaar)
     would be specified as:
-    
+
         <method>
             <ejb-name>EmployeeService</ejb-name>
             <method-name>foobar</method-name>
@@ -466,7 +486,7 @@
                 <method-param>mypackage.MyClass[][]</method-param>
             </method-params>
         </method>
-    
+
     The optional method-intf element can be used when it becomes
     necessary to differentiate between a method defined in the home
     interface and a method with the same name and signature that is
@@ -481,11 +501,11 @@
                 <method-param>java.lang.String</method-param>
             </method-params>
         </method>
-    
+
     can be used to differentiate the create(String, String) method
     defined in the remote interface from the create(String, String)
     method defined in the home interface, which would be defined as
-        
+
         <method>
             <ejb-name>EmployeeService</ejb-name>
             <method-intf>Home</method-intf>
@@ -495,12 +515,12 @@
                 <method-param>java.lang.String</method-param>
             </method-params>
         </method>
-    
+
     The method-intf element can be used with all three Styles of the
     method element usage. For example, the following method element exam-ple
     could be used to refer to all the methods of the EmployeeService
     bean's home interface.
-    
+
         <method>
             <ejb-name>EmployeeService</ejb-name>
             <method-intf>Home</method-intf>
@@ -519,7 +539,7 @@
 			<xsd:attribute name="id" type="xsd:ID" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
-	
+
     <!--
     The method-intf element allows a method element to differentiate
     between the methods with the same name and signature that are defined
@@ -530,7 +550,7 @@
     Used in: method
     -->
     <xsd:element name="method-intf" type="HomeOrRemote" />
-    
+
     <!--
     The method-name element contains a name of an enterprise bean method,
     or the asterisk (*) character. The asterisk is used when the element
@@ -538,14 +558,14 @@
     Used in: method
     -->
 	<xsd:element name="method-name" type="xsd:string" />
-    
+
     <!--
     The method-param element contains the fully-qualified Java type name
     of a method parameter.
     Used in: method-params
     -->
 	<xsd:element name="method-param" type="xsd:string" />
-    
+
     <!--
     The method-params element contains a list of the fully-qualified Java
     type names of the method parameters.
@@ -559,7 +579,7 @@
 			<xsd:attribute name="id" type="xsd:ID" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
-	
+
     <!--
     The method-permission element specifies that one or more security
     roles are allowed to invoke one or more enterprise bean methods. The
@@ -581,18 +601,18 @@
 			<xsd:attribute name="id" type="xsd:ID" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
-	
+
     <!--
     The persistence-type element specifies an entity bean's persistence
     management type.
-    
+
     The persistence-type element must be one of the two following:
     <persistence-type>Bean</persistence-type>
     <persistence-type>Container</persistence-type>
     Used in: entity
     -->
     <xsd:element name="persistence-type" type="ContainerOrBean" />
-    
+
     <!--
     The prim-key-class element contains the fully-qualified name of an
     entity bean's primary key class.
@@ -605,14 +625,14 @@
     <prim-key-class>java.lang.Object</prim-key-class>
     -->
     <xsd:element name="prim-key-class" type="ClassName" />
-    
+
     <!--
     The primkey-field element is used to specify the name of the primary
     key field for an entity with container-managed persistence.
     The primkey-field must be one of the fields declared in the cmp-field
     element, and the type of the field must be the same as the primary key
     type.
-    
+
     The primkey-field element is not used if the primary key maps to mul-tiple
     container-managed fields (i.e. the key is a compound key). In
     this case, the fields of the primary key class must be public, and
@@ -623,20 +643,20 @@
     <primkey-field>EmployeeId</primkey-field>
     -->
 	<xsd:element name="primkey-field" type="xsd:string" />
-    
+
     <!--
     The reentrant element specifies whether an entity bean is reentrant or
     not.
-    
+
     The reentrant element must be one of the two following:
     <reentrant>True</reentrant>
     <reentrant>False</reentrant>
     Used in: entity
     -->
 	<xsd:element name="reentrant" type="xsd:boolean" default="false"/>
-    
-    
-    <!--    
+
+
+    <!--
     The remote element contains the fully-qualified name of the enter-prise
     bean's remote interface.
     Used in: ejb-ref, entity, and session
@@ -645,7 +665,7 @@
     -->
 	<xsd:element name="remote" type="ClassName" />
     <xsd:element name="local" type="ClassName" />
-    
+
     <!--
     The res-auth element specifies whether the enterprise bean code signs
     on programmatically to the resource manager, or whether the Container
@@ -664,7 +684,7 @@
     Used in: resource-ref
     -->
     <xsd:element name="res-ref-name" type="xsd:string" />
-    
+
     <!--
     The res-type element specifies the type of the data source. The type
     is specified by the Java interface (or class) expected to be imple-mented
@@ -672,7 +692,7 @@
     Used in: resource-ref
     -->
 	<xsd:element name="res-type" type="ClassName" />
-    
+
     <!--
     The resource-ref element contains a declaration of enterprise bean's
     reference to an external resource. It consists of an optional descrip-tion,
@@ -699,7 +719,7 @@
 			<xsd:attribute name="id" type="xsd:ID" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
-	
+
     <!--
     The role-link element is used to link a security role reference to a
     defined security role. The role-link element must contain the name of
@@ -707,14 +727,14 @@
     Used in: security-role-ref
     -->
     <xsd:element name="role-link" type="xsd:string" />
-    
+
     <!--
     The role-name element contains the name of a security role.
     The name must conform to the lexical rules for an NMTOKEN.
     Used in: method-permission, security-role, and security-role-ref
     -->
 	<xsd:element name="role-name" type="xsd:string" />
-	
+
     <!--
     The security-role element contains the definition of a security role.
     The definition consists of an optional description of the security
@@ -738,7 +758,7 @@
 			<xsd:attribute name="id" type="xsd:ID" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
-	
+
     <!--
     The security-role-ref element contains the declaration of a security
     role reference in the enterprise bean's code. The declaration con-sists
@@ -760,17 +780,17 @@
 			<xsd:attribute name="id" type="xsd:ID" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
-	
+
     <!--
     The session-type element describes whether the session bean is a
     stateful session, or stateless session.
     The session-type element must be one of the two following:
-    
+
     <session-type>Stateful</session-type>
     <session-type>Stateless</session-type>
     -->
     <xsd:element name="session-type" type="StatefulOrStateless" />
-    
+
     <!--
     The session element declares an session bean. The declaration con-sists
     of: an optional description; optional display name; optional
@@ -811,7 +831,7 @@
 			<xsd:attribute name="id" type="xsd:ID" use="optional"/>
 		</xsd:complexType>
 	</xsd:element>
-    
+
     <!--
     The small-icon element contains the name of a file containing a small
     (16 x 16) icon image. The file name is relative path within the
@@ -823,7 +843,7 @@
     <small-icon>employee-service-icon16x16.jpg</small-icon>
     -->
     <xsd:element name="small-icon" type="GifOrJpeg" />
-    
+
     <!--
     The transaction-type element specifies an enterprise bean's transac-tion
     management type.
@@ -833,9 +853,9 @@
     Used in: session
     -->
     <xsd:element name="transaction-type" type="ContainerOrBean" />
-	
-    
-    
+
+
+
     <!--
     The trans-attribute element specifies how the container must manage
     the transaction boundaries when delegating a method invocation to an
@@ -851,7 +871,7 @@
     -->
     <xsd:element name="trans-attribute" type="ValidTxType" />
 
-    
+
     <!--
     The ID mechanism is to allow tools that produce additional deployment
     information (i.e information beyond the standard EJB deployment
@@ -861,69 +881,69 @@
     The EJB architecture does not allow the tools to add the non-standard
     information into the EJB deployment descriptor.
     -->
-	
-    
-    <!-- 
+
+
+    <!--
     #############################################
     #                                           #
     #    Input Validation Rules                 #
     #                                           #
 	#############################################
     -->
-    
+
     <!-- Application|Container -->
     <xsd:simpleType name="AppOrContainer">
         <xsd:restriction base="xsd:string">
             <xsd:pattern value="Container|Application"/>
         </xsd:restriction>
-    </xsd:simpleType> 
-	
+    </xsd:simpleType>
+
     <!-- Class name -->
     <xsd:simpleType name="ClassName">
         <xsd:restriction base="xsd:string">
             <xsd:pattern value="[a-zA-Z0-9_$.]+"/>
         </xsd:restriction>
-    </xsd:simpleType> 
-    
-    
+    </xsd:simpleType>
+
+
     <!-- Container|Bean -->
     <xsd:simpleType name="ContainerOrBean">
         <xsd:restriction base="xsd:string">
             <xsd:pattern value="Container|Bean"/>
         </xsd:restriction>
-    </xsd:simpleType> 
-    
-    
+    </xsd:simpleType>
+
+
     <!-- Entity|Session -->
     <xsd:simpleType name="EntityOrSession">
         <xsd:restriction base="xsd:string">
             <xsd:pattern value="Entity|Session"/>
         </xsd:restriction>
-    </xsd:simpleType> 
+    </xsd:simpleType>
+
 
-    
     <!-- Gif|Jpeg -->
     <xsd:simpleType name="GifOrJpeg">
         <xsd:restriction base="xsd:string">
             <xsd:pattern value=".*\.(gif|jpeg)$"/>
         </xsd:restriction>
-    </xsd:simpleType> 
+    </xsd:simpleType>
+
 
-    
     <!-- Home|Remote -->
     <xsd:simpleType name="HomeOrRemote">
         <xsd:restriction base="xsd:string">
             <xsd:pattern value="Home|Remote"/>
         </xsd:restriction>
-    </xsd:simpleType> 
-    
-    
+    </xsd:simpleType>
+
+
     <!-- Stateful|Stateless -->
     <xsd:simpleType name="StatefulOrStateless">
         <xsd:restriction base="xsd:string">
             <xsd:pattern value="Stateful|Stateless"/>
         </xsd:restriction>
-    </xsd:simpleType> 
+    </xsd:simpleType>
 
     <!-- ValidTxType ___________________________
         Must be one of:
@@ -938,7 +958,7 @@
         <xsd:restriction base="xsd:string">
             <xsd:pattern value="NotSupported|Supports|Required|RequiresNew|Mandatory|Never"/>
         </xsd:restriction>
-    </xsd:simpleType> 
+    </xsd:simpleType>
+
 
-    
 </xsd:schema>

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/src/main/resources/default.openejb.conf
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/src/main/resources/default.openejb.conf?rev=945060&r1=945059&r2=945060&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/src/main/resources/default.openejb.conf
(original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/src/main/resources/default.openejb.conf
Mon May 17 10:18:03 2010
@@ -1,4 +1,21 @@
 <?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.
+-->
 <openejb>
 
 <Container id="My Stateless Container" type="STATELESS">

Modified: geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/src/main/resources/login.config
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/src/main/resources/login.config?rev=945060&r1=945059&r2=945060&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/src/main/resources/login.config
(original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/container/openejb-osgi/src/main/resources/login.config
Mon May 17 10:18:03 2010
@@ -1,3 +1,19 @@
+/**
+ *  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.
+ */
 PropertiesLogin {
     org.apache.openejb.core.security.jaas.PropertiesLoginModule required
         Debug=true

Modified: geronimo/external/branches/openejb-3.1.3-r942249/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/external/branches/openejb-3.1.3-r942249/pom.xml?rev=945060&r1=945059&r2=945060&view=diff
==============================================================================
--- geronimo/external/branches/openejb-3.1.3-r942249/pom.xml (original)
+++ geronimo/external/branches/openejb-3.1.3-r942249/pom.xml Mon May 17 10:18:03 2010
@@ -19,7 +19,8 @@
 
 <!-- $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">
+<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>
 



Mime
View raw message