You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2015/12/09 17:37:16 UTC

[07/18] tomee git commit: EOL

http://git-wip-us.apache.org/repos/asf/tomee/blob/48c99a5a/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-pojo-openejb-jar.xml
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-pojo-openejb-jar.xml b/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-pojo-openejb-jar.xml
index cd8fbb3..229900c 100644
--- a/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-pojo-openejb-jar.xml
+++ b/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-pojo-openejb-jar.xml
@@ -1,234 +1,234 @@
-<?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$ -->
-
-<openejb-jar xmlns="http://tomee.apache.org/xml/ns/openejb-jar-2.2"
-  xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-    <!--xmlns:pkgen="http://tomee.apache.org/xml/ns/pkgen-2.1"-->
-
-    <environment>
-        <moduleId>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-itests-core</artifactId>
-            <version>${openejbVersion}</version>
-            <type>car</type>
-        </moduleId>
-
-        <dependencies>
-          <dependency>
-              <groupId>org.apache.geronimo.configs</groupId>
-              <artifactId>j2ee-corba-yoko</artifactId>
-              <version>${version}</version>
-              <type>car</type>
-          </dependency>
-            <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>system-database</artifactId>
-                <version>${version}</version>
-                <type>car</type>
-            </dependency>
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-            </dependency>
-        </dependencies>
-    </environment>
-
-    <cmp-connection-factory>
-        <resource-link>SystemDatasource</resource-link>
-    </cmp-connection-factory>
-
-    <enterprise-beans>
-        <session>
-            <ejb-name>BasicStatelessBean</ejb-name>
-            <jndi-name>client/tests/stateless/BasicStatelessHome</jndi-name>
-            <resource-ref>
-                <ref-name>stateless/references/Resource_manager_access</ref-name>
-                <pattern>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>system-database</artifactId>
-                    <version>${version}</version>
-                    <name>SystemDatasource</name>
-                </pattern>
-            </resource-ref>
-        </session>
-        <session>
-            <ejb-name>BasicBMTStatelessBean</ejb-name>
-            <jndi-name>client/tests/stateless/BeanManagedBasicStatelessHome</jndi-name>
-            <resource-ref>
-                <ref-name>stateless/references/Resource_manager_access</ref-name>
-                <pattern>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>system-database</artifactId>
-                    <version>${version}</version>
-                    <name>SystemDatasource</name>
-                </pattern>
-            </resource-ref>
-        </session>
-        <session>
-            <ejb-name>DatabaseBean</ejb-name>
-            <jndi-name>client/tools/DatabaseHome</jndi-name>
-            <resource-ref>
-                <ref-name>database</ref-name>
-                <pattern>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>system-database</artifactId>
-                    <version>${version}</version>
-                    <name>SystemDatasource</name>
-                </pattern>
-            </resource-ref>
-        </session>
-        <session>
-            <ejb-name>BMTStatelessBean</ejb-name>
-            <jndi-name>client/tests/stateless/BeanManagedTransactionTests/EJBHome</jndi-name>
-            <resource-ref>
-                <ref-name>database</ref-name>
-                <pattern>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>system-database</artifactId>
-                    <version>${version}</version>
-                    <name>SystemDatasource</name>
-                </pattern>
-            </resource-ref>
-        </session>
-        <session>
-            <ejb-name>EncStatelessBean</ejb-name>
-            <jndi-name>client/tests/stateless/EncBean</jndi-name>
-            <resource-ref>
-                <ref-name>datasource</ref-name>
-                <pattern>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>system-database</artifactId>
-                    <version>${version}</version>
-                    <name>SystemDatasource</name>
-                </pattern>
-            </resource-ref>
-        </session>
-        <session>
-            <ejb-name>StatelessRMIIIOPBean</ejb-name>
-            <jndi-name>client/tests/stateless/RMI-over-IIOP/EJBHome</jndi-name>
-        </session>
-        <session>
-            <ejb-name>BasicStatelessBean</ejb-name>
-            <jndi-name>client/tests/stateless/BasicStatelessHome</jndi-name>
-            <resource-ref>
-                <ref-name>stateless/references/Resource_manager_access</ref-name>
-                <pattern>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>system-database</artifactId>
-                    <version>${version}</version>
-                    <name>SystemDatasource</name>
-                </pattern>
-            </resource-ref>
-        </session>
-        <session>
-            <ejb-name>SessionFacadeBean</ejb-name>
-            <jndi-name>client/tests/entity/cmp/SessionFacadeBean</jndi-name>
-        </session>
-        <session>
-            <ejb-name>BasicStatefulBean</ejb-name>
-            <jndi-name>client/tests/stateful/BasicStatefulHome</jndi-name>
-            <resource-ref>
-                <ref-name>stateful/references/Resource_manager_access</ref-name>
-                <pattern>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>system-database</artifactId>
-                    <version>${version}</version>
-                    <name>SystemDatasource</name>
-                </pattern>
-            </resource-ref>
-        </session>
-        <session>
-            <ejb-name>BasicBMTStatefulBean</ejb-name>
-            <jndi-name>client/tests/stateful/BeanManagedBasicStatefulHome</jndi-name>
-            <resource-ref>
-                <ref-name>stateful/references/Resource_manager_access</ref-name>
-                <pattern>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>system-database</artifactId>
-                    <version>${version}</version>
-                    <name>SystemDatasource</name>
-                </pattern>
-            </resource-ref>
-        </session>
-        <session>
-            <ejb-name>BMTStatefulBean</ejb-name>
-            <jndi-name>client/tests/stateful/BeanManagedTransactionTests/EJBHome</jndi-name>
-            <resource-ref>
-                <ref-name>datasource</ref-name>
-                <pattern>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>system-database</artifactId>
-                    <version>${version}</version>
-                    <name>SystemDatasource</name>
-                </pattern>
-            </resource-ref>
-        </session>
-        <session>
-            <ejb-name>EncStatefulBean</ejb-name>
-            <jndi-name>client/tests/stateful/EncBean</jndi-name>
-            <resource-ref>
-                <ref-name>datasource</ref-name>
-                <pattern>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>system-database</artifactId>
-                    <version>${version}</version>
-                    <name>SystemDatasource</name>
-                </pattern>
-            </resource-ref>
-        </session>
-        <session>
-            <ejb-name>StatefulRMIIIOPBean</ejb-name>
-            <jndi-name>client/tests/stateful/RMI-over-IIOP/EJBHome</jndi-name>
-        </session>
-        <entity>
-            <ejb-name>BasicBmpBean</ejb-name>
-            <jndi-name>client/tests/entity/bmp/BasicBmpHome</jndi-name>
-            <resource-ref>
-                <ref-name>jdbc/basic/entityDatabase</ref-name>
-                <pattern>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>system-database</artifactId>
-                    <version>${version}</version>
-                    <name>SystemDatasource</name>
-                </pattern>
-            </resource-ref>
-        </entity>
-        <entity>
-            <ejb-name>AOBasicBmpBean</ejb-name>
-            <jndi-name>client/tests/entity/bmp/allowed_operations/EntityHome</jndi-name>
-            <resource-ref>
-                <ref-name>jdbc/basic/entityDatabase</ref-name>
-                <pattern>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>system-database</artifactId>
-                    <version>${version}</version>
-                    <name>SystemDatasource</name>
-                </pattern>
-            </resource-ref>
-            <resource-ref>
-                <ref-name>entity/references/Resource_manager_access</ref-name>
-                <pattern>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>system-database</artifactId>
-                    <version>${version}</version>
+<?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$ -->
+
+<openejb-jar xmlns="http://tomee.apache.org/xml/ns/openejb-jar-2.2"
+  xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+    <!--xmlns:pkgen="http://tomee.apache.org/xml/ns/pkgen-2.1"-->
+
+    <environment>
+        <moduleId>
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>openejb-itests-core</artifactId>
+            <version>${openejbVersion}</version>
+            <type>car</type>
+        </moduleId>
+
+        <dependencies>
+          <dependency>
+              <groupId>org.apache.geronimo.configs</groupId>
+              <artifactId>j2ee-corba-yoko</artifactId>
+              <version>${version}</version>
+              <type>car</type>
+          </dependency>
+            <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>system-database</artifactId>
+                <version>${version}</version>
+                <type>car</type>
+            </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+            </dependency>
+        </dependencies>
+    </environment>
+
+    <cmp-connection-factory>
+        <resource-link>SystemDatasource</resource-link>
+    </cmp-connection-factory>
+
+    <enterprise-beans>
+        <session>
+            <ejb-name>BasicStatelessBean</ejb-name>
+            <jndi-name>client/tests/stateless/BasicStatelessHome</jndi-name>
+            <resource-ref>
+                <ref-name>stateless/references/Resource_manager_access</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </session>
+        <session>
+            <ejb-name>BasicBMTStatelessBean</ejb-name>
+            <jndi-name>client/tests/stateless/BeanManagedBasicStatelessHome</jndi-name>
+            <resource-ref>
+                <ref-name>stateless/references/Resource_manager_access</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </session>
+        <session>
+            <ejb-name>DatabaseBean</ejb-name>
+            <jndi-name>client/tools/DatabaseHome</jndi-name>
+            <resource-ref>
+                <ref-name>database</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </session>
+        <session>
+            <ejb-name>BMTStatelessBean</ejb-name>
+            <jndi-name>client/tests/stateless/BeanManagedTransactionTests/EJBHome</jndi-name>
+            <resource-ref>
+                <ref-name>database</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </session>
+        <session>
+            <ejb-name>EncStatelessBean</ejb-name>
+            <jndi-name>client/tests/stateless/EncBean</jndi-name>
+            <resource-ref>
+                <ref-name>datasource</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </session>
+        <session>
+            <ejb-name>StatelessRMIIIOPBean</ejb-name>
+            <jndi-name>client/tests/stateless/RMI-over-IIOP/EJBHome</jndi-name>
+        </session>
+        <session>
+            <ejb-name>BasicStatelessBean</ejb-name>
+            <jndi-name>client/tests/stateless/BasicStatelessHome</jndi-name>
+            <resource-ref>
+                <ref-name>stateless/references/Resource_manager_access</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </session>
+        <session>
+            <ejb-name>SessionFacadeBean</ejb-name>
+            <jndi-name>client/tests/entity/cmp/SessionFacadeBean</jndi-name>
+        </session>
+        <session>
+            <ejb-name>BasicStatefulBean</ejb-name>
+            <jndi-name>client/tests/stateful/BasicStatefulHome</jndi-name>
+            <resource-ref>
+                <ref-name>stateful/references/Resource_manager_access</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </session>
+        <session>
+            <ejb-name>BasicBMTStatefulBean</ejb-name>
+            <jndi-name>client/tests/stateful/BeanManagedBasicStatefulHome</jndi-name>
+            <resource-ref>
+                <ref-name>stateful/references/Resource_manager_access</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </session>
+        <session>
+            <ejb-name>BMTStatefulBean</ejb-name>
+            <jndi-name>client/tests/stateful/BeanManagedTransactionTests/EJBHome</jndi-name>
+            <resource-ref>
+                <ref-name>datasource</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </session>
+        <session>
+            <ejb-name>EncStatefulBean</ejb-name>
+            <jndi-name>client/tests/stateful/EncBean</jndi-name>
+            <resource-ref>
+                <ref-name>datasource</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </session>
+        <session>
+            <ejb-name>StatefulRMIIIOPBean</ejb-name>
+            <jndi-name>client/tests/stateful/RMI-over-IIOP/EJBHome</jndi-name>
+        </session>
+        <entity>
+            <ejb-name>BasicBmpBean</ejb-name>
+            <jndi-name>client/tests/entity/bmp/BasicBmpHome</jndi-name>
+            <resource-ref>
+                <ref-name>jdbc/basic/entityDatabase</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </entity>
+        <entity>
+            <ejb-name>AOBasicBmpBean</ejb-name>
+            <jndi-name>client/tests/entity/bmp/allowed_operations/EntityHome</jndi-name>
+            <resource-ref>
+                <ref-name>jdbc/basic/entityDatabase</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+            <resource-ref>
+                <ref-name>entity/references/Resource_manager_access</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
                     <name>SystemDatasource</name>
                 </pattern>
             </resource-ref>
@@ -291,38 +291,38 @@
                 </pattern>
             </resource-ref>
         </entity>
-        <entity>
-            <ejb-name>BasicCmp2PojoBean</ejb-name>
-            <jndi-name>client/tests/entity/cmp2/BasicCmpPojoHome</jndi-name>
-            <table-name>entity</table-name>
-            <cmp-field-mapping>
-                <cmp-field-name>id</cmp-field-name>
-                <table-column>id</table-column>
-            </cmp-field-mapping>
-            <cmp-field-mapping>
-                <cmp-field-name>firstName</cmp-field-name>
-                <table-column>first_name</table-column>
-            </cmp-field-mapping>
-            <cmp-field-mapping>
-                <cmp-field-name>lastName</cmp-field-name>
-                <table-column>last_name</table-column>
-            </cmp-field-mapping>
-            <key-generator>
-                <auto-increment-table>
-                    <sql>INSERT INTO entity (first_name) VALUES ('AUTO_GENERATED')</sql>
-                    <return-type>java.lang.Integer</return-type>
-                </auto-increment-table>
-            </key-generator>
-            <resource-ref>
-                <ref-name>jdbc/basic/entityDatabase</ref-name>
-                <pattern>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>system-database</artifactId>
-                    <version>${version}</version>
-                    <name>SystemDatasource</name>
-                </pattern>
-            </resource-ref>
-        </entity>
+        <entity>
+            <ejb-name>BasicCmp2PojoBean</ejb-name>
+            <jndi-name>client/tests/entity/cmp2/BasicCmpPojoHome</jndi-name>
+            <table-name>entity</table-name>
+            <cmp-field-mapping>
+                <cmp-field-name>id</cmp-field-name>
+                <table-column>id</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>firstName</cmp-field-name>
+                <table-column>first_name</table-column>
+            </cmp-field-mapping>
+            <cmp-field-mapping>
+                <cmp-field-name>lastName</cmp-field-name>
+                <table-column>last_name</table-column>
+            </cmp-field-mapping>
+            <key-generator>
+                <auto-increment-table>
+                    <sql>INSERT INTO entity (first_name) VALUES ('AUTO_GENERATED')</sql>
+                    <return-type>java.lang.Integer</return-type>
+                </auto-increment-table>
+            </key-generator>
+            <resource-ref>
+                <ref-name>jdbc/basic/entityDatabase</ref-name>
+                <pattern>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>system-database</artifactId>
+                    <version>${version}</version>
+                    <name>SystemDatasource</name>
+                </pattern>
+            </resource-ref>
+        </entity>
         <entity>
             <ejb-name>AOBasicCmp2Bean</ejb-name>
             <jndi-name>client/tests/entity/cmp2/allowed_operations/EntityHome</jndi-name>
@@ -821,4 +821,4 @@
     <gbean name="ORBConfigAdapter" class="org.apache.openejb.yoko.ORBConfigAdapterGBean"/>
 
 </openejb-jar>
-
+

http://git-wip-us.apache.org/repos/asf/tomee/blob/48c99a5a/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-sun-cmp-mappings.xml
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-sun-cmp-mappings.xml b/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-sun-cmp-mappings.xml
index ceb9bd1..8926f7a 100644
--- a/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-sun-cmp-mappings.xml
+++ b/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-sun-cmp-mappings.xml
@@ -1,23 +1,23 @@
-<?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$ -->
-
+<?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$ -->
+
 <!DOCTYPE sun-cmp-mappings PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 7.0 CMP 1.0//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-cmp-mapping_1_0.dtd">
 <sun-cmp-mappings>
     <sun-cmp-mapping>

http://git-wip-us.apache.org/repos/asf/tomee/blob/48c99a5a/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-sun-ejb-jar.xml
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-sun-ejb-jar.xml b/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-sun-ejb-jar.xml
index 10404cc..8c1876c 100644
--- a/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-sun-ejb-jar.xml
+++ b/container/openejb-core/src/test/resources/convert/oej2/cmp/itest-2.2/itest-2.2-sun-ejb-jar.xml
@@ -1,22 +1,22 @@
-<?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$ -->
+<?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$ -->
 
 <!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
 <sun-ejb-jar>

http://git-wip-us.apache.org/repos/asf/tomee/blob/48c99a5a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/CollectionTable.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/CollectionTable.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/CollectionTable.java
index f7ece7f..91c5605 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/CollectionTable.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/CollectionTable.java
@@ -1,193 +1,193 @@
-/**
- * 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.
- */
-
-package org.apache.openejb.jee.jpa;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * @Target({METHOD, FIELD}) @Retention(RUNTIME)
- * public @interface CollectionTable {
- * String name() default "";
- * String catalog() default "";
- * String schema() default "";
- * JoinColumn[] joinColumns() default {};
- * UniqueConstraint[] uniqueConstraints() default {};
- * }
- * <p/>
- * <p/>
- * <p/>
- * <p>Java class for collection-table complex type.
- * <p/>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="collection-table">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="join-column" type="{http://java.sun.com/xml/ns/persistence/orm}join-column" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element name="unique-constraint" type="{http://java.sun.com/xml/ns/persistence/orm}unique-constraint" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="catalog" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="schema" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "collection-table", propOrder = {
-    "joinColumn",
-    "uniqueConstraint"
-})
-public class CollectionTable {
-
-    @XmlElement(name = "join-column")
-    protected List<JoinColumn> joinColumn;
-    @XmlElement(name = "unique-constraint")
-    protected List<UniqueConstraint> uniqueConstraint;
-    @XmlAttribute
-    protected String name;
-    @XmlAttribute
-    protected String catalog;
-    @XmlAttribute
-    protected String schema;
-
-    /**
-     * Gets the value of the joinColumn property.
-     * <p/>
-     * <p/>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the joinColumn property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getJoinColumn().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link org.apache.openejb.jee.jpa.JoinColumn }
-     */
-    public List<JoinColumn> getJoinColumn() {
-        if (joinColumn == null) {
-            joinColumn = new ArrayList<JoinColumn>();
-        }
-        return this.joinColumn;
-    }
-
-    /**
-     * Gets the value of the uniqueConstraint property.
-     * <p/>
-     * <p/>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the uniqueConstraint property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getUniqueConstraint().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link org.apache.openejb.jee.jpa.UniqueConstraint }
-     */
-    public List<UniqueConstraint> getUniqueConstraint() {
-        if (uniqueConstraint == null) {
-            uniqueConstraint = new ArrayList<UniqueConstraint>();
-        }
-        return this.uniqueConstraint;
-    }
-
-    /**
-     * Gets the value of the name property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setName(final String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the catalog property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getCatalog() {
-        return catalog;
-    }
-
-    /**
-     * Sets the value of the catalog property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setCatalog(final String value) {
-        this.catalog = value;
-    }
-
-    /**
-     * Gets the value of the schema property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getSchema() {
-        return schema;
-    }
-
-    /**
-     * Sets the value of the schema property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setSchema(final String value) {
-        this.schema = value;
-    }
-
-}
+/**
+ * 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.
+ */
+
+package org.apache.openejb.jee.jpa;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * @Target({METHOD, FIELD}) @Retention(RUNTIME)
+ * public @interface CollectionTable {
+ * String name() default "";
+ * String catalog() default "";
+ * String schema() default "";
+ * JoinColumn[] joinColumns() default {};
+ * UniqueConstraint[] uniqueConstraints() default {};
+ * }
+ * <p/>
+ * <p/>
+ * <p/>
+ * <p>Java class for collection-table complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="collection-table">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="join-column" type="{http://java.sun.com/xml/ns/persistence/orm}join-column" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="unique-constraint" type="{http://java.sun.com/xml/ns/persistence/orm}unique-constraint" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="catalog" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="schema" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "collection-table", propOrder = {
+    "joinColumn",
+    "uniqueConstraint"
+})
+public class CollectionTable {
+
+    @XmlElement(name = "join-column")
+    protected List<JoinColumn> joinColumn;
+    @XmlElement(name = "unique-constraint")
+    protected List<UniqueConstraint> uniqueConstraint;
+    @XmlAttribute
+    protected String name;
+    @XmlAttribute
+    protected String catalog;
+    @XmlAttribute
+    protected String schema;
+
+    /**
+     * Gets the value of the joinColumn property.
+     * <p/>
+     * <p/>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the joinColumn property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getJoinColumn().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link org.apache.openejb.jee.jpa.JoinColumn }
+     */
+    public List<JoinColumn> getJoinColumn() {
+        if (joinColumn == null) {
+            joinColumn = new ArrayList<JoinColumn>();
+        }
+        return this.joinColumn;
+    }
+
+    /**
+     * Gets the value of the uniqueConstraint property.
+     * <p/>
+     * <p/>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the uniqueConstraint property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getUniqueConstraint().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link org.apache.openejb.jee.jpa.UniqueConstraint }
+     */
+    public List<UniqueConstraint> getUniqueConstraint() {
+        if (uniqueConstraint == null) {
+            uniqueConstraint = new ArrayList<UniqueConstraint>();
+        }
+        return this.uniqueConstraint;
+    }
+
+    /**
+     * Gets the value of the name property.
+     *
+     * @return possible object is
+     * {@link String }
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setName(final String value) {
+        this.name = value;
+    }
+
+    /**
+     * Gets the value of the catalog property.
+     *
+     * @return possible object is
+     * {@link String }
+     */
+    public String getCatalog() {
+        return catalog;
+    }
+
+    /**
+     * Sets the value of the catalog property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setCatalog(final String value) {
+        this.catalog = value;
+    }
+
+    /**
+     * Gets the value of the schema property.
+     *
+     * @return possible object is
+     * {@link String }
+     */
+    public String getSchema() {
+        return schema;
+    }
+
+    /**
+     * Sets the value of the schema property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setSchema(final String value) {
+        this.schema = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/48c99a5a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/ElementCollection.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/ElementCollection.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/ElementCollection.java
index 79511da..6de7bca 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/ElementCollection.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/ElementCollection.java
@@ -1,577 +1,577 @@
-/**
- * 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.
- */
-
-package org.apache.openejb.jee.jpa;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * @Target({METHOD, FIELD}) @Retention(RUNTIME)
- * public @interface ElementCollection {
- * Class targetClass() default void.class;
- * FetchType fetch() default LAZY;
- * }
- * <p/>
- * <p/>
- * <p/>
- * <p>Java class for element-collection complex type.
- * <p/>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="element-collection">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;choice>
- *           &lt;element name="order-by" type="{http://java.sun.com/xml/ns/persistence/orm}order-by" minOccurs="0"/>
- *           &lt;element name="order-column" type="{http://java.sun.com/xml/ns/persistence/orm}order-column" minOccurs="0"/>
- *         &lt;/choice>
- *         &lt;choice>
- *           &lt;element name="map-key" type="{http://java.sun.com/xml/ns/persistence/orm}map-key" minOccurs="0"/>
- *           &lt;sequence>
- *             &lt;element name="map-key-class" type="{http://java.sun.com/xml/ns/persistence/orm}map-key-class" minOccurs="0"/>
- *             &lt;choice>
- *               &lt;element name="map-key-temporal" type="{http://java.sun.com/xml/ns/persistence/orm}temporal" minOccurs="0"/>
- *               &lt;element name="map-key-enumerated" type="{http://java.sun.com/xml/ns/persistence/orm}enumerated" minOccurs="0"/>
- *               &lt;element name="map-key-attribute-override" type="{http://java.sun.com/xml/ns/persistence/orm}attribute-override" maxOccurs="unbounded" minOccurs="0"/>
- *             &lt;/choice>
- *             &lt;choice>
- *               &lt;element name="map-key-column" type="{http://java.sun.com/xml/ns/persistence/orm}map-key-column" minOccurs="0"/>
- *               &lt;element name="map-key-join-column" type="{http://java.sun.com/xml/ns/persistence/orm}map-key-join-column" maxOccurs="unbounded" minOccurs="0"/>
- *             &lt;/choice>
- *           &lt;/sequence>
- *         &lt;/choice>
- *         &lt;choice>
- *           &lt;sequence>
- *             &lt;element name="column" type="{http://java.sun.com/xml/ns/persistence/orm}column" minOccurs="0"/>
- *             &lt;choice>
- *               &lt;element name="temporal" type="{http://java.sun.com/xml/ns/persistence/orm}temporal" minOccurs="0"/>
- *               &lt;element name="enumerated" type="{http://java.sun.com/xml/ns/persistence/orm}enumerated" minOccurs="0"/>
- *               &lt;element name="lob" type="{http://java.sun.com/xml/ns/persistence/orm}lob" minOccurs="0"/>
- *             &lt;/choice>
- *           &lt;/sequence>
- *           &lt;sequence>
- *             &lt;element name="attribute-override" type="{http://java.sun.com/xml/ns/persistence/orm}attribute-override" maxOccurs="unbounded" minOccurs="0"/>
- *             &lt;element name="association-override" type="{http://java.sun.com/xml/ns/persistence/orm}association-override" maxOccurs="unbounded" minOccurs="0"/>
- *           &lt;/sequence>
- *         &lt;/choice>
- *         &lt;element name="collection-table" type="{http://java.sun.com/xml/ns/persistence/orm}collection-table" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="target-class" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="fetch" type="{http://java.sun.com/xml/ns/persistence/orm}fetch-type" />
- *       &lt;attribute name="access" type="{http://java.sun.com/xml/ns/persistence/orm}access-type" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "element-collection", propOrder = {
-    "orderBy",
-    "orderColumn",
-    "mapKey",
-    "mapKeyClass",
-    "mapKeyTemporal",
-    "mapKeyEnumerated",
-    "mapKeyAttributeOverride",
-    "mapKeyColumn",
-    "mapKeyJoinColumn",
-    "column",
-    "temporal",
-    "enumerated",
-    "lob",
-    "attributeOverride",
-    "associationOverride",
-    "collectionTable"
-})
-public class ElementCollection {
-
-    @XmlElement(name = "order-by")
-    protected String orderBy;
-    @XmlElement(name = "order-column")
-    protected OrderColumn orderColumn;
-    @XmlElement(name = "map-key")
-    protected MapKey mapKey;
-    @XmlElement(name = "map-key-class")
-    protected MapKeyClass mapKeyClass;
-    @XmlElement(name = "map-key-temporal")
-    protected TemporalType mapKeyTemporal;
-    @XmlElement(name = "map-key-enumerated")
-    protected EnumType mapKeyEnumerated;
-    @XmlElement(name = "map-key-attribute-override")
-    protected List<AttributeOverride> mapKeyAttributeOverride;
-    @XmlElement(name = "map-key-column")
-    protected MapKeyColumn mapKeyColumn;
-    @XmlElement(name = "map-key-join-column")
-    protected List<MapKeyJoinColumn> mapKeyJoinColumn;
-    protected Column column;
-    protected TemporalType temporal;
-    protected EnumType enumerated;
-    protected Lob lob;
-    @XmlElement(name = "attribute-override")
-    protected List<AttributeOverride> attributeOverride;
-    @XmlElement(name = "association-override")
-    protected List<AssociationOverride> associationOverride;
-    @XmlElement(name = "collection-table")
-    protected CollectionTable collectionTable;
-    @XmlAttribute(required = true)
-    protected String name;
-    @XmlAttribute(name = "target-class")
-    protected String targetClass;
-    @XmlAttribute
-    protected FetchType fetch;
-    @XmlAttribute
-    protected AccessType access;
-
-    /**
-     * Gets the value of the orderBy property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getOrderBy() {
-        return orderBy;
-    }
-
-    /**
-     * Sets the value of the orderBy property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setOrderBy(final String value) {
-        this.orderBy = value;
-    }
-
-    /**
-     * Gets the value of the orderColumn property.
-     *
-     * @return possible object is
-     * {@link OrderColumn }
-     */
-    public OrderColumn getOrderColumn() {
-        return orderColumn;
-    }
-
-    /**
-     * Sets the value of the orderColumn property.
-     *
-     * @param value allowed object is
-     *              {@link OrderColumn }
-     */
-    public void setOrderColumn(final OrderColumn value) {
-        this.orderColumn = value;
-    }
-
-    /**
-     * Gets the value of the mapKey property.
-     *
-     * @return possible object is
-     * {@link org.apache.openejb.jee.jpa.MapKey }
-     */
-    public MapKey getMapKey() {
-        return mapKey;
-    }
-
-    /**
-     * Sets the value of the mapKey property.
-     *
-     * @param value allowed object is
-     *              {@link org.apache.openejb.jee.jpa.MapKey }
-     */
-    public void setMapKey(final MapKey value) {
-        this.mapKey = value;
-    }
-
-    /**
-     * Gets the value of the mapKeyClass property.
-     *
-     * @return possible object is
-     * {@link MapKeyClass }
-     */
-    public MapKeyClass getMapKeyClass() {
-        return mapKeyClass;
-    }
-
-    /**
-     * Sets the value of the mapKeyClass property.
-     *
-     * @param value allowed object is
-     *              {@link MapKeyClass }
-     */
-    public void setMapKeyClass(final MapKeyClass value) {
-        this.mapKeyClass = value;
-    }
-
-    /**
-     * Gets the value of the mapKeyTemporal property.
-     *
-     * @return possible object is
-     * {@link org.apache.openejb.jee.jpa.TemporalType }
-     */
-    public TemporalType getMapKeyTemporal() {
-        return mapKeyTemporal;
-    }
-
-    /**
-     * Sets the value of the mapKeyTemporal property.
-     *
-     * @param value allowed object is
-     *              {@link org.apache.openejb.jee.jpa.TemporalType }
-     */
-    public void setMapKeyTemporal(final TemporalType value) {
-        this.mapKeyTemporal = value;
-    }
-
-    /**
-     * Gets the value of the mapKeyEnumerated property.
-     *
-     * @return possible object is
-     * {@link org.apache.openejb.jee.jpa.EnumType }
-     */
-    public EnumType getMapKeyEnumerated() {
-        return mapKeyEnumerated;
-    }
-
-    /**
-     * Sets the value of the mapKeyEnumerated property.
-     *
-     * @param value allowed object is
-     *              {@link org.apache.openejb.jee.jpa.EnumType }
-     */
-    public void setMapKeyEnumerated(final EnumType value) {
-        this.mapKeyEnumerated = value;
-    }
-
-    /**
-     * Gets the value of the mapKeyAttributeOverride property.
-     * <p/>
-     * <p/>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the mapKeyAttributeOverride property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getMapKeyAttributeOverride().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link org.apache.openejb.jee.jpa.AttributeOverride }
-     */
-    public List<AttributeOverride> getMapKeyAttributeOverride() {
-        if (mapKeyAttributeOverride == null) {
-            mapKeyAttributeOverride = new ArrayList<AttributeOverride>();
-        }
-        return this.mapKeyAttributeOverride;
-    }
-
-    /**
-     * Gets the value of the mapKeyColumn property.
-     *
-     * @return possible object is
-     * {@link MapKeyColumn }
-     */
-    public MapKeyColumn getMapKeyColumn() {
-        return mapKeyColumn;
-    }
-
-    /**
-     * Sets the value of the mapKeyColumn property.
-     *
-     * @param value allowed object is
-     *              {@link MapKeyColumn }
-     */
-    public void setMapKeyColumn(final MapKeyColumn value) {
-        this.mapKeyColumn = value;
-    }
-
-    /**
-     * Gets the value of the mapKeyJoinColumn property.
-     * <p/>
-     * <p/>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the mapKeyJoinColumn property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getMapKeyJoinColumn().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link MapKeyJoinColumn }
-     */
-    public List<MapKeyJoinColumn> getMapKeyJoinColumn() {
-        if (mapKeyJoinColumn == null) {
-            mapKeyJoinColumn = new ArrayList<MapKeyJoinColumn>();
-        }
-        return this.mapKeyJoinColumn;
-    }
-
-    /**
-     * Gets the value of the column property.
-     *
-     * @return possible object is
-     * {@link org.apache.openejb.jee.jpa.Column }
-     */
-    public Column getColumn() {
-        return column;
-    }
-
-    /**
-     * Sets the value of the column property.
-     *
-     * @param value allowed object is
-     *              {@link org.apache.openejb.jee.jpa.Column }
-     */
-    public void setColumn(final Column value) {
-        this.column = value;
-    }
-
-    /**
-     * Gets the value of the temporal property.
-     *
-     * @return possible object is
-     * {@link org.apache.openejb.jee.jpa.TemporalType }
-     */
-    public TemporalType getTemporal() {
-        return temporal;
-    }
-
-    /**
-     * Sets the value of the temporal property.
-     *
-     * @param value allowed object is
-     *              {@link org.apache.openejb.jee.jpa.TemporalType }
-     */
-    public void setTemporal(final TemporalType value) {
-        this.temporal = value;
-    }
-
-    /**
-     * Gets the value of the enumerated property.
-     *
-     * @return possible object is
-     * {@link org.apache.openejb.jee.jpa.EnumType }
-     */
-    public EnumType getEnumerated() {
-        return enumerated;
-    }
-
-    /**
-     * Sets the value of the enumerated property.
-     *
-     * @param value allowed object is
-     *              {@link org.apache.openejb.jee.jpa.EnumType }
-     */
-    public void setEnumerated(final EnumType value) {
-        this.enumerated = value;
-    }
-
-    /**
-     * Gets the value of the lob property.
-     *
-     * @return possible object is
-     * {@link org.apache.openejb.jee.jpa.Lob }
-     */
-    public Lob getLob() {
-        return lob;
-    }
-
-    /**
-     * Sets the value of the lob property.
-     *
-     * @param value allowed object is
-     *              {@link org.apache.openejb.jee.jpa.Lob }
-     */
-    public void setLob(final Lob value) {
-        this.lob = value;
-    }
-
-    /**
-     * Gets the value of the attributeOverride property.
-     * <p/>
-     * <p/>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the attributeOverride property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAttributeOverride().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link org.apache.openejb.jee.jpa.AttributeOverride }
-     */
-    public List<AttributeOverride> getAttributeOverride() {
-        if (attributeOverride == null) {
-            attributeOverride = new ArrayList<AttributeOverride>();
-        }
-        return this.attributeOverride;
-    }
-
-    /**
-     * Gets the value of the associationOverride property.
-     * <p/>
-     * <p/>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the associationOverride property.
-     * <p/>
-     * <p/>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAssociationOverride().add(newItem);
-     * </pre>
-     * <p/>
-     * <p/>
-     * <p/>
-     * Objects of the following type(s) are allowed in the list
-     * {@link org.apache.openejb.jee.jpa.AssociationOverride }
-     */
-    public List<AssociationOverride> getAssociationOverride() {
-        if (associationOverride == null) {
-            associationOverride = new ArrayList<AssociationOverride>();
-        }
-        return this.associationOverride;
-    }
-
-    /**
-     * Gets the value of the collectionTable property.
-     *
-     * @return possible object is
-     * {@link CollectionTable }
-     */
-    public CollectionTable getCollectionTable() {
-        return collectionTable;
-    }
-
-    /**
-     * Sets the value of the collectionTable property.
-     *
-     * @param value allowed object is
-     *              {@link CollectionTable }
-     */
-    public void setCollectionTable(final CollectionTable value) {
-        this.collectionTable = value;
-    }
-
-    /**
-     * Gets the value of the name property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setName(final String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the targetClass property.
-     *
-     * @return possible object is
-     * {@link String }
-     */
-    public String getTargetClass() {
-        return targetClass;
-    }
-
-    /**
-     * Sets the value of the targetClass property.
-     *
-     * @param value allowed object is
-     *              {@link String }
-     */
-    public void setTargetClass(final String value) {
-        this.targetClass = value;
-    }
-
-    /**
-     * Gets the value of the fetch property.
-     *
-     * @return possible object is
-     * {@link org.apache.openejb.jee.jpa.FetchType }
-     */
-    public FetchType getFetch() {
-        return fetch;
-    }
-
-    /**
-     * Sets the value of the fetch property.
-     *
-     * @param value allowed object is
-     *              {@link org.apache.openejb.jee.jpa.FetchType }
-     */
-    public void setFetch(final FetchType value) {
-        this.fetch = value;
-    }
-
-    /**
-     * Gets the value of the access property.
-     *
-     * @return possible object is
-     * {@link org.apache.openejb.jee.jpa.AccessType }
-     */
-    public AccessType getAccess() {
-        return access;
-    }
-
-    /**
-     * Sets the value of the access property.
-     *
-     * @param value allowed object is
-     *              {@link org.apache.openejb.jee.jpa.AccessType }
-     */
-    public void setAccess(final AccessType value) {
-        this.access = value;
-    }
-
-}
+/**
+ * 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.
+ */
+
+package org.apache.openejb.jee.jpa;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import java.util.ArrayList;
+import java.util.List;
+
+
+/**
+ * @Target({METHOD, FIELD}) @Retention(RUNTIME)
+ * public @interface ElementCollection {
+ * Class targetClass() default void.class;
+ * FetchType fetch() default LAZY;
+ * }
+ * <p/>
+ * <p/>
+ * <p/>
+ * <p>Java class for element-collection complex type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;complexType name="element-collection">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;choice>
+ *           &lt;element name="order-by" type="{http://java.sun.com/xml/ns/persistence/orm}order-by" minOccurs="0"/>
+ *           &lt;element name="order-column" type="{http://java.sun.com/xml/ns/persistence/orm}order-column" minOccurs="0"/>
+ *         &lt;/choice>
+ *         &lt;choice>
+ *           &lt;element name="map-key" type="{http://java.sun.com/xml/ns/persistence/orm}map-key" minOccurs="0"/>
+ *           &lt;sequence>
+ *             &lt;element name="map-key-class" type="{http://java.sun.com/xml/ns/persistence/orm}map-key-class" minOccurs="0"/>
+ *             &lt;choice>
+ *               &lt;element name="map-key-temporal" type="{http://java.sun.com/xml/ns/persistence/orm}temporal" minOccurs="0"/>
+ *               &lt;element name="map-key-enumerated" type="{http://java.sun.com/xml/ns/persistence/orm}enumerated" minOccurs="0"/>
+ *               &lt;element name="map-key-attribute-override" type="{http://java.sun.com/xml/ns/persistence/orm}attribute-override" maxOccurs="unbounded" minOccurs="0"/>
+ *             &lt;/choice>
+ *             &lt;choice>
+ *               &lt;element name="map-key-column" type="{http://java.sun.com/xml/ns/persistence/orm}map-key-column" minOccurs="0"/>
+ *               &lt;element name="map-key-join-column" type="{http://java.sun.com/xml/ns/persistence/orm}map-key-join-column" maxOccurs="unbounded" minOccurs="0"/>
+ *             &lt;/choice>
+ *           &lt;/sequence>
+ *         &lt;/choice>
+ *         &lt;choice>
+ *           &lt;sequence>
+ *             &lt;element name="column" type="{http://java.sun.com/xml/ns/persistence/orm}column" minOccurs="0"/>
+ *             &lt;choice>
+ *               &lt;element name="temporal" type="{http://java.sun.com/xml/ns/persistence/orm}temporal" minOccurs="0"/>
+ *               &lt;element name="enumerated" type="{http://java.sun.com/xml/ns/persistence/orm}enumerated" minOccurs="0"/>
+ *               &lt;element name="lob" type="{http://java.sun.com/xml/ns/persistence/orm}lob" minOccurs="0"/>
+ *             &lt;/choice>
+ *           &lt;/sequence>
+ *           &lt;sequence>
+ *             &lt;element name="attribute-override" type="{http://java.sun.com/xml/ns/persistence/orm}attribute-override" maxOccurs="unbounded" minOccurs="0"/>
+ *             &lt;element name="association-override" type="{http://java.sun.com/xml/ns/persistence/orm}association-override" maxOccurs="unbounded" minOccurs="0"/>
+ *           &lt;/sequence>
+ *         &lt;/choice>
+ *         &lt;element name="collection-table" type="{http://java.sun.com/xml/ns/persistence/orm}collection-table" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="target-class" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="fetch" type="{http://java.sun.com/xml/ns/persistence/orm}fetch-type" />
+ *       &lt;attribute name="access" type="{http://java.sun.com/xml/ns/persistence/orm}access-type" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "element-collection", propOrder = {
+    "orderBy",
+    "orderColumn",
+    "mapKey",
+    "mapKeyClass",
+    "mapKeyTemporal",
+    "mapKeyEnumerated",
+    "mapKeyAttributeOverride",
+    "mapKeyColumn",
+    "mapKeyJoinColumn",
+    "column",
+    "temporal",
+    "enumerated",
+    "lob",
+    "attributeOverride",
+    "associationOverride",
+    "collectionTable"
+})
+public class ElementCollection {
+
+    @XmlElement(name = "order-by")
+    protected String orderBy;
+    @XmlElement(name = "order-column")
+    protected OrderColumn orderColumn;
+    @XmlElement(name = "map-key")
+    protected MapKey mapKey;
+    @XmlElement(name = "map-key-class")
+    protected MapKeyClass mapKeyClass;
+    @XmlElement(name = "map-key-temporal")
+    protected TemporalType mapKeyTemporal;
+    @XmlElement(name = "map-key-enumerated")
+    protected EnumType mapKeyEnumerated;
+    @XmlElement(name = "map-key-attribute-override")
+    protected List<AttributeOverride> mapKeyAttributeOverride;
+    @XmlElement(name = "map-key-column")
+    protected MapKeyColumn mapKeyColumn;
+    @XmlElement(name = "map-key-join-column")
+    protected List<MapKeyJoinColumn> mapKeyJoinColumn;
+    protected Column column;
+    protected TemporalType temporal;
+    protected EnumType enumerated;
+    protected Lob lob;
+    @XmlElement(name = "attribute-override")
+    protected List<AttributeOverride> attributeOverride;
+    @XmlElement(name = "association-override")
+    protected List<AssociationOverride> associationOverride;
+    @XmlElement(name = "collection-table")
+    protected CollectionTable collectionTable;
+    @XmlAttribute(required = true)
+    protected String name;
+    @XmlAttribute(name = "target-class")
+    protected String targetClass;
+    @XmlAttribute
+    protected FetchType fetch;
+    @XmlAttribute
+    protected AccessType access;
+
+    /**
+     * Gets the value of the orderBy property.
+     *
+     * @return possible object is
+     * {@link String }
+     */
+    public String getOrderBy() {
+        return orderBy;
+    }
+
+    /**
+     * Sets the value of the orderBy property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setOrderBy(final String value) {
+        this.orderBy = value;
+    }
+
+    /**
+     * Gets the value of the orderColumn property.
+     *
+     * @return possible object is
+     * {@link OrderColumn }
+     */
+    public OrderColumn getOrderColumn() {
+        return orderColumn;
+    }
+
+    /**
+     * Sets the value of the orderColumn property.
+     *
+     * @param value allowed object is
+     *              {@link OrderColumn }
+     */
+    public void setOrderColumn(final OrderColumn value) {
+        this.orderColumn = value;
+    }
+
+    /**
+     * Gets the value of the mapKey property.
+     *
+     * @return possible object is
+     * {@link org.apache.openejb.jee.jpa.MapKey }
+     */
+    public MapKey getMapKey() {
+        return mapKey;
+    }
+
+    /**
+     * Sets the value of the mapKey property.
+     *
+     * @param value allowed object is
+     *              {@link org.apache.openejb.jee.jpa.MapKey }
+     */
+    public void setMapKey(final MapKey value) {
+        this.mapKey = value;
+    }
+
+    /**
+     * Gets the value of the mapKeyClass property.
+     *
+     * @return possible object is
+     * {@link MapKeyClass }
+     */
+    public MapKeyClass getMapKeyClass() {
+        return mapKeyClass;
+    }
+
+    /**
+     * Sets the value of the mapKeyClass property.
+     *
+     * @param value allowed object is
+     *              {@link MapKeyClass }
+     */
+    public void setMapKeyClass(final MapKeyClass value) {
+        this.mapKeyClass = value;
+    }
+
+    /**
+     * Gets the value of the mapKeyTemporal property.
+     *
+     * @return possible object is
+     * {@link org.apache.openejb.jee.jpa.TemporalType }
+     */
+    public TemporalType getMapKeyTemporal() {
+        return mapKeyTemporal;
+    }
+
+    /**
+     * Sets the value of the mapKeyTemporal property.
+     *
+     * @param value allowed object is
+     *              {@link org.apache.openejb.jee.jpa.TemporalType }
+     */
+    public void setMapKeyTemporal(final TemporalType value) {
+        this.mapKeyTemporal = value;
+    }
+
+    /**
+     * Gets the value of the mapKeyEnumerated property.
+     *
+     * @return possible object is
+     * {@link org.apache.openejb.jee.jpa.EnumType }
+     */
+    public EnumType getMapKeyEnumerated() {
+        return mapKeyEnumerated;
+    }
+
+    /**
+     * Sets the value of the mapKeyEnumerated property.
+     *
+     * @param value allowed object is
+     *              {@link org.apache.openejb.jee.jpa.EnumType }
+     */
+    public void setMapKeyEnumerated(final EnumType value) {
+        this.mapKeyEnumerated = value;
+    }
+
+    /**
+     * Gets the value of the mapKeyAttributeOverride property.
+     * <p/>
+     * <p/>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the mapKeyAttributeOverride property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getMapKeyAttributeOverride().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link org.apache.openejb.jee.jpa.AttributeOverride }
+     */
+    public List<AttributeOverride> getMapKeyAttributeOverride() {
+        if (mapKeyAttributeOverride == null) {
+            mapKeyAttributeOverride = new ArrayList<AttributeOverride>();
+        }
+        return this.mapKeyAttributeOverride;
+    }
+
+    /**
+     * Gets the value of the mapKeyColumn property.
+     *
+     * @return possible object is
+     * {@link MapKeyColumn }
+     */
+    public MapKeyColumn getMapKeyColumn() {
+        return mapKeyColumn;
+    }
+
+    /**
+     * Sets the value of the mapKeyColumn property.
+     *
+     * @param value allowed object is
+     *              {@link MapKeyColumn }
+     */
+    public void setMapKeyColumn(final MapKeyColumn value) {
+        this.mapKeyColumn = value;
+    }
+
+    /**
+     * Gets the value of the mapKeyJoinColumn property.
+     * <p/>
+     * <p/>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the mapKeyJoinColumn property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getMapKeyJoinColumn().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link MapKeyJoinColumn }
+     */
+    public List<MapKeyJoinColumn> getMapKeyJoinColumn() {
+        if (mapKeyJoinColumn == null) {
+            mapKeyJoinColumn = new ArrayList<MapKeyJoinColumn>();
+        }
+        return this.mapKeyJoinColumn;
+    }
+
+    /**
+     * Gets the value of the column property.
+     *
+     * @return possible object is
+     * {@link org.apache.openejb.jee.jpa.Column }
+     */
+    public Column getColumn() {
+        return column;
+    }
+
+    /**
+     * Sets the value of the column property.
+     *
+     * @param value allowed object is
+     *              {@link org.apache.openejb.jee.jpa.Column }
+     */
+    public void setColumn(final Column value) {
+        this.column = value;
+    }
+
+    /**
+     * Gets the value of the temporal property.
+     *
+     * @return possible object is
+     * {@link org.apache.openejb.jee.jpa.TemporalType }
+     */
+    public TemporalType getTemporal() {
+        return temporal;
+    }
+
+    /**
+     * Sets the value of the temporal property.
+     *
+     * @param value allowed object is
+     *              {@link org.apache.openejb.jee.jpa.TemporalType }
+     */
+    public void setTemporal(final TemporalType value) {
+        this.temporal = value;
+    }
+
+    /**
+     * Gets the value of the enumerated property.
+     *
+     * @return possible object is
+     * {@link org.apache.openejb.jee.jpa.EnumType }
+     */
+    public EnumType getEnumerated() {
+        return enumerated;
+    }
+
+    /**
+     * Sets the value of the enumerated property.
+     *
+     * @param value allowed object is
+     *              {@link org.apache.openejb.jee.jpa.EnumType }
+     */
+    public void setEnumerated(final EnumType value) {
+        this.enumerated = value;
+    }
+
+    /**
+     * Gets the value of the lob property.
+     *
+     * @return possible object is
+     * {@link org.apache.openejb.jee.jpa.Lob }
+     */
+    public Lob getLob() {
+        return lob;
+    }
+
+    /**
+     * Sets the value of the lob property.
+     *
+     * @param value allowed object is
+     *              {@link org.apache.openejb.jee.jpa.Lob }
+     */
+    public void setLob(final Lob value) {
+        this.lob = value;
+    }
+
+    /**
+     * Gets the value of the attributeOverride property.
+     * <p/>
+     * <p/>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the attributeOverride property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAttributeOverride().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link org.apache.openejb.jee.jpa.AttributeOverride }
+     */
+    public List<AttributeOverride> getAttributeOverride() {
+        if (attributeOverride == null) {
+            attributeOverride = new ArrayList<AttributeOverride>();
+        }
+        return this.attributeOverride;
+    }
+
+    /**
+     * Gets the value of the associationOverride property.
+     * <p/>
+     * <p/>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the associationOverride property.
+     * <p/>
+     * <p/>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAssociationOverride().add(newItem);
+     * </pre>
+     * <p/>
+     * <p/>
+     * <p/>
+     * Objects of the following type(s) are allowed in the list
+     * {@link org.apache.openejb.jee.jpa.AssociationOverride }
+     */
+    public List<AssociationOverride> getAssociationOverride() {
+        if (associationOverride == null) {
+            associationOverride = new ArrayList<AssociationOverride>();
+        }
+        return this.associationOverride;
+    }
+
+    /**
+     * Gets the value of the collectionTable property.
+     *
+     * @return possible object is
+     * {@link CollectionTable }
+     */
+    public CollectionTable getCollectionTable() {
+        return collectionTable;
+    }
+
+    /**
+     * Sets the value of the collectionTable property.
+     *
+     * @param value allowed object is
+     *              {@link CollectionTable }
+     */
+    public void setCollectionTable(final CollectionTable value) {
+        this.collectionTable = value;
+    }
+
+    /**
+     * Gets the value of the name property.
+     *
+     * @return possible object is
+     * {@link String }
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setName(final String value) {
+        this.name = value;
+    }
+
+    /**
+     * Gets the value of the targetClass property.
+     *
+     * @return possible object is
+     * {@link String }
+     */
+    public String getTargetClass() {
+        return targetClass;
+    }
+
+    /**
+     * Sets the value of the targetClass property.
+     *
+     * @param value allowed object is
+     *              {@link String }
+     */
+    public void setTargetClass(final String value) {
+        this.targetClass = value;
+    }
+
+    /**
+     * Gets the value of the fetch property.
+     *
+     * @return possible object is
+     * {@link org.apache.openejb.jee.jpa.FetchType }
+     */
+    public FetchType getFetch() {
+        return fetch;
+    }
+
+    /**
+     * Sets the value of the fetch property.
+     *
+     * @param value allowed object is
+     *              {@link org.apache.openejb.jee.jpa.FetchType }
+     */
+    public void setFetch(final FetchType value) {
+        this.fetch = value;
+    }
+
+    /**
+     * Gets the value of the access property.
+     *
+     * @return possible object is
+     * {@link org.apache.openejb.jee.jpa.AccessType }
+     */
+    public AccessType getAccess() {
+        return access;
+    }
+
+    /**
+     * Sets the value of the access property.
+     *
+     * @param value allowed object is
+     *              {@link org.apache.openejb.jee.jpa.AccessType }
+     */
+    public void setAccess(final AccessType value) {
+        this.access = value;
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/tomee/blob/48c99a5a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/LockModeType.java
----------------------------------------------------------------------
diff --git a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/LockModeType.java b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/LockModeType.java
index 995479e..292089e 100644
--- a/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/LockModeType.java
+++ b/container/openejb-jee/src/main/java/org/apache/openejb/jee/jpa/LockModeType.java
@@ -1,65 +1,65 @@
-/**
- * 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.
- */
-
-package org.apache.openejb.jee.jpa;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for lock-mode-type.
- * <p/>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p/>
- * <pre>
- * &lt;simpleType name="lock-mode-type">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token">
- *     &lt;enumeration value="READ"/>
- *     &lt;enumeration value="WRITE"/>
- *     &lt;enumeration value="OPTIMISTIC"/>
- *     &lt;enumeration value="OPTIMISTIC_FORCE_INCREMENT"/>
- *     &lt;enumeration value="PESSIMISTIC_READ"/>
- *     &lt;enumeration value="PESSIMISTIC_WRITE"/>
- *     &lt;enumeration value="PESSIMISTIC_FORCE_INCREMENT"/>
- *     &lt;enumeration value="NONE"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- */
-@XmlType(name = "lock-mode-type")
-@XmlEnum
-public enum LockModeType {
-
-    READ,
-    WRITE,
-    OPTIMISTIC,
-    OPTIMISTIC_FORCE_INCREMENT,
-    PESSIMISTIC_READ,
-    PESSIMISTIC_WRITE,
-    PESSIMISTIC_FORCE_INCREMENT,
-    NONE;
-
-    public String value() {
-        return name();
-    }
-
-    public static LockModeType fromValue(final String v) {
-        return valueOf(v);
-    }
-
-}
+/**
+ * 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.
+ */
+
+package org.apache.openejb.jee.jpa;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for lock-mode-type.
+ * <p/>
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p/>
+ * <pre>
+ * &lt;simpleType name="lock-mode-type">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token">
+ *     &lt;enumeration value="READ"/>
+ *     &lt;enumeration value="WRITE"/>
+ *     &lt;enumeration value="OPTIMISTIC"/>
+ *     &lt;enumeration value="OPTIMISTIC_FORCE_INCREMENT"/>
+ *     &lt;enumeration value="PESSIMISTIC_READ"/>
+ *     &lt;enumeration value="PESSIMISTIC_WRITE"/>
+ *     &lt;enumeration value="PESSIMISTIC_FORCE_INCREMENT"/>
+ *     &lt;enumeration value="NONE"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ */
+@XmlType(name = "lock-mode-type")
+@XmlEnum
+public enum LockModeType {
+
+    READ,
+    WRITE,
+    OPTIMISTIC,
+    OPTIMISTIC_FORCE_INCREMENT,
+    PESSIMISTIC_READ,
+    PESSIMISTIC_WRITE,
+    PESSIMISTIC_FORCE_INCREMENT,
+    NONE;
+
+    public String value() {
+        return name();
+    }
+
+    public static LockModeType fromValue(final String v) {
+        return valueOf(v);
+    }
+
+}